On Saturday 18 April 2009 21:28:45 Dan Dennedy wrote:
> On Sat, Apr 18, 2009 at 3:00 AM, Alberto Villa <[email protected]>
wrote:
> > On Friday 17 April 2009 19:30:24 Alberto Villa wrote:
> >> on freebsd (as well as on linuces without /usr/local/lib in default ld
> >> path) building concurrent versions of mlt is not possible, because of
> >> the wrong linking of -lmlt while using LDFLAGS=-L/usr/local/lib
here's a patch (ldflags_order...), it works fine here with cd srcdir && patch
-p1 < patch.diff
some things are not required, they're just added spaces to make the code
cleaner...
i could build everything without any problem, and tested it trying to write
some lines of code and linking them to libmlt and libmlt++ (anyway, the
changes shouldn't break anything)
jb: i also had to patch kdenlive to build it with my local version of mlt (i
don't have /usr/local/include in default include paths, and it was specified
before my local mlt include directories)
here's a very little patch (local_mlt...) which fixes the issue here
--
Alberto Villa <[email protected]>
diff -ur mlt.orig/configure mlt/configure
--- mlt.orig/configure 2009-04-18 23:14:41.000000000 +0200
+++ mlt/configure 2009-04-18 23:21:10.000000000 +0200
@@ -174,7 +174,7 @@
# 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 @@
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 -ur mlt.orig/src/albino/Makefile mlt/src/albino/Makefile
--- mlt.orig/src/albino/Makefile 2009-04-18 23:14:25.000000000 +0200
+++ mlt/src/albino/Makefile 2009-04-18 23:31:53.000000000 +0200
@@ -6,7 +6,9 @@
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 -ur mlt.orig/src/humperdink/Makefile mlt/src/humperdink/Makefile
--- mlt.orig/src/humperdink/Makefile 2009-04-18 23:14:24.000000000 +0200
+++ mlt/src/humperdink/Makefile 2009-04-18 23:35:53.000000000 +0200
@@ -3,12 +3,13 @@
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 -ur mlt.orig/src/miracle/Makefile mlt/src/miracle/Makefile
--- mlt.orig/src/miracle/Makefile 2009-04-18 23:14:38.000000000 +0200
+++ mlt/src/miracle/Makefile 2009-04-18 23:37:31.000000000 +0200
@@ -32,7 +32,8 @@
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 -ur mlt.orig/src/modules/avformat/Makefile mlt/src/modules/avformat/Makefile
--- mlt.orig/src/modules/avformat/Makefile 2009-04-18 23:14:28.000000000 +0200
+++ mlt/src/modules/avformat/Makefile 2009-04-18 23:59:56.000000000 +0200
@@ -1,6 +1,16 @@
include ../../../config.mak
+
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
include config.mak
+LDFLAGS += -lavformat$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavcodec$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavutil$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS)
+
ifndef CODECS
TARGET = ../libmltffmpeg$(LIBSUF)
else
@@ -25,22 +35,16 @@
CFLAGS += -DCODECS
endif
-CFLAGS+=-I../..
-
-LDFLAGS+=-L../../framework
-
-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
-
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 -ur mlt.orig/src/modules/avformat/configure mlt/src/modules/avformat/configure
--- mlt.orig/src/modules/avformat/configure 2009-04-18 23:14:28.000000000 +0200
+++ mlt/src/modules/avformat/configure 2009-04-18 23:52:01.000000000 +0200
@@ -33,7 +33,7 @@
Darwin)
export LIBSUF=.dylib
;;
- Linux)
+ Linux|FreeBSD)
export LIBSUF=.so
;;
*)
diff -ur mlt.orig/src/modules/core/Makefile mlt/src/modules/core/Makefile
--- mlt.orig/src/modules/core/Makefile 2009-04-18 23:14:26.000000000 +0200
+++ mlt/src/modules/core/Makefile 2009-04-19 00:02:01.000000000 +0200
@@ -33,7 +33,7 @@
CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/modules/dgraft/Makefile mlt/src/modules/dgraft/Makefile
--- mlt.orig/src/modules/dgraft/Makefile 2009-04-18 23:14:35.000000000 +0200
+++ mlt/src/modules/dgraft/Makefile 2009-04-19 00:02:21.000000000 +0200
@@ -7,7 +7,7 @@
CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/modules/dv/Makefile mlt/src/modules/dv/Makefile
--- mlt.orig/src/modules/dv/Makefile 2009-04-18 23:14:27.000000000 +0200
+++ mlt/src/modules/dv/Makefile 2009-04-19 00:03:35.000000000 +0200
@@ -6,12 +6,12 @@
producer_libdv.o \
consumer_libdv.o
-CFLAGS += `pkg-config --cflags libdv` -I../..
+CFLAGS += -I../..
+CFLAGS += `pkg-config --cflags libdv`
+LDFLAGS += -L../../framework -lmlt
LDFLAGS += `pkg-config --libs libdv`
-LDFLAGS+=-L../../framework -lmlt
-
SRCS := $(OBJS:.o=.c)
all: $(TARGET)
diff -ur mlt.orig/src/modules/effectv/Makefile mlt/src/modules/effectv/Makefile
--- mlt.orig/src/modules/effectv/Makefile 2009-04-18 23:14:33.000000000 +0200
+++ mlt/src/modules/effectv/Makefile 2009-04-19 00:03:57.000000000 +0200
@@ -9,7 +9,7 @@
CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/modules/fezzik/Makefile mlt/src/modules/fezzik/Makefile
--- mlt.orig/src/modules/fezzik/Makefile 2009-04-18 23:14:34.000000000 +0200
+++ mlt/src/modules/fezzik/Makefile 2009-04-19 00:04:23.000000000 +0200
@@ -8,7 +8,7 @@
CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/modules/frei0r/Makefile mlt/src/modules/frei0r/Makefile
--- mlt.orig/src/modules/frei0r/Makefile 2009-04-18 23:14:34.000000000 +0200
+++ mlt/src/modules/frei0r/Makefile 2009-04-19 00:05:45.000000000 +0200
@@ -10,10 +10,9 @@
CFLAGS += -I../..
+LDFLAGS += -L../../framework -lmlt
LDFLAGS += -lm
-LDFLAGS+=-L../../framework -lmlt
-
SRCS := $(OBJS:.o=.c)
all: $(TARGET)
diff -ur mlt.orig/src/modules/gtk2/Makefile mlt/src/modules/gtk2/Makefile
--- mlt.orig/src/modules/gtk2/Makefile 2009-04-18 23:14:35.000000000 +0200
+++ mlt/src/modules/gtk2/Makefile 2009-04-19 00:07:43.000000000 +0200
@@ -5,6 +5,9 @@
OBJS = factory.o
+CFLAGS += -I../..
+LDFLAGS += -L../../framework -lmlt
+
ifdef USE_GTK2
OBJS += consumer_gtk2.o
CFLAGS += `pkg-config gtk+-2.0 --cflags`
@@ -29,9 +32,6 @@
LDFLAGS += `pkg-config pangoft2 --libs`
endif
-CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
-
SRCS := $(OBJS:.o=.c)
all: $(TARGET)
diff -ur mlt.orig/src/modules/inigo/Makefile mlt/src/modules/inigo/Makefile
--- mlt.orig/src/modules/inigo/Makefile 2009-04-18 23:14:35.000000000 +0200
+++ mlt/src/modules/inigo/Makefile 2009-04-19 00:08:17.000000000 +0200
@@ -7,7 +7,7 @@
CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/modules/jackrack/Makefile mlt/src/modules/jackrack/Makefile
--- mlt.orig/src/modules/jackrack/Makefile 2009-04-18 23:14:36.000000000 +0200
+++ mlt/src/modules/jackrack/Makefile 2009-04-19 00:09:47.000000000 +0200
@@ -13,16 +13,16 @@
filter_jackrack.o \
filter_ladspa.o
-CFLAGS += -I../.. `pkg-config --cflags jack`
+CFLAGS += -I../..
+CFLAGS += `pkg-config --cflags jack`
CFLAGS += `xml2-config --cflags`
CFLAGS += `pkg-config glib-2.0 --cflags`
+LDFLAGS += -L../../framework -lmlt
LDFLAGS += `pkg-config --libs jack`
LDFLAGS += `xml2-config --libs`
LDFLAGS += `pkg-config glib-2.0 --libs`
-LDFLAGS+=-L../../framework -lmlt
-
SRCS := $(OBJS:.o=.c)
all: $(TARGET)
diff -ur mlt.orig/src/modules/kdenlive/Makefile mlt/src/modules/kdenlive/Makefile
--- mlt.orig/src/modules/kdenlive/Makefile 2009-04-18 23:14:26.000000000 +0200
+++ mlt/src/modules/kdenlive/Makefile 2009-04-19 00:10:08.000000000 +0200
@@ -10,10 +10,9 @@
CFLAGS += -I../..
+LDFLAGS += -L../../framework -lmlt
LDFLAGS += -lm
-LDFLAGS+=-L../../framework -lmlt
-
SRCS := $(OBJS:.o=.c)
all: $(TARGET)
diff -ur mlt.orig/src/modules/kino/Makefile mlt/src/modules/kino/Makefile
--- mlt.orig/src/modules/kino/Makefile 2009-04-18 23:14:26.000000000 +0200
+++ mlt/src/modules/kino/Makefile 2009-04-19 00:12:29.000000000 +0200
@@ -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 -ur mlt.orig/src/modules/motion_est/Makefile mlt/src/modules/motion_est/Makefile
--- mlt.orig/src/modules/motion_est/Makefile 2009-04-18 23:14:36.000000000 +0200
+++ mlt/src/modules/motion_est/Makefile 2009-04-19 00:13:18.000000000 +0200
@@ -12,7 +12,7 @@
CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/modules/normalize/Makefile mlt/src/modules/normalize/Makefile
--- mlt.orig/src/modules/normalize/Makefile 2009-04-18 23:14:26.000000000 +0200
+++ mlt/src/modules/normalize/Makefile 2009-04-19 00:13:29.000000000 +0200
@@ -7,7 +7,7 @@
CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/modules/oldfilm/Makefile mlt/src/modules/oldfilm/Makefile
--- mlt.orig/src/modules/oldfilm/Makefile 2009-04-18 23:14:25.000000000 +0200
+++ mlt/src/modules/oldfilm/Makefile 2009-04-19 00:13:46.000000000 +0200
@@ -12,10 +12,9 @@
CFLAGS += -I../..
+LDFLAGS += -L../../framework -lmlt
LDFLAGS += -lm
-LDFLAGS+=-L../../framework -lmlt
-
SRCS := $(OBJS:.o=.c)
all: $(TARGET)
diff -ur mlt.orig/src/modules/plus/Makefile mlt/src/modules/plus/Makefile
--- mlt.orig/src/modules/plus/Makefile 2009-04-18 23:14:33.000000000 +0200
+++ mlt/src/modules/plus/Makefile 2009-04-19 00:13:57.000000000 +0200
@@ -11,7 +11,7 @@
CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/modules/qimage/Makefile mlt/src/modules/qimage/Makefile
--- mlt.orig/src/modules/qimage/Makefile 2009-04-18 23:14:27.000000000 +0200
+++ mlt/src/modules/qimage/Makefile 2009-04-19 00:24:32.000000000 +0200
@@ -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 -ur mlt.orig/src/modules/qimage/configure mlt/src/modules/qimage/configure
--- mlt.orig/src/modules/qimage/configure 2009-04-18 23:14:27.000000000 +0200
+++ mlt/src/modules/qimage/configure 2009-04-19 00:17:38.000000000 +0200
@@ -16,13 +16,13 @@
else
targetos=$(uname -s)
case $targetos in
- MINGW32*)
- export LIBSUF=.dll
- ;;
+ MINGW32*)
+ export LIBSUF=.dll
+ ;;
Darwin)
export LIBSUF=.dylib
;;
- Linux)
+ Linux|FreeBSD)
export LIBSUF=.so
;;
*)
diff -ur mlt.orig/src/modules/sdl/Makefile mlt/src/modules/sdl/Makefile
--- mlt.orig/src/modules/sdl/Makefile 2009-04-18 23:14:37.000000000 +0200
+++ mlt/src/modules/sdl/Makefile 2009-04-19 00:27:00.000000000 +0200
@@ -1,5 +1,4 @@
include ../../../config.mak
-
include config.mak
TARGET = ../libmltsdl$(LIBSUF)
@@ -10,17 +9,17 @@
consumer_sdl_still.o
ifeq ($(targetos),Darwin)
- CFLAGS +=-ObjC
- LDFLAGS +=-lobjc -framework Foundation
+CFLAGS += -ObjC
+LDFLAGS += -lobjc -framework Foundation
else
- LDFLAGS +=-lX11
+LDFLAGS += -lX11
endif
-CFLAGS +=-I../.. `sdl-config --cflags`
-
-LDFLAGS +=`sdl-config --libs`
+CFLAGS += -I../..
+CFLAGS += `sdl-config --cflags`
-LDFLAGS +=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
+LDFLAGS += `sdl-config --libs`
ifeq ($(WITH_SDL_IMAGE),1)
OBJS += producer_sdl_image.o
diff -ur mlt.orig/src/modules/sox/Makefile mlt/src/modules/sox/Makefile
--- mlt.orig/src/modules/sox/Makefile 2009-04-18 23:14:36.000000000 +0200
+++ mlt/src/modules/sox/Makefile 2009-04-19 00:34:59.000000000 +0200
@@ -1,4 +1,9 @@
include ../../../config.mak
+
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
include config.mak
TARGET = ../libmltsox$(LIBSUF)
@@ -6,10 +11,6 @@
OBJS = factory.o \
filter_sox.o
-CFLAGS += -I../../
-
-LDFLAGS += -L../../framework -lmlt
-
SRCS := $(OBJS:.o=.c)
all: $(TARGET)
diff -ur mlt.orig/src/modules/sox/configure mlt/src/modules/sox/configure
--- mlt.orig/src/modules/sox/configure 2009-04-18 23:14:36.000000000 +0200
+++ mlt/src/modules/sox/configure 2009-04-19 00:30:01.000000000 +0200
@@ -36,7 +36,7 @@
$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 -ur mlt.orig/src/modules/valerie/Makefile mlt/src/modules/valerie/Makefile
--- mlt.orig/src/modules/valerie/Makefile 2009-04-18 23:14:25.000000000 +0200
+++ mlt/src/modules/valerie/Makefile 2009-04-19 00:35:44.000000000 +0200
@@ -5,9 +5,10 @@
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 -ur mlt.orig/src/modules/vmfx/Makefile mlt/src/modules/vmfx/Makefile
--- mlt.orig/src/modules/vmfx/Makefile 2009-04-18 23:14:36.000000000 +0200
+++ mlt/src/modules/vmfx/Makefile 2009-04-19 00:35:56.000000000 +0200
@@ -11,7 +11,7 @@
CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/modules/westley/Makefile mlt/src/modules/westley/Makefile
--- mlt.orig/src/modules/westley/Makefile 2009-04-18 23:14:26.000000000 +0200
+++ mlt/src/modules/westley/Makefile 2009-04-19 00:37:34.000000000 +0200
@@ -6,12 +6,12 @@
consumer_westley.o \
producer_westley.o
-CFLAGS += -I../../ `xml2-config --cflags`
+CFLAGS += -I../..
+CFLAGS += `xml2-config --cflags`
+LDFLAGS += -L../../framework -lmlt
LDFLAGS += `xml2-config --libs`
-LDFLAGS+=-L../../framework -lmlt
-
SRCS := $(OBJS:.o=.c)
all: $(TARGET)
diff -ur mlt.orig/src/modules/xine/Makefile mlt/src/modules/xine/Makefile
--- mlt.orig/src/modules/xine/Makefile 2009-04-18 23:14:35.000000000 +0200
+++ mlt/src/modules/xine/Makefile 2009-04-19 00:37:51.000000000 +0200
@@ -12,7 +12,7 @@
CFLAGS += -I../../ -DARCH_X86
-LDFLAGS+=-L../../framework -lmlt
+LDFLAGS += -L../../framework -lmlt
SRCS := $(OBJS:.o=.c)
diff -ur mlt.orig/src/tests/Makefile mlt/src/tests/Makefile
--- mlt.orig/src/tests/Makefile 2009-04-18 23:14:24.000000000 +0200
+++ mlt/src/tests/Makefile 2009-04-18 23:38:38.000000000 +0200
@@ -4,7 +4,8 @@
CFLAGS += -I.. $(RDYNAMIC)
-LDFLAGS += -L../framework -L../modules -lmlt
+LDFLAGS += -L../modules
+LDFLAGS += -L../framework -lmlt
all: $(TARGET)
diff -ur mlt.orig/src/valerie/Makefile mlt/src/valerie/Makefile
--- mlt.orig/src/valerie/Makefile 2009-04-18 23:14:25.000000000 +0200
+++ mlt/src/valerie/Makefile 2009-04-18 23:39:05.000000000 +0200
@@ -35,6 +35,7 @@
SRCS := $(OBJS:.o=.c)
CFLAGS += -I.. $(RDYNAMIC)
+
LDFLAGS += -L../framework -lmlt -lpthread
all: $(TARGET)
--- src/CMakeLists.txt.orig 2009-04-22 10:27:27.000000000 +0200
+++ src/CMakeLists.txt 2009-04-22 10:22:47.000000000 +0200
@@ -5,14 +5,14 @@
find_package(Nepomuk REQUIRED)
include_directories (
+ ${LIBMLT_INCLUDE_DIR}
+ ${LIBMLTPLUS_INCLUDE_DIR}
${QDBUS_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
${CMAKE_SOURCE_DIR}/src/widgets
- ${LIBMLT_INCLUDE_DIR}
- ${LIBMLTPLUS_INCLUDE_DIR}
${NEPOMUK_INCLUDES}
)
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Kdenlive-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kdenlive-devel
