aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Host/LowLevel
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-06-19 05:08:04 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-06-19 05:08:04 +0000
commitfeabfd12ce3d14b43d2decb2b2f1c5b27e9d6181 (patch)
tree0ba750826bc90999461f8b5657157742771c6956 /Demos/Host/LowLevel
parentbeb0b2bda0c45e958e88933a055d409e42fa0a0b (diff)
downloadlufa-feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181.tar.gz
lufa-feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181.tar.bz2
lufa-feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181.zip
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.
Diffstat (limited to 'Demos/Host/LowLevel')
-rw-r--r--Demos/Host/LowLevel/CDCHost/makefile10
-rw-r--r--Demos/Host/LowLevel/GenericHIDHost/makefile10
-rw-r--r--Demos/Host/LowLevel/KeyboardHost/makefile10
-rw-r--r--Demos/Host/LowLevel/KeyboardHostWithParser/makefile10
-rw-r--r--Demos/Host/LowLevel/MassStorageHost/makefile12
-rw-r--r--Demos/Host/LowLevel/MouseHost/makefile10
-rw-r--r--Demos/Host/LowLevel/MouseHostWithParser/makefile10
-rw-r--r--Demos/Host/LowLevel/StillImageHost/makefile10
8 files changed, 41 insertions, 41 deletions
diff --git a/Demos/Host/LowLevel/CDCHost/makefile b/Demos/Host/LowLevel/CDCHost/makefile
index de217dff8..ac1581062 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 a117578a3..e75ef1490 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 ef77810ff..b86760a59 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 faf8910f6..25144880e 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 f236eed2b..96d1b9ffa 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 f62697dad..e6eafda90 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 caf20df61..de17efc0b 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 96eca4258..258ea8160 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 03:10:11 +0000