Various build sytem cleanups

* Parallel build appears to work properly
* Use $(SILENT) instead of @ about everywhere
* Less calls to bash by using make builtin substitutions


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8638 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 67 insertions, 67 deletions

diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index 915e922..c93b59b 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -43,34 +43,33 @@ CODECDEPS = $(LINKCODEC) $(BUILDDIR)/libcodec.a
 
 OUTPUT = $(SOFTWARECODECS)
 
-all: $(OUTPUT) $(ROCKS)
+all: $(ROCKS)
 
 ifndef SIMVER
-ELFIT =	$(SILENT)(file=`basename $@`; \
-	echo "LD $$file"; \
-	$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map)
-
-.elf.o:
-	$(ELFIT)
-
-$(OBJDIR)/mpa.elf: $(OBJDIR)/mpa.o $(CODECDEPS) $(BUILDDIR)/libmad.a
-$(OBJDIR)/a52.elf: $(OBJDIR)/a52.o $(CODECDEPS) $(BUILDDIR)/liba52.a
-$(OBJDIR)/flac.elf: $(OBJDIR)/flac.o $(CODECDEPS) $(BUILDDIR)/libffmpegFLAC.a
-$(OBJDIR)/vorbis.elf: $(OBJDIR)/vorbis.o $(CODECDEPS) $(BUILDDIR)/libTremor.a
-$(OBJDIR)/mpc.elf: $(OBJDIR)/mpc.o $(CODECDEPS) $(BUILDDIR)/libmusepack.a
-$(OBJDIR)/wav.elf: $(OBJDIR)/wav.o $(CODECDEPS)
-$(OBJDIR)/wavpack.elf: $(OBJDIR)/wavpack.o $(CODECDEPS) $(BUILDDIR)/libwavpack.a
-$(OBJDIR)/alac.elf: $(OBJDIR)/alac.o $(CODECDEPS) $(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a
-$(OBJDIR)/aac.elf: $(OBJDIR)/aac.o $(CODECDEPS) $(BUILDDIR)/libfaad.a $(BUILDDIR)/libm4a.a
-$(OBJDIR)/shorten.elf: $(OBJDIR)/shorten.o $(CODECDEPS) $(BUILDDIR)/libffmpegFLAC.a
-$(OBJDIR)/aiff.elf: $(OBJDIR)/aiff.o $(CODECDEPS)
-
-$(OBJDIR)/%.elf: $(OBJDIR)/%.o $(CODECDEPS)
-	$(ELFIT)
+NULL =
+
+$(OBJDIR)/wav.elf : $(NULL)
+$(OBJDIR)/aiff.elf : $(NULL)
+$(OBJDIR)/mpa.elf : $(BUILDDIR)/libmad.a
+$(OBJDIR)/a52.elf : $(BUILDDIR)/liba52.a
+$(OBJDIR)/flac.elf : $(BUILDDIR)/libffmpegFLAC.a
+$(OBJDIR)/vorbis.elf : $(BUILDDIR)/libTremor.a
+$(OBJDIR)/mpc.elf : $(BUILDDIR)/libmusepack.a
+$(OBJDIR)/wavpack.elf : $(BUILDDIR)/libwavpack.a
+$(OBJDIR)/alac.elf : $(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a
+$(OBJDIR)/aac.elf : $(BUILDDIR)/libfaad.a $(BUILDDIR)/libm4a.a
+$(OBJDIR)/shorten.elf : $(BUILDDIR)/libffmpegFLAC.a
+
+$(OBJDIR)/%.elf :
+	@echo "LD $(notdir $@)"
+	$(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map
+
+$(BUILDDIR)/%.a : % $(CODECDEPS)
+	
 
 $(OBJDIR)/%.codec : $(OBJDIR)/%.elf
-	@echo "OBJCOPY "`basename $@`
-	@$(OC) -O binary $< $@
+	@echo "OBJCOPY $(notdir $@)"
+	$(SILENT)$(OC) -O binary $< $@
 else
 
 ifeq ($(SIMVER), x11)
@@ -78,14 +77,14 @@ ifeq ($(SIMVER), x11)
 # This is the X11 simulator version
 
 $(OBJDIR)/%.codec : $(OBJDIR)/%.o  $(BUILDDIR)/libcodec.a
-	@echo "LD "`basename $@`
-	@$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR)  $(CODECLIBS) -lcodec -o $@
+	@echo "LD $(notdir $@)"
+	$(SILENT)$(CC) $(CFLAGS) -shared $^ -L$(BUILDDIR)  $(CODECLIBS) -lcodec -o $@
 ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
 # 'x' must be kept or you'll have "Win32 error 5"
 #     $ fgrep 5 /usr/include/w32api/winerror.h | head -1
 #         #define ERROR_ACCESS_DENIED 5L
 else
-	@chmod -x $@
+	$(SILENT)chmod -x $@
 endif
 
 else	# end of x11-simulator
@@ -95,13 +94,13 @@ ifeq ($(SIMVER), sdl)
 
 $(OBJDIR)/%.codec : $(OBJDIR)/%.o  $(BUILDDIR)/libcodec.a
 	@echo "LD "`basename $@`
-	@$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR)  $(CODECLIBS) -lcodec -o $@
+	$(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR)  $(CODECLIBS) -lcodec -o $@
 ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
 # 'x' must be kept or you'll have "Win32 error 5"
 #     $ fgrep 5 /usr/include/w32api/winerror.h | head -1
 #         #define ERROR_ACCESS_DENIED 5L
 else
-	@chmod -x $@
+	$(SILENT)chmod -x $@
 endif
 
 else	# end of sdl-simulator
@@ -111,16 +110,16 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OBJDIR)/%.codec : $(OBJDIR)/%.o  $(BUILDDIR)/libcodec.a
-	@echo "DLL "`basename $@`
-	@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
-	@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \
+	@echo "DLL $(notdir $@)"
+	$(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
+	$(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \
                 $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@
 ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
 # 'x' must be kept or you'll have "Win32 error 5"
 #     $ fgrep 5 /usr/include/w32api/winerror.h | head -1
 #         #define ERROR_ACCESS_DENIED 5L
 else
-	@chmod -x $@
+	$(SILENT)chmod -x $@
 endif
 endif # end of win32-simulator
 endif
@@ -131,76 +130,77 @@ include $(TOOLSDIR)/make.inc
 
 $(BUILDDIR)/libcodec.a:
 	@echo "MAKE in codecs/lib"
-	@mkdir -p $(OBJDIR)/lib
-	@$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib
+	$(SILENT)mkdir -p $(OBJDIR)/lib
+	$(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib
 
 $(LINKCODEC): $(LDS)
 	@echo "build $@"
-	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@
+	$(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@
 
 libmad:
 	@echo "MAKE in libmad"
-	@mkdir -p $(OBJDIR)/libmad
-	@$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a
+	$(SILENT)mkdir -p $(OBJDIR)/libmad
+	$(SILENT)$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a
 
 liba52:
 	@echo "MAKE in liba52"
-	@mkdir -p $(OBJDIR)/liba52
-	@$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a
+	$(SILENT)mkdir -p $(OBJDIR)/liba52
+	$(SILENT)$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a
 
 libffmpegFLAC:
 	@echo "MAKE in libffmpegFLAC"
-	@mkdir -p $(OBJDIR)/libffmpegFLAC
-	@$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a
+	$(SILENT)mkdir -p $(OBJDIR)/libffmpegFLAC
+	$(SILENT)$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a
 
 libTremor:
 	@echo "MAKE in Tremor"
-	@mkdir -p $(OBJDIR)/Tremor
-	@$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a
+	$(SILENT)mkdir -p $(OBJDIR)/Tremor
+	$(SILENT)$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a
 
 libwavpack:
 	@echo "MAKE in libwavpack"
-	@mkdir -p $(OBJDIR)/libwavpack
-	@$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a
+	$(SILENT)mkdir -p $(OBJDIR)/libwavpack
+	$(SILENT)$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a
 
 dumb:
 	@echo "MAKE in dumb"
-	@mkdir -p $(OBJDIR)/dumb
-	@$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)"
+	$(SILENT)mkdir -p $(OBJDIR)/dumb
+	$(SILENT)$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)"
 
 libmusepack:
 	@echo "MAKE in libmusepack"
-	@mkdir -p $(OBJDIR)/libmusepack
-	@$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a
+	$(SILENT)mkdir -p $(OBJDIR)/libmusepack
+	$(SILENT)$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a
 
 libalac:
 	@echo "MAKE in libalac"
-	@mkdir -p $(OBJDIR)/libalac
-	@$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a
+	$(SILENT)mkdir -p $(OBJDIR)/libalac
+	$(SILENT)$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a
+
 libm4a:
 	@echo "MAKE in libm4a"
-	@mkdir -p $(OBJDIR)/libm4a
-	@$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a
+	$(SILENT)mkdir -p $(OBJDIR)/libm4a
+	$(SILENT)$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a
 
 libfaad:
 	@echo "MAKE in libfaad"
-	@mkdir -p $(OBJDIR)/libfaad
-	@$(MAKE) -C libfaad OBJDIR=$(OBJDIR)/libfaad OUTPUT=$(BUILDDIR)/libfaad.a
+	$(SILENT)mkdir -p $(OBJDIR)/libfaad
+	$(SILENT)$(MAKE) -C libfaad OBJDIR=$(OBJDIR)/libfaad OUTPUT=$(BUILDDIR)/libfaad.a
 
 clean:
 	@echo "cleaning codecs"
 	$(SILENT)rm -fr $(OBJDIR)/libmad $(BUILDDIR)/libmad.a $(OBJDIR)/liba52 $(BUILDDIR)/liba52.a $(OBJDIR)/libffmpegFLAC $(BUILDDIR)/libffmpegFLAC.a $(OBJDIR)/Tremor $(BUILDDIR)/libTremor.a $(OBJDIR)/libwavpack $(BUILDDIR)/libwavpack.a $(OBJDIR)/dumb $(BUILDDIR)/libdumb.a $(BUILDDIR)/libdumbd.a $(OBJDIR)/libmusepack $(BUILDDIR)/libmusepack.a $(OBJDIR)/libalac $(BUILDDIR)/libalac.a $(OBJDIR)/libfaad $(BUILDDIR)/libfaad.a $(OBJDIR)/libm4a $(BUILDDIR)/libm4a.a
-	@$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad
-	@$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52
-	@$(MAKE) -C libffmpegFLAC clean OBJDIR=$(OBJDIR)/libffmpegFLAC
-	@$(MAKE) -C Tremor clean OBJDIR=$(OBJDIR)/Tremor
-	@$(MAKE) -C libwavpack clean OBJDIR=$(OBJDIR)/libwavpack
-	@$(MAKE) -C libmusepack clean OBJDIR=$(OBJDIR)/libmusepack
-	@$(MAKE) -C libalac clean OBJDIR=$(OBJDIR)/libalac
-	@$(MAKE) -C libfaad clean OBJDIR=$(OBJDIR)/libfaad
-	@$(MAKE) -C libm4a clean OBJDIR=$(OBJDIR)/libm4a
-	@$(MAKE) -C dumb clean OBJDIR=$(OBJDIR)/dumb
-	@$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib
+	$(SILENT)$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad
+	$(SILENT)$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52
+	$(SILENT)$(MAKE) -C libffmpegFLAC clean OBJDIR=$(OBJDIR)/libffmpegFLAC
+	$(SILENT)$(MAKE) -C Tremor clean OBJDIR=$(OBJDIR)/Tremor
+	$(SILENT)$(MAKE) -C libwavpack clean OBJDIR=$(OBJDIR)/libwavpack
+	$(SILENT)$(MAKE) -C libmusepack clean OBJDIR=$(OBJDIR)/libmusepack
+	$(SILENT)$(MAKE) -C libalac clean OBJDIR=$(OBJDIR)/libalac
+	$(SILENT)$(MAKE) -C libfaad clean OBJDIR=$(OBJDIR)/libfaad
+	$(SILENT)$(MAKE) -C libm4a clean OBJDIR=$(OBJDIR)/libm4a
+	$(SILENT)$(MAKE) -C dumb clean OBJDIR=$(OBJDIR)/dumb
+	$(SILENT)$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib
 
 ifneq ($(MAKECMDGOALS),clean)
 -include $(DEPFILE)