From 29adc5c3397bb05c920672a665b5d50b95680f7d Mon Sep 17 00:00:00 2001
From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Mon, 5 Dec 2005 11:40:21 +0000
Subject: [PATCH] + MLT++ updates for 0.2.1 - distclean corrected, soname
 usage in linking

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@875 d19143bc-622f-0410-bfdd-b5b2a6649095
---
 mlt++/Makefile      |    2 +-
 mlt++/configure     |    3 ++-
 mlt++/src/Makefile  |   15 +++++++++------
 mlt++/test/Makefile |    2 ++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/mlt++/Makefile b/mlt++/Makefile
index ee3444c..7253a71 100644
--- a/mlt++/Makefile
+++ b/mlt++/Makefile
@@ -1,4 +1,4 @@
-all clean dist-clean install:
+all clean distclean install:
 	$(MAKE) DESTDIR=$(DESTDIR) -C src $@ 
 	$(MAKE) -C test $@ 
 
diff --git a/mlt++/configure b/mlt++/configure
index 599a217..030e4ae 100755
--- a/mlt++/configure
+++ b/mlt++/configure
@@ -25,7 +25,8 @@ done
 # Sanity check
 [ ! -d "$prefix" ] && echo "Invalid prefix $prefix - aborting" && exit 1
 
-echo "prefix=$prefix" > config.mak
+echo "version=`mlt-config --version`" > config.mak
+echo "prefix=$prefix" >> config.mak
 echo "libdir=$libdir" >> config.mak
 
 targetos=$(uname -s)
diff --git a/mlt++/src/Makefile b/mlt++/src/Makefile
index 5d205b8..72b900f 100644
--- a/mlt++/src/Makefile
+++ b/mlt++/src/Makefile
@@ -1,7 +1,8 @@
 include ../config.mak
 INSTALL = install
 
-TARGET = libmlt++$(LIBSUF)
+NAME = libmlt++$(LIBSUF)
+TARGET = $(NAME).$(version)
 
 OBJS = MltConsumer.o \
 	   MltDeque.o \
@@ -26,22 +27,24 @@ OBJS = MltConsumer.o \
 	   MltTransition.o
 
 SRCS = $(OBJS:.o=.cpp)
-
 HEADERS = Mlt.h $(OBJS:.o=.h)
-
-CC=g++
+LDFLAGS += -Wl,-soname,$(TARGET)
 
 all:		$(TARGET)
 
 $(TARGET):	$(OBJS)
-	$(CC) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+	$(CXX) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS)
+	ln -sf $(TARGET) $(NAME)
 
 clean:
-	$(RM) $(OBJS) $(TARGET)
+	$(RM) $(OBJS) $(TARGET) $(NAME)
+
+distclean:	clean
 
 install:
 	$(INSTALL) -d "$(DESTDIR)$(libdir)"
 	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(libdir)
+	ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME)
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/include/mlt++"
 	$(INSTALL) -m 644 $(HEADERS) "$(DESTDIR)$(prefix)/include/mlt++"
 	/sbin/ldconfig || true
diff --git a/mlt++/test/Makefile b/mlt++/test/Makefile
index 173b572..1170fdd 100644
--- a/mlt++/test/Makefile
+++ b/mlt++/test/Makefile
@@ -18,4 +18,6 @@ clean:
 	$(RM) play play.o
 	$(RM) server server.o
 
+distclean: clean
+
 install:
-- 
1.7.4.4