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

3 files changed, 45 insertions, 44 deletions

diff --git a/tools/Makefile b/tools/Makefile
index 89c3681cc9..bd253e7584 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -27,30 +27,31 @@ iaudio.o: iaudio.c
 sh2d: sh2d.c
 
 bmp2rb: bmp2rb.c
-        $(CC) -DAPPLICATION_NAME=\"$@\" -g $+ -o $@
+        $(SILENT)$(CC) -DAPPLICATION_NAME=\"$@\" -g $+ -o $@
 
 rdf2binary:     rdf2binary.c
-        $(CC) -g $+ -o $@
+        $(SILENT)$(CC) -g $+ -o $@
 
 mkboot: mkboot.c
-        $(CC) -g $+ -o $@
+        $(SILENT)$(CC) -g $+ -o $@
 
 ipod_fw:        ipod_fw.c
-        $(CC) -g $+ -o $@
+        $(SILENT)$(CC) -g $+ -o $@
 
 convbdf: convbdf.c
-        $(CC) -g $+ -o $@
+        $(SILENT)$(CC) -g $+ -o $@
 
 codepages: codepages.c codepage_tables.c
-        $(CC) -g $+ -o $@
+        $(SILENT)$(CC) -g $+ -o $@
 
 generate_rocklatin: generate_rocklatin.c ../firmware/drivers/lcd-player-charset.c 
-        $(CC) -DHAVE_LCD_CHARCELLS -D__CONFIG_H__ -I../firmware/export $+ -o $@
+        $(SILENT)$(CC) -DHAVE_LCD_CHARCELLS -D__CONFIG_H__ -I../firmware/export $+ -o $@
 
 uclpack:
-        $(MAKE) -C ucl
+        $(SILENT)$(MAKE) -C ucl
 
 clean:
-        rm -f $(CLEANALL) $(shell for f in $(CLEANALL) ; do echo $$f.exe $$f.o $$f.obj ; done) *.ajf *~
-        $(MAKE) -C ucl clean
+        @echo "Cleaning tools"
+        $(SILENT)rm -f $(CLEANALL) $(shell for f in $(CLEANALL) ; do echo $$f.exe $$f.o $$f.obj ; done) *.ajf *~
+        $(SILENT)$(MAKE) -C ucl clean
 
diff --git a/tools/configure b/tools/configure
index a50abb8d1d..ddfea63cb3 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1073,6 +1073,10 @@ sed > Makefile \
 <<EOF
 ## Automaticly generated. http://www.rockbox.org/
 
+ifndef V
+SILENT=@
+endif
+
 export ROOTDIR=@ROOTDIR@
 export FIRMDIR=@FIRMDIR@
 export APPSDIR=@APPSDIR@
@@ -1129,33 +1133,33 @@ MAKEFLAGS += --no-print-directory
 all: tools
         @SIMUL1@
         @SIMUL2@
-        @\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
-        @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@
+        \$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
+        \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@
 
 clean:
-        @\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware
-        @\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/@APPS@
-        @\$(MAKE) -C \$(TOOLSDIR) clean
-        @rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.h manual *.pdf
+        \$(SILENT)\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware
+        \$(SILENT)\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/@APPS@
+        \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) clean
+        \$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.h manual *.pdf
 
 tools:
-        \$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@
+        \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@
 
 tags:
-        @rm -f TAGS
-        \$(MAKE) -C \$(FIRMDIR) tags
-        \$(MAKE) -C \$(APPSDIR) tags
-        \$(MAKE) -C \$(APPSDIR)/plugins tags
-        \$(MAKE) -C \$(APPSDIR)/plugins/lib tags
+        \$(SILENT)rm -f TAGS
+        \$(SILENT)\$(MAKE) -C \$(FIRMDIR) tags
+        \$(SILENT)\$(MAKE) -C \$(APPSDIR) tags
+        \$(SILENT)\$(MAKE) -C \$(APPSDIR)/plugins tags
+        \$(SILENT)\$(MAKE) -C \$(APPSDIR)/plugins/lib tags
 
 zip:
-        @\$(TOOLSDIR)/buildzip.pl -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+        \$(SILENT)\$(TOOLSDIR)/buildzip.pl -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
 
 7zip:
-        @\$(TOOLSDIR)/buildzip.pl -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+        \$(SILENT)\$(TOOLSDIR)/buildzip.pl -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
 
 manual:
-        @\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual buildmanual
+        \$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual buildmanual
 
 EOF
 
diff --git a/tools/make.inc b/tools/make.inc
index 5a2ed800a6..344fa23543 100644
--- a/tools/make.inc
+++ b/tools/make.inc
@@ -28,25 +28,21 @@ $(OBJDIR)/%.o: %.S
 $(DEPFILE): $(SOURCES)
         $(SILENT)mkdir -p `dirname $(DEPFILE)`
         $(SILENT)rm -f $(DEPFILE)
-        $(SILENT)(if test ! -f $(BUILDDIR)/lang.h; then \
-          del="$(BUILDDIR)/lang.h"; \
-          touch $(BUILDDIR)/lang.h; \
-        fi; \
-        for each in $(SOURCES) x; do \
-          if test "$$each" = "credits.c"; then \
-            del="$$del$(BUILDDIR)/credits.raw"; \
-            touch $(BUILDDIR)/credits.raw; \
-          fi; \
-          if test "x" != "$$each"; then \
-            obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \
-            $(CC) -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each >> $(DEPFILE) 2>/dev/null; \
-          fi; \
-          if test -n "$$del"; then \
-            rm $$del; \
-            del=""; \
-          fi \
-        done; \
-        echo "oo" >/dev/null )
+        $(SILENT)(for each in $(SOURCES) x; do \
+            if test "$$each" = "credits.c"; then \
+                del="$$del$(BUILDDIR)/credits.raw"; \
+                touch $(BUILDDIR)/credits.raw; \
+            fi; \
+            if test "x" != "$$each"; then \
+                obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \
+                $(CC) -MG -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each 2>/dev/null; \
+            fi; \
+            if test -n "$$del"; then \
+                rm $$del; \
+                del=""; \
+            fi \
+        done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang.o:" > $(DEPFILE); \
+        echo "oo" > /dev/null )
 
 tags:
         $(SILENT)(for d in $(DIRS); do \