From feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Fri, 19 Jun 2009 05:08:04 +0000
Subject: 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.

---
 Bootloaders/CDC/makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Bootloaders/CDC/makefile')

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index 71e2da7f6..fce2e5b88 100644
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -111,12 +111,12 @@ LUFA_PATH = ../..
 
 
 # LUFA library compile-time options
-LUFA_OPTS  = USB_DEVICE_ONLY
-LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES
-LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8
-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 FIXED_CONTROL_ENDPOINT_SIZE=8
+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.)
@@ -181,7 +181,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
 
 
-- 
cgit v1.2.3