From 27c509fc552013ba07e80cfcee1be1e8bf813dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sat, 21 Aug 2010 18:07:12 +0000 Subject: makefiles - some functions don't need to return their output, drop $(shell ... ) and prefix with $(SILENT), make V=1 will show the complete scripts being run - tweak make.dep generation: make the temporary file appear in root.make only, and remove a useless "real command", there is already a real command (mv) - make addtargetdir.pl terminate its output with a newline ($(shell) did that for us) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27855 a1c6a512-1295-4272-9138-f99709370657 --- tools/root.make | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tools/root.make') diff --git a/tools/root.make b/tools/root.make index 6ed1fc3..4aff793 100644 --- a/tools/root.make +++ b/tools/root.make @@ -110,12 +110,11 @@ $(RBINFO): $(BUILDDIR)/$(BINARY) $(DEPFILE) dep: $(call PRINTS,Generating dependencies) - @echo foo > /dev/null # there must be a "real" command in the rule - $(call mkdepfile,$(DEPFILE),$(SRC)) - $(call mkdepfile,$(DEPFILE),$(OTHER_SRC:%.lua=)) - $(call mkdepfile,$(DEPFILE),$(ASMDEFS_SRC)) + $(call mkdepfile,$(DEPFILE)_,$(SRC)) + $(call mkdepfile,$(DEPFILE)_,$(OTHER_SRC:%.lua=)) + $(call mkdepfile,$(DEPFILE)_,$(ASMDEFS_SRC)) + $(call bmpdepfile,$(DEPFILE)_,$(BMP) $(PBMP)) @mv $(DEPFILE)_ $(DEPFILE) - $(call bmpdepfile,$(DEPFILE),$(BMP) $(PBMP)) bin: $(DEPFILE) $(TOOLS) $(BUILDDIR)/$(BINARY) $(RBINFO) rocks: $(DEPFILE) $(TOOLS) $(ROCKS) @@ -220,8 +219,8 @@ $(BUILDDIR)/rombox.ucl: $(BUILDDIR)/rombox.bin $(MAXOUTFILE) $(MAXOUTFILE): $(call PRINTS,Creating $(@F)) - $(SILENT)$(shell echo '#include "config.h"' > $(MAXINFILE)) - $(SILENT)$(shell echo "ROM_START" >> $(MAXINFILE)) + $(SILENT)echo '#include "config.h"' > $(MAXINFILE) + $(SILENT)echo "ROM_START" >> $(MAXINFILE) $(call preprocess2file,$(MAXINFILE),$(MAXOUTFILE)) $(SILENT)rm $(MAXINFILE) -- cgit v1.1