Revert putting EXTRALIBS in common.mak, linking fails on MinGW.
authorDiego Biurrun <diego@biurrun.de>
Sun, 15 Oct 2006 12:59:45 +0000 (12:59 +0000)
committerDiego Biurrun <diego@biurrun.de>
Sun, 15 Oct 2006 12:59:45 +0000 (12:59 +0000)
Originally committed as revision 6700 to svn://svn.ffmpeg.org/ffmpeg/trunk

common.mak
libavcodec/Makefile
libavformat/Makefile
libpostproc/Makefile

index 21b2273da4f9cd8f283b3896df4064fbe90d0826..d045c0895d634247b4f1046cb922c0950f7a0c21 100644 (file)
@@ -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)
index 3d961b8fa1ee872df033465c299b7fc87e812ed0..611a022372bc046d414bfca36fc2ac978eead144 100644 (file)
@@ -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)
index 95be67b298354c00ae2199628c05fcde7b490f39..8c8e2b70733729159720891f59b3997c0a3def4a 100644 (file)
@@ -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
index 6f95049a3bbccab2eb0ecb8a943b6e4a51ee6968..8b7f5f96aa9efaa980e274c794c990d691ade07d 100644 (file)
@@ -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)