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.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@616 d5102386-fcda-11dd-9fdb-3debd5008f28

13 files changed, 92 insertions, 92 deletions

diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile
index 8ebf0494..58e953e9 100644
--- a/Demos/Device/LowLevel/AudioInput/makefile
+++ b/Demos/Device/LowLevel/AudioInput/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/AudioOutput/makefile b/Demos/Device/LowLevel/AudioOutput/makefile
index 1401e90c..63ad2df3 100644
--- a/Demos/Device/LowLevel/AudioOutput/makefile
+++ b/Demos/Device/LowLevel/AudioOutput/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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 += -DAUDIO_OUT_STEREO

 

 

diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile
index ea135975..886a66f9 100644
--- a/Demos/Device/LowLevel/CDC/makefile
+++ b/Demos/Device/LowLevel/CDC/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/DualCDC/makefile b/Demos/Device/LowLevel/DualCDC/makefile
index 3191b60f..b31a8da3 100644
--- a/Demos/Device/LowLevel/DualCDC/makefile
+++ b/Demos/Device/LowLevel/DualCDC/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/GenericHID/makefile b/Demos/Device/LowLevel/GenericHID/makefile
index e53346b9..3d7cf94c 100644
--- a/Demos/Device/LowLevel/GenericHID/makefile
+++ b/Demos/Device/LowLevel/GenericHID/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile
index a9a51d17..ac6a31f0 100644
--- a/Demos/Device/LowLevel/Joystick/makefile
+++ b/Demos/Device/LowLevel/Joystick/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/Keyboard/makefile b/Demos/Device/LowLevel/Keyboard/makefile
index a3399110..a73167a5 100644
--- a/Demos/Device/LowLevel/Keyboard/makefile
+++ b/Demos/Device/LowLevel/Keyboard/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile
index 7282d9fc..acb2438b 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/makefile
+++ b/Demos/Device/LowLevel/KeyboardMouse/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/MIDI/makefile b/Demos/Device/LowLevel/MIDI/makefile
index f9ff1ed8..cd5795bb 100644
--- a/Demos/Device/LowLevel/MIDI/makefile
+++ b/Demos/Device/LowLevel/MIDI/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/MassStorage/makefile b/Demos/Device/LowLevel/MassStorage/makefile
index e2301468..062007f1 100644
--- a/Demos/Device/LowLevel/MassStorage/makefile
+++ b/Demos/Device/LowLevel/MassStorage/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += USB_DEVICE_ONLY 

-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 += INTERRUPT_CONTROL_ENDPOINT

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D USB_DEVICE_ONLY 

+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 INTERRUPT_CONTROL_ENDPOINT

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/Mouse/makefile b/Demos/Device/LowLevel/Mouse/makefile
index 49126802..fc7d438b 100644
--- a/Demos/Device/LowLevel/Mouse/makefile
+++ b/Demos/Device/LowLevel/Mouse/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -188,7 +188,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile
index e17c7344..423aaab0 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/makefile
+++ b/Demos/Device/LowLevel/RNDISEthernet/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -201,8 +201,8 @@ CSTANDARD = -std=gnu99
 

 

 # 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 += NO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP

+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)

+CDEFS += -DNO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP

 

 

 # Place -D or -U options here for ASM sources

diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile
index ff46809e..00e4c556 100644
--- a/Demos/Device/LowLevel/USBtoSerial/makefile
+++ b/Demos/Device/LowLevel/USBtoSerial/makefile
@@ -123,12 +123,12 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_DEVICE_ONLY

-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  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_DEVICE_ONLY

+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)"

 

 

 # List C source files here. (C dependencies are automatically generated.)

@@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99
 

 

 # 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)

 

 

 # Place -D or -U options here for ASM sources