Apply ldflags-order part of ldflags_order patch from Alberto Villa.

Alberto wrote:
"on freebsd (as well as on linuces without /usr/local/lib in default ld path)
building concurrent versions of mlt is not possible, because of the wrong
linking of -lmlt while using LDFLAGS=-L/usr/local/lib
this patch fixes the issue using pkg-config"

Signed-off-by: Dan Dennedy <dan@dennedy.org>

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1416 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index d36d6c6..5891780 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,6 +1,16 @@
 include ../../../config.mak
+
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include config.mak
 
+LDFLAGS += -lavformat$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavcodec$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavutil$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS)
+
 ifndef CODECS
 TARGET = ../libmltffmpeg$(LIBSUF)
 else
@@ -25,12 +35,6 @@ OBJS += producer_avformat.o \
 CFLAGS += -DCODECS
 endif
 
-CFLAGS+=-I../..
-
-LDFLAGS+=-L../../framework
-
-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
-
 ifdef SWSCALE
        CFLAGS+=-DSWSCALE
        LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)

diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile
index 7d2868d..8c5ef1b 100644 (file)
--- a/src/modules/dv/Makefile
+++ b/src/modules/dv/Makefile
@@ -6,12 +6,12 @@ OBJS = factory.o \
           producer_libdv.o \
           consumer_libdv.o
 
-CFLAGS += `pkg-config --cflags libdv` -I../..
+CFLAGS += -I../..
+CFLAGS += `pkg-config --cflags libdv`
 
+LDFLAGS += -L../../framework -lmlt
 LDFLAGS += `pkg-config --libs libdv`
 
-LDFLAGS+=-L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 1a632d7..de5fa2f 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -5,6 +5,9 @@ TARGET = ../libmltgtk2$(LIBSUF)
 
 OBJS = factory.o
 
+CFLAGS += -I../..
+LDFLAGS += -L../../framework -lmlt
+
 ifdef USE_GTK2
 OBJS += consumer_gtk2.o
 CFLAGS += `pkg-config gtk+-2.0 --cflags`
@@ -29,9 +32,6 @@ CFLAGS += `pkg-config pangoft2 --cflags`
 LDFLAGS += `pkg-config pangoft2 --libs`
 endif
 
-CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index a8754f7..50d7d88 100644 (file)
--- a/src/modules/jackrack/Makefile
+++ b/src/modules/jackrack/Makefile
@@ -13,16 +13,16 @@ OBJS = factory.o \
           filter_jackrack.o \
           filter_ladspa.o
 
-CFLAGS += -I../.. `pkg-config --cflags jack`
+CFLAGS += -I../..
+CFLAGS += `pkg-config --cflags jack`
 CFLAGS += `xml2-config --cflags`
 CFLAGS += `pkg-config glib-2.0 --cflags` 
 
+LDFLAGS += -L../../framework -lmlt
 LDFLAGS += `pkg-config --libs jack`
 LDFLAGS += `xml2-config --libs`
 LDFLAGS += `pkg-config glib-2.0 --libs`
 
-LDFLAGS+=-L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index a18191e..e2b5b36 100644 (file)
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -10,17 +10,17 @@ OBJS = factory.o \
           consumer_sdl_still.o 
 
 ifeq ($(targetos),Darwin)
-       CFLAGS +=-ObjC
-       LDFLAGS +=-lobjc -framework Foundation
+CFLAGS += -ObjC
+LDFLAGS += -lobjc -framework Foundation
 else
-       LDFLAGS +=-lX11
+LDFLAGS += -lX11
 endif
 
-CFLAGS +=-I../.. `sdl-config --cflags`
+CFLAGS += -I../..
+CFLAGS += `sdl-config --cflags`
 
-LDFLAGS +=`sdl-config --libs`
-
-LDFLAGS +=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
+LDFLAGS += `sdl-config --libs`
 
 ifeq ($(WITH_SDL_IMAGE),1)
 OBJS += producer_sdl_image.o

diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index a02e0ec..472c591 100644 (file)
--- a/src/modules/sox/Makefile
+++ b/src/modules/sox/Makefile
@@ -1,4 +1,9 @@
 include ../../../config.mak
+
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include config.mak
 
 TARGET = ../libmltsox$(LIBSUF)
@@ -6,10 +11,6 @@ TARGET = ../libmltsox$(LIBSUF)
 OBJS = factory.o \
           filter_sox.o 
 
-CFLAGS += -I../../
-
-LDFLAGS += -L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/westley/Makefile b/src/modules/westley/Makefile
index dda026e..2ab4ed8 100644 (file)
--- a/src/modules/westley/Makefile
+++ b/src/modules/westley/Makefile
@@ -6,12 +6,12 @@ OBJS = factory.o \
           consumer_westley.o \
           producer_westley.o
 
-CFLAGS += -I../../ `xml2-config --cflags`
+CFLAGS += -I../..
+CFLAGS += `xml2-config --cflags`
 
+LDFLAGS += -L../../framework -lmlt
 LDFLAGS += `xml2-config --libs`
 
-LDFLAGS+=-L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)