+ 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/src/framework/Makefile b/src/framework/Makefile
index 9c24a582b509d29f69fe07cf93145264a66caa7c..2a9ac355b7a76abb2eea3f330acdd837768a155a 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -3,6 +3,16 @@ include ../../config.mak
 NAME = libmlt$(LIBSUF)
 TARGET = $(NAME).$(version)
 
+ifneq ($(targetos), Darwin)
+NAME = libmlt$(LIBSUF)
+TARGET = $(NAME).$(version)
+SHFLAGS += -Wl,-soname,$(TARGET)
+else
+NAME = libmlt$(LIBSUF)
+TARGET = libmlt.$(version)$(LIBSUF)
+SHFLAGS += -install_name $(libdir)/$(TARGET)
+endif
+
 OBJS = mlt_frame.o \
           mlt_geometry.o \
           mlt_deque.o \
@@ -51,7 +61,7 @@ SRCS := $(OBJS:.o=.c)
 
 CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\""
 
-LDFLAGS += -Wl,-soname,libmlt.so.$(version) -lm $(LIBDL) -lpthread
+LDFLAGS += -lm $(LIBDL) -lpthread
 
 all:   $(TARGET)
 

diff --git a/src/miracle/Makefile b/src/miracle/Makefile
index 691142d2885f3183f9495b9b638f59fe1a6f89ce..70ae71114429a4412d37e3c4bbe8f32c4fc2cce9 100644 (file)
--- a/src/miracle/Makefile
+++ b/src/miracle/Makefile
@@ -1,8 +1,16 @@
 include ../../config.mak
 
 TARGET = miracle
+
+ifneq ($(targetos), Darwin)
+LIBNAME = libmiracle$(LIBSUF)
+LIBTARGET = $(NAME).$(version)
+SHFLAGS += -Wl,-soname,$(LIBTARGET)
+else
 LIBNAME = libmiracle$(LIBSUF)
-LIBTARGET = $(LIBNAME).$(version)
+LIBTARGET = libmiracle.$(version)$(LIBSUF)
+SHFLAGS += -install_name $(libdir)/$(LIBTARGET)
+endif
 
 APP_OBJS = miracle.o
 
@@ -32,7 +40,7 @@ $(TARGET):    $(APP_OBJS) $(LIBTARGET)
                        $(CC) -o $@ $(APP_OBJS) -L. -lmiracle $(LDFLAGS)
 
 $(LIBTARGET):  $(LIB_OBJS)
-                       $(CC) -Wl,-soname,$(LIBTARGET) $(SHFLAGS) -o $@ $(LIB_OBJS) $(LDFLAGS)
+                       $(CC) $(SHFLAGS) -o $@ $(LIB_OBJS) $(LDFLAGS)
                        ln -sf $(LIBTARGET) $(LIBNAME)
 
 depend:                $(SRCS)

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index f6175794e3774ebcef2d6dfc11442db03b144883..d74c8116b4e6b30c0e5812a298e3dc3da862899c 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -45,7 +45,7 @@ else
        export cvs_ffmpeg=
        export avformat_suffix=
 
-       if [ "$shared_ffmpeg" != "" ]
+       if [ "$shared_ffmpeg" != "" -a -f "$shared_ffmpeg" ]
        then
                # Chop ffmpeg 
                shared_ffmpeg=`dirname $shared_ffmpeg`
@@ -92,7 +92,7 @@ else
                        echo 0
                fi
        else 
-               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$LIBSUF" ]
+               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
                then
                        echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
                        echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak

diff --git a/src/valerie/Makefile b/src/valerie/Makefile
index d7417434a22db3408a8e900bae31e462453d32bb..301918394498368962dd2437b3eeebd94c266636 100644 (file)
--- a/src/valerie/Makefile
+++ b/src/valerie/Makefile
@@ -1,7 +1,14 @@
 include ../../config.mak
 
+ifneq ($(targetos), Darwin)
 NAME = libvalerie$(LIBSUF)
-TARGET = libvalerie$(LIBSUF).$(version)
+TARGET = $(NAME).$(version)
+SHFLAGS += -Wl,-soname,$(TARGET)
+else
+NAME = libvalerie$(LIBSUF)
+TARGET = libvalerie.$(version)$(LIBSUF)
+SHFLAGS += -install_name $(libdir)/$(TARGET)
+endif
 
 OBJS = valerie.o \
           valerie_notifier.o \
@@ -26,7 +33,7 @@ INCS = valerie.h \
 SRCS := $(OBJS:.o=.c)
 
 CFLAGS += -I.. $(RDYNAMIC)
-LDFLAGS += -Wl,-soname,$(TARGET) -L../framework -lmlt -lpthread
+LDFLAGS += -L../framework -lmlt -lpthread
 
 all: $(TARGET)