From 1501df045f75b1ee607b49ce2f970c762a2538a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn@haxx.se>
Date: Thu, 24 Jan 2013 16:01:28 +0100
Subject: Deprecate the EXTRA_LIBS variable.

Instead specify explicit library dependencies for codecs and plugins.
---
 lib/libsetjmp/libsetjmp.make   | 1 -
 lib/rbcodec/codecs/codecs.make | 4 ++--
 lib/tlsf/libtlsf.make          | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/libsetjmp/libsetjmp.make b/lib/libsetjmp/libsetjmp.make
index f8df751..cf1e4bb 100644
--- a/lib/libsetjmp/libsetjmp.make
+++ b/lib/libsetjmp/libsetjmp.make
@@ -14,7 +14,6 @@ SETJMPLIB = $(BUILDDIR)/lib/libsetjmp.a
 
 INCLUDES += -I$(SETJMPLIB_DIR)
 OTHER_SRC += $(SETJMPLIB_SRC)
-EXTRA_LIBS += $(SETJMPLIB)
 
 $(SETJMPLIB): $(SETJMPLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
index 844a8f4..eea8950 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
diff --git a/lib/tlsf/libtlsf.make b/lib/tlsf/libtlsf.make
index cb61a5c..e36efe5 100644
--- a/lib/tlsf/libtlsf.make
+++ b/lib/tlsf/libtlsf.make
@@ -14,7 +14,6 @@ TLSFLIB := $(BUILDDIR)/lib/libtlsf.a
 
 OTHER_SRC += $(TLSFLIB_SRC)
 INCLUDES += -I$(TLSFLIB_DIR)/src
-EXTRA_LIBS += $(TLSFLIB)
 
 TLSFLIBFLAGS = $(CFLAGS) -fstrict-aliasing -ffunction-sections $(SHARED_CFLAGS)
 
-- 
cgit v1.1