+ Fix for Darwin and soname logic

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt++@878 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/mlt++/configure b/mlt++/configure
index 030e4ae463674c71312327943c8eef6bcfd85e57..f93620c3dfe5f0c1877ae1bc5f9069610b4c8e68 100755 (executable)
--- a/mlt++/configure
+++ b/mlt++/configure
@@ -30,13 +30,14 @@ echo "prefix=$prefix" >> config.mak
 echo "libdir=$libdir" >> config.mak
 
 targetos=$(uname -s)
+echo "targetos=$targetos" >> config.mak
 
 case $targetos in 
        Darwin)
                echo LIBSUF=.dylib
         echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC `mlt-config --cflags`"
-               echo "LIBFLAGS=-dynamiclib"
-        echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs` -single_module"
+               echo "LIBFLAGS=-dynamiclib -single_module"
+        echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs`"
                ;;
        Linux)
                echo LIBSUF=.so

diff --git a/mlt++/src/Makefile b/mlt++/src/Makefile
index 72b900f5af1acbccd2f9cd475bb60b4c59fc6944..eb7e69e48fab9c867f4b96e470c63fdd6d2ab232 100644 (file)
--- a/mlt++/src/Makefile
+++ b/mlt++/src/Makefile
@@ -1,8 +1,15 @@
 include ../config.mak
 INSTALL = install
 
+ifneq ($(targetos), Darwin)
 NAME = libmlt++$(LIBSUF)
 TARGET = $(NAME).$(version)
+LIBFLAGS += -Wl,-soname,$(TARGET)
+else
+NAME = libmlt++$(LIBSUF)
+TARGET = libmlt++.$(version)$(LIBSUF)
+LIBFLAGS += -install_name $(libdir)/$(TARGET)
+endif
 
 OBJS = MltConsumer.o \
           MltDeque.o \
@@ -28,7 +35,6 @@ OBJS = MltConsumer.o \
 
 SRCS = $(OBJS:.o=.cpp)
 HEADERS = Mlt.h $(OBJS:.o=.h)
-LDFLAGS += -Wl,-soname,$(TARGET)
 
 all:           $(TARGET)