diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2014-01-07 15:19:53 +1100 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2014-01-07 15:19:53 +1100 |
| commit | 812114d9c1f39469d9c4630f4f1c9753a1cba7c0 (patch) | |
| tree | 87ab3b4c8aee84e5f7e19e17d1f47194ecb3b65b /LUFA/Build | |
| parent | 129824028b39ad0de6a8db35f82d333dd7271547 (diff) | |
| download | lufa-812114d9c1f39469d9c4630f4f1c9753a1cba7c0.tar.gz lufa-812114d9c1f39469d9c4630f4f1c9753a1cba7c0.tar.bz2 lufa-812114d9c1f39469d9c4630f4f1c9753a1cba7c0.zip | |
Fix broken teensy-ee build rule.
Diffstat (limited to 'LUFA/Build')
| -rw-r--r-- | LUFA/Build/lufa_hid.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/LUFA/Build/lufa_hid.mk b/LUFA/Build/lufa_hid.mk index 96b2eba87..e79b7bf4d 100644 --- a/LUFA/Build/lufa_hid.mk +++ b/LUFA/Build/lufa_hid.mk @@ -52,6 +52,8 @@ LUFA_BUILD_PROVIDED_MACROS += SHELL = /bin/sh +LUFA_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) + ERROR_IF_UNSET ?= $(if $(filter undefined, $(origin $(strip $(1)))), $(error Makefile $(strip $(1)) value not set)) ERROR_IF_EMPTY ?= $(if $(strip $($(strip $(1)))), , $(error Makefile $(strip $(1)) option cannot be blank)) ERROR_IF_NONBOOL ?= $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(strip $(1)) option must be Y or N)) @@ -74,9 +76,9 @@ hid: $(TARGET).hex $(MAKEFILE_LIST) # Programs in the target EEPROM memory using the HID_BOOTLOADER_CLI tool (note: clears target FLASH memory) hid-ee: $(TARGET).eep $(MAKEFILE_LIST) @echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a binary file \"InputEEData.bin\" - avr-objcopy -I ihex -O binary $< $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/InputEEData.bin + avr-objcopy -I ihex -O binary $< $(LUFA_MODULE_PATH)/HID_EEPROM_Loader/InputEEData.bin @echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\" - $(MAKE) -C $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/ MCU=$(MCU) clean hid + $(MAKE) -C $(LUFA_MODULE_PATH)/HID_EEPROM_Loader/ MCU=$(MCU) clean hid # Programs in the target FLASH memory using the TEENSY_BOOTLOADER_CLI tool teensy: $(TARGET).hex $(MAKEFILE_LIST) @@ -86,9 +88,9 @@ teensy: $(TARGET).hex $(MAKEFILE_LIST) # Programs in the target EEPROM memory using the TEENSY_BOOTLOADER_CLI tool (note: clears target FLASH memory) teensy-ee: $(TARGET).hex $(MAKEFILE_LIST) @echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a binary file \"InputEEData.bin\" - avr-objcopy -I ihex -O binary $< $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/InputEEData.bin + avr-objcopy -I ihex -O binary $< $(LUFA_MODULE_PATH)/HID_EEPROM_Loader/InputEEData.bin @echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\" - $(MAKE) -s -C $(patsubst %/,%,$(LUFA_PATH))/Build/HID_EEPROM_Loader/ MCU=$(MCU) clean hid-teensy + $(MAKE) -s -C $(LUFA_MODULE_PATH)/HID_EEPROM_Loader/ MCU=$(MCU) clean teensy # Phony build targets for this module .PHONY: hid hid-ee teensy teensy-ee |