Move EXTRALIBS handling to common.mak.

Originally committed as revision 6545 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/common.mak b/common.mak
index cc7c782..ac570c1 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -10,6 +10,8 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
 SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
 
+EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+
 all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
 
 $(LIB): $(STATIC_OBJS)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 17481c3..937269a 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -366,8 +366,6 @@ CFLAGS += $(CFLAGS-yes)
 OBJS += $(OBJS-yes)
 ASM_OBJS += $(ASM_OBJS-yes)
 
-EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
-
 NAME=avcodec
 LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0c01c67..a9a4632 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -160,8 +160,7 @@ OBJS-$(CONFIG_AUDIO_DEMUXER)             += audio.o
 OBJS-$(CONFIG_AUDIO_MUXER)               += audio.o
 endif
 
-EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) \
-             -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS)
+EXTRALIBS := -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS)
 
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
 CPPOBJS+= beosaudio.o

diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index 6f3527c..e3d320b 100644 (file)
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -4,8 +4,6 @@ include ../config.mak
 # Overload incdir, postproc include files go in a different directory.
 incdir=$(prefix)/include/postproc
 
-EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
-
 NAME=postproc
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(SPPVERSION)