[SCM] libav/experimental: Move MinGW LDFLAGS setting to configure.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:48:58 UTC 2013


The following commit has been merged in the experimental branch:
commit 7b0cd9ee2b09e5c6d7e11b3cc05e7839b3809b40
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Jul 10 00:19:38 2006 +0000

    Move MinGW LDFLAGS setting to configure.
    
    Originally committed as revision 5699 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/common.mak b/common.mak
index be7d476..cdafa60 100644
--- a/common.mak
+++ b/common.mak
@@ -5,11 +5,6 @@
 SRC_DIR = $(SRC_PATH)/lib$(NAME)
 VPATH = $(SRC_DIR)
 
-#FIXME: This should be in configure/config.mak
-ifeq ($(CONFIG_WIN32),yes)
-LDFLAGS = -Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
-endif
-
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
 LDFLAGS+=-p
diff --git a/configure b/configure
index 2dd5bf9..0075250 100755
--- a/configure
+++ b/configure
@@ -1166,6 +1166,7 @@ EOF
     if test "$mingwce" = "yes"; then
         protocols="no"
     fi
+    LDFLAGS=-Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
     SLIBPREF=""
     SLIBSUF=".dll"
     EXESUF=".exe"

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list