From 1faa5ba70aecc5a55ec198e2129181f5a79489d2 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Wed, 11 Jul 2012 19:57:19 +0000
Subject: Fix project makefiles - remove trailing slash from LUFA_PATH entries
and the XPLAINBridge project AVRISP file include path to prevent build
errors.
---
Bootloaders/CDC/makefile | 2 +-
Bootloaders/DFU/makefile | 2 +-
Bootloaders/HID/makefile | 2 +-
BuildTests/BoardDriverTest/makefile.test | 2 +-
BuildTests/ModuleTest/makefile.test | 2 +-
BuildTests/SingleUSBModeTest/makefile.test | 8 ++++----
Demos/Device/ClassDriver/AudioInput/makefile | 2 +-
Demos/Device/ClassDriver/AudioOutput/makefile | 2 +-
Demos/Device/ClassDriver/DualVirtualSerial/makefile | 2 +-
Demos/Device/ClassDriver/GenericHID/makefile | 2 +-
Demos/Device/ClassDriver/Joystick/makefile | 2 +-
Demos/Device/ClassDriver/Keyboard/makefile | 2 +-
Demos/Device/ClassDriver/KeyboardMouse/makefile | 2 +-
Demos/Device/ClassDriver/KeyboardMouseMultiReport/makefile | 2 +-
Demos/Device/ClassDriver/MIDI/makefile | 2 +-
Demos/Device/ClassDriver/MassStorage/makefile | 2 +-
Demos/Device/ClassDriver/MassStorageKeyboard/makefile | 2 +-
Demos/Device/ClassDriver/Mouse/makefile | 2 +-
Demos/Device/ClassDriver/RNDISEthernet/makefile | 2 +-
Demos/Device/ClassDriver/VirtualSerial/makefile | 2 +-
Demos/Device/ClassDriver/VirtualSerialMassStorage/makefile | 2 +-
Demos/Device/ClassDriver/VirtualSerialMouse/makefile | 2 +-
Demos/Device/Incomplete/Sideshow/makefile | 5 +++--
Demos/Device/Incomplete/TestAndMeasurement/makefile | 2 +-
Demos/Device/LowLevel/AudioInput/makefile | 2 +-
Demos/Device/LowLevel/AudioOutput/makefile | 2 +-
Demos/Device/LowLevel/DualVirtualSerial/makefile | 2 +-
Demos/Device/LowLevel/GenericHID/makefile | 2 +-
Demos/Device/LowLevel/Joystick/makefile | 2 +-
Demos/Device/LowLevel/Keyboard/makefile | 2 +-
Demos/Device/LowLevel/KeyboardMouse/makefile | 2 +-
Demos/Device/LowLevel/MIDI/makefile | 2 +-
Demos/Device/LowLevel/MassStorage/makefile | 2 +-
Demos/Device/LowLevel/Mouse/makefile | 2 +-
Demos/Device/LowLevel/RNDISEthernet/makefile | 2 +-
Demos/Device/LowLevel/VirtualSerial/makefile | 2 +-
Demos/DualRole/ClassDriver/MouseHostDevice/makefile | 2 +-
Demos/Host/ClassDriver/AndroidAccessoryHost/makefile | 2 +-
Demos/Host/ClassDriver/AudioInputHost/makefile | 2 +-
Demos/Host/ClassDriver/AudioOutputHost/makefile | 2 +-
Demos/Host/ClassDriver/JoystickHostWithParser/makefile | 2 +-
Demos/Host/ClassDriver/KeyboardHost/makefile | 2 +-
Demos/Host/ClassDriver/KeyboardHostWithParser/makefile | 2 +-
Demos/Host/ClassDriver/MIDIHost/makefile | 2 +-
Demos/Host/ClassDriver/MassStorageHost/makefile | 2 +-
Demos/Host/ClassDriver/MouseHost/makefile | 2 +-
Demos/Host/ClassDriver/MouseHostWithParser/makefile | 2 +-
Demos/Host/ClassDriver/PrinterHost/makefile | 2 +-
Demos/Host/ClassDriver/RNDISEthernetHost/makefile | 2 +-
Demos/Host/ClassDriver/StillImageHost/makefile | 2 +-
Demos/Host/ClassDriver/VirtualSerialHost/makefile | 2 +-
Demos/Host/LowLevel/AndroidAccessoryHost/makefile | 2 +-
Demos/Host/LowLevel/AudioInputHost/makefile | 2 +-
Demos/Host/LowLevel/AudioOutputHost/makefile | 2 +-
Demos/Host/LowLevel/GenericHIDHost/makefile | 2 +-
Demos/Host/LowLevel/JoystickHostWithParser/makefile | 2 +-
Demos/Host/LowLevel/KeyboardHost/makefile | 2 +-
Demos/Host/LowLevel/KeyboardHostWithParser/makefile | 2 +-
Demos/Host/LowLevel/MIDIHost/makefile | 2 +-
Demos/Host/LowLevel/MassStorageHost/makefile | 2 +-
Demos/Host/LowLevel/MouseHost/makefile | 2 +-
Demos/Host/LowLevel/MouseHostWithParser/makefile | 2 +-
Demos/Host/LowLevel/PrinterHost/makefile | 2 +-
Demos/Host/LowLevel/RNDISEthernetHost/makefile | 2 +-
Demos/Host/LowLevel/StillImageHost/makefile | 2 +-
Demos/Host/LowLevel/VirtualSerialHost/makefile | 2 +-
LUFA/Build/HID_EEPROM_Loader/makefile | 2 +-
LUFA/CodeTemplates/makefile_template | 4 ++--
Projects/AVRISP-MKII/makefile | 2 +-
Projects/Benito/makefile | 2 +-
Projects/HIDReportViewer/makefile | 2 +-
Projects/LEDNotifier/makefile | 2 +-
Projects/MIDIToneGenerator/makefile | 2 +-
Projects/Magstripe/makefile | 2 +-
Projects/MediaController/makefile | 2 +-
Projects/MissileLauncher/makefile | 2 +-
Projects/RelayBoard/makefile | 2 +-
Projects/SerialToLCD/makefile | 2 +-
Projects/TempDataLogger/makefile | 2 +-
Projects/USBtoSerial/makefile | 2 +-
Projects/Webserver/makefile | 2 +-
Projects/XPLAINBridge/makefile | 8 ++------
82 files changed, 89 insertions(+), 92 deletions(-)
diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index 5ebd8b599..6ec04993d 100644
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = BootloaderCDC
SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)
LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)
diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index b4fd268d9..626b3e95f 100644
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = BootloaderDFU
SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET)
LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)
diff --git a/Bootloaders/HID/makefile b/Bootloaders/HID/makefile
index 44ae028c9..c788c7e6c 100644
--- a/Bootloaders/HID/makefile
+++ b/Bootloaders/HID/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = BootloaderHID
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET)
diff --git a/BuildTests/BoardDriverTest/makefile.test b/BuildTests/BoardDriverTest/makefile.test
index 82ff3ad0a..06dfb5422 100644
--- a/BuildTests/BoardDriverTest/makefile.test
+++ b/BuildTests/BoardDriverTest/makefile.test
@@ -17,7 +17,7 @@ F_USB = 8000000
OPTIMIZATION = 1
TARGET = Test
SRC = $(TARGET).c
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -Werror
# Include LUFA build script makefiles
diff --git a/BuildTests/ModuleTest/makefile.test b/BuildTests/ModuleTest/makefile.test
index 4e7d6f900..aad7e728a 100644
--- a/BuildTests/ModuleTest/makefile.test
+++ b/BuildTests/ModuleTest/makefile.test
@@ -16,7 +16,7 @@ F_CPU = $(F_USB)
OPTIMIZATION = 1
TARGET = Test
SRC = $(TARGET)_C.c $(TARGET)_CPP.cpp Dummy.S $(LUFA_SRC_USB)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
ifeq ($(ARCH), AVR8)
F_USB = 8000000
diff --git a/BuildTests/SingleUSBModeTest/makefile.test b/BuildTests/SingleUSBModeTest/makefile.test
index 461a4b612..7f634821f 100644
--- a/BuildTests/SingleUSBModeTest/makefile.test
+++ b/BuildTests/SingleUSBModeTest/makefile.test
@@ -15,17 +15,17 @@ BOARD = NONE
F_CPU = $(F_USB)
ifeq ($(ARCH), AVR8)
-F_USB = 8000000
+ F_USB = 8000000
else ifeq ($(ARCH), XMEGA)
-F_USB = 48000000
+ F_USB = 48000000
else ifeq ($(ARCH), UC3)
-F_USB = 48000000
+ F_USB = 48000000
endif
OPTIMIZATION = 1
TARGET = Test
SRC = Test.c Dummy.S $(LUFA_SRC_USB)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS =
# TODO: Add warnings and set warnings as errors
diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile
index 1b251cd50..26d7bcb50 100644
--- a/Demos/Device/ClassDriver/AudioInput/makefile
+++ b/Demos/Device/ClassDriver/AudioInput/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AudioInput
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile
index 904e13684..a0bb0d07a 100644
--- a/Demos/Device/ClassDriver/AudioOutput/makefile
+++ b/Demos/Device/ClassDriver/AudioOutput/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AudioOutput
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/makefile b/Demos/Device/ClassDriver/DualVirtualSerial/makefile
index ce751a865..8658ccb13 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/makefile
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = DualVirtualSerial
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile
index 5a4b85bf3..8af6cd318 100644
--- a/Demos/Device/ClassDriver/GenericHID/makefile
+++ b/Demos/Device/ClassDriver/GenericHID/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = GenericHID
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile
index 926a50d81..eafd54bf0 100644
--- a/Demos/Device/ClassDriver/Joystick/makefile
+++ b/Demos/Device/ClassDriver/Joystick/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = Joystick
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile
index 346f428dd..0abbbd62a 100644
--- a/Demos/Device/ClassDriver/Keyboard/makefile
+++ b/Demos/Device/ClassDriver/Keyboard/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = Keyboard
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile
index 4727bb1bf..18ebb8488 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/makefile
+++ b/Demos/Device/ClassDriver/KeyboardMouse/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = KeyboardMouse
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/makefile b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/makefile
index e27213bd7..2eee38d7e 100644
--- a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/makefile
+++ b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = KeyboardMouseMultiReport
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile
index 6e5f7d36e..00d54348e 100644
--- a/Demos/Device/ClassDriver/MIDI/makefile
+++ b/Demos/Device/ClassDriver/MIDI/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MIDI
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile
index 4d2d5d03d..5ea441ee4 100644
--- a/Demos/Device/ClassDriver/MassStorage/makefile
+++ b/Demos/Device/ClassDriver/MassStorage/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MassStorage
SRC = $(TARGET).c Descriptors.c Lib/DataflashManager.c Lib/SCSI.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/makefile b/Demos/Device/ClassDriver/MassStorageKeyboard/makefile
index 2e410c869..61467be3b 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/makefile
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MassStorageKeyboard
SRC = $(TARGET).c Descriptors.c Lib/DataflashManager.c Lib/SCSI.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile
index d4781581c..e20bbd1a8 100644
--- a/Demos/Device/ClassDriver/Mouse/makefile
+++ b/Demos/Device/ClassDriver/Mouse/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = Mouse
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile
index 80242eadc..9d818e2de 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/makefile
+++ b/Demos/Device/ClassDriver/RNDISEthernet/makefile
@@ -18,7 +18,7 @@ OPTIMIZATION = s
TARGET = RNDISEthernet
SRC = $(TARGET).c Descriptors.c Lib/Ethernet.c Lib/ProtocolDecoders.c Lib/ICMP.c Lib/TCP.c Lib/UDP.c Lib/DHCP.c Lib/ARP.c \
Lib/IP.c Lib/Webserver.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/VirtualSerial/makefile b/Demos/Device/ClassDriver/VirtualSerial/makefile
index da7c8a38c..5f72f123d 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/makefile
+++ b/Demos/Device/ClassDriver/VirtualSerial/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = VirtualSerial
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/makefile b/Demos/Device/ClassDriver/VirtualSerialMassStorage/makefile
index 0665a7f25..56127ea8c 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/makefile
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = VirtualSerialMassStorage
SRC = $(TARGET).c Descriptors.c Lib/DataflashManager.c Lib/SCSI.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/makefile b/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
index 67e7e365e..6e9b076eb 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = VirtualSerialMouse
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/Incomplete/Sideshow/makefile b/Demos/Device/Incomplete/Sideshow/makefile
index 2f032f394..701d7c5b8 100644
--- a/Demos/Device/Incomplete/Sideshow/makefile
+++ b/Demos/Device/Incomplete/Sideshow/makefile
@@ -16,8 +16,9 @@ F_CPU = 8000000
F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = SideShow
-SRC = $(TARGET).c Descriptors.c Lib/SideshowApplications.c Lib/SideshowCommands.c Lib/SideshowCommon.c Lib/SideshowContent.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+SRC = $(TARGET).c Descriptors.c Lib/SideshowApplications.c Lib/SideshowCommands.c \
+ Lib/SideshowCommon.c Lib/SideshowContent.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/Incomplete/TestAndMeasurement/makefile b/Demos/Device/Incomplete/TestAndMeasurement/makefile
index f59981dc4..dcb553750 100644
--- a/Demos/Device/Incomplete/TestAndMeasurement/makefile
+++ b/Demos/Device/Incomplete/TestAndMeasurement/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = TestAndMeasurement
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile
index 477221cb4..942829619 100644
--- a/Demos/Device/LowLevel/AudioInput/makefile
+++ b/Demos/Device/LowLevel/AudioInput/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AudioInput
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/AudioOutput/makefile b/Demos/Device/LowLevel/AudioOutput/makefile
index 38fb012d2..e847b1d17 100644
--- a/Demos/Device/LowLevel/AudioOutput/makefile
+++ b/Demos/Device/LowLevel/AudioOutput/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AudioOutput
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/makefile b/Demos/Device/LowLevel/DualVirtualSerial/makefile
index 4cb9057d7..53332c29e 100644
--- a/Demos/Device/LowLevel/DualVirtualSerial/makefile
+++ b/Demos/Device/LowLevel/DualVirtualSerial/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = DualVirtualSerial
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/GenericHID/makefile b/Demos/Device/LowLevel/GenericHID/makefile
index 9a35c6d2e..3b735ede3 100644
--- a/Demos/Device/LowLevel/GenericHID/makefile
+++ b/Demos/Device/LowLevel/GenericHID/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = GenericHID
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile
index 1e2e6ee45..1b3a0eef6 100644
--- a/Demos/Device/LowLevel/Joystick/makefile
+++ b/Demos/Device/LowLevel/Joystick/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = Joystick
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/Keyboard/makefile b/Demos/Device/LowLevel/Keyboard/makefile
index af67b625a..2fa78d5ad 100644
--- a/Demos/Device/LowLevel/Keyboard/makefile
+++ b/Demos/Device/LowLevel/Keyboard/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = Keyboard
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile
index 3485e7f83..d9f2d998c 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/makefile
+++ b/Demos/Device/LowLevel/KeyboardMouse/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = KeyboardMouse
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/MIDI/makefile b/Demos/Device/LowLevel/MIDI/makefile
index 5290fe665..4f8283194 100644
--- a/Demos/Device/LowLevel/MIDI/makefile
+++ b/Demos/Device/LowLevel/MIDI/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MIDI
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/MassStorage/makefile b/Demos/Device/LowLevel/MassStorage/makefile
index 7ea0abfc5..16115caa2 100644
--- a/Demos/Device/LowLevel/MassStorage/makefile
+++ b/Demos/Device/LowLevel/MassStorage/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MassStorage
SRC = $(TARGET).c Descriptors.c Lib/DataflashManager.c Lib/SCSI.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/Mouse/makefile b/Demos/Device/LowLevel/Mouse/makefile
index 5552aee5a..950e9b3ce 100644
--- a/Demos/Device/LowLevel/Mouse/makefile
+++ b/Demos/Device/LowLevel/Mouse/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = Mouse
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile
index c6c867be8..55b32397f 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/makefile
+++ b/Demos/Device/LowLevel/RNDISEthernet/makefile
@@ -18,7 +18,7 @@ OPTIMIZATION = s
TARGET = RNDISEthernet
SRC = $(TARGET).c Descriptors.c Lib/Ethernet.c Lib/ProtocolDecoders.c Lib/RNDIS.c Lib/ICMP.c Lib/TCP.c Lib/UDP.c \
Lib/DHCP.c Lib/ARP.c Lib/IP.c Lib/Webserver.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Device/LowLevel/VirtualSerial/makefile b/Demos/Device/LowLevel/VirtualSerial/makefile
index 8ab7f5278..87b578a6f 100644
--- a/Demos/Device/LowLevel/VirtualSerial/makefile
+++ b/Demos/Device/LowLevel/VirtualSerial/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = VirtualSerial
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/makefile b/Demos/DualRole/ClassDriver/MouseHostDevice/makefile
index c30b35361..e8da89e2b 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/makefile
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MouseHostDevice
SRC = $(TARGET).c Descriptors.c DeviceFunctions.c HostFunctions.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/AndroidAccessoryHost/makefile b/Demos/Host/ClassDriver/AndroidAccessoryHost/makefile
index 2f11b854c..01a16e04c 100644
--- a/Demos/Host/ClassDriver/AndroidAccessoryHost/makefile
+++ b/Demos/Host/ClassDriver/AndroidAccessoryHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AndroidAccessoryHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/AudioInputHost/makefile b/Demos/Host/ClassDriver/AudioInputHost/makefile
index 46916fcc3..a423c8246 100644
--- a/Demos/Host/ClassDriver/AudioInputHost/makefile
+++ b/Demos/Host/ClassDriver/AudioInputHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AudioInputHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/AudioOutputHost/makefile b/Demos/Host/ClassDriver/AudioOutputHost/makefile
index ea54c2e5f..6452ba312 100644
--- a/Demos/Host/ClassDriver/AudioOutputHost/makefile
+++ b/Demos/Host/ClassDriver/AudioOutputHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AudioOutputHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/JoystickHostWithParser/makefile b/Demos/Host/ClassDriver/JoystickHostWithParser/makefile
index a170830e5..69d03fc21 100644
--- a/Demos/Host/ClassDriver/JoystickHostWithParser/makefile
+++ b/Demos/Host/ClassDriver/JoystickHostWithParser/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = JoystickHostWithParser
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/KeyboardHost/makefile b/Demos/Host/ClassDriver/KeyboardHost/makefile
index fb74d48ee..40070cad8 100644
--- a/Demos/Host/ClassDriver/KeyboardHost/makefile
+++ b/Demos/Host/ClassDriver/KeyboardHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = KeyboardHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
index 005a79641..b4f8471bf 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = KeyboardHostWithParser
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/MIDIHost/makefile b/Demos/Host/ClassDriver/MIDIHost/makefile
index 998972556..32585a0f0 100644
--- a/Demos/Host/ClassDriver/MIDIHost/makefile
+++ b/Demos/Host/ClassDriver/MIDIHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MIDIHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/MassStorageHost/makefile b/Demos/Host/ClassDriver/MassStorageHost/makefile
index e2835d243..f6f0aaeac 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/makefile
+++ b/Demos/Host/ClassDriver/MassStorageHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MassStorageHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/MouseHost/makefile b/Demos/Host/ClassDriver/MouseHost/makefile
index a20d59d3c..13b42be43 100644
--- a/Demos/Host/ClassDriver/MouseHost/makefile
+++ b/Demos/Host/ClassDriver/MouseHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MouseHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/makefile b/Demos/Host/ClassDriver/MouseHostWithParser/makefile
index 6bf3ee3bf..2e037bffa 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/makefile
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MouseHostWithParser
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/PrinterHost/makefile b/Demos/Host/ClassDriver/PrinterHost/makefile
index f4531fcf4..9f345de0f 100644
--- a/Demos/Host/ClassDriver/PrinterHost/makefile
+++ b/Demos/Host/ClassDriver/PrinterHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = PrinterHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/RNDISEthernetHost/makefile b/Demos/Host/ClassDriver/RNDISEthernetHost/makefile
index 30e6bfcea..484cc4693 100644
--- a/Demos/Host/ClassDriver/RNDISEthernetHost/makefile
+++ b/Demos/Host/ClassDriver/RNDISEthernetHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = RNDISEthernetHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/StillImageHost/makefile b/Demos/Host/ClassDriver/StillImageHost/makefile
index 118778a86..5d873468c 100644
--- a/Demos/Host/ClassDriver/StillImageHost/makefile
+++ b/Demos/Host/ClassDriver/StillImageHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = StillImageHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/makefile b/Demos/Host/ClassDriver/VirtualSerialHost/makefile
index 6bd3fbe7a..b368942ef 100644
--- a/Demos/Host/ClassDriver/VirtualSerialHost/makefile
+++ b/Demos/Host/ClassDriver/VirtualSerialHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = VirtualSerialHost
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/makefile b/Demos/Host/LowLevel/AndroidAccessoryHost/makefile
index c8da7e08f..af3bb7557 100644
--- a/Demos/Host/LowLevel/AndroidAccessoryHost/makefile
+++ b/Demos/Host/LowLevel/AndroidAccessoryHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AndroidAccessoryHost
SRC = $(TARGET).c ConfigDescriptor.c DeviceDescriptor.c Lib/AndroidAccessoryCommands.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/AudioInputHost/makefile b/Demos/Host/LowLevel/AudioInputHost/makefile
index 4f9e8dfae..6c0031508 100644
--- a/Demos/Host/LowLevel/AudioInputHost/makefile
+++ b/Demos/Host/LowLevel/AudioInputHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AudioInputHost
SRC = $(TARGET).c ConfigDescriptor.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/AudioOutputHost/makefile b/Demos/Host/LowLevel/AudioOutputHost/makefile
index bb73504ef..394692ec8 100644
--- a/Demos/Host/LowLevel/AudioOutputHost/makefile
+++ b/Demos/Host/LowLevel/AudioOutputHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = AudioOutputHost
SRC = $(TARGET).c ConfigDescriptor.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/GenericHIDHost/makefile b/Demos/Host/LowLevel/GenericHIDHost/makefile
index cbec54a4c..fc0dd0300 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/makefile
+++ b/Demos/Host/LowLevel/GenericHIDHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = GenericHIDHost
SRC = $(TARGET).c ConfigDescriptor.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/JoystickHostWithParser/makefile b/Demos/Host/LowLevel/JoystickHostWithParser/makefile
index 6ad028847..044616af9 100644
--- a/Demos/Host/LowLevel/JoystickHostWithParser/makefile
+++ b/Demos/Host/LowLevel/JoystickHostWithParser/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = JoystickHostWithParser
SRC = $(TARGET).c ConfigDescriptor.c HIDReport.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/KeyboardHost/makefile b/Demos/Host/LowLevel/KeyboardHost/makefile
index fe27ca196..50a442729 100644
--- a/Demos/Host/LowLevel/KeyboardHost/makefile
+++ b/Demos/Host/LowLevel/KeyboardHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = KeyboardHost
SRC = $(TARGET).c ConfigDescriptor.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
index 4cc47619d..39e6d0f2b 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = KeyboardHostWithParser
SRC = $(TARGET).c ConfigDescriptor.c HIDReport.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/MIDIHost/makefile b/Demos/Host/LowLevel/MIDIHost/makefile
index a4a347175..4956bc34e 100644
--- a/Demos/Host/LowLevel/MIDIHost/makefile
+++ b/Demos/Host/LowLevel/MIDIHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MIDIHost
SRC = $(TARGET).c ConfigDescriptor.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/MassStorageHost/makefile b/Demos/Host/LowLevel/MassStorageHost/makefile
index 0d5520263..702dfdb4e 100644
--- a/Demos/Host/LowLevel/MassStorageHost/makefile
+++ b/Demos/Host/LowLevel/MassStorageHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MassStorageHost
SRC = $(TARGET).c ConfigDescriptor.c Lib/MassStoreCommands.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/MouseHost/makefile b/Demos/Host/LowLevel/MouseHost/makefile
index dc8c671e4..5cb129f11 100644
--- a/Demos/Host/LowLevel/MouseHost/makefile
+++ b/Demos/Host/LowLevel/MouseHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MouseHost
SRC = $(TARGET).c ConfigDescriptor.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/makefile b/Demos/Host/LowLevel/MouseHostWithParser/makefile
index d32a20ac7..00370cf6f 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/makefile
+++ b/Demos/Host/LowLevel/MouseHostWithParser/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MouseHostWithParser
SRC = $(TARGET).c ConfigDescriptor.c HIDReport.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/PrinterHost/makefile b/Demos/Host/LowLevel/PrinterHost/makefile
index 7269e122b..6adac7b10 100644
--- a/Demos/Host/LowLevel/PrinterHost/makefile
+++ b/Demos/Host/LowLevel/PrinterHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = PrinterHost
SRC = $(TARGET).c ConfigDescriptor.c Lib/PrinterCommands.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/makefile b/Demos/Host/LowLevel/RNDISEthernetHost/makefile
index defb5b2e0..b9e559cae 100644
--- a/Demos/Host/LowLevel/RNDISEthernetHost/makefile
+++ b/Demos/Host/LowLevel/RNDISEthernetHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = RNDISEthernetHost
SRC = $(TARGET).c ConfigDescriptor.c Lib/RNDISCommands.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/StillImageHost/makefile b/Demos/Host/LowLevel/StillImageHost/makefile
index 67537f036..d4f2bb9cb 100644
--- a/Demos/Host/LowLevel/StillImageHost/makefile
+++ b/Demos/Host/LowLevel/StillImageHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = StillImageHost
SRC = $(TARGET).c ConfigDescriptor.c Lib/StillImageCommands.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/makefile b/Demos/Host/LowLevel/VirtualSerialHost/makefile
index 8346c8d55..8e3c75204 100644
--- a/Demos/Host/LowLevel/VirtualSerialHost/makefile
+++ b/Demos/Host/LowLevel/VirtualSerialHost/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = VirtualSerialHost
SRC = $(TARGET).c ConfigDescriptor.c $(LUFA_SRC_USB) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../../../LUFA/
+LUFA_PATH = ../../../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/LUFA/Build/HID_EEPROM_Loader/makefile b/LUFA/Build/HID_EEPROM_Loader/makefile
index 148e779e7..6226783ed 100644
--- a/LUFA/Build/HID_EEPROM_Loader/makefile
+++ b/LUFA/Build/HID_EEPROM_Loader/makefile
@@ -16,7 +16,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = HID_EEPROM_Loader
SRC = $(TARGET).c
-LUFA_PATH = ../../../LUFA/
+LUFA_PATH = ../../../LUFA
CC_FLAGS =
LD_FLAGS =
OBJECT_FILES = InputEEData.o
diff --git a/LUFA/CodeTemplates/makefile_template b/LUFA/CodeTemplates/makefile_template
index cf2b6737c..28d7c884f 100644
--- a/LUFA/CodeTemplates/makefile_template
+++ b/LUFA/CodeTemplates/makefile_template
@@ -17,8 +17,8 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = Target
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_PLATFORM)
-LUFA_PATH = ../../LUFA/
-CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
+LUFA_PATH = ../../LUFA
+CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig
LD_FLAGS =
# Default target
diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
index a24ced974..9833b6e94 100644
--- a/Projects/AVRISP-MKII/makefile
+++ b/Projects/AVRISP-MKII/makefile
@@ -18,7 +18,7 @@ OPTIMIZATION = s
TARGET = AVRISP-MKII
SRC = $(TARGET).c AVRISPDescriptors.c Lib/V2Protocol.c Lib/V2ProtocolParams.c Lib/ISP/ISPProtocol.c Lib/ISP/ISPTarget.c Lib/XPROG/XPROGProtocol.c \
Lib/XPROG/XPROGTarget.c Lib/XPROG/XMEGANVM.c Lib/XPROG/TINYNVM.c $(LUFA_SRC_USB)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/Benito/makefile b/Projects/Benito/makefile
index 333f2f6a5..86d4bfa30 100644
--- a/Projects/Benito/makefile
+++ b/Projects/Benito/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = Benito
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/HIDReportViewer/makefile b/Projects/HIDReportViewer/makefile
index ecb4989c1..028d67993 100644
--- a/Projects/HIDReportViewer/makefile
+++ b/Projects/HIDReportViewer/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = HIDReportViewer
SRC = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/LEDNotifier/makefile b/Projects/LEDNotifier/makefile
index fa5f9ff46..90fb44836 100644
--- a/Projects/LEDNotifier/makefile
+++ b/Projects/LEDNotifier/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = LEDNotifier
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/MIDIToneGenerator/makefile b/Projects/MIDIToneGenerator/makefile
index 0166c62e0..52e31f2d2 100644
--- a/Projects/MIDIToneGenerator/makefile
+++ b/Projects/MIDIToneGenerator/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MIDIToneGenerator
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index 94504a0fe..13a0bd9b7 100644
--- a/Projects/Magstripe/makefile
+++ b/Projects/Magstripe/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = Magstripe
SRC = $(TARGET).c Descriptors.c Lib/CircularBitBuffer.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/MediaController/makefile b/Projects/MediaController/makefile
index a87c5574c..e0609ece2 100644
--- a/Projects/MediaController/makefile
+++ b/Projects/MediaController/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MediaController
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/MissileLauncher/makefile b/Projects/MissileLauncher/makefile
index de4ec444b..541ed1b69 100644
--- a/Projects/MissileLauncher/makefile
+++ b/Projects/MissileLauncher/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = MissileLauncher
SRC = $(TARGET).c ConfigDescriptor.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/RelayBoard/makefile b/Projects/RelayBoard/makefile
index 553810500..9c8e236be 100644
--- a/Projects/RelayBoard/makefile
+++ b/Projects/RelayBoard/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = RelayBoard
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/SerialToLCD/makefile b/Projects/SerialToLCD/makefile
index 3b4d5aefe..bbe37dd3a 100644
--- a/Projects/SerialToLCD/makefile
+++ b/Projects/SerialToLCD/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = SerialToLCD
SRC = $(TARGET).c Descriptors.c Lib/HD44780.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/TempDataLogger/makefile b/Projects/TempDataLogger/makefile
index d851cee5b..50a10355f 100644
--- a/Projects/TempDataLogger/makefile
+++ b/Projects/TempDataLogger/makefile
@@ -18,7 +18,7 @@ OPTIMIZATION = s
TARGET = TempDataLogger
SRC = $(TARGET).c Descriptors.c Lib/DataflashManager.c Lib/DS1307.c Lib/SCSI.c Lib/FATFs/diskio.c Lib/FATFs/ff.c \
$(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL) $(LUFA_SRC_TWI) $(LUFA_SRC_TEMPERATURE)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/USBtoSerial/makefile b/Projects/USBtoSerial/makefile
index 0c837d08b..14b467b96 100644
--- a/Projects/USBtoSerial/makefile
+++ b/Projects/USBtoSerial/makefile
@@ -17,7 +17,7 @@ F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = USBtoSerial
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/
LD_FLAGS =
diff --git a/Projects/Webserver/makefile b/Projects/Webserver/makefile
index 0ef40a526..cb3786dde 100644
--- a/Projects/Webserver/makefile
+++ b/Projects/Webserver/makefile
@@ -20,7 +20,7 @@ SRC = $(TARGET).c Descriptors.c USBDeviceMode.c USBHostMode.c Lib/SCSI.
Lib/uIPManagement.c Lib/DHCPCommon.c Lib/DHCPClientApp.c Lib/DHCPServerApp.c Lib/HTTPServerApp.c \
Lib/TELNETServerApp.c Lib/uip/uip.c Lib/uip/uip_arp.c Lib/uip/timer.c Lib/uip/clock.c \
Lib/uip/uip-split.c Lib/FATFs/diskio.c Lib/FATFs/ff.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -ILib/uip/ -ILib/FATFs/
LD_FLAGS =
diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index d4136bc2f..26a02dadd 100644
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -9,10 +9,7 @@
# LUFA Project Makefile.
# --------------------------------------
-AVRISP_PATH = ../AVRISP-MKII/
-
-# FIXME - object directories do not currently work for this project
-override OBJDIR = .
+AVRISP_PATH = ../AVRISP-MKII
MCU = at90usb1287
ARCH = AVR8
@@ -25,8 +22,7 @@ SRC = $(TARGET).c Lib/SoftUART.c USARTDescriptors.c $(AVRISP_PATH)/AVRI
$(AVRISP_PATH)/Lib/V2ProtocolParams.c $(AVRISP_PATH)/Lib/ISP/ISPProtocol.c $(AVRISP_PATH)/Lib/ISP/ISPTarget.c \
$(AVRISP_PATH)/Lib/XPROG/XPROGProtocol.c $(AVRISP_PATH)/Lib/XPROG/XPROGTarget.c $(AVRISP_PATH)/Lib/XPROG/XMEGANVM.c \
$(AVRISP_PATH)/Lib/XPROG/TINYNVM.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-
-LUFA_PATH = ../../LUFA/
+LUFA_PATH = ../../LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -I$(AVRISP_PATH)
LD_FLAGS =
--
cgit v1.2.3