Correct BuildTest makefiles to use LUFA_PATH rather than LUFA_ROOT_PATH.

diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index 252b3f8..54afa57 100644 (file)
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -11,8 +11,8 @@
 # possible board targets using their respective\r
 # compiler.\r
 \r
 # possible board targets using their respective\r
 # compiler.\r
 \r

-# Path to the root of the LUFA tree to scan\r
-LUFA_ROOT_PATH    = ../..\r
+# Path to the LUFA library core\r
+LUFA_PATH         = ../../LUFA/\r

 \r
 \r
 all: begin makeboardlist testboards clean end\r
 \r
 \r
 all: begin makeboardlist testboards clean end\r


@@ -26,7 +26,7 @@ end:
        @echo\r
 \r
 makeboardlist:\r
        @echo\r
 \r
 makeboardlist:\r

-       @grep "BOARD_" $(LUFA_ROOT_PATH)/LUFA/Common/BoardTypes.h | cut -d'#' -f2 | cut -d' ' -f2 | grep "BOARD_" > BoardList.txt\r
+       @grep "BOARD_" $(patsubst %/,%,$(LUFA_PATH))/Common/BoardTypes.h | cut -d'#' -f2 | cut -d' ' -f2 | grep "BOARD_" > BoardList.txt\r

        \r
 testboards:\r
        @echo "buildtest:" > BuildMakefile\r
        \r
 testboards:\r
        @echo "buildtest:" > BuildMakefile\r


@@ -63,4 +63,4 @@ clean:
 .PHONY: all begin end makeboardlist testboards clean\r
 \r
 # Include LUFA build script makefiles\r
 .PHONY: all begin end makeboardlist testboards clean\r
 \r
 # Include LUFA build script makefiles\r

-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r
+include $(LUFA_PATH)/Build/lufa.core.in\r

diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile
index 635c5c6..bc59bc4 100644 (file)
--- a/BuildTests/BootloaderTest/makefile
+++ b/BuildTests/BootloaderTest/makefile
@@ -10,8 +10,8 @@
 # test attempts to build all the bootloaders\r
 # with all supported device configurations.\r
 \r
 # test attempts to build all the bootloaders\r
 # with all supported device configurations.\r
 \r

-# Path to the root of the LUFA tree to scan\r
-LUFA_ROOT_PATH    = ../..\r
+# Path to the LUFA library core\r
+LUFA_PATH         = ../../LUFA/\r

 \r
 \r
 all: begin testbootloaders clean end\r
 \r
 \r
 all: begin testbootloaders clean end\r


@@ -44,7 +44,7 @@ testbootloaders:
             printf "Found bootloader configuration for bootloader '%s' (FLASH: %3s KB | BOOT: %3s KB | MCU: %12s / %4s)\n" $$build_bootloader $$build_flashsize $$build_bootsize $$build_mcu $$build_arch; \\r
                                                                  \\r
             printf "\t@echo Building bootloader %s - %s - FLASH: %s KB, BOOT: %s KB\n" $$build_bootloader $$build_mcu $$build_flashsize $$build_bootsize >> BuildMakefile; \\r
             printf "Found bootloader configuration for bootloader '%s' (FLASH: %3s KB | BOOT: %3s KB | MCU: %12s / %4s)\n" $$build_bootloader $$build_flashsize $$build_bootsize $$build_mcu $$build_arch; \\r
                                                                  \\r
             printf "\t@echo Building bootloader %s - %s - FLASH: %s KB, BOOT: %s KB\n" $$build_bootloader $$build_mcu $$build_flashsize $$build_bootsize >> BuildMakefile; \\r

-            printf "\t$(MAKE) -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ clean elf ARCH=%s MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s\n\n" $$build_bootloader $$build_arch $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \\r
+            printf "\t$(MAKE) -s -C $(patsubst %/,%,$(LUFA_PATH))/../Bootloaders/%s/ clean elf ARCH=%s MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s\n\n" $$build_bootloader $$build_arch $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \\r

           fi;                                                    \\r
         done < BootloaderDeviceMap.cfg\r
         \r
           fi;                                                    \\r
         done < BootloaderDeviceMap.cfg\r
         \r


@@ -58,4 +58,4 @@ clean:
 .PHONY: all begin end testbootloaders clean\r
 \r
 # Include LUFA build script makefiles\r
 .PHONY: all begin end testbootloaders clean\r
 \r
 # Include LUFA build script makefiles\r

-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r
+include $(LUFA_PATH)/Build/lufa.core.in\r

diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile
index 6cdd575..a756c30 100644 (file)
--- a/BuildTests/ModuleTest/makefile
+++ b/BuildTests/ModuleTest/makefile
@@ -12,6 +12,8 @@
 # all module headers in a simple C and C++\r
 # application.\r
 \r
 # all module headers in a simple C and C++\r
 # application.\r
 \r

+# Path to the LUFA library core\r
+LUFA_PATH         = ../../LUFA/\r

 \r
 # List of device families per architecture, one device per architecture sub-family\r
 AVR8_FAMILIES  = at90usb1287 at90usb1286 atmega16u4 atmega16u2 at90usb162\r
 \r
 # List of device families per architecture, one device per architecture sub-family\r
 AVR8_FAMILIES  = at90usb1287 at90usb1286 atmega16u4 atmega16u2 at90usb162\r


@@ -55,4 +57,4 @@ clean:
 .PHONY: all arch_avr8 arch_xmega arch_uc3 begin end\r
 \r
 # Include LUFA build script makefiles\r
 .PHONY: all arch_avr8 arch_xmega arch_uc3 begin end\r
 \r
 # Include LUFA build script makefiles\r

-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r
+include $(LUFA_PATH)/Build/lufa.core.in\r

diff --git a/BuildTests/SingleUSBModeTest/makefile b/BuildTests/SingleUSBModeTest/makefile
index 98e2d25..096d4b3 100644 (file)
--- a/BuildTests/SingleUSBModeTest/makefile
+++ b/BuildTests/SingleUSBModeTest/makefile
@@ -12,6 +12,9 @@
 # all module headers in a simple C and C++\r
 # application.\r
 \r
 # all module headers in a simple C and C++\r
 # application.\r
 \r

+# Path to the LUFA library core\r
+LUFA_PATH         = ../../LUFA/\r
+\r

 all: begin compile clean end\r
 \r
 begin:\r
 all: begin compile clean end\r
 \r
 begin:\r


@@ -41,4 +44,4 @@ clean:
 .PHONY: begin end compile clean\r
 \r
 # Include LUFA build script makefiles\r
 .PHONY: begin end compile clean\r
 \r
 # Include LUFA build script makefiles\r

-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r
+include $(LUFA_PATH)/Build/lufa.core.in\r

diff --git a/BuildTests/StaticAnalysisTest/makefile b/BuildTests/StaticAnalysisTest/makefile
index 6f138af..aecb677 100644 (file)
--- a/BuildTests/StaticAnalysisTest/makefile
+++ b/BuildTests/StaticAnalysisTest/makefile
@@ -8,14 +8,15 @@
 \r
 # Static anlysis of the entire LUFA source tree, using the free cross-platform "cppcheck" tool.\r
 \r
 \r
 # Static anlysis of the entire LUFA source tree, using the free cross-platform "cppcheck" tool.\r
 \r

-LUFA_ROOT_PATH = ../..\r
+# Path to the LUFA library core\r
+LUFA_PATH         = ../../LUFA/\r

 \r
 CPPCHECK_EXCLUDES = FATFs/            \\r
                     PetiteFATFs/      \\r
                     uip/\r
 \r
 CPPCHECK_EXCLUDES = FATFs/            \\r
                     PetiteFATFs/      \\r
                     uip/\r

-CPPCHECK_INCLUDES = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/   \\r
-                    $(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/\r
-CPPCHECK_PATH     = $(LUFA_ROOT_PATH)\r
+CPPCHECK_INCLUDES = $(patsubst %/,%,$(LUFA_PATH))/CodeTemplates/   \\r
+                    $(patsubst %/,%,$(LUFA_PATH))/../Projects/AVRISP-MKII/\r
+CPPCHECK_PATH     = $(patsubst %/,%,$(LUFA_PATH))/..\r

 \r
 all: begin cppcheck-config cppcheck end\r
 \r
 \r
 all: begin cppcheck-config cppcheck end\r
 \r


@@ -32,5 +33,5 @@ end:
 .PHONY: all begin end\r
 \r
 # Include LUFA build script makefiles\r
 .PHONY: all begin end\r
 \r
 # Include LUFA build script makefiles\r

-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r
-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.cppcheck.in
\ No newline at end of file
+include $(LUFA_PATH)/Build/lufa.core.in\r
+include $(LUFA_PATH)/Build/lufa.cppcheck.in
\ No newline at end of file