diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-19 05:08:04 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-19 05:08:04 +0000 |
| commit | feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181 (patch) | |
| tree | 0ba750826bc90999461f8b5657157742771c6956 /Bootloaders/DFU/makefile | |
| parent | beb0b2bda0c45e958e88933a055d409e42fa0a0b (diff) | |
| download | lufa-feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181.tar.gz lufa-feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181.tar.bz2 lufa-feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181.zip | |
Fix makefiles -- the auto-addition of -D switches to each LUFA compile time option was faulty, due to GNUMake becomming confused by the spaces in the USE_STATIC_OPTIONS lines. Make user add in the switches explicitly instead.
Diffstat (limited to 'Bootloaders/DFU/makefile')
| -rw-r--r-- | Bootloaders/DFU/makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 410301431..f3d5cfad8 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -111,13 +111,13 @@ LUFA_PATH = ../.. # LUFA library compile-time options
-LUFA_OPTS = USB_DEVICE_ONLY
-LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES
-LUFA_OPTS += CONTROL_ONLY_DEVICE
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=32
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-LUFA_OPTS += USE_RAM_DESCRIPTORS
+LUFA_OPTS = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += -D CONTROL_ONLY_DEVICE
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D USE_RAM_DESCRIPTORS
# List C source files here. (C dependencies are automatically generated.)
@@ -182,7 +182,7 @@ BOOT_START = 0x1E000 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
|