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

18 files changed, 88 insertions, 88 deletions

diff --git a/Demos/Host/ClassDriver/CDCHost/makefile b/Demos/Host/ClassDriver/CDCHost/makefile
index 59e79539..2d18a178 100644
--- a/Demos/Host/ClassDriver/CDCHost/makefile
+++ b/Demos/Host/ClassDriver/CDCHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(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

diff --git a/Demos/Host/ClassDriver/GenericHIDHost/makefile b/Demos/Host/ClassDriver/GenericHIDHost/makefile
index fa993051..e2138152 100644
--- a/Demos/Host/ClassDriver/GenericHIDHost/makefile
+++ b/Demos/Host/ClassDriver/GenericHIDHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(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_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

 # 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/Host/ClassDriver/KeyboardHost/makefile b/Demos/Host/ClassDriver/KeyboardHost/makefile
index be9a8cad..34873598 100644
--- a/Demos/Host/ClassDriver/KeyboardHost/makefile
+++ b/Demos/Host/ClassDriver/KeyboardHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(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

diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
index 4b9aa454..fb71c57c 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

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

@@ -192,7 +192,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/Host/ClassDriver/MassStorageHost/makefile b/Demos/Host/ClassDriver/MassStorageHost/makefile
index f9234f41..be32c628 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/makefile
+++ b/Demos/Host/ClassDriver/MassStorageHost/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-LUFA_OPTS += USB_STREAM_TIMEOUT_MS=2000

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+LUFA_OPTS += -D USB_STREAM_TIMEOUT_MS=2000

 

 

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

@@ -192,7 +192,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/Host/ClassDriver/MouseHost/makefile b/Demos/Host/ClassDriver/MouseHost/makefile
index be9e9d7c..d835f279 100644
--- a/Demos/Host/ClassDriver/MouseHost/makefile
+++ b/Demos/Host/ClassDriver/MouseHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(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_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

 # 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/Host/ClassDriver/MouseHostWithParser/makefile b/Demos/Host/ClassDriver/MouseHostWithParser/makefile
index c5f81e20..4c05b9ff 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/makefile
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(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_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

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

@@ -192,7 +192,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/Host/ClassDriver/StillImageHost/makefile b/Demos/Host/ClassDriver/StillImageHost/makefile
index c1cedd87..9ae6a02c 100644
--- a/Demos/Host/ClassDriver/StillImageHost/makefile
+++ b/Demos/Host/ClassDriver/StillImageHost/makefile
@@ -122,10 +122,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(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_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(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/Host/Incomplete/BluetoothHost/makefile b/Demos/Host/Incomplete/BluetoothHost/makefile
index 86bdd040..2bbcc3be 100644
--- a/Demos/Host/Incomplete/BluetoothHost/makefile
+++ b/Demos/Host/Incomplete/BluetoothHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

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

@@ -193,7 +193,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/Host/LowLevel/CDCHost/makefile b/Demos/Host/LowLevel/CDCHost/makefile
index de217dff..ac158106 100644
--- a/Demos/Host/LowLevel/CDCHost/makefile
+++ b/Demos/Host/LowLevel/CDCHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(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/Host/LowLevel/GenericHIDHost/makefile b/Demos/Host/LowLevel/GenericHIDHost/makefile
index a117578a..e75ef149 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/makefile
+++ b/Demos/Host/LowLevel/GenericHIDHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(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_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(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

diff --git a/Demos/Host/LowLevel/KeyboardHost/makefile b/Demos/Host/LowLevel/KeyboardHost/makefile
index ef77810f..b86760a5 100644
--- a/Demos/Host/LowLevel/KeyboardHost/makefile
+++ b/Demos/Host/LowLevel/KeyboardHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(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/Host/LowLevel/KeyboardHostWithParser/makefile b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
index faf8910f..25144880 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

 # 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/Host/LowLevel/MassStorageHost/makefile b/Demos/Host/LowLevel/MassStorageHost/makefile
index f236eed2..96d1b9ff 100644
--- a/Demos/Host/LowLevel/MassStorageHost/makefile
+++ b/Demos/Host/LowLevel/MassStorageHost/makefile
@@ -123,11 +123,11 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

-LUFA_OPTS += USB_STREAM_TIMEOUT_MS=2000

+LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

+LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

+LUFA_OPTS += -D USB_STREAM_TIMEOUT_MS=2000

 

 

 # 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/Host/LowLevel/MouseHost/makefile b/Demos/Host/LowLevel/MouseHost/makefile
index f62697da..e6eafda9 100644
--- a/Demos/Host/LowLevel/MouseHost/makefile
+++ b/Demos/Host/LowLevel/MouseHost/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(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_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(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/Host/LowLevel/MouseHostWithParser/makefile b/Demos/Host/LowLevel/MouseHostWithParser/makefile
index caf20df6..de17efc0 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/makefile
+++ b/Demos/Host/LowLevel/MouseHostWithParser/makefile
@@ -123,10 +123,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(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_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

 # 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/Host/LowLevel/StillImageHost/makefile b/Demos/Host/LowLevel/StillImageHost/makefile
index 96eca425..258ea816 100644
--- a/Demos/Host/LowLevel/StillImageHost/makefile
+++ b/Demos/Host/LowLevel/StillImageHost/makefile
@@ -122,10 +122,10 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += NO_STREAM_CALLBACKS

-LUFA_OPTS += USB_HOST_ONLY

-LUFA_OPTS += USE_STATIC_OPTIONS="(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_HOST_ONLY

+LUFA_OPTS += -D USE_STATIC_OPTIONS="(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/Host/makefile b/Demos/Host/makefile
index 937c8fac..25314133 100644
--- a/Demos/Host/makefile
+++ b/Demos/Host/makefile
@@ -14,5 +14,5 @@
 # code.
 
 %:
-	make -C ClassDriver/ $@
+#	make -C ClassDriver/ $@        <TODO: Re-enable after Host class drivers complete>
 	make -C LowLevel/ $@