Oops - really fix logic errors in USBMode.h.

[pub/USBasp.git] / BuildTests / ModuleTest / makefile

diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile
index d80e2a2..93a49e8 100644 (file)
--- a/BuildTests/ModuleTest/makefile
+++ b/BuildTests/ModuleTest/makefile
@@ -1,6 +1,6 @@
 #\r
 #             LUFA Library\r
 #\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
 #\r
 #  dean [at] fourwalledcubicle [dot] com\r
 #           www.lufa-lib.org\r


@@ -12,10 +12,12 @@
 # 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
 \r
 # List of device families per architecture, one device per architecture sub-family\r

-AVR8_FAMILIES  = at90usb1287 at90usb1286 atmega32u4 atmega32u2\r
-XMEGA_FAMILIES = atxmega128a1u atxmega128a3u atxmega128a4u atxmega128b1 atxmega128b3\r
+AVR8_FAMILIES  = at90usb1287 at90usb1286 atmega16u4 atmega16u2 at90usb162\r
+XMEGA_FAMILIES = atxmega128a1u atxmega128a3u atxmega256a3bu atxmega128a4u atxmega128b1 atxmega128b3 atxmega128c3 atxmega32c4\r

 UC3_FAMILIES   = uc3a0256 uc3a1256 uc3a3256 uc3a4256 uc3b0256 uc3b1256\r
 \r
 # List of all device families, with a family postfix\r
 UC3_FAMILIES   = uc3a0256 uc3a1256 uc3a3256 uc3a4256 uc3b0256 uc3b1256\r
 \r
 # List of all device families, with a family postfix\r


@@ -24,6 +26,10 @@ DEVICE_FAMILIES = $(AVR8_FAMILIES:%=%.avr8) $(XMEGA_FAMILIES:%=%.xmega) $(UC3_FA
 \r
 all: begin $(DEVICE_FAMILIES) clean end\r
 \r
 \r
 all: begin $(DEVICE_FAMILIES) clean end\r
 \r

+arch_avr8:  begin $(AVR8_FAMILIES:%=%.avr8) end\r
+arch_xmega: begin $(XMEGA_FAMILIES:%=%.xmega) end\r
+arch_uc3:   begin $(UC3_FAMILIES:%=%.uc3) end\r
+\r

 begin:\r
        @echo Executing build test "ModuleTest".\r
        @echo\r
 begin:\r
        @echo Executing build test "ModuleTest".\r
        @echo\r


@@ -33,21 +39,22 @@ end:
        @echo\r
 \r
 %.avr8:\r
        @echo\r
 \r
 %.avr8:\r

-       $(MAKE) -f makefile.avr8 clean -s\r
-       $(MAKE) -f makefile.avr8 all MCU=$(@:%.avr8=%) -s\r
+       $(MAKE) -s -f makefile.test clean elf ARCH=AVR8 MCU=$(@:%.avr8=%)\r

 \r
 %.xmega:\r
 \r
 %.xmega:\r

-       $(MAKE) -f makefile.xmega clean -s\r
-       $(MAKE) -f makefile.xmega all MCU=$(@:%.xmega=%) -s\r
+       $(MAKE) -s -f makefile.test clean elf ARCH=XMEGA MCU=$(@:%.xmega=%)\r

 \r
 %.uc3:\r
 \r
 %.uc3:\r

-       $(MAKE) -f makefile.uc3 clean -s\r
-       $(MAKE) -f makefile.uc3 all MCU=$(@:%.uc3=%) -s\r
+       $(MAKE) -s -f makefile.test clean elf ARCH=UC3 MCU=$(@:%.uc3=%)\r

 \r
 clean:\r
 \r
 clean:\r

-       $(MAKE) -f makefile.avr8 clean -s\r
-       $(MAKE) -f makefile.xmega clean -s\r
-       $(MAKE) -f makefile.uc3 clean -s\r
+       $(MAKE) -s -f makefile.test clean ARCH=AVR8 MCU=$(firstword $(AVR8_FAMILIES))\r
+       $(MAKE) -s -f makefile.test clean ARCH=XMEGA MCU=$(firstword $(XMEGA_FAMILIES))\r
+       $(MAKE) -s -f makefile.test clean ARCH=UC3 MCU=$(firstword $(UC3_FAMILIES))\r

 \r
 %:\r
 \r
 %:\r

-       
\ No newline at end of file
+\r
+.PHONY: all arch_avr8 arch_xmega arch_uc3 begin end\r
+\r
+# Include LUFA build script makefiles\r
+include $(LUFA_PATH)/Build/lufa.core.in\r