diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-02 13:00:22 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-06-02 13:00:22 +0000 |
| commit | e24993c13aa30115b5ef5e4877dbb610efd9626e (patch) | |
| tree | 8c6b26b3255e565e2093f4c054d1ee87fa4a96cb | |
| parent | fcf0b8a5bb27eacb9de54ca4f85d63872562e380 (diff) | |
| download | lufa-e24993c13aa30115b5ef5e4877dbb610efd9626e.tar.gz lufa-e24993c13aa30115b5ef5e4877dbb610efd9626e.tar.bz2 lufa-e24993c13aa30115b5ef5e4877dbb610efd9626e.zip | |
Ensure build tests use the system provided $(MAKE) variable to determine the command to invoke make, rather than a hard-coded name. Strip off excess whitespace from the list of object files when printing them out to the shell in the build system BUILD module.
| -rw-r--r-- | BuildTests/BoardDriverTest/makefile | 2 | ||||
| -rw-r--r-- | BuildTests/BootloaderTest/makefile | 2 | ||||
| -rw-r--r-- | LUFA/Build/lufa.build.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile index 1477205fe..1d1be8687 100644 --- a/BuildTests/BoardDriverTest/makefile +++ b/BuildTests/BoardDriverTest/makefile @@ -45,7 +45,7 @@ testboards: echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu"; \
\
printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \
- printf "\tmake -s -f makefile.test clean elf MCU=%s ARCH=%s BOARD=%s\n\n" $$build_mcu $$build_arch $$build_board >> BuildMakefile; \
+ printf "\t$(MAKE) -s -f makefile.test clean elf MCU=%s ARCH=%s BOARD=%s\n\n" $$build_mcu $$build_arch $$build_board >> BuildMakefile; \
fi; \
done < BoardList.txt
diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile index 611b55408..08b7590b3 100644 --- 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; \
\
printf "\t@echo Building bootloader %s - %s - FLASH: %s KB, BOOT: %s KB\n" $$build_bootloader $$build_mcu $$build_flashsize $$build_bootsize >> BuildMakefile; \
- 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; \
+ 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; \
fi; \
done < BootloaderDeviceMap.cfg
diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in index 067b07736..e76f5c3f9 100644 --- a/LUFA/Build/lufa.build.in +++ b/LUFA/Build/lufa.build.in @@ -190,7 +190,7 @@ lss: $(TARGET).lss $(CROSS)objdump -h -S -z $< > $@
clean:
- @echo $(MSG_REMOVE_CMD) Removing object files \"$(notdir $(OBJECT_FILES))\"
+ @echo $(MSG_REMOVE_CMD) Removing object files \"$(strip $(notdir $(OBJECT_FILES)))\"
rm -f $(OBJECT_FILES)
@echo $(MSG_REMOVE_CMD) Removing output files \"$(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\"
rm -f $(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss
|