From 1faa5ba70aecc5a55ec198e2129181f5a79489d2 Mon Sep 17 00:00:00 2001 From: Dean Camera 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. --- 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 ++------ 14 files changed, 15 insertions(+), 19 deletions(-) (limited to 'Projects') 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