diff --git a/tools/export/makefile/Makefile.tmpl b/tools/export/makefile/Makefile.tmpl index b93950099d..e16024cc46 100644 --- a/tools/export/makefile/Makefile.tmpl +++ b/tools/export/makefile/Makefile.tmpl @@ -13,10 +13,10 @@ else RM = '$(SHELL)' -c "rm -rf \"$(1)\"" endif -# Move to the build directory -ifeq (,$(filter .build,$(notdir $(CURDIR)))) -.SUFFIXES: OBJDIR := .build +# Move to the build directory +ifeq (,$(filter $(OBJDIR),$(notdir $(CURDIR)))) +.SUFFIXES: mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) MAKETARGET = '$(MAKE)' --no-print-directory -C $(OBJDIR) -f '$(mkfile_path)' \ 'SRCDIR=$(CURDIR)' $(MAKECMDGOALS) @@ -127,6 +127,7 @@ $(PROJECT).elf: $(OBJECTS) $(SYS_OBJECTS) $(LINKER_SCRIPT) $(PROJECT).bin: $(PROJECT).elf {%- block elf2bin -%}{%- endblock %} +{% if not hex_files %} +@echo ===== bin file ready to flash: $(OBJDIR)/$@ ===== {% endif %} $(PROJECT).hex: $(PROJECT).elf {%- block elf2hex -%}{%- endblock %} @@ -135,6 +136,7 @@ $(PROJECT).hex: $(PROJECT).elf $(PROJECT)-combined.hex: $(PROJECT).hex +@echo "NOTE: the $(SREC_CAT) binary is required to be present in your PATH. Please see http://srecord.sourceforge.net/ for more information." $(SREC_CAT) {% for f in hex_files %}{{f}} {% endfor %} -intel $(PROJECT).hex -intel -o $(PROJECT)-combined.hex -intel --line-length=44 + +@echo ===== hex file ready to flash: $(OBJDIR)/$@ ===== {% endif %} # Rules ###############################################################################