diff options
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 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 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 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 OTHER_SRC += $(TLSFLIB_SRC) INCLUDES += -I$(TLSFLIB_DIR)/src -EXTRA_LIBS += $(TLSFLIB) TLSFLIBFLAGS = $(CFLAGS) -fstrict-aliasing -ffunction-sections $(SHARED_CFLAGS) |