Apply cosmetic cleanup part of ldflags_order patch from Alberto Villa.

Signed-off-by: Dan Dennedy <dan@dennedy.org>
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1418 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/configure b/configure
index 16f105e655d895302e45c33f01d4d6b164baa83f..72bbfe51d974b6d96bc69e0f9b317546b8faa3f5 100755 (executable)
--- a/configure
+++ b/configure
@@ -174,7 +174,7 @@ done
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
 
-# Double check mmx (Linux and FreeBSD supported, may end up disabling mmx on other platforms incorrectly)
+# Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
        case $targetos in
@@ -193,7 +193,7 @@ then
        esac
 fi
 
-# Double check SSE (Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
+# Double check SSE (Darwin, Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
 if [ "$sse" = "true" ]
 then
        case $targetos in

diff --git a/src/albino/Makefile b/src/albino/Makefile
index ebb60a0f8dab34dcf641c61244b5ecb6424079c0..29bb3ee692b03c343bc94b2ac25be4c51f919bc5 100644 (file)
--- a/src/albino/Makefile
+++ b/src/albino/Makefile
@@ -6,7 +6,9 @@ OBJS = albino.o
 
 CFLAGS += -I.. $(RDYNAMIC)
 
-LDFLAGS += -L../miracle -lmiracle -L../valerie -lvalerie -L../miracle -lmiracle -L../framework -lmlt -lpthread
+LDFLAGS += -L../miracle -lmiracle
+LDFLAGS += -L../valerie -lvalerie
+LDFLAGS += -L../framework -lmlt -lpthread
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/humperdink/Makefile b/src/humperdink/Makefile
index f3cd756b8de2b05f4886a89acc612d271f724837..dd03dc9a24f14ff270d038f25eac0b799da65cde 100644 (file)
--- a/src/humperdink/Makefile
+++ b/src/humperdink/Makefile
@@ -3,12 +3,13 @@ include ../../config.mak
 TARGET = humperdink
 
 OBJS = client.o \
-       io.o \
+          io.o \
           remote.o
 
 CFLAGS += -I.. $(RDYNAMIC)
 
-LDFLAGS += -L../valerie -L../framework -lvalerie -lmlt -lpthread
+LDFLAGS += -L../valerie -lvalerie
+LDFLAGS += -L../framework -lmlt -lpthread
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/miracle/Makefile b/src/miracle/Makefile
index 742ec91dd0b9408f8768369df634b305d3113233..2d92bfb9348ae2cb74116a6c48ecb6d0b086bcc3 100644 (file)
--- a/src/miracle/Makefile
+++ b/src/miracle/Makefile
@@ -32,7 +32,8 @@ OBJS = $(APP_OBJS) $(LIB_OBJS)
 
 CFLAGS += -I.. $(RDYNAMIC)
 
-LDFLAGS += -L../valerie -lvalerie -L../framework -lmlt -lpthread
+LDFLAGS += -L../valerie -lvalerie
+LDFLAGS += -L../framework -lmlt -lpthread
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 5891780b5e835ab62feaeb0af7360a19b0a76b06..7d889435ca1d23d7aded41a845039c9eaa7c2009 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -36,15 +36,15 @@ CFLAGS += -DCODECS
 endif
 
 ifdef SWSCALE
-       CFLAGS+=-DSWSCALE
-       LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
+CFLAGS += -DSWSCALE
+LDFLAGS += -lswscale$(AVFORMAT_SUFFIX)
 endif
 
 ifdef LOCAL_FFMPEG
-       LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavutil/libavdevice$(AVFORMAT_SUFFIX)
+LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
+                    ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
+                    ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX) \
+                    ffmpeg/libavutil/libavdevice$(AVFORMAT_SUFFIX)
 endif
 
 SRCS := $(OBJS:.o=.c)

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index b4c3b4399f22b53870b6b09e5373df991200aaf2..a3132aedd5828870a44506f7523d62d1193ce642 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -33,7 +33,7 @@ ASM_OBJS =
 
 CFLAGS += -I../..
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/dgraft/Makefile b/src/modules/dgraft/Makefile
index e312fced3a612cafd3a5ed7ca6aef8f1866994ee..7e17749ac7185375023731315aab8a2c0b8976d4 100644 (file)
--- a/src/modules/dgraft/Makefile
+++ b/src/modules/dgraft/Makefile
@@ -7,7 +7,7 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/effectv/Makefile b/src/modules/effectv/Makefile
index 19d8fdf556c853260ab179ced257d033c4a367d5..a8f5f623c0eb7d01bd00f66a755a33d173e5ea5d 100644 (file)
--- a/src/modules/effectv/Makefile
+++ b/src/modules/effectv/Makefile
@@ -9,7 +9,7 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/fezzik/Makefile b/src/modules/fezzik/Makefile
index 78d8294e138df8f47d84a564e164c5dede97a270..52b51298de5ba4f63c2cc25072d409ff2201cbe2 100644 (file)
--- a/src/modules/fezzik/Makefile
+++ b/src/modules/fezzik/Makefile
@@ -8,7 +8,7 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/frei0r/Makefile b/src/modules/frei0r/Makefile
index c708057584fe8516af1db0a2d87c54a9a5699705..2c3762d2dbd408227f722a57b6b09eb240ac645b 100644 (file)
--- a/src/modules/frei0r/Makefile
+++ b/src/modules/frei0r/Makefile
@@ -10,10 +10,9 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
+LDFLAGS += -L../../framework -lmlt
 LDFLAGS += -lm
 
-LDFLAGS+=-L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/inigo/Makefile b/src/modules/inigo/Makefile
index da1434e2b97885cde3854892b8440796143a7fb3..b2e297f131a37cc4911ffe44dfbed5aa8371da6e 100644 (file)
--- a/src/modules/inigo/Makefile
+++ b/src/modules/inigo/Makefile
@@ -7,7 +7,7 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/kdenlive/Makefile b/src/modules/kdenlive/Makefile
index cfe0811ea0825e83a374bf4c70b602bf59609cf5..d32ab0c61f50c7dc48526642877c9db1fe710e79 100644 (file)
--- a/src/modules/kdenlive/Makefile
+++ b/src/modules/kdenlive/Makefile
@@ -10,10 +10,9 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
+LDFLAGS += -L../../framework -lmlt
 LDFLAGS += -lm
 
-LDFLAGS+=-L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index 46326c759a15821ec36a1b7d9097eecad6ff0254..32cdeaa60eb8ccb37743c18410463123ff9e0136 100644 (file)
--- a/src/modules/kino/Makefile
+++ b/src/modules/kino/Makefile
@@ -1,18 +1,21 @@
 include ../../../config.mak
 include config.mak
 
-TARGET=../libmltkino.so
+TARGET = ../libmltkino.so
 
-OBJS=factory.o producer_kino.o
-CPPOBJS=kino_wrapper.o avi.o error.o filehandler.o riff.o
-CFLAGS+=-I../../
-LDFLAGS+=-L../../framework -lmlt -lstdc++
-CXXFLAGS+=$(CFLAGS) -Wno-deprecated
+OBJS = factory.o producer_kino.o
+CPPOBJS = kino_wrapper.o avi.o error.o filehandler.o riff.o
+
+CFLAGS += -I../../
+CXXFLAGS += $(CFLAGS) -Wno-deprecated
+
+LDFLAGS += -L../../framework -lmlt
+LDFLAGS += -lstdc++
 
 ifdef HAVE_LIBQUICKTIME
-CFLAGS+=`pkg-config --cflags libquicktime` 
-CXXFLAGS+=`pkg-config --cflags libquicktime` 
-LDFLAGS+=`pkg-config --libs libquicktime`
+CFLAGS += `pkg-config --cflags libquicktime` 
+CXXFLAGS += `pkg-config --cflags libquicktime` 
+LDFLAGS += `pkg-config --libs libquicktime`
 endif
 
 ifdef HAVE_LIBDV

diff --git a/src/modules/motion_est/Makefile b/src/modules/motion_est/Makefile
index 6fff507f25c559a570d609e013f5ceedc43a0179..953f8982f4a328df934a84d7c865fc5d217721fd 100644 (file)
--- a/src/modules/motion_est/Makefile
+++ b/src/modules/motion_est/Makefile
@@ -12,7 +12,7 @@ OBJS = factory.o \
 
 CFLAGS += -I../.. 
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile
index 923c2238a7e5661d668dbe93dc6b2776cd9af898..096e2e3ded89ae6a2a6b96cb8579798bd8f87b7a 100644 (file)
--- a/src/modules/normalize/Makefile
+++ b/src/modules/normalize/Makefile
@@ -7,7 +7,7 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/oldfilm/Makefile b/src/modules/oldfilm/Makefile
index d9fe7cb891b81874f7981c9eae49293a83de2f57..90c13c335218b2731cf123f73fbc5e49c34f85b6 100644 (file)
--- a/src/modules/oldfilm/Makefile
+++ b/src/modules/oldfilm/Makefile
@@ -12,10 +12,9 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
+LDFLAGS += -L../../framework -lmlt
 LDFLAGS += -lm
 
-LDFLAGS+=-L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
index 29eac4d037453542924698831281a09d8c0ebefc..4003b425e082b66308433d3607d721646852e1ed 100644 (file)
--- a/src/modules/plus/Makefile
+++ b/src/modules/plus/Makefile
@@ -11,7 +11,7 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/qimage/Makefile b/src/modules/qimage/Makefile
index dfd3993d4b4a3d23fd812395a55c45d127f9eacf..42bdc817ced0b14491f0ef70f4574d8ac45f2201 100644 (file)
--- a/src/modules/qimage/Makefile
+++ b/src/modules/qimage/Makefile
@@ -1,16 +1,20 @@
 include ../../../config.mak
 include config.mak
 
-TARGET=../libmltqimage$(LIBSUF)
+TARGET = ../libmltqimage$(LIBSUF)
 
-OBJS=factory.o producer_qimage.o
-CPPOBJS=qimage_wrapper.o
-CFLAGS+=-I../../
-LDFLAGS=-L../../framework $(QTLIBS) -lmlt -lstdc++
-CXXFLAGS+=$(CFLAGS) $(QTCXXFLAGS) -Wno-deprecated
+OBJS = factory.o producer_qimage.o
+CPPOBJS = qimage_wrapper.o
+
+CFLAGS += -I../..
+CXXFLAGS += $(CFLAGS) $(QTCXXFLAGS) -Wno-deprecated
+
+LDFLAGS = -L../../framework -lmlt
+LDFLAGS += $(QTLIBS)
+LDFLAGS += -lstdc++
 
 ifdef USE_KDE
-LDFLAGS+= -lkio
+LDFLAGS += -lkio
 endif
 
 SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cpp)

diff --git a/src/modules/sox/configure b/src/modules/sox/configure
index 55b012265077cefdd29306ef67d364c75579f000..9df730af6e8e259d65cef0820bc18cba7d7a68cd 100755 (executable)
--- a/src/modules/sox/configure
+++ b/src/modules/sox/configure
@@ -36,7 +36,7 @@ then
                        $LDD $(which sox) | grep libsamplerate > /dev/null
                        [ $? -eq 0 ] && libsamplerate="-lsamplerate"
 
-                       echo "CFLAGS += $(libst-config --cflags) -I../../" > config.mak
+                       echo "CFLAGS += $(libst-config --cflags) -I../.." > config.mak
                        echo "LDFLAGS += -lst $(libst-config --libs) $libsndfile $libsamplerate" >> config.mak
                else
                        sox --version 2> /dev/null | grep 'v14.' > /dev/null

diff --git a/src/modules/valerie/Makefile b/src/modules/valerie/Makefile
index b4b85d3da7e66cb70677fd7fd2e7643dcf1584b2..9cdd020a8f9cdce49d09ff8858f5fc81b32d14d2 100644 (file)
--- a/src/modules/valerie/Makefile
+++ b/src/modules/valerie/Makefile
@@ -5,9 +5,10 @@ TARGET = ../libmltvalerie$(LIBSUF)
 OBJS = factory.o \
           consumer_valerie.o
 
-CFLAGS += -I../../ 
+CFLAGS += -I../.. 
 
-LDFLAGS+=-L../../valerie -lvalerie -L../../framework -lmlt
+LDFLAGS += -L../../valerie -lvalerie
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/vmfx/Makefile b/src/modules/vmfx/Makefile
index f60d23350aa455b59041b172061d4a3a81090a33..d18f568d27aebb142bc9f609ca0f5f3b769cdc68 100644 (file)
--- a/src/modules/vmfx/Makefile
+++ b/src/modules/vmfx/Makefile
@@ -11,7 +11,7 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile
index fdbe0c62f21e208446585da62eaf6ec012ad7125..5efb718b9d1479c777ac44b249d30bc2314054af 100644 (file)
--- a/src/modules/xine/Makefile
+++ b/src/modules/xine/Makefile
@@ -12,7 +12,7 @@ endif
 
 CFLAGS += -I../../ -DARCH_X86
 
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/tests/Makefile b/src/tests/Makefile
index 0c81bdf84cc11ad18cba76008aadaefdcff24327..65099fb80487af1ac74b74cb5441ea183e062e35 100644 (file)
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -4,7 +4,8 @@ TARGET = dan charlie pango pixbuf dissolve luma
 
 CFLAGS += -I.. $(RDYNAMIC)
 
-LDFLAGS += -L../framework -L../modules -lmlt
+LDFLAGS += -L../modules
+LDFLAGS += -L../framework -lmlt
 
 all: $(TARGET)
 

diff --git a/src/valerie/Makefile b/src/valerie/Makefile
index 0cb34508ee8df2ba76f0be22d6057f40902e501a..52b61e15a59265272e3579254411b1a195795ad4 100644 (file)
--- a/src/valerie/Makefile
+++ b/src/valerie/Makefile
@@ -35,6 +35,7 @@ INCS = valerie.h \
 SRCS := $(OBJS:.o=.c)
 
 CFLAGS += -I.. $(RDYNAMIC)
+
 LDFLAGS += -L../framework -lmlt -lpthread
 
 all: $(TARGET)