Fix errors in the SingleUSBModeTest build test. Fix logic errors in USBMode.h.

[pub/lufa.git] / BuildTests / BootloaderTest / makefile

diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile
index 5b378ec..bc59bc4 100644 (file)
--- a/BuildTests/BootloaderTest/makefile
+++ b/BuildTests/BootloaderTest/makefile
@@ -1,6 +1,6 @@
 #\r
 #             LUFA Library\r
-#     Copyright (C) Dean Camera, 2011.\r
+#     Copyright (C) Dean Camera, 2012.\r
 #\r
 #  dean [at] fourwalledcubicle [dot] com\r
 #           www.lufa-lib.org\r
@@ -10,8 +10,8 @@
 # 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
@@ -44,8 +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 "\tmake -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ clean\n" $$build_bootloader >> BuildMakefile; \\r
-            printf "\tmake -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s elf\n\n" $$build_bootloader $$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
@@ -55,4 +54,8 @@ clean:
        rm -f BuildMakefile\r
 \r
 %:\r
-       
\ No newline at end of file
+\r
+.PHONY: all begin end testbootloaders clean\r
+\r
+# Include LUFA build script makefiles\r
+include $(LUFA_PATH)/Build/lufa.core.in\r