From a796260a6b9929f6aca844b4a788a2f55ef60d4b Mon Sep 17 00:00:00 2001 From: Jens Arnold 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 --- apps/codecs/Makefile | 54 +++++++++++++------------------------- apps/codecs/Tremor/Makefile | 8 +++--- apps/codecs/lib/Makefile | 8 +++--- apps/codecs/libFLAC/Makefile | 13 ++++----- apps/codecs/liba52/Makefile | 8 +++--- apps/codecs/libalac/Makefile | 8 +++--- apps/codecs/libfaad/Makefile | 8 +++--- apps/codecs/libffmpegFLAC/Makefile | 8 +++--- apps/codecs/libm4a/Makefile | 8 +++--- apps/codecs/libmad/Makefile | 8 +++--- apps/codecs/libmusepack/Makefile | 8 +++--- 11 files changed, 50 insertions(+), 89 deletions(-) (limited to 'apps/codecs') diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index cd0677aebf..12235b490c 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile @@ -66,12 +66,10 @@ $(OBJDIR)/wav_enc.elf: $(OBJDIR)/wav_enc.o $(OBJDIR)/wavpack_enc.elf: $(OBJDIR)/wavpack_enc.o $(BUILDDIR)/libwavpack.a $(OBJDIR)/%.elf: - @echo "LD $(notdir $@)" - $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map + $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map $(OBJDIR)/%.codec : $(OBJDIR)/%.elf - @echo "OBJCOPY $(notdir $@)" - $(SILENT)$(OC) -O binary $< $@ + $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ else ifeq ($(SIMVER), x11) @@ -79,8 +77,7 @@ ifeq ($(SIMVER), x11) # This is the X11 simulator version $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) - @echo "LD $(notdir $@)" - $(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $< -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 @@ -95,8 +92,7 @@ ifeq ($(SIMVER), sdl) # This is the SDL simulator version $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) - @echo "LD $(notdir $@)" - $(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ + $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $< -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 @@ -112,8 +108,7 @@ DLLTOOLFLAGS = --export-all DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) - @echo "DLL $(notdir $@)" - $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< + $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< \ $(BUILDDIR)/libcodec.a $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) \ -o $@ @@ -132,85 +127,72 @@ endif # end of simulator section include $(TOOLSDIR)/make.inc $(BUILDDIR)/libcodec.a: - @echo "MAKE in codecs/lib" $(SILENT)mkdir -p $(OBJDIR)/lib - $(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib + $(call PRINTS,MAKE in codecs/lib)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib $(LINKCODEC): $(LDS) - @echo "build $(notdir $@)" - $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ + $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ $(BUILDDIR)/libmad.a: libmad libmad: - @echo "MAKE in libmad" $(SILENT)mkdir -p $(OBJDIR)/libmad - $(SILENT)$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a + $(call PRINTS,MAKE in libmad)$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a $(BUILDDIR)/liba52.a: liba52 liba52: - @echo "MAKE in liba52" $(SILENT)mkdir -p $(OBJDIR)/liba52 - $(SILENT)$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a + $(call PRINTS,MAKE in liba52)$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a $(BUILDDIR)/libffmpegFLAC.a: libffmpegFLAC libffmpegFLAC: - @echo "MAKE in libffmpegFLAC" $(SILENT)mkdir -p $(OBJDIR)/libffmpegFLAC - $(SILENT)$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a + $(call PRINTS,MAKE in libffmpegFLAC)$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a $(BUILDDIR)/libTremor.a: libTremor libTremor: - @echo "MAKE in Tremor" $(SILENT)mkdir -p $(OBJDIR)/Tremor - $(SILENT)$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a + $(call PRINTS,MAKE in Tremor)$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a $(BUILDDIR)/libwavpack.a: libwavpack libwavpack: - @echo "MAKE in libwavpack" $(SILENT)mkdir -p $(OBJDIR)/libwavpack - $(SILENT)$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a + $(call PRINTS,MAKE in libwavpack)$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a dumb: - @echo "MAKE in dumb" $(SILENT)mkdir -p $(OBJDIR)/dumb - $(SILENT)$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)" + $(call PRINTS,MAKE in dumb)$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)" $(BUILDDIR)/libmusepack.a: libmusepack libmusepack: - @echo "MAKE in libmusepack" $(SILENT)mkdir -p $(OBJDIR)/libmusepack - $(SILENT)$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a + $(call PRINTS,MAKE in libmusepack)$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a $(BUILDDIR)/libalac.a: libalac libalac: - @echo "MAKE in libalac" $(SILENT)mkdir -p $(OBJDIR)/libalac - $(SILENT)$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a + $(call PRINTS,MAKE in libalac)$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a: libm4a libm4a: - @echo "MAKE in libm4a" $(SILENT)mkdir -p $(OBJDIR)/libm4a - $(SILENT)$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a + $(call PRINTS,MAKE in libm4a)$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a $(BUILDDIR)/libfaad.a: libfaad libfaad: - @echo "MAKE in libfaad" $(SILENT)mkdir -p $(OBJDIR)/libfaad - $(SILENT)$(MAKE) -C libfaad OBJDIR=$(OBJDIR)/libfaad OUTPUT=$(BUILDDIR)/libfaad.a + $(call PRINTS,MAKE in libfaad)$(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 + $(call PRINTS,cleaning codecs)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 $(SILENT)$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad $(SILENT)$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52 $(SILENT)$(MAKE) -C libffmpegFLAC clean OBJDIR=$(OBJDIR)/libffmpegFLAC diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile index ee91a05af9..c3c4ae7cdb 100644 --- a/apps/codecs/Tremor/Makefile +++ b/apps/codecs/Tremor/Makefile @@ -30,15 +30,13 @@ DIRS = all: $(OUTPUT) $(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) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning Tremor" - @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) + $(call PRINTS,cleaning Tremor)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) diff --git a/apps/codecs/lib/Makefile b/apps/codecs/lib/Makefile index fcf84c2acd..9f831d5f92 100644 --- a/apps/codecs/lib/Makefile +++ b/apps/codecs/lib/Makefile @@ -33,14 +33,12 @@ OUTPUT = $(BUILDDIR)/libcodec.a all: $(OUTPUT) $(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) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning codecs/lib" - @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) + $(call PRINTS,cleaning codecs/lib)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) -include $(DEPFILE) diff --git a/apps/codecs/libFLAC/Makefile b/apps/codecs/libFLAC/Makefile index 221b934c13..b8ab586200 100644 --- a/apps/codecs/libFLAC/Makefile +++ b/apps/codecs/libFLAC/Makefile @@ -44,19 +44,16 @@ OUTPUT = $(BUILDDIR)/libFLAC.a all: $(OUTPUT) $(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) $@ $(OBJDIR)/libFLAC/%.o: $(APPSDIR)/codecs/libFLAC/%.c - @mkdir -p $(OBJDIR)/libFLAC - @echo "(libFLAC) CC $<" - @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libFLAC/include/FLAC $< -o $@ + $(SILENT)mkdir -p $(OBJDIR)/libFLAC + $(call PRINTS,CC $(/dev/null 2>&1 - @$(RANLIB) $@ + $(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $+ >/dev/null 2>&1 + $(SILENT)$(RANLIB) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning liba52" - @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) + $(call PRINTS,cleaning liba52)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) diff --git a/apps/codecs/libalac/Makefile b/apps/codecs/libalac/Makefile index 6f75a08e51..07b901139f 100644 --- a/apps/codecs/libalac/Makefile +++ b/apps/codecs/libalac/Makefile @@ -30,15 +30,13 @@ DIRS = all: $(OUTPUT) $(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) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning libalac" - @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) + $(call PRINTS,cleaning libalac)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) diff --git a/apps/codecs/libfaad/Makefile b/apps/codecs/libfaad/Makefile index 4a59d6c872..8288b4ce79 100644 --- a/apps/codecs/libfaad/Makefile +++ b/apps/codecs/libfaad/Makefile @@ -30,15 +30,13 @@ DIRS = all: $(OUTPUT) $(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) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning libfaad" - @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) + $(call PRINTS,cleaning libfaad)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) diff --git a/apps/codecs/libffmpegFLAC/Makefile b/apps/codecs/libffmpegFLAC/Makefile index 27c17c8243..78c560bf75 100644 --- a/apps/codecs/libffmpegFLAC/Makefile +++ b/apps/codecs/libffmpegFLAC/Makefile @@ -30,15 +30,13 @@ DIRS = all: $(OUTPUT) $(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) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning libffmpegFLAC" - @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) + $(call PRINTS,cleaning libffmpegFLAC)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) diff --git a/apps/codecs/libm4a/Makefile b/apps/codecs/libm4a/Makefile index 73b24bc214..1bc71e50b7 100644 --- a/apps/codecs/libm4a/Makefile +++ b/apps/codecs/libm4a/Makefile @@ -30,15 +30,13 @@ DIRS = all: $(OUTPUT) $(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) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning libm4a" - @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) + $(call PRINTS,cleaning libm4a)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile index 7ee16d9e4c..13cde8f1f6 100644 --- a/apps/codecs/libmad/Makefile +++ b/apps/codecs/libmad/Makefile @@ -39,15 +39,13 @@ DIRS = all: $(OUTPUT) $(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) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning libmad" - @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) + $(call PRINTS,cleaning libmad)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile index 68c2603580..d6bf174d2c 100644 --- a/apps/codecs/libmusepack/Makefile +++ b/apps/codecs/libmusepack/Makefile @@ -30,15 +30,13 @@ DIRS = all: $(OUTPUT) $(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) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning libmusepack" - @rm -f $(OBJS) $(OUTPUT) $(DEPFILE) + $(call PRINTS,cleaning libmusepack)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) -- cgit v1.2.3