From f8fe9cae70f8d4f1c48dd06bb60978ebf5a7a5c6 Mon Sep 17 00:00:00 2001 From: zagor Date: Thu, 20 Nov 2008 16:49:55 +0000 Subject: [PATCH] Remove .a files before running ar, to avoid problems with renamed files remaining in the library. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19160 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/demac/libdemac.make | 1 + apps/codecs/lib/libcodec.make | 1 + apps/codecs/liba52/liba52.make | 1 + apps/codecs/libalac/libalac.make | 1 + apps/codecs/libasap/libasap.make | 1 + apps/codecs/libfaad/libfaad.make | 1 + apps/codecs/libffmpegFLAC/libffmpegFLAC.make | 1 + apps/codecs/libm4a/libm4a.make | 1 + apps/codecs/libmad/libmad.make | 1 + apps/codecs/libmusepack/libmusepack.make | 1 + apps/codecs/libspc/libspc.make | 1 + apps/codecs/libspeex/libspeex.make | 1 + apps/codecs/libtremor/libtremor.make | 1 + apps/codecs/libwavpack/libwavpack.make | 1 + apps/codecs/libwma/libwma.make | 1 + apps/plugins/bitmaps/pluginbitmaps.make | 1 + apps/plugins/plugins.make | 1 + firmware/firmware.make | 1 + 18 files changed, 18 insertions(+) diff --git a/apps/codecs/demac/libdemac.make b/apps/codecs/demac/libdemac.make index ba764f897..1f59cabc8 100644 --- a/apps/codecs/demac/libdemac.make +++ b/apps/codecs/demac/libdemac.make @@ -14,6 +14,7 @@ DEMACLIB_OBJ := $(call c2obj, $(DEMACLIB_SRC)) OTHER_SRC += $(DEMACLIB_SRC) $(DEMACLIB): $(DEMACLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 DEMACFLAGS = $(filter-out -O%,$(CODECFLAGS)) diff --git a/apps/codecs/lib/libcodec.make b/apps/codecs/lib/libcodec.make index 5e96f7579..087583b2b 100644 --- a/apps/codecs/lib/libcodec.make +++ b/apps/codecs/lib/libcodec.make @@ -13,6 +13,7 @@ CODECLIB_OBJ := $(call c2obj, $(CODECLIB_SRC)) OTHER_SRC += $(CODECLIB_SRC) $(CODECLIB): $(CODECLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 CODECLIBFLAGS = $(CODECFLAGS) -ffunction-sections diff --git a/apps/codecs/liba52/liba52.make b/apps/codecs/liba52/liba52.make index 4e0353d56..faf546507 100644 --- a/apps/codecs/liba52/liba52.make +++ b/apps/codecs/liba52/liba52.make @@ -14,4 +14,5 @@ A52LIB_OBJ := $(call c2obj, $(A52LIB_SRC)) OTHER_SRC += $(A52LIB_SRC) $(A52LIB): $(A52LIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 diff --git a/apps/codecs/libalac/libalac.make b/apps/codecs/libalac/libalac.make index b6b22d17e..da4a9da9e 100644 --- a/apps/codecs/libalac/libalac.make +++ b/apps/codecs/libalac/libalac.make @@ -14,6 +14,7 @@ ALACLIB_OBJ := $(call c2obj, $(ALACLIB_SRC)) OTHER_SRC += $(ALACLIB_SRC) $(ALACLIB): $(ALACLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 ALACFLAGS = $(filter-out -O%,$(CODECFLAGS)) diff --git a/apps/codecs/libasap/libasap.make b/apps/codecs/libasap/libasap.make index 443dfbe7b..c49b1dee6 100644 --- a/apps/codecs/libasap/libasap.make +++ b/apps/codecs/libasap/libasap.make @@ -14,6 +14,7 @@ ASAPLIB_OBJ := $(call c2obj, $(ASAPLIB_SRC)) OTHER_SRC += $(ASAPLIB_SRC) $(ASAPLIB): $(ASAPLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 ASAPFLAGS = $(filter-out -O%,$(CODECFLAGS)) diff --git a/apps/codecs/libfaad/libfaad.make b/apps/codecs/libfaad/libfaad.make index 0af2cfb1f..0ba38a4fb 100644 --- a/apps/codecs/libfaad/libfaad.make +++ b/apps/codecs/libfaad/libfaad.make @@ -15,4 +15,5 @@ OTHER_SRC += $(FAADLIB_SRC) OTHER_INC += -I$(APPSDIR)/codecs/libfaad $(FAADLIB): $(FAADLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 diff --git a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make b/apps/codecs/libffmpegFLAC/libffmpegFLAC.make index 41addbe2b..808f0b387 100644 --- a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make +++ b/apps/codecs/libffmpegFLAC/libffmpegFLAC.make @@ -14,4 +14,5 @@ FFMPEGFLACLIB_OBJ := $(call c2obj, $(FFMPEGFLACLIB_SRC)) OTHER_SRC += $(FFMPEGFLACLIB_SRC) $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 diff --git a/apps/codecs/libm4a/libm4a.make b/apps/codecs/libm4a/libm4a.make index 6c092bad5..63e9c6a10 100644 --- a/apps/codecs/libm4a/libm4a.make +++ b/apps/codecs/libm4a/libm4a.make @@ -14,6 +14,7 @@ M4ALIB_OBJ := $(call c2obj, $(M4ALIB_SRC)) OTHER_SRC += $(M4ALIB_SRC) $(M4ALIB): $(M4ALIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 M4AFLAGS = $(filter-out -O%,$(CODECFLAGS)) diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make index f0334956c..cf2c20259 100644 --- a/apps/codecs/libmad/libmad.make +++ b/apps/codecs/libmad/libmad.make @@ -21,6 +21,7 @@ MADLIB_OBJ := $(call c2obj, $(MADLIB_SRC)) OTHER_SRC += $(MADLIB_SRC) $(MADLIB): $(MADLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 # libmad-mpeg diff --git a/apps/codecs/libmusepack/libmusepack.make b/apps/codecs/libmusepack/libmusepack.make index 736f58bc7..795f3fea5 100644 --- a/apps/codecs/libmusepack/libmusepack.make +++ b/apps/codecs/libmusepack/libmusepack.make @@ -14,6 +14,7 @@ MUSEPACKLIB_OBJ := $(call c2obj, $(MUSEPACKLIB_SRC)) OTHER_SRC += $(MUSEPACKLIB_SRC) $(MUSEPACKLIB): $(MUSEPACKLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 # libmusepack is faster on ARM-targets with -O1 than -O2 diff --git a/apps/codecs/libspc/libspc.make b/apps/codecs/libspc/libspc.make index 62f788be0..80ace0c22 100644 --- a/apps/codecs/libspc/libspc.make +++ b/apps/codecs/libspc/libspc.make @@ -14,6 +14,7 @@ SPCLIB_OBJ := $(call c2obj, $(SPCLIB_SRC)) OTHER_SRC += $(SPCLIB_SRC) $(SPCLIB): $(SPCLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 SPCFLAGS = $(filter-out -O%,$(CODECFLAGS)) diff --git a/apps/codecs/libspeex/libspeex.make b/apps/codecs/libspeex/libspeex.make index a27d559a0..b0c362ea8 100644 --- a/apps/codecs/libspeex/libspeex.make +++ b/apps/codecs/libspeex/libspeex.make @@ -31,6 +31,7 @@ SPEEXLIB_OBJ := $(call c2obj, $(SPEEXLIB_SRC)) OTHER_SRC += $(SPEEXLIB_SRC) $(SPEEXLIB): $(SPEEXLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 # libspeex-voice diff --git a/apps/codecs/libtremor/libtremor.make b/apps/codecs/libtremor/libtremor.make index 6f500ea7a..8431eedc5 100644 --- a/apps/codecs/libtremor/libtremor.make +++ b/apps/codecs/libtremor/libtremor.make @@ -14,6 +14,7 @@ TREMORLIB_OBJ := $(call c2obj, $(TREMORLIB_SRC)) OTHER_SRC += $(TREMORLIB_SRC) $(TREMORLIB): $(TREMORLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 $(CODECDIR)/libtremor/%.o: $(ROOTDIR)/apps/codecs/libtremor/%.c diff --git a/apps/codecs/libwavpack/libwavpack.make b/apps/codecs/libwavpack/libwavpack.make index 0237d3966..4b45ca96b 100644 --- a/apps/codecs/libwavpack/libwavpack.make +++ b/apps/codecs/libwavpack/libwavpack.make @@ -14,4 +14,5 @@ WAVPACKLIB_OBJ := $(call c2obj, $(WAVPACKLIB_SRC)) OTHER_SRC += $(WAVPACKLIB_SRC) $(WAVPACKLIB): $(WAVPACKLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 diff --git a/apps/codecs/libwma/libwma.make b/apps/codecs/libwma/libwma.make index d40d62eb7..11e7b8bc3 100644 --- a/apps/codecs/libwma/libwma.make +++ b/apps/codecs/libwma/libwma.make @@ -14,4 +14,5 @@ WMALIB_OBJ := $(call c2obj, $(WMALIB_SRC)) OTHER_SRC += $(WMALIB_SRC) $(WMALIB): $(WMALIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 diff --git a/apps/plugins/bitmaps/pluginbitmaps.make b/apps/plugins/bitmaps/pluginbitmaps.make index 7dbcc0bdf..8fc430208 100644 --- a/apps/plugins/bitmaps/pluginbitmaps.make +++ b/apps/plugins/bitmaps/pluginbitmaps.make @@ -37,6 +37,7 @@ PBMPHFILES := $(shell echo $(PBMPHFILES) | sed -e 's/\.[0-9x]\+\.bmp/.h/g' -e ' $(PBMPHFILES): $(PLUGIN_BITMAPS) $(PLUGINBITMAPLIB): $(PLUGIN_BITMAPS) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $+ >/dev/null 2>&1 # pattern rules to create .c files from .bmp, one for each subdir: diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 9fff82d83..fdaae3e54 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -40,6 +40,7 @@ PLUGINFLAGS = -I$(APPSDIR)/plugins -DPLUGIN $(CFLAGS) $(ROCKS): $(PLUGINLIB) $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(PLUGINBITMAPLIB) $(PLUGINLIB): $(PLUGINLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 $(PLUGINLINK_LDS): $(PLUGIN_LDS) diff --git a/firmware/firmware.make b/firmware/firmware.make index 992df2614..02d60db25 100644 --- a/firmware/firmware.make +++ b/firmware/firmware.make @@ -28,6 +28,7 @@ else endif $(FIRMLIB): $(FIRMLIB_OBJ) + $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 $(BUILDDIR)/sysfont.h: $(SYSFONT) $(TOOLS) -- 2.11.4.GIT