diff options
| author | Jerome Forissier <jerome.forissier@linaro.org> | 2014-09-01 13:41:48 +0200 |
|---|---|---|
| committer | Jerome Forissier <jerome.forissier@linaro.org> | 2014-09-02 09:00:57 +0200 |
| commit | 0047cb63e905a83006d0b8a09218d028c1ca6f1a (patch) | |
| tree | e62c2f9eed114a9720033ee93529b3113246b345 /ta | |
| parent | 92542a710463ded7e5d314183b4c5b3df92aa1b9 (diff) | |
Cosmetic fixes for build output
By default, the OP-TEE build shows abbreviated output similar to the Linux
kernel. This commit fixes a number of deviations/inconsistencies.
- Always print a command in uppercase, followed by the target file.
- Make sure commands and file paths are nicely aligned, with two leading spaces
to make command output/errors better stand out.
- Remove some duplicate slashes in file paths. We use the following rule:
variables that hold directory names such as $(arch-dir) or $(platform-dir)
always have a trailing slash. The 'subdirs' and 'incdirs' variables used in
sub-makefiles are an exception because doing otherwise would needlessly
clutter the sub-makefiles.
Diffstat (limited to 'ta')
| -rw-r--r-- | ta/arch/arm32/link.mk | 8 | ||||
| -rw-r--r-- | ta/mk/ta_dev_kit.mk | 2 | ||||
| -rw-r--r-- | ta/ta.mk | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/ta/arch/arm32/link.mk b/ta/arch/arm32/link.mk index 718ae99..aa8a6c7 100644 --- a/ta/arch/arm32/link.mk +++ b/ta/arch/arm32/link.mk @@ -28,19 +28,19 @@ ldargs-$(binary).elf := $(link-ldflags) $(objs) $(link-ldadd) $(libgcc) $(link-script-pp): $(link-script) $(MAKEFILE_LIST) - @echo PP $< + @echo ' CPP $@' $(q)cat < $< > $@ $(link-out-dir)$(binary).elf: $(objs) $(libdeps) $(link-script-pp) - @echo LD $@ + @echo ' LD $@' $(q)$(LD) $(ldargs-$(binary).elf) -o $@ $(link-out-dir)$(binary).dmp: $(link-out-dir)$(binary).elf - @echo OBJDUMP $@ + @echo ' OBJDUMP $@' $(q)$(OBJDUMP) -l -x -d $< > $@ $(link-out-dir)$(binary).bin: $(link-out-dir)$(binary).elf - @echo OBJCOPY $@ + @echo ' OBJCOPY $@' $(q)$(OBJCOPY) -O binary $< $@ $(q)$(FIX_TA_BINARY) $< $@ diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk index ceae6cd..9c20093 100644 --- a/ta/mk/ta_dev_kit.mk +++ b/ta/mk/ta_dev_kit.mk @@ -43,7 +43,7 @@ libdeps += $(ta-dev-kit-dir)/lib/libutee.a .PHONY: clean clean: - @echo Cleaning + @echo ' CLEAN .' ${q}rm -f $(cleanfiles) @@ -37,7 +37,9 @@ incdirs-host := $(filter-out lib/libutils%, $(incdirs$(sm))) define copy-file $2/$$(notdir $1): $1 - @mkdir -p $$(dir $$@) + @set -e; \ + mkdir -p $$(dir $$@) ; \ + echo ' INSTALL $$@' ; \ cp $$< $$@ cleanfiles += $2/$$(notdir $1) @@ -59,7 +61,7 @@ $(foreach f, $(ta-mkfiles), \ define copy-incdir sf := $(subst $1/, , $(shell find $1 -name "*.h")) $$(foreach h, $$(sf), $$(eval $$(call copy-file, $1/$$(h), \ - $$(subst /./,/,$2/$$(dir $$(h)))))) + $$(patsubst %/,%,$$(subst /./,/,$2/$$(dir $$(h))))))) endef $(foreach d, $(incdirs$(sm)), \ $(eval $(call copy-incdir, $(d), $(out-dir)export-user_ta/include))) |