diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-05-08 23:32:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-08 23:32:52 +0100 |
| commit | 172138b9e077ec53c9fdec2eb0a4df73f1db3f22 (patch) | |
| tree | 0988e54019da5692afe24953a72409b711c27ca7 /make_helpers/build_macros.mk | |
| parent | 07f40001d17426143542b71ac9b3d88b11788fa4 (diff) | |
| parent | 052ab529c4a02ee60974c20a1dd954238ec40c4c (diff) | |
Merge pull request #926 from EvanLloyd/win_make_4
Minor makefile fixes
Diffstat (limited to 'make_helpers/build_macros.mk')
| -rw-r--r-- | make_helpers/build_macros.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 2d23ef8b..36f220e0 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -284,14 +284,16 @@ define MAKE_BL $(eval BL_LINKERFILE := $(BL$(call uppercase,$(1))_LINKERFILE)) # We use sort only to get a list of unique object directory names. # ordering is not relevant but sort removes duplicates. - $(eval TEMP_OBJ_DIRS := $(sort $(BUILD_DIR)/ $(dir ${OBJS} ${LINKERFILE}))) + $(eval TEMP_OBJ_DIRS := $(sort $(dir ${OBJS} ${LINKERFILE}))) # The $(dir ) function leaves a trailing / on the directory names # Rip off the / to match directory names with make rule targets. $(eval OBJ_DIRS := $(patsubst %/,%,$(TEMP_OBJ_DIRS))) # Create generators for object directory structure -$(eval $(foreach objd,${OBJ_DIRS},$(call MAKE_PREREQ_DIR,${objd},))) +$(eval $(call MAKE_PREREQ_DIR,${BUILD_DIR},)) + +$(eval $(foreach objd,${OBJ_DIRS},$(call MAKE_PREREQ_DIR,${objd},${BUILD_DIR}))) .PHONY : bl${1}_dirs @@ -321,9 +323,9 @@ $(DUMP): $(ELF) $(BIN): $(ELF) @echo " BIN $$@" $$(Q)$$(OC) -O binary $$< $$@ - @echo + @${ECHO_BLANK_LINE} @echo "Built $$@ successfully" - @echo + @${ECHO_BLANK_LINE} .PHONY: bl$(1) bl$(1): $(BIN) $(DUMP) |