A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd

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

+16 -18
+1
tools/addtargetdir.pl
··· 39 39 print " \\\n $src"; 40 40 } 41 41 } 42 + print "\n";
+9 -11
tools/functions.make
··· 22 22 grep -v '^\#' | \ 23 23 sed -e 's:^..*:$(dir $(1))&:') 24 24 25 - preprocess2file = $(shell $(CC) $(PPCFLAGS) $(3) -E -P -x c -include config.h $(1) | \ 26 - grep -v '^\#' | grep -v "^$$" > $(2)) 25 + preprocess2file = $(SILENT)$(CC) $(PPCFLAGS) $(3) -E -P -x c -include config.h $(1) | \ 26 + grep -v '^\#' | grep -v "^$$" > $(2) 27 27 28 - asmdefs2file = $(shell $(CC) $(PPCFLAGS) $(3) -S -x c -o - -include config.h $(1) | \ 29 - perl -ne 'if(/^_?AD_(\w+):$$/){$$var=$$1}else{/^\W\.(?:word|long)\W(.*)$$/ && $$var && print "\#define $$var $$1\n";$$var=0}' > $2) 28 + asmdefs2file = $(SILENT)$(CC) $(PPCFLAGS) $(3) -S -x c -o - -include config.h $(1) | \ 29 + perl -ne 'if(/^_?AD_(\w+):$$/){$$var=$$1}else{/^\W\.(?:word|long)\W(.*)$$/ && $$var && print "\#define $$var $$1\n";$$var=0}' > $(2) 30 30 31 31 c2obj = $(addsuffix .o,$(basename $(subst $(ROOTDIR),$(BUILDDIR),$(1)))) 32 32 33 - # calculate dependencies for a list of source files $(2) and output them 34 - # to a file $(1)_, to be later renamed to $(1). 35 - mkdepfile = $(shell \ 36 - perl $(TOOLSDIR)/multigcc.pl $(CC) $(PPCFLAGS) $(OTHER_INC) -MG -MM -include config.h -- $(2) | \ 33 + # calculate dependencies for a list of source files $(2) and output them to $(1) 34 + mkdepfile = $(SILENT)perl $(TOOLSDIR)/multigcc.pl $(CC) $(PPCFLAGS) $(OTHER_INC) -MG -MM -include config.h -- $(2) | \ 37 35 sed -e "s: lang.h: lang/lang.h:" \ 38 36 -e 's:_asmdefs.o:_asmdefs.h:' \ 39 37 -e "s: max_language_size.h: lang/max_language_size.h:" | \ 40 38 $(TOOLSDIR)/addtargetdir.pl $(ROOTDIR) $(BUILDDIR) \ 41 - >> $(1)_) 39 + >> $(1) 42 40 43 41 # function to create .bmp dependencies 44 - bmpdepfile = $(shell \ 42 + bmpdepfile = $(SILENT) \ 45 43 for each in $(2); do \ 46 44 obj=`echo $$each | sed -e 's/\.bmp/.o/' -e 's:$(ROOTDIR):$(BUILDDIR):'`; \ 47 45 src=`echo $$each | sed -e 's/\.bmp/.c/' -e 's:$(ROOTDIR):$(BUILDDIR):'`; \ 48 46 echo $$obj: $$src; \ 49 47 echo $$src: $$each; \ 50 48 done \ 51 - >> $(1); ) 49 + >> $(1) 52 50 53 51 ifndef V 54 52 SILENT:=@
+6 -7
tools/root.make
··· 110 110 111 111 $(DEPFILE) dep: 112 112 $(call PRINTS,Generating dependencies) 113 - @echo foo > /dev/null # there must be a "real" command in the rule 114 - $(call mkdepfile,$(DEPFILE),$(SRC)) 115 - $(call mkdepfile,$(DEPFILE),$(OTHER_SRC:%.lua=)) 116 - $(call mkdepfile,$(DEPFILE),$(ASMDEFS_SRC)) 113 + $(call mkdepfile,$(DEPFILE)_,$(SRC)) 114 + $(call mkdepfile,$(DEPFILE)_,$(OTHER_SRC:%.lua=)) 115 + $(call mkdepfile,$(DEPFILE)_,$(ASMDEFS_SRC)) 116 + $(call bmpdepfile,$(DEPFILE)_,$(BMP) $(PBMP)) 117 117 @mv $(DEPFILE)_ $(DEPFILE) 118 - $(call bmpdepfile,$(DEPFILE),$(BMP) $(PBMP)) 119 118 120 119 bin: $(DEPFILE) $(TOOLS) $(BUILDDIR)/$(BINARY) $(RBINFO) 121 120 rocks: $(DEPFILE) $(TOOLS) $(ROCKS) ··· 220 219 221 220 $(MAXOUTFILE): 222 221 $(call PRINTS,Creating $(@F)) 223 - $(SILENT)$(shell echo '#include "config.h"' > $(MAXINFILE)) 224 - $(SILENT)$(shell echo "ROM_START" >> $(MAXINFILE)) 222 + $(SILENT)echo '#include "config.h"' > $(MAXINFILE) 223 + $(SILENT)echo "ROM_START" >> $(MAXINFILE) 225 224 $(call preprocess2file,$(MAXINFILE),$(MAXOUTFILE)) 226 225 $(SILENT)rm $(MAXINFILE) 227 226