Move LUFA compile time options to a new section in the application makefiles for clarity.

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

13 files changed, 135 insertions, 54 deletions

diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile
index 38a954d0..8ebf0494 100644
--- a/Demos/Device/LowLevel/AudioInput/makefile
+++ b/Demos/Device/LowLevel/AudioInput/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -180,10 +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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 2ef97b56..1401e90c 100644
--- a/Demos/Device/LowLevel/AudioOutput/makefile
+++ b/Demos/Device/LowLevel/AudioOutput/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -180,12 +189,10 @@ 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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

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

 CDEFS += -DAUDIO_OUT_STEREO

 

+

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

 ADEFS = -DF_CPU=$(F_CPU)

 

diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile
index c8e8798d..ea135975 100644
--- a/Demos/Device/LowLevel/CDC/makefile
+++ b/Demos/Device/LowLevel/CDC/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -180,10 +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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 143c0be9..3191b60f 100644
--- a/Demos/Device/LowLevel/DualCDC/makefile
+++ b/Demos/Device/LowLevel/DualCDC/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -180,10 +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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 e9e90370..e53346b9 100644
--- a/Demos/Device/LowLevel/GenericHID/makefile
+++ b/Demos/Device/LowLevel/GenericHID/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -180,10 +189,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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

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

+

 

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

 ADEFS = -DF_CPU=$(F_CPU)

diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile
index cee822c5..a9a51d17 100644
--- a/Demos/Device/LowLevel/Joystick/makefile
+++ b/Demos/Device/LowLevel/Joystick/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -180,10 +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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 3ab9de95..a3399110 100644
--- a/Demos/Device/LowLevel/Keyboard/makefile
+++ b/Demos/Device/LowLevel/Keyboard/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -180,10 +189,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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

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

+

 

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

 ADEFS = -DF_CPU=$(F_CPU)

diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile
index b9394345..7282d9fc 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/makefile
+++ b/Demos/Device/LowLevel/KeyboardMouse/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -180,10 +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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 51c67c86..f9ff1ed8 100644
--- a/Demos/Device/LowLevel/MIDI/makefile
+++ b/Demos/Device/LowLevel/MIDI/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -180,10 +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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 77993d04..e2301468 100644
--- a/Demos/Device/LowLevel/MassStorage/makefile
+++ b/Demos/Device/LowLevel/MassStorage/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -182,11 +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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-CDEFS += -DINTERRUPT_CONTROL_ENDPOINT

+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 314148a1..49126802 100644
--- a/Demos/Device/LowLevel/Mouse/makefile
+++ b/Demos/Device/LowLevel/Mouse/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -179,10 +188,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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

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

+

 

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

 ADEFS = -DF_CPU=$(F_CPU)

diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile
index 584cba90..e17c7344 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/makefile
+++ b/Demos/Device/LowLevel/RNDISEthernet/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

       Descriptors.c                                               \

@@ -192,11 +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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-CDEFS += -DNO_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) $(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

 

 

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

diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile
index f1491a52..ff46809e 100644
--- a/Demos/Device/LowLevel/USBtoSerial/makefile
+++ b/Demos/Device/LowLevel/USBtoSerial/makefile
@@ -122,6 +122,15 @@ OBJDIR = .
 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)"

+

+

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

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

@@ -181,10 +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)

-CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY

-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION

-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

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

 

 

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