Fix makefiles -- the auto-addition of -D switches to each LUFA compile time option...

[pub/USBasp.git] / Bootloaders / DFU / makefile

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index 4103014..f3d5cfa 100644 (file)
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -111,13 +111,13 @@ LUFA_PATH = ../..
 \r
 \r
 # LUFA library compile-time options\r
-LUFA_OPTS  = USB_DEVICE_ONLY\r
-LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += CONTROL_ONLY_DEVICE\r
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=32\r
-LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-LUFA_OPTS += USE_RAM_DESCRIPTORS\r
+LUFA_OPTS  = -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32\r
+LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
@@ -182,7 +182,7 @@ BOOT_START = 0x1E000
 \r
 \r
 # Place -D or -U options here for C sources\r
-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r
 \r
 \r