From e89b21b07607ae485f56b32f3e67f83f528f2ae6 Mon Sep 17 00:00:00 2001 From: ddennedy Date: Sun, 3 May 2009 00:09:47 +0000 Subject: [PATCH] Apply cosmetic cleanup part of ldflags_order patch from Alberto Villa. Signed-off-by: Dan Dennedy git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1418 d19143bc-622f-0410-bfdd-b5b2a6649095 --- configure | 4 ++-- src/albino/Makefile | 4 +++- src/humperdink/Makefile | 5 +++-- src/miracle/Makefile | 3 ++- src/modules/avformat/Makefile | 12 ++++++------ src/modules/core/Makefile | 2 +- src/modules/dgraft/Makefile | 2 +- src/modules/effectv/Makefile | 2 +- src/modules/fezzik/Makefile | 2 +- src/modules/frei0r/Makefile | 3 +-- src/modules/inigo/Makefile | 2 +- src/modules/kdenlive/Makefile | 3 +-- src/modules/kino/Makefile | 21 ++++++++++++--------- src/modules/motion_est/Makefile | 2 +- src/modules/normalize/Makefile | 2 +- src/modules/oldfilm/Makefile | 3 +-- src/modules/plus/Makefile | 2 +- src/modules/qimage/Makefile | 18 +++++++++++------- src/modules/sox/configure | 2 +- src/modules/valerie/Makefile | 5 +++-- src/modules/vmfx/Makefile | 2 +- src/modules/xine/Makefile | 2 +- src/tests/Makefile | 3 ++- src/valerie/Makefile | 1 + 24 files changed, 59 insertions(+), 48 deletions(-) diff --git a/configure b/configure index 16f105e6..72bbfe51 100755 --- 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 ebb60a0f..29bb3ee6 100644 --- 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 f3cd756b..dd03dc9a 100644 --- 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 742ec91d..2d92bfb9 100644 --- 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 5891780b..7d889435 100644 --- 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 b4c3b439..a3132aed 100644 --- 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 e312fced..7e17749a 100644 --- 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 19d8fdf5..a8f5f623 100644 --- 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 78d8294e..52b51298 100644 --- 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 c7080575..2c3762d2 100644 --- 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 da1434e2..b2e297f1 100644 --- 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 cfe0811e..d32ab0c6 100644 --- 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 46326c75..32cdeaa6 100644 --- 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 6fff507f..953f8982 100644 --- 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 923c2238..096e2e3d 100644 --- 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 d9fe7cb8..90c13c33 100644 --- 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 29eac4d0..4003b425 100644 --- 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 dfd3993d..42bdc817 100644 --- 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 55b01226..9df730af 100755 --- 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 b4b85d3d..9cdd020a 100644 --- 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 f60d2335..d18f568d 100644 --- 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 fdbe0c62..5efb718b 100644 --- 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 0c81bdf8..65099fb8 100644 --- 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 0cb34508..52b61e15 100644 --- 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) -- 2.39.2