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 16f105e..72bbfe5 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 ebb60a0..29bb3ee 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 f3cd756..dd03dc9 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 742ec91..2d92bfb 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 5891780..7d88943 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 b4c3b43..a3132ae 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 e312fce..7e17749 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 19d8fdf..a8f5f62 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 78d8294..52b5129 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 c708057..2c3762d 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 da1434e..b2e297f 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 cfe0811..d32ab0c 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 46326c7..32cdeaa 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 6fff507..953f898 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 923c223..096e2e3 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 d9fe7cb..90c13c3 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 29eac4d..4003b42 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 dfd3993..42bdc81 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 55b0122..9df730a 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 b4b85d3..9cdd020 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 f60d233..d18f568 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 fdbe0c6..5efb718 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 0c81bdf..65099fb 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 0cb3450..52b61e1 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)