From a796260a6b9929f6aca844b4a788a2f55ef60d4b Mon Sep 17 00:00:00 2001
From: Jens Arnold <amiconn@rockbox.org>
Date: Fri, 27 Oct 2006 21:48:06 +0000
Subject: Next step of Makefile tuning: * Use 'make' internal commands for
 printing messages. Saves build time especially on cygwin. * SILENT variable
 used in more places. * Bitmap build system uses one Makefille less.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11369 a1c6a512-1295-4272-9138-f99709370657
---
 tools/configure   |  4 ++--
 tools/make.inc    |  7 +++----
 tools/makebmp.inc | 12 +++++-------
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'tools')

diff --git a/tools/configure b/tools/configure
index 3d457881ad..66636b55b4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1355,8 +1355,8 @@ fi
 
 if test "$simulator" = "yes"; then
   # add simul make stuff on the #SIMUL# line
-  simmagic1="s,@SIMUL1@,@\$(MAKE) -C \$(SIMDIR) OBJDIR=\$(BUILDDIR)/sim,"
-  simmagic2="s,@SIMUL2@,@\$(MAKE) -C \$(ROOTDIR)/uisimulator/common OBJDIR=\$(BUILDDIR)/comsim,"
+  simmagic1="s,@SIMUL1@,\$(SILENT)\$(MAKE) -C \$(SIMDIR) OBJDIR=\$(BUILDDIR)/sim,"
+  simmagic2="s,@SIMUL2@,\$(SILENT)\$(MAKE) -C \$(ROOTDIR)/uisimulator/common OBJDIR=\$(BUILDDIR)/comsim,"
 else
   # delete the lines that match
   simmagic1='/@SIMUL1@/D'
diff --git a/tools/make.inc b/tools/make.inc
index e2430a2b6b..8d75326bf0 100644
--- a/tools/make.inc
+++ b/tools/make.inc
@@ -3,16 +3,15 @@
 ifndef V
 SILENT=@
 endif
+PRINTS=$(info $(1))$(SILENT)
 
 $(OBJDIR)/%.o: %.c
 	$(SILENT)mkdir -p $(dir $@)
-	@echo "CC $<"
-	$(SILENT)$(CC) $(CFLAGS) -c $< -o $@
+	$(call PRINTS,CC $<)$(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: %.S
 	$(SILENT)mkdir -p $(dir $@)
-	@echo "CC $<"
-	$(SILENT)$(CC) $(CFLAGS) -c $< -o $@
+	$(call PRINTS,CC $<)$(CC) $(CFLAGS) -c $< -o $@
 
 # The echo stuff last in the dep update shell magic is to prevent any compiler
 # errors/warnings to cause an error code to get returned and thus stop the
diff --git a/tools/makebmp.inc b/tools/makebmp.inc
index 62d3f25b41..9c8c640203 100644
--- a/tools/makebmp.inc
+++ b/tools/makebmp.inc
@@ -5,17 +5,16 @@ dep: $(DEPFILE)
 ifndef V
 SILENT=@
 endif
+PRINTS=$(info $(1))$(SILENT)
 
 $(OBJDIR)/%.c: %.bmp
 	$(SILENT)mkdir -p $(dir $@)
 	$(SILENT)mkdir -p $(BMPINCDIR)
-	@echo BMP2RB $<
-	$(SILENT)$(BMP2RB) -h $(BMPINCDIR) $< > $@
+	$(call PRINTS,BMP2RB $<)$(BMP2RB) -h $(BMPINCDIR) $< > $@
 
 $(OBJDIR)/%.o: $(OBJDIR)/%.c
 	$(SILENT)mkdir -p $(dir $@)
-	@echo CC $(notdir $<)
-	$(SILENT)$(CC) $(CFLAGS) -c $< -o $@
+	$(call PRINTS,CC $(<F))$(CC) $(CFLAGS) -c $< -o $@
 
 $(DEPFILE): SOURCES
 	$(SILENT)mkdir -p $(dir $(DEPFILE))
@@ -30,6 +29,5 @@ $(DEPFILE): SOURCES
         done)
 
 $(OUTPUT): $(OBJS)
-	@echo "AR+RANLIB $(notdir $@)"
-	@$(AR) ruv $@ $+ >/dev/null 2>&1
-	@$(RANLIB) $@
+	$(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $+ >/dev/null 2>&1
+	$(SILENT)$(RANLIB) $@
-- 
cgit v1.2.3