From: hyc Date: Mon, 9 Aug 2010 21:46:31 +0000 (+0000) Subject: Fixes for Darwin - use dylib, not bundle for shared lib X-Git-Tag: v2.4~23 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13798268e10fc8c56eecf5fce297375f7fca1526;p=rtmpdump Fixes for Darwin - use dylib, not bundle for shared lib git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@547 400ebc74-4327-4243-bc38-086b20814532 --- diff --git a/Makefile b/Makefile index fda3c74..c322e9a 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ MANDIR=$(DESTDIR)$(mandir) LIBS_posix= LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 -LIBS=-L librtmp -lrtmp $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) +LIBS=-Llibrtmp -lrtmp $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) THREADLIB_posix=-lpthread THREADLIB_darwin=-lpthread diff --git a/librtmp/Makefile b/librtmp/Makefile index 2fd5869..a4bf67e 100644 --- a/librtmp/Makefile +++ b/librtmp/Makefile @@ -26,13 +26,14 @@ CRYPTO_LIB=$(LIB_$(CRYPTO)) $(LIBS_$(SYS)) CRYPTO_REQ=$(REQ_$(CRYPTO)) CRYPTO_DEF=$(DEF_$(CRYPTO)) -SO_posix=so.0 -SO_darwin=so.0 +SO_VERSION=0 +SO_posix=so.$(SO_VERSION) +SO_darwin=$(SO_VERSION).dylib SO_mingw=dll SO_EXT=$(SO_$(SYS)) SO_LDFLAGS_posix=-shared -Wl,-soname,$@ -SO_LDFLAGS_darwin=-bundle -flat_namespace -undefined suppress -fno-common \ +SO_LDFLAGS_darwin=-dynamiclib -flat_namespace -undefined suppress -fno-common \ -headerpad_max_install_names SO_LDFLAGS_mingw= SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) @@ -92,9 +93,13 @@ install_base: librtmp.a librtmp.pc cp librtmp.pc $(LIBDIR)/pkgconfig cp librtmp.3 $(MANDIR)/man3 -install_so.0: librtmp.so.0 - cp librtmp.so.0 $(LIBDIR) - cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so +install_so.$(SO_VERSION): librtmp.$(SO_EXT) + cp librtmp.$(SO_EXT) $(LIBDIR) + cd $(LIBDIR); ln -sf librtmp.$(SO_EXT) librtmp.so + +install_$(SO_VERSION).dylib: librtmp.$(SO_EXT) + cp librtmp.$(SO_EXT) $(LIBDIR) + cd $(LIBDIR); ln -sf librtmp.$(SO_EXT) librtmp.dylib install_dll: librtmp.dll cp librtmp.dll $(BINDIR)