Ensure build tests use the system provided $(MAKE) variable to determine the command...

diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index 1477205..1d1be86 100644 (file)
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -45,7 +45,7 @@ testboards:
             echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu";            \\r
                                                                                                            \\r
                 printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile;           \\r
             echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu";            \\r
                                                                                                            \\r
                 printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile;           \\r

-                printf "\tmake -s -f makefile.test clean elf MCU=%s ARCH=%s BOARD=%s\n\n" $$build_mcu $$build_arch $$build_board >> BuildMakefile; \\r
+                printf "\t$(MAKE) -s -f makefile.test clean elf MCU=%s ARCH=%s BOARD=%s\n\n" $$build_mcu $$build_arch $$build_board >> BuildMakefile; \\r

           fi;                                                                                          \\r
         done < BoardList.txt\r
         \r
           fi;                                                                                          \\r
         done < BoardList.txt\r
         \r

diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile
index 611b554..08b7590 100644 (file)
--- a/BuildTests/BootloaderTest/makefile
+++ b/BuildTests/BootloaderTest/makefile
@@ -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 "\tmake -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 $(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

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

diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in
index 067b077..e76f5c3 100644 (file)
--- a/LUFA/Build/lufa.build.in
+++ b/LUFA/Build/lufa.build.in
@@ -190,7 +190,7 @@ lss: $(TARGET).lss
        $(CROSS)objdump -h -S -z $< > $@\r
 \r
 clean:\r
        $(CROSS)objdump -h -S -z $< > $@\r
 \r
 clean:\r

-       @echo $(MSG_REMOVE_CMD) Removing object files \"$(notdir $(OBJECT_FILES))\"\r
+       @echo $(MSG_REMOVE_CMD) Removing object files \"$(strip $(notdir $(OBJECT_FILES)))\"\r

        rm -f $(OBJECT_FILES)\r
        @echo $(MSG_REMOVE_CMD) Removing output files \"$(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\"\r
        rm -f $(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\r
        rm -f $(OBJECT_FILES)\r
        @echo $(MSG_REMOVE_CMD) Removing output files \"$(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\"\r
        rm -f $(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\r