+ 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

diff --git a/mlt++/Makefile b/mlt++/Makefile
index ee3444cf1675e2b350a18f688082dcc5a50b0894..7253a719dd361a132c7374507c84db677e04735d 100644 (file)
--- 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 599a217a53b5cdc260996aa1ed648f8612165c9b..030e4ae463674c71312327943c8eef6bcfd85e57 100755 (executable)
--- 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 5d205b80d44897c67ae792bce47d1bed54e8c0b8..72b900f5af1acbccd2f9cd475bb60b4c59fc6944 100644 (file)
--- 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 173b572c43f7cb4c55adc5bb236c8a260cdbe563..1170fdd9d6aa477636a7d95130104faba5df4d8a 100644 (file)
--- a/mlt++/test/Makefile
+++ b/mlt++/test/Makefile
@@ -18,4 +18,6 @@ clean:
        $(RM) play play.o
        $(RM) server server.o
 
+distclean: clean
+
 install: