Revert putting EXTRALIBS in common.mak, linking fails on MinGW.

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

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

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3d961b8..611a022 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -399,6 +399,8 @@ CFLAGS += $(CFLAGS-yes)
 OBJS += $(OBJS-yes)
 ASM_OBJS += $(ASM_OBJS-yes)
 
+EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+
 NAME=avcodec
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVCVERSION)

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

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