[Ffmpeg-cvslog] r6700 - in trunk: common.mak libavcodec/Makefile libavformat/Makefile libpostproc/Makefile

[diego]

Author: diego
Date: Sun Oct 15 14:59:45 2006
New Revision: 6700

Modified:
   trunk/common.mak
   trunk/libavcodec/Makefile
   trunk/libavformat/Makefile
   trunk/libpostproc/Makefile

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


Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Sun Oct 15 14:59:45 2006
@@ -13,8 +13,6 @@
 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)

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Sun Oct 15 14:59:45 2006
@@ -399,6 +399,8 @@
 OBJS += $(OBJS-yes)
 ASM_OBJS += $(ASM_OBJS-yes)
 
+EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+
 NAME=avcodec
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVCVERSION)

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Sun Oct 15 14:59:45 2006
@@ -161,7 +161,8 @@
 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

Modified: trunk/libpostproc/Makefile
==============================================================================
--- trunk/libpostproc/Makefile	(original)
+++ trunk/libpostproc/Makefile	Sun Oct 15 14:59:45 2006
@@ -4,6 +4,8 @@
 # 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)