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.

Dean Camera 13 years ago
parent fcf0b8a5bb
commit e24993c13a
  1. 2
      BuildTests/BoardDriverTest/makefile
  2. 2
      BuildTests/BootloaderTest/makefile
  3. 2
      LUFA/Build/lufa.build.in

@ -45,7 +45,7 @@ testboards:
echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu"; \ echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu"; \
\ \
printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \ 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; \ fi; \
done < BoardList.txt done < BoardList.txt

@ -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 "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 "\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; \ fi; \
done < BootloaderDeviceMap.cfg done < BootloaderDeviceMap.cfg

@ -190,7 +190,7 @@ lss: $(TARGET).lss
$(CROSS)objdump -h -S -z $< > $@ $(CROSS)objdump -h -S -z $< > $@
clean: 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) rm -f $(OBJECT_FILES)
@echo $(MSG_REMOVE_CMD) Removing output files \"$(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\" @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 rm -f $(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss

Loading…
Cancel
Save