Fix over- and under-linking.

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

diff --git a/configure b/configure
index f87bc3593702053fa842fbd1cb74bd01b6d727b9..894b5d80848a7093d3830b0f66994aee506f999c 100755 (executable)
--- a/configure
+++ b/configure
@@ -64,6 +64,7 @@ build_config()
                echo "OPTIMISATIONS=-O2 -pipe -fomit-frame-pointer"
 
                echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
+               echo "LDFLAGS+=-Wl,--as-needed"
 
                case $targetos in
                Darwin)

diff --git a/src/examples/Makefile b/src/examples/Makefile
index d7bf02fb6e9f9e66147249c308a86f7b4850065b..6b0e9f422cbf5152fd26b554feb8645a0210f606 100644 (file)
--- a/src/examples/Makefile
+++ b/src/examples/Makefile
@@ -1,7 +1,5 @@
-include ../config.mak
-
-CXXFLAGS+=-Wall -g `pkg-config mlt-framework --cflags` -I ../src
-LDFLAGS+=-L../src -lmlt++ `pkg-config mlt-framework --libs`
+CXXFLAGS += -Wall -g `pkg-config mlt-framework --cflags` -I ../mlt++
+LDFLAGS += -L../mlt++ -lmlt++ `pkg-config mlt-framework --libs`
 CC=c++
 
 all:           play

diff --git a/src/framework/Makefile b/src/framework/Makefile
index 58b3899c0e792777574315f829cf87442d86403f..e84caa687b55408576be1b87c82e309a744b578b 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -85,7 +85,7 @@ distclean:    clean
                rm -f .depend
 
 clean: 
-               rm -f $(OBJS) $(TARGET) $(NAME)
+               rm -f $(OBJS) $(TARGET) $(NAME) $(SONAME)
 
 install:
        install -d $(DESTDIR)$(libdir)

diff --git a/src/framework/mlt_geometry.c b/src/framework/mlt_geometry.c
index db9c877c66296298f2cf5770225afbd9785d326e..c500076c5e1e0b33b433d9aa7e63d753ff9da1e8 100644 (file)
--- a/src/framework/mlt_geometry.c
+++ b/src/framework/mlt_geometry.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
 typedef struct geometry_item_s
 {

diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index e5ad81af9c54af51cb62bb6ef83c60a34961caed..7510b5e768d61138dbdc5bb80aa102b86c7d0160 100644 (file)
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <math.h>
 
 /* Forward references. */
 

diff --git a/src/mlt++/Makefile b/src/mlt++/Makefile
index 28f465d5e07ca281e8a54a5330f1af44cdb7b748..e746cc0402f2cd873640158a641e000d0e9bdcd3 100644 (file)
--- a/src/mlt++/Makefile
+++ b/src/mlt++/Makefile
@@ -16,7 +16,7 @@ endif
 
 CXXFLAGS += -I.. $(RDYNAMIC) -DVERSION=\"$(version)\"
 
-LDFLAGS += -L../framework -lmlt -lpthread
+LDFLAGS += -L../framework -lmlt
 
 OBJS = MltConsumer.o \
           MltDeque.o \
@@ -54,7 +54,7 @@ depend:       $(SRCS)
        $(CXX) -MM $(CXXFLAGS) $^ 1>.depend
 
 clean:
-       $(RM) $(OBJS) $(TARGET) $(NAME)
+       $(RM) $(OBJS) $(TARGET) $(NAME) $(SONAME)
 
 distclean:     clean
 

diff --git a/src/mlt++/configure b/src/mlt++/configure
index 57f305d508264727753d81f87f3575ceb3acd88d..a9dbf5576cd7e9734acdac86624ac8a0516105a5 100755 (executable)
--- a/src/mlt++/configure
+++ b/src/mlt++/configure
@@ -12,7 +12,7 @@ case $targetos in
                ;;
        Linux|FreeBSD)
                echo LIBSUF=.so
-               echo "CXXFLAGS+=-pthread -Wall $WARNINGS"
+               echo "CXXFLAGS+=-Wall $WARNINGS"
                echo "LIBFLAGS=-shared"
                ;;
 esac > config.mak

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 7d889435ca1d23d7aded41a845039c9eaa7c2009..4a8ff3a0866ead5d95c6b40e2d42006d603604d1 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -2,7 +2,7 @@ include ../../../config.mak
 
 CFLAGS += -I../..
 
-LDFLAGS += -L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt -lpthread
 
 include config.mak
 

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index dc371a399b3f0b77eece80a1d4ef62a7f579fd23..5b2862223366d344a2c7f485d62a848becf65ee8 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -128,7 +128,7 @@ else
                                echo "SWSCALE=1" >> config.mak
                        fi
                        echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
-                       extra_libs="$extra_libs -lz"
+                       extra_libs="$extra_libs -lz -lbz2"
                else
                        echo "avformat: Invalid path specified: $static_ffmpeg"
                        touch ../disable-avformat

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index bc83b0b9b275b3b48f98ee28355743c81e13d18e..224001ae75f04f323cad2ef2007ecaad22139c1f 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -31,7 +31,6 @@
 #include <limits.h>
 #include <pthread.h>
 #include <sys/time.h>
-#include <math.h>
 #include <unistd.h>
 
 // avformat header files

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 2474f9a065794ea1d4e377723841d762063de8d1..5f528d2150caa161520fa57e32c25b8a1e99fd22 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -38,7 +38,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
-#include <math.h>
 
 #if LIBAVUTIL_VERSION_INT < (50<<16)
 #define PIX_FMT_YUYV422 PIX_FMT_YUV422

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index 99b477723e4de35b9e33c03831169068e327f2e1..4419568db67f64fbca44901ed36492dc97bdb47b 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -35,7 +35,7 @@ ASM_OBJS =
 
 CFLAGS += -I../..
 
-LDFLAGS += -L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt -lm -lpthread
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/dgraft/filter_telecide.c b/src/modules/dgraft/filter_telecide.c
index 9bb11497b5da5f7080323142f89f62050bfcdf08..152683fbd5d9bf6e9e0590122cd5aa1cc5042405 100644 (file)
--- a/src/modules/dgraft/filter_telecide.c
+++ b/src/modules/dgraft/filter_telecide.c
@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
 
 //#define DEBUG_PATTERN_GUIDANCE

diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile
index 8c5ef1bb3a27204281cbce6dbdf25e3334df0ed2..79d1a8eef1654aaf13e5228b4f65ef5837b5d38a 100644 (file)
--- a/src/modules/dv/Makefile
+++ b/src/modules/dv/Makefile
@@ -9,7 +9,7 @@ OBJS = factory.o \
 CFLAGS += -I../..
 CFLAGS += `pkg-config --cflags libdv`
 
-LDFLAGS += -L../../framework -lmlt
+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 a8f5f623c0eb7d01bd00f66a755a33d173e5ea5d..32bc97a90a159db06cc45adb3dc9249e03685aa1 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 -lm
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/frei0r/Makefile b/src/modules/frei0r/Makefile
index 2c3762d2dbd408227f722a57b6b09eb240ac645b..873d8ae1df1b798a2414ad8561c00460c4cd1de9 100644 (file)
--- a/src/modules/frei0r/Makefile
+++ b/src/modules/frei0r/Makefile
@@ -11,7 +11,7 @@ OBJS = factory.o \
 CFLAGS += -I../..
 
 LDFLAGS += -L../../framework -lmlt
-LDFLAGS += -lm
+LDFLAGS += -lm $(LIBDL)
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index de5fa2fb2ccd788c70798961f594b940279004a0..744073c64a4348a46a8c0e7a56a985ba0e6373f4 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -6,7 +6,7 @@ TARGET = ../libmltgtk2$(LIBSUF)
 OBJS = factory.o
 
 CFLAGS += -I../..
-LDFLAGS += -L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt -lpthread
 
 ifdef USE_GTK2
 OBJS += consumer_gtk2.o

diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index 50d7d8802fe360215a9c60dd5a464c8fb61d4a44..896dcf769a11e604582e1f910a90b4f6ad4e7ed1 100644 (file)
--- a/src/modules/jackrack/Makefile
+++ b/src/modules/jackrack/Makefile
@@ -15,13 +15,13 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 CFLAGS += `pkg-config --cflags jack`
-CFLAGS += `xml2-config --cflags`
-CFLAGS += `pkg-config glib-2.0 --cflags` 
+CFLAGS += `pkg-config --cflags libxml-2.0`
+CFLAGS += `pkg-config --cflags glib-2.0`
 
-LDFLAGS += -L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt -lpthread $(LIBDL)
 LDFLAGS += `pkg-config --libs jack`
-LDFLAGS += `xml2-config --libs`
-LDFLAGS += `pkg-config glib-2.0 --libs`
+LDFLAGS += `pkg-config --libs libxml-2.0`
+LDFLAGS += `pkg-config --libs glib-2.0`
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/jackrack/configure b/src/modules/jackrack/configure
index d10b2942afde8a40fdf6aeab28d5e2db693a909f..789764d60ceb6e28dce830af90bee9d379c8cc15 100755 (executable)
--- a/src/modules/jackrack/configure
+++ b/src/modules/jackrack/configure
@@ -6,7 +6,7 @@ then
        pkg-config jack
        disable_jack=$?
 
-       which xml2-config > /dev/null 2>&1
+       pkg-config libxml-2.0 > /dev/null 2>&1
        disable_xml2=$?
 
        disable_ladspa=1

diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index 32cdeaa60eb8ccb37743c18410463123ff9e0136..35fd21a07c34fdb757ac4a78543687551522d8c2 100644 (file)
--- a/src/modules/kino/Makefile
+++ b/src/modules/kino/Makefile
@@ -9,7 +9,7 @@ CPPOBJS = kino_wrapper.o avi.o error.o filehandler.o riff.o
 CFLAGS += -I../../
 CXXFLAGS += $(CFLAGS) -Wno-deprecated
 
-LDFLAGS += -L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt -lpthread
 LDFLAGS += -lstdc++
 
 ifdef HAVE_LIBQUICKTIME

diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile
index 096e2e3ded89ae6a2a6b96cb8579798bd8f87b7a..0c9727cd000fd9c1d4a1436bf24fba6d928aa3e6 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 -lm
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
index 4003b425e082b66308433d3607d721646852e1ed..092b074769c3cb20eb110abf257e639bc8cfdde4 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 -lm
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/qimage/Makefile b/src/modules/qimage/Makefile
index 42bdc817ced0b14491f0ef70f4574d8ac45f2201..ad3e4fa55604fb2236618d7f8002f65039fbd3f3 100644 (file)
--- a/src/modules/qimage/Makefile
+++ b/src/modules/qimage/Makefile
@@ -9,7 +9,7 @@ CPPOBJS = qimage_wrapper.o
 CFLAGS += -I../..
 CXXFLAGS += $(CFLAGS) $(QTCXXFLAGS) -Wno-deprecated
 
-LDFLAGS = -L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt -lpthread -lm
 LDFLAGS += $(QTLIBS)
 LDFLAGS += -lstdc++
 

diff --git a/src/modules/resample/filter_resample.c b/src/modules/resample/filter_resample.c
index 6838465275902eae6f158b4e7f8f317f8f66b49f..9ff4d9e17a64b9d90c67f1ec97b07c83751f71b5 100644 (file)
--- a/src/modules/resample/filter_resample.c
+++ b/src/modules/resample/filter_resample.c
@@ -24,8 +24,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <samplerate.h>
-#define __USE_ISOC99 1
-#include <math.h>
 
 #define BUFFER_LEN 20480
 #define RESAMPLE_TYPE SRC_SINC_FASTEST

diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index e2b5b363835a16003cf837ac0ceca5a0d8b69854..5c779d49477dc9ffe0bceb9f98eb93242e13b720 100644 (file)
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -19,7 +19,7 @@ endif
 CFLAGS += -I../..
 CFLAGS += `sdl-config --cflags`
 
-LDFLAGS += -L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt -lpthread -lm
 LDFLAGS += `sdl-config --libs`
 
 ifeq ($(WITH_SDL_IMAGE),1)

diff --git a/src/modules/vmfx/filter_chroma.c b/src/modules/vmfx/filter_chroma.c
index f13838ba7aea8eb17f436aa96c1d57201547c25f..de54135cf6017e0fa216fba2ab7abbb741478234 100644 (file)
--- a/src/modules/vmfx/filter_chroma.c
+++ b/src/modules/vmfx/filter_chroma.c
@@ -20,7 +20,6 @@
 
 #include <framework/mlt_filter.h>
 #include <stdlib.h>
-#include <math.h>
 #include <framework/mlt_factory.h>
 #include <framework/mlt_frame.h>
 #include <framework/mlt_producer.h>

diff --git a/src/modules/xml/consumer_xml.c b/src/modules/xml/consumer_xml.c
index 9e85e6ecbc97979f125f7cf846558b837bf9217d..187d626c09d2de9c62836628158348ea2b20a87e 100644 (file)
--- a/src/modules/xml/consumer_xml.c
+++ b/src/modules/xml/consumer_xml.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pthread.h>
 #include <unistd.h>
 #include <libxml/tree.h>