summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2008-11-20 16:49:55 +0000
committerBjörn Stenberg <bjorn@haxx.se>2008-11-20 16:49:55 +0000
commit303b455ceb0ed19875a370d4a12c0aaaf8ed3cc7 (patch)
treec6c88e96fd438df05aed5240d5fd04cc98bc6caf /apps
parent7677916aa0a58fc9411d80927002b68bd4cfeeae (diff)
downloadrockbox-303b455ceb0ed19875a370d4a12c0aaaf8ed3cc7.tar.gz
rockbox-303b455ceb0ed19875a370d4a12c0aaaf8ed3cc7.zip
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
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/demac/libdemac.make1
-rw-r--r--apps/codecs/lib/libcodec.make1
-rw-r--r--apps/codecs/liba52/liba52.make1
-rw-r--r--apps/codecs/libalac/libalac.make1
-rw-r--r--apps/codecs/libasap/libasap.make1
-rw-r--r--apps/codecs/libfaad/libfaad.make1
-rw-r--r--apps/codecs/libffmpegFLAC/libffmpegFLAC.make1
-rw-r--r--apps/codecs/libm4a/libm4a.make1
-rw-r--r--apps/codecs/libmad/libmad.make1
-rw-r--r--apps/codecs/libmusepack/libmusepack.make1
-rw-r--r--apps/codecs/libspc/libspc.make1
-rw-r--r--apps/codecs/libspeex/libspeex.make1
-rw-r--r--apps/codecs/libtremor/libtremor.make1
-rw-r--r--apps/codecs/libwavpack/libwavpack.make1
-rw-r--r--apps/codecs/libwma/libwma.make1
-rw-r--r--apps/plugins/bitmaps/pluginbitmaps.make1
-rw-r--r--apps/plugins/plugins.make1
17 files changed, 17 insertions, 0 deletions
diff --git a/apps/codecs/demac/libdemac.make b/apps/codecs/demac/libdemac.make
index ba764f897e..1f59cabc85 100644
--- a/apps/codecs/demac/libdemac.make
+++ b/apps/codecs/demac/libdemac.make
@@ -14,6 +14,7 @@ DEMACLIB_OBJ := $(call c2obj, $(DEMACLIB_SRC))
14OTHER_SRC += $(DEMACLIB_SRC) 14OTHER_SRC += $(DEMACLIB_SRC)
15 15
16$(DEMACLIB): $(DEMACLIB_OBJ) 16$(DEMACLIB): $(DEMACLIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
18 19
19DEMACFLAGS = $(filter-out -O%,$(CODECFLAGS)) 20DEMACFLAGS = $(filter-out -O%,$(CODECFLAGS))
diff --git a/apps/codecs/lib/libcodec.make b/apps/codecs/lib/libcodec.make
index 5e96f75794..087583b2b3 100644
--- a/apps/codecs/lib/libcodec.make
+++ b/apps/codecs/lib/libcodec.make
@@ -13,6 +13,7 @@ CODECLIB_OBJ := $(call c2obj, $(CODECLIB_SRC))
13OTHER_SRC += $(CODECLIB_SRC) 13OTHER_SRC += $(CODECLIB_SRC)
14 14
15$(CODECLIB): $(CODECLIB_OBJ) 15$(CODECLIB): $(CODECLIB_OBJ)
16 $(SILENT)$(shell rm -f $@)
16 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
17 18
18CODECLIBFLAGS = $(CODECFLAGS) -ffunction-sections 19CODECLIBFLAGS = $(CODECFLAGS) -ffunction-sections
diff --git a/apps/codecs/liba52/liba52.make b/apps/codecs/liba52/liba52.make
index 4e0353d56d..faf546507c 100644
--- a/apps/codecs/liba52/liba52.make
+++ b/apps/codecs/liba52/liba52.make
@@ -14,4 +14,5 @@ A52LIB_OBJ := $(call c2obj, $(A52LIB_SRC))
14OTHER_SRC += $(A52LIB_SRC) 14OTHER_SRC += $(A52LIB_SRC)
15 15
16$(A52LIB): $(A52LIB_OBJ) 16$(A52LIB): $(A52LIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(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 b6b22d17e1..da4a9da9ea 100644
--- a/apps/codecs/libalac/libalac.make
+++ b/apps/codecs/libalac/libalac.make
@@ -14,6 +14,7 @@ ALACLIB_OBJ := $(call c2obj, $(ALACLIB_SRC))
14OTHER_SRC += $(ALACLIB_SRC) 14OTHER_SRC += $(ALACLIB_SRC)
15 15
16$(ALACLIB): $(ALACLIB_OBJ) 16$(ALACLIB): $(ALACLIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
18 19
19ALACFLAGS = $(filter-out -O%,$(CODECFLAGS)) 20ALACFLAGS = $(filter-out -O%,$(CODECFLAGS))
diff --git a/apps/codecs/libasap/libasap.make b/apps/codecs/libasap/libasap.make
index 443dfbe7bc..c49b1dee6d 100644
--- a/apps/codecs/libasap/libasap.make
+++ b/apps/codecs/libasap/libasap.make
@@ -14,6 +14,7 @@ ASAPLIB_OBJ := $(call c2obj, $(ASAPLIB_SRC))
14OTHER_SRC += $(ASAPLIB_SRC) 14OTHER_SRC += $(ASAPLIB_SRC)
15 15
16$(ASAPLIB): $(ASAPLIB_OBJ) 16$(ASAPLIB): $(ASAPLIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
18 19
19ASAPFLAGS = $(filter-out -O%,$(CODECFLAGS)) 20ASAPFLAGS = $(filter-out -O%,$(CODECFLAGS))
diff --git a/apps/codecs/libfaad/libfaad.make b/apps/codecs/libfaad/libfaad.make
index 0af2cfb1f5..0ba38a4fbc 100644
--- a/apps/codecs/libfaad/libfaad.make
+++ b/apps/codecs/libfaad/libfaad.make
@@ -15,4 +15,5 @@ OTHER_SRC += $(FAADLIB_SRC)
15OTHER_INC += -I$(APPSDIR)/codecs/libfaad 15OTHER_INC += -I$(APPSDIR)/codecs/libfaad
16 16
17$(FAADLIB): $(FAADLIB_OBJ) 17$(FAADLIB): $(FAADLIB_OBJ)
18 $(SILENT)$(shell rm -f $@)
18 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 19 $(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 41addbe2b8..808f0b3873 100644
--- a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make
+++ b/apps/codecs/libffmpegFLAC/libffmpegFLAC.make
@@ -14,4 +14,5 @@ FFMPEGFLACLIB_OBJ := $(call c2obj, $(FFMPEGFLACLIB_SRC))
14OTHER_SRC += $(FFMPEGFLACLIB_SRC) 14OTHER_SRC += $(FFMPEGFLACLIB_SRC)
15 15
16$(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ) 16$(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(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 6c092bad5e..63e9c6a10b 100644
--- a/apps/codecs/libm4a/libm4a.make
+++ b/apps/codecs/libm4a/libm4a.make
@@ -14,6 +14,7 @@ M4ALIB_OBJ := $(call c2obj, $(M4ALIB_SRC))
14OTHER_SRC += $(M4ALIB_SRC) 14OTHER_SRC += $(M4ALIB_SRC)
15 15
16$(M4ALIB): $(M4ALIB_OBJ) 16$(M4ALIB): $(M4ALIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
18 19
19M4AFLAGS = $(filter-out -O%,$(CODECFLAGS)) 20M4AFLAGS = $(filter-out -O%,$(CODECFLAGS))
diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make
index f0334956c1..cf2c20259e 100644
--- a/apps/codecs/libmad/libmad.make
+++ b/apps/codecs/libmad/libmad.make
@@ -21,6 +21,7 @@ MADLIB_OBJ := $(call c2obj, $(MADLIB_SRC))
21OTHER_SRC += $(MADLIB_SRC) 21OTHER_SRC += $(MADLIB_SRC)
22 22
23$(MADLIB): $(MADLIB_OBJ) 23$(MADLIB): $(MADLIB_OBJ)
24 $(SILENT)$(shell rm -f $@)
24 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 25 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
25 26
26# libmad-mpeg 27# libmad-mpeg
diff --git a/apps/codecs/libmusepack/libmusepack.make b/apps/codecs/libmusepack/libmusepack.make
index 736f58bc72..795f3fea54 100644
--- a/apps/codecs/libmusepack/libmusepack.make
+++ b/apps/codecs/libmusepack/libmusepack.make
@@ -14,6 +14,7 @@ MUSEPACKLIB_OBJ := $(call c2obj, $(MUSEPACKLIB_SRC))
14OTHER_SRC += $(MUSEPACKLIB_SRC) 14OTHER_SRC += $(MUSEPACKLIB_SRC)
15 15
16$(MUSEPACKLIB): $(MUSEPACKLIB_OBJ) 16$(MUSEPACKLIB): $(MUSEPACKLIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
18 19
19# libmusepack is faster on ARM-targets with -O1 than -O2 20# 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 62f788be02..80ace0c227 100644
--- a/apps/codecs/libspc/libspc.make
+++ b/apps/codecs/libspc/libspc.make
@@ -14,6 +14,7 @@ SPCLIB_OBJ := $(call c2obj, $(SPCLIB_SRC))
14OTHER_SRC += $(SPCLIB_SRC) 14OTHER_SRC += $(SPCLIB_SRC)
15 15
16$(SPCLIB): $(SPCLIB_OBJ) 16$(SPCLIB): $(SPCLIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
18 19
19SPCFLAGS = $(filter-out -O%,$(CODECFLAGS)) 20SPCFLAGS = $(filter-out -O%,$(CODECFLAGS))
diff --git a/apps/codecs/libspeex/libspeex.make b/apps/codecs/libspeex/libspeex.make
index a27d559a06..b0c362ea8b 100644
--- a/apps/codecs/libspeex/libspeex.make
+++ b/apps/codecs/libspeex/libspeex.make
@@ -31,6 +31,7 @@ SPEEXLIB_OBJ := $(call c2obj, $(SPEEXLIB_SRC))
31OTHER_SRC += $(SPEEXLIB_SRC) 31OTHER_SRC += $(SPEEXLIB_SRC)
32 32
33$(SPEEXLIB): $(SPEEXLIB_OBJ) 33$(SPEEXLIB): $(SPEEXLIB_OBJ)
34 $(SILENT)$(shell rm -f $@)
34 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 35 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
35 36
36# libspeex-voice 37# libspeex-voice
diff --git a/apps/codecs/libtremor/libtremor.make b/apps/codecs/libtremor/libtremor.make
index 6f500ea7ac..8431eedc5a 100644
--- a/apps/codecs/libtremor/libtremor.make
+++ b/apps/codecs/libtremor/libtremor.make
@@ -14,6 +14,7 @@ TREMORLIB_OBJ := $(call c2obj, $(TREMORLIB_SRC))
14OTHER_SRC += $(TREMORLIB_SRC) 14OTHER_SRC += $(TREMORLIB_SRC)
15 15
16$(TREMORLIB): $(TREMORLIB_OBJ) 16$(TREMORLIB): $(TREMORLIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
18 19
19$(CODECDIR)/libtremor/%.o: $(ROOTDIR)/apps/codecs/libtremor/%.c 20$(CODECDIR)/libtremor/%.o: $(ROOTDIR)/apps/codecs/libtremor/%.c
diff --git a/apps/codecs/libwavpack/libwavpack.make b/apps/codecs/libwavpack/libwavpack.make
index 0237d39668..4b45ca96b7 100644
--- a/apps/codecs/libwavpack/libwavpack.make
+++ b/apps/codecs/libwavpack/libwavpack.make
@@ -14,4 +14,5 @@ WAVPACKLIB_OBJ := $(call c2obj, $(WAVPACKLIB_SRC))
14OTHER_SRC += $(WAVPACKLIB_SRC) 14OTHER_SRC += $(WAVPACKLIB_SRC)
15 15
16$(WAVPACKLIB): $(WAVPACKLIB_OBJ) 16$(WAVPACKLIB): $(WAVPACKLIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(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 d40d62eb7b..11e7b8bc39 100644
--- a/apps/codecs/libwma/libwma.make
+++ b/apps/codecs/libwma/libwma.make
@@ -14,4 +14,5 @@ WMALIB_OBJ := $(call c2obj, $(WMALIB_SRC))
14OTHER_SRC += $(WMALIB_SRC) 14OTHER_SRC += $(WMALIB_SRC)
15 15
16$(WMALIB): $(WMALIB_OBJ) 16$(WMALIB): $(WMALIB_OBJ)
17 $(SILENT)$(shell rm -f $@)
17 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 18 $(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 7dbcc0bdff..8fc4302087 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 '
37$(PBMPHFILES): $(PLUGIN_BITMAPS) 37$(PBMPHFILES): $(PLUGIN_BITMAPS)
38 38
39$(PLUGINBITMAPLIB): $(PLUGIN_BITMAPS) 39$(PLUGINBITMAPLIB): $(PLUGIN_BITMAPS)
40 $(SILENT)$(shell rm -f $@)
40 $(call PRINTS,AR $(@F))$(AR) rs $@ $+ >/dev/null 2>&1 41 $(call PRINTS,AR $(@F))$(AR) rs $@ $+ >/dev/null 2>&1
41 42
42# pattern rules to create .c files from .bmp, one for each subdir: 43# 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 9fff82d832..fdaae3e54c 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -40,6 +40,7 @@ PLUGINFLAGS = -I$(APPSDIR)/plugins -DPLUGIN $(CFLAGS)
40$(ROCKS): $(PLUGINLIB) $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(PLUGINBITMAPLIB) 40$(ROCKS): $(PLUGINLIB) $(APPSDIR)/plugin.h $(PLUGINLINK_LDS) $(PLUGINBITMAPLIB)
41 41
42$(PLUGINLIB): $(PLUGINLIB_OBJ) 42$(PLUGINLIB): $(PLUGINLIB_OBJ)
43 $(SILENT)$(shell rm -f $@)
43 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 44 $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1
44 45
45$(PLUGINLINK_LDS): $(PLUGIN_LDS) 46$(PLUGINLINK_LDS): $(PLUGIN_LDS)
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 03:49:03 +0000