summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2013-01-24 16:01:28 +0100
committerBjörn Stenberg <bjorn@haxx.se>2013-01-24 16:06:45 +0100
commit1501df045f75b1ee607b49ce2f970c762a2538a4 (patch)
tree2cc1515e773eac5efd9a771a3bdcc93ec2d3c1c9 /lib/rbcodec/codecs
parent02a90890343a75ca71169f601605613607e450ea (diff)
Deprecate the EXTRA_LIBS variable.
Instead specify explicit library dependencies for codecs and plugins.
Diffstat (limited to 'lib/rbcodec/codecs')
-rw-r--r--lib/rbcodec/codecs/codecs.make4
1 files changed, 2 insertions, 2 deletions
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
OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib
# extra libraries
-CODEC_LIBS := $(EXTRA_LIBS) $(CODECLIB)
+CODEC_LIBS := $(CODECLIB)
# the codec libraries
include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make
@@ -140,7 +140,7 @@ $(CODECDIR)/spc.codec : $(CODECDIR)/libspc.a
$(CODECDIR)/mpa.codec : $(CODECDIR)/libmad.a
$(CODECDIR)/a52.codec : $(CODECDIR)/liba52.a
$(CODECDIR)/flac.codec : $(CODECDIR)/libffmpegFLAC.a
-$(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a
+$(CODECDIR)/vorbis.codec : $(CODECDIR)/libtremor.a $(TLSFLIB) $(SETJMPLIB)
$(CODECDIR)/speex.codec : $(CODECDIR)/libspeex.a
$(CODECDIR)/mpc.codec : $(CODECDIR)/libmusepack.a
$(CODECDIR)/wavpack.codec : $(CODECDIR)/libwavpack.a