diff options
author | Björn Stenberg <bjorn@haxx.se> | 2013-01-24 16:01:28 +0100 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2013-01-24 16:06:45 +0100 |
commit | 1501df045f75b1ee607b49ce2f970c762a2538a4 (patch) | |
tree | 2cc1515e773eac5efd9a771a3bdcc93ec2d3c1c9 /lib | |
parent | 02a90890343a75ca71169f601605613607e450ea (diff) | |
download | rockbox-1501df045f75b1ee607b49ce2f970c762a2538a4.tar.gz rockbox-1501df045f75b1ee607b49ce2f970c762a2538a4.zip |
Deprecate the EXTRA_LIBS variable.
Instead specify explicit library dependencies for codecs and plugins.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libsetjmp/libsetjmp.make | 1 | ||||
-rw-r--r-- | lib/rbcodec/codecs/codecs.make | 4 | ||||
-rw-r--r-- | lib/tlsf/libtlsf.make | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/lib/libsetjmp/libsetjmp.make b/lib/libsetjmp/libsetjmp.make index f8df7513c9..cf1e4bbdfe 100644 --- a/lib/libsetjmp/libsetjmp.make +++ b/lib/libsetjmp/libsetjmp.make | |||
@@ -14,7 +14,6 @@ SETJMPLIB = $(BUILDDIR)/lib/libsetjmp.a | |||
14 | 14 | ||
15 | INCLUDES += -I$(SETJMPLIB_DIR) | 15 | INCLUDES += -I$(SETJMPLIB_DIR) |
16 | OTHER_SRC += $(SETJMPLIB_SRC) | 16 | OTHER_SRC += $(SETJMPLIB_SRC) |
17 | EXTRA_LIBS += $(SETJMPLIB) | ||
18 | 17 | ||
19 | $(SETJMPLIB): $(SETJMPLIB_OBJ) | 18 | $(SETJMPLIB): $(SETJMPLIB_OBJ) |
20 | $(SILENT)$(shell rm -f $@) | 19 | $(SILENT)$(shell rm -f $@) |
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make index 844a8f4cee..eea8950d0d 100644 --- a/lib/rbcodec/codecs/codecs.make +++ b/lib/rbcodec/codecs/codecs.make | |||
@@ -19,7 +19,7 @@ include $(RBCODECLIB_DIR)/codecs/lib/libcodec.make | |||
19 | OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib | 19 | OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib |
20 | 20 | ||
21 | # extra libraries | 21 | # extra libraries |
22 | CODEC_LIBS := $(EXTRA_LIBS) $(CODECLIB) | 22 | CODEC_LIBS := $(CODECLIB) |
23 | 23 | ||
24 | # the codec libraries | 24 | # the codec libraries |
25 | include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make | 25 | include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make |
@@ -140,7 +140,7 @@ $(CODECDIR)/spc.codec : $(CODECDIR)/libspc.a | |||
140 | $(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a | 140 | $(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a |
141 | $(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a | 141 | $(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a |
142 | $(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a | 142 | $(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a |
143 | $(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a | 143 | $(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a $(TLSFLIB) $(SETJMPLIB) |
144 | $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a | 144 | $(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a |
145 | $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a | 145 | $(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a |
146 | $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a | 146 | $(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a |
diff --git a/lib/tlsf/libtlsf.make b/lib/tlsf/libtlsf.make index cb61a5c09e..e36efe5e27 100644 --- a/lib/tlsf/libtlsf.make +++ b/lib/tlsf/libtlsf.make | |||
@@ -14,7 +14,6 @@ TLSFLIB := $(BUILDDIR)/lib/libtlsf.a | |||
14 | 14 | ||
15 | OTHER_SRC += $(TLSFLIB_SRC) | 15 | OTHER_SRC += $(TLSFLIB_SRC) |
16 | INCLUDES += -I$(TLSFLIB_DIR)/src | 16 | INCLUDES += -I$(TLSFLIB_DIR)/src |
17 | EXTRA_LIBS += $(TLSFLIB) | ||
18 | 17 | ||
19 | TLSFLIBFLAGS = $(CFLAGS) -fstrict-aliasing -ffunction-sections $(SHARED_CFLAGS) | 18 | TLSFLIBFLAGS = $(CFLAGS) -fstrict-aliasing -ffunction-sections $(SHARED_CFLAGS) |
20 | 19 | ||