Fix build on OS X and possibly others.

Gives higher priority to local lib and include dirs than system or
SDL-based lib and include dirs. Also, moves previous -lm fix to
from general build to --avformat-svn and --avformat-static builds.

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

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index c827150eacf65a6e22ed3a68b40eee9b18e9cbf8..74cdbbe6eedbc785dfb68070bdb59ad611ea8ab2 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,16 +1,14 @@
-include ../../../config.mak
-
 CFLAGS += -I../..
-
 LDFLAGS += -L../../framework -lmlt -lpthread
 
+include ../../../config.mak
 include config.mak
 
 LDFLAGS += -lavformat$(AVFORMAT_SUFFIX)
 LDFLAGS += -lavcodec$(AVFORMAT_SUFFIX)
 LDFLAGS += -lavutil$(AVFORMAT_SUFFIX)
 LDFLAGS += -lavdevice$(AVFORMAT_SUFFIX)
-LDFLAGS += -lm $(EXTRA_LIBS)
+LDFLAGS += $(EXTRA_LIBS)
 
 ifndef CODECS
 TARGET = ../libmltffmpeg$(LIBSUF)

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 5b2862223366d344a2c7f485d62a848becf65ee8..62b855507dbc4a899d14d1f26ac902b9d2303cfc 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -112,7 +112,7 @@ else
                        echo "LDFLAGS+=-single_module" >> config.mak
                echo "LOCAL_FFMPEG=1" >> config.mak
                echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
-               extra_libs="$extra_libs -lz -lbz2"
+               extra_libs="$extra_libs -lm -lz -lbz2"
        elif [ "$static_ffmpeg" != "" ]
        then 
                if [ -d "$static_ffmpeg" ]
@@ -128,7 +128,7 @@ else
                                echo "SWSCALE=1" >> config.mak
                        fi
                        echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
-                       extra_libs="$extra_libs -lz -lbz2"
+                       extra_libs="$extra_libs -lm -lz -lbz2"
                else
                        echo "avformat: Invalid path specified: $static_ffmpeg"
                        touch ../disable-avformat

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index 3d7c7024d884c0a8ef19af51b0c6350ec3f14f05..fbd83a59853f7454c807a00a08ed9f534fd4801c 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lm -lpthread
+
 include ../../../config.mak
 
 TARGET = ../libmltcore$(LIBSUF)
@@ -34,10 +38,6 @@ OBJS = factory.o \
 
 ASM_OBJS = 
 
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt -lm -lpthread
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/dgraft/Makefile b/src/modules/dgraft/Makefile
index 7e17749ac7185375023731315aab8a2c0b8976d4..0fbf5f6ebd23f834967b7f5c9f0d13ea5ce41660 100644 (file)
--- a/src/modules/dgraft/Makefile
+++ b/src/modules/dgraft/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include ../../../config.mak
 
 TARGET = ../libmltdgraft$(LIBSUF)
@@ -5,10 +9,6 @@ TARGET = ../libmltdgraft$(LIBSUF)
 OBJS = factory.o \
           filter_telecide.o
 
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile
index 79d1a8eef1654aaf13e5228b4f65ef5837b5d38a..9cd2c6bd1d6c0a80bb32891746ac754313d88c93 100644 (file)
--- a/src/modules/dv/Makefile
+++ b/src/modules/dv/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lpthread
+
 include ../../../config.mak
 
 TARGET = ../libmltdv$(LIBSUF)
@@ -6,10 +10,8 @@ OBJS = factory.o \
           producer_libdv.o \
           consumer_libdv.o
 
-CFLAGS += -I../..
 CFLAGS += `pkg-config --cflags libdv`
 
-LDFLAGS += -L../../framework -lmlt -lpthread
 LDFLAGS += `pkg-config --libs libdv`
 
 SRCS := $(OBJS:.o=.c)

diff --git a/src/modules/effectv/Makefile b/src/modules/effectv/Makefile
index 32bc97a90a159db06cc45adb3dc9249e03685aa1..0015708325adecbd593f607046d658653b7b3c76 100644 (file)
--- a/src/modules/effectv/Makefile
+++ b/src/modules/effectv/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lm
+
 include ../../../config.mak
 
 TARGET = ../libmlteffectv$(LIBSUF)
@@ -7,10 +11,6 @@ OBJS = factory.o \
           image.o \
           utils.o
 
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt -lm
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/frei0r/Makefile b/src/modules/frei0r/Makefile
index d0208a8a3881c06ac126b4528c882dcf476a3014..d4419385d43a735d214f5f98a4570c4d341de943 100644 (file)
--- a/src/modules/frei0r/Makefile
+++ b/src/modules/frei0r/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include ../../../config.mak
 
 TARGET = ../libmltfrei0r$(LIBSUF)
@@ -8,12 +12,10 @@ OBJS = factory.o \
           transition_frei0r.o \
           frei0r_helper.o
 
-CFLAGS += -I../..
-CFLAGS += `pkg-config --cflags frei0r`
+CFLAGS += `pkg-config --cflags frei0r 2> /dev/null`
 
-LDFLAGS += -L../../framework -lmlt
 LDFLAGS += -lm $(LIBDL)
-LDFLAGS += `pkg-config --libs frei0r`
+LDFLAGS += `pkg-config --libs frei0r 2> /dev/null`
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index cd172ab17ea7d1c0085ab95515aca4d5fecc069f..19ad1d6a47de01870d7d4ab0d10e0af7ed001078 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lpthread -lm
+
 include ../../../config.mak
 include config.mak
 
@@ -5,9 +9,6 @@ TARGET = ../libmltgtk2$(LIBSUF)
 
 OBJS = factory.o
 
-CFLAGS += -I../..
-LDFLAGS += -L../../framework -lmlt -lpthread -lm
-
 ifdef USE_GTK2
 OBJS += consumer_gtk2.o
 CFLAGS += `pkg-config gtk+-2.0 --cflags`

diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index 240854abfb2102b276ce4408798183f2393af629..2d2a8563b1f351a7ed9f98df6fce5e4ed0a7a976 100644 (file)
--- a/src/modules/jackrack/Makefile
+++ b/src/modules/jackrack/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lpthread -lm
+
 include ../../../config.mak
 
 TARGET = ../libmltjackrack$(LIBSUF)
@@ -13,12 +17,11 @@ OBJS = factory.o \
           filter_jackrack.o \
           filter_ladspa.o
 
-CFLAGS += -I../..
 CFLAGS += `pkg-config --cflags jack`
 CFLAGS += `pkg-config --cflags libxml-2.0`
 CFLAGS += `pkg-config --cflags glib-2.0`
 
-LDFLAGS += -L../../framework -lmlt -lpthread -lm $(LIBDL)
+LDFLAGS += $(LIBDL)
 LDFLAGS += `pkg-config --libs jack`
 LDFLAGS += `pkg-config --libs libxml-2.0`
 LDFLAGS += `pkg-config --libs glib-2.0`

diff --git a/src/modules/kdenlive/Makefile b/src/modules/kdenlive/Makefile
index d32ab0c61f50c7dc48526642877c9db1fe710e79..58707687606329780cb7cdddee3d58054f7b7dc2 100644 (file)
--- a/src/modules/kdenlive/Makefile
+++ b/src/modules/kdenlive/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include ../../../config.mak
 
 TARGET = ../libmltkdenlive$(LIBSUF)
@@ -8,9 +12,7 @@ OBJS = factory.o \
           filter_wave.o \
           producer_framebuffer.o
 
-CFLAGS += -I../..
 
-LDFLAGS += -L../../framework -lmlt
 LDFLAGS += -lm
 
 SRCS := $(OBJS:.o=.c)

diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index 35fd21a07c34fdb757ac4a78543687551522d8c2..74abb40791d061ce9f8592724aeff900c0de78fb 100644 (file)
--- a/src/modules/kino/Makefile
+++ b/src/modules/kino/Makefile
@@ -1,3 +1,8 @@
+CFLAGS += -I../../
+CXXFLAGS += $(CFLAGS) -Wno-deprecated
+
+LDFLAGS += -L../../framework -lmlt -lpthread
+
 include ../../../config.mak
 include config.mak
 
@@ -6,10 +11,6 @@ TARGET = ../libmltkino.so
 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 -lpthread
 LDFLAGS += -lstdc++
 
 ifdef HAVE_LIBQUICKTIME

diff --git a/src/modules/melt/Makefile b/src/modules/melt/Makefile
index 2e70fd927e9f23821cb164df2b728d462e05bca3..5775d9b8817b0f9f1612384a6ca523c5f13256f4 100644 (file)
--- a/src/modules/melt/Makefile
+++ b/src/modules/melt/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include ../../../config.mak
 
 TARGET = ../libmltmelt$(LIBSUF)
@@ -5,10 +9,6 @@ TARGET = ../libmltmelt$(LIBSUF)
 OBJS = factory.o \
           producer_melt.o 
 
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/motion_est/Makefile b/src/modules/motion_est/Makefile
index e577685267d822e60b3865d8dc21f7b33dddd0c8..78bcd22ca95672eb468e6e84d2dc695fde1fbbe1 100644 (file)
--- a/src/modules/motion_est/Makefile
+++ b/src/modules/motion_est/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../.. 
+
+LDFLAGS += -L../../framework -lmlt -lm
+
 include ../../../config.mak
 
 TARGET = ../libmltmotion_est.so
@@ -10,10 +14,6 @@ OBJS = factory.o \
           filter_vismv.o \
           producer_slowmotion.o
 
-CFLAGS += -I../.. 
-
-LDFLAGS += -L../../framework -lmlt -lm
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile
index 0c9727cd000fd9c1d4a1436bf24fba6d928aa3e6..22472493095f0df8a74b94a466c7ca8b19f2f74d 100644 (file)
--- a/src/modules/normalize/Makefile
+++ b/src/modules/normalize/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lm
+
 include ../../../config.mak
 
 TARGET = ../libmltnormalize$(LIBSUF)
@@ -5,10 +9,6 @@ TARGET = ../libmltnormalize$(LIBSUF)
 OBJS = factory.o \
           filter_volume.o 
 
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt -lm
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/oldfilm/Makefile b/src/modules/oldfilm/Makefile
index 50038ab491eb16536ee4d40e30e29acaa749b9c2..e7e200be28111af565eb7176709b6353f6f2e9d6 100644 (file)
--- a/src/modules/oldfilm/Makefile
+++ b/src/modules/oldfilm/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lm
+
 include ../../../config.mak
 
 TARGET = ../libmltoldfilm$(LIBSUF)
@@ -10,11 +14,6 @@ OBJS = factory.o \
           filter_tcolor.o \
           filter_vignette.o
 
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt
-LDFLAGS += -lm
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
index 092b074769c3cb20eb110abf257e639bc8cfdde4..99faa028d721ec4111e9a1cc52d03a65c30d1f45 100644 (file)
--- a/src/modules/plus/Makefile
+++ b/src/modules/plus/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lm
+
 include ../../../config.mak
 
 TARGET = ../libmltplus$(LIBSUF)
@@ -9,10 +13,6 @@ OBJS = factory.o \
           filter_sepia.o \
           transition_affine.o
 
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt -lm
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/qimage/Makefile b/src/modules/qimage/Makefile
index ad3e4fa55604fb2236618d7f8002f65039fbd3f3..0a1d52404258dad75b97b9686582b2fd70efa59a 100644 (file)
--- a/src/modules/qimage/Makefile
+++ b/src/modules/qimage/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lpthread -lm
+
 include ../../../config.mak
 include config.mak
 
@@ -6,10 +10,8 @@ TARGET = ../libmltqimage$(LIBSUF)
 OBJS = factory.o producer_qimage.o
 CPPOBJS = qimage_wrapper.o
 
-CFLAGS += -I../..
 CXXFLAGS += $(CFLAGS) $(QTCXXFLAGS) -Wno-deprecated
 
-LDFLAGS += -L../../framework -lmlt -lpthread -lm
 LDFLAGS += $(QTLIBS)
 LDFLAGS += -lstdc++
 

diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile
index faf00a8726d7450cbd434b97e7b014e9b67f1fea..009e34792b0090701a7b46d29073b71f098fde34 100644 (file)
--- a/src/modules/resample/Makefile
+++ b/src/modules/resample/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include ../../../config.mak
 
 TARGET = ../libmltresample$(LIBSUF)
@@ -5,10 +9,8 @@ TARGET = ../libmltresample$(LIBSUF)
 OBJS = factory.o \
           filter_resample.o 
 
-CFLAGS += -I../..
 CFLAGS += `pkg-config --cflags samplerate`
 
-LDFLAGS += -L../../framework -lmlt
 LDFLAGS += `pkg-config --libs samplerate`
 
 SRCS := $(OBJS:.o=.c)

diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index 5c779d49477dc9ffe0bceb9f98eb93242e13b720..255cbe023858956bc124b235373ff638c0847266 100644 (file)
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lpthread -lm
+
 include ../../../config.mak
 
 include config.mak
@@ -16,10 +20,8 @@ else
 LDFLAGS += -lX11
 endif
 
-CFLAGS += -I../..
 CFLAGS += `sdl-config --cflags`
 
-LDFLAGS += -L../../framework -lmlt -lpthread -lm
 LDFLAGS += `sdl-config --libs`
 
 ifeq ($(WITH_SDL_IMAGE),1)

diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index d9aafd6e8029a62a9b45c06fc1bbc29df17c01d5..654af4d52ed19adee90c1467aa3dd402757070df 100644 (file)
--- a/src/modules/sox/Makefile
+++ b/src/modules/sox/Makefile
@@ -1,9 +1,9 @@
-include ../../../config.mak
-
 CFLAGS += -I../..
 
 LDFLAGS += -L../../framework -lmlt -lm
 
+include ../../../config.mak
+
 include config.mak
 
 TARGET = ../libmltsox$(LIBSUF)

diff --git a/src/modules/vmfx/Makefile b/src/modules/vmfx/Makefile
index d18f568d27aebb142bc9f609ca0f5f3b769cdc68..3d86b9dd87e4ae126ca1e594a85ddb254803618a 100644 (file)
--- a/src/modules/vmfx/Makefile
+++ b/src/modules/vmfx/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include ../../../config.mak
 
 TARGET = ../libmltvmfx$(LIBSUF)
@@ -9,10 +13,6 @@ OBJS = factory.o \
           filter_shape.o \
           producer_pgm.o
 
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile
index f159a2a054a919c9fd674958b5dbd2db799b64f6..161f3b0bb9024bf6ded9e226757f8ea94b9f0c0f 100644 (file)
--- a/src/modules/vorbis/Makefile
+++ b/src/modules/vorbis/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include ../../../config.mak
 
 TARGET = ../libmltvorbis$(LIBSUF)
@@ -5,11 +9,9 @@ TARGET = ../libmltvorbis$(LIBSUF)
 OBJS = factory.o \
           producer_vorbis.o
 
-CFLAGS += -I../..
 CFLAGS += `pkg-config --cflags vorbis`
 CFLAGS += `pkg-config --cflags vorbisfile`
 
-LDFLAGS += -L../../framework -lmlt
 LDFLAGS += `pkg-config --libs vorbis`
 LDFLAGS += `pkg-config --libs vorbisfile`
 

diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile
index 5efb718b9d1479c777ac44b249d30bc2314054af..14619ad5788f227982b0c44c619e19addce9fda2 100644 (file)
--- a/src/modules/xine/Makefile
+++ b/src/modules/xine/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../../ -DARCH_X86
+
+LDFLAGS += -L../../framework -lmlt
+
 include ../../../config.mak
 
 TARGET = ../libmltxine$(LIBSUF)
@@ -10,10 +14,6 @@ ifdef MMX_FLAGS
 OBJS += cpu_accel.o
 endif
 
-CFLAGS += -I../../ -DARCH_X86
-
-LDFLAGS += -L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/xml/Makefile b/src/modules/xml/Makefile
index 83c617b58afebdd99c603a73c5870dd5140a4b9f..cdc0b1fbbc3ff52dd34d47fa6a65c855e16eefc9 100644 (file)
--- a/src/modules/xml/Makefile
+++ b/src/modules/xml/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
 include ../../../config.mak
 
 TARGET = ../libmltxml$(LIBSUF)
@@ -6,10 +10,8 @@ OBJS = factory.o \
           consumer_xml.o \
           producer_xml.o
 
-CFLAGS += -I../..
 CFLAGS += `pkg-config libxml-2.0 --cflags`
 
-LDFLAGS += -L../../framework -lmlt
 LDFLAGS += `pkg-config libxml-2.0 --libs`
 
 SRCS := $(OBJS:.o=.c)