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

5 files changed, 9 insertions, 47 deletions

diff --git a/apps/bitmaps/Makefile b/apps/bitmaps/Makefile
deleted file mode 100644
index aa43615894..0000000000
--- a/apps/bitmaps/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#             __________               __   ___.
-#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
-#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
-#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
-#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-#                     \/            \/     \/    \/            \/
-# $Id$
-#
-
-ifndef V
-SILENT=@
-endif
-
-all:
-ifneq ($(strip $(BMP2RB_NATIVE)),)
-	@echo "MAKE in bitmaps/native"
-	$(SILENT)mkdir -p $(OBJDIR)/native
-	@$(MAKE) -C native OBJDIR=$(OBJDIR)/native
-endif
-ifneq ($(strip $(BMP2RB_MONO)),)
-	@echo "MAKE in bitmaps/mono"
-	$(SILENT)mkdir -p $(OBJDIR)/mono
-	@$(MAKE) -C mono OBJDIR=$(OBJDIR)/mono
-endif
-ifneq ($(strip $(BMP2RB_REMOTENATIVE)),)
-	@echo "MAKE in bitmaps/remote_native"
-	$(SILENT)mkdir -p $(OBJDIR)/remote_native
-	@$(MAKE) -C remote_native OBJDIR=$(OBJDIR)/remote_native
-endif
-ifneq ($(strip $(BMP2RB_REMOTEMONO)),)
-	@echo "MAKE in bitmaps/remote_mono"
-	$(SILENT)mkdir -p $(OBJDIR)/remote_mono
-	@$(MAKE) -C remote_mono OBJDIR=$(OBJDIR)/remote_mono
-endif
diff --git a/apps/bitmaps/mono/Makefile b/apps/bitmaps/mono/Makefile
index dede4e81d9..28893e914d 100644
--- a/apps/bitmaps/mono/Makefile
+++ b/apps/bitmaps/mono/Makefile
@@ -5,7 +5,7 @@
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
 # $Id$
-#
+#                            
 
 INCLUDES= -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDIR) \
           -I$(OBJDIR)
@@ -26,8 +26,7 @@ BMPINCDIR = $(BUILDDIR)/bitmaps
 include $(TOOLSDIR)/makebmp.inc
 
 clean:
-	@echo "cleaning bitmaps/mono"
-	@rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE)
-	@rmdir $(OBJDIR)
+	$(call PRINTS,cleaning bitmaps/mono)rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE)
+	$(SILENT)rmdir $(OBJDIR)
 
 -include $(DEPFILE)
diff --git a/apps/bitmaps/native/Makefile b/apps/bitmaps/native/Makefile
index 49e941799e..96f7e50a56 100644
--- a/apps/bitmaps/native/Makefile
+++ b/apps/bitmaps/native/Makefile
@@ -26,8 +26,7 @@ BMPINCDIR = $(BUILDDIR)/bitmaps
 include $(TOOLSDIR)/makebmp.inc
 
 clean:
-	@echo "cleaning bitmaps/native"
-	@rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE)
-	@rmdir $(OBJDIR)
+	$(call PRINTS,cleaning bitmaps/native)rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE)
+	$(SILENT)rmdir $(OBJDIR)
 
 -include $(DEPFILE)
diff --git a/apps/bitmaps/remote_mono/Makefile b/apps/bitmaps/remote_mono/Makefile
index dd781242b5..db707c7542 100644
--- a/apps/bitmaps/remote_mono/Makefile
+++ b/apps/bitmaps/remote_mono/Makefile
@@ -26,8 +26,7 @@ BMPINCDIR = $(BUILDDIR)/bitmaps
 include $(TOOLSDIR)/makebmp.inc
 
 clean:
-	@echo "cleaning bitmaps/remotemono"
-	@rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE)
-	@rmdir $(OBJDIR)
+	$(call PRINTS,cleaning bitmaps/remotemono)rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE)
+	$(SILENT)rmdir $(OBJDIR)
 
 -include $(DEPFILE)
diff --git a/apps/bitmaps/remote_native/Makefile b/apps/bitmaps/remote_native/Makefile
index 573ee554b2..03eccfd5ce 100644
--- a/apps/bitmaps/remote_native/Makefile
+++ b/apps/bitmaps/remote_native/Makefile
@@ -26,8 +26,7 @@ BMPINCDIR = $(BUILDDIR)/bitmaps
 include $(TOOLSDIR)/makebmp.inc
 
 clean:
-	@echo "cleaning bitmaps/remote_native"
-	@rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE)
-	@rmdir $(OBJDIR)
+	$(call PRINTS,cleaning bitmaps/remote_native)rm -f $(CSRC) $(OBJS) $(OUTPUT) $(DEPFILE)
+	$(SILENT)rmdir $(OBJDIR)
 
 -include $(DEPFILE)