Update Studio Integration DLL, to include package logging.

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

diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile
index b997b35..b292e41 100644 (file)
--- a/BuildTests/ModuleTest/makefile
+++ b/BuildTests/ModuleTest/makefile
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
 #
 #             LUFA Library

-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2015.

 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org


@@ -13,15 +13,18 @@
 # application.
 
 # Path to the LUFA library core
 # application.
 
 # Path to the LUFA library core

-LUFA_PATH         = ../../LUFA/
+LUFA_PATH := ../../LUFA/
+
+# Build test cannot be run with multiple parallel jobs
+.NOTPARALLEL:

 
 # List of device families per architecture, one device per architecture sub-family
 
 # List of device families per architecture, one device per architecture sub-family

-AVR8_FAMILIES  = at90usb1287 at90usb1286 atmega16u4 atmega16u2 at90usb162
-XMEGA_FAMILIES = atxmega128a1u atxmega128a3u atxmega256a3bu atxmega128a4u atxmega128b1 atxmega128b3 atxmega128c3 atxmega32c4
-UC3_FAMILIES   = uc3a0256 uc3a1256 uc3a3256 uc3a4256 uc3b0256 uc3b1256
+AVR8_FAMILIES   := at90usb1287 at90usb1286 atmega16u4 atmega16u2 at90usb162
+XMEGA_FAMILIES  := atxmega128a1u atxmega128a3u atxmega256a3bu atxmega128a4u atxmega128b1 atxmega128b3 atxmega128c3 atxmega32c4
+UC3_FAMILIES    := uc3a0256 uc3a1256 uc3a3256 uc3a4256 uc3b0256 uc3b1256

 
 # List of all device families, with a family postfix
 
 # List of all device families, with a family postfix

-DEVICE_FAMILIES = $(AVR8_FAMILIES:%=%.avr8) $(XMEGA_FAMILIES:%=%.xmega) $(UC3_FAMILIES:%=%.uc3)
+DEVICE_FAMILIES := $(AVR8_FAMILIES:%=%.avr8) $(XMEGA_FAMILIES:%=%.xmega) $(UC3_FAMILIES:%=%.uc3)

 
 
 all: begin $(DEVICE_FAMILIES) clean end
 
 
 all: begin $(DEVICE_FAMILIES) clean end


@@ -40,24 +43,24 @@ end:
 
 %.avr8:
        @echo Building ModuleTest for ARCH=AVR8 MCU=$(@:%.avr8=%)...
 
 %.avr8:
        @echo Building ModuleTest for ARCH=AVR8 MCU=$(@:%.avr8=%)...

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

 
 %.xmega:
        @echo Building ModuleTest for ARCH=XMEGA MCU=$(@:%.xmega=%)...
 
 %.xmega:
        @echo Building ModuleTest for ARCH=XMEGA MCU=$(@:%.xmega=%)...

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

 
 %.uc3:
        @echo Building ModuleTest for ARCH=UC3 MCU=$(@:%.uc3=%)...
 
 %.uc3:
        @echo Building ModuleTest for ARCH=UC3 MCU=$(@:%.uc3=%)...

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

 
 clean:
 
 clean:

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

 
 %:
 
 .PHONY: all arch_avr8 arch_xmega arch_uc3 begin end
 
 # Include LUFA build script makefiles
 
 %:
 
 .PHONY: all arch_avr8 arch_xmega arch_uc3 begin end
 
 # Include LUFA build script makefiles

-include $(LUFA_PATH)/Build/lufa.core.in
+include $(LUFA_PATH)/Build/lufa_core.mk