Move Darwin shared library build peculiarities to configure.

Originally committed as revision 4838 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index d726704..e983d23 100755 (executable)
--- a/configure
+++ b/configure
@@ -336,7 +336,7 @@ v4l="no"
 audio_oss="no"
 dv1394="no"
 ffserver="no"
-SHFLAGS="-dynamiclib -Wl,-single_module"
+SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(libdir)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION)"
 extralibs=""
 darwin="yes"
 strip="strip -x"

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 5f24dbb..6063dc1 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -392,11 +392,6 @@ ifeq ($(TARGET_ARCH_SPARC64),yes)
 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
 endif
 
-# Darwin specific stuff
-ifeq ($(CONFIG_DARWIN),yes)
-SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBPREF)avcodec$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
-endif
-
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
 OBJS := $(OBJS) $(ASM_OBJS)
 

diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile
index 81d3aaa..d8c7782 100644 (file)
--- a/libavcodec/libpostproc/Makefile
+++ b/libavcodec/libpostproc/Makefile
@@ -1,3 +1,4 @@
+#FIXME: This Makefile differs from all the others for no good reason...
 
 include ../../config.mak
 
@@ -8,11 +9,7 @@ SPPLIBNAME = $(SLIBPREF)postproc$(SLIBSUF)
 SPPLIBMAJOR = $(SPPLIBNAME).$(SPPMAJOR)
 SPPLIB = $(SPPLIBNAME).$(SPPVERSION)
 LIBVERSION = $(SPPLIB)
-ifeq ($(CONFIG_DARWIN),yes)
-SPPLIBMAJOR = $(SLIBPREF)postproc.$(SPPMAJOR)$(SLIBSUF)
-SPPLIB = $(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF)
-SHFLAGS += -Wl,-install_name,$(libdir)/$(SPPLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
-endif
+SLIBNAME = $(SLIBPREF)postproc$(SLIBSUF)
 endif
 PPLIB = $(LIBPREF)postproc$(LIBSUF)
 

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 41927f7..8db1c59 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -83,9 +83,6 @@ ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVFMAJOR)
 SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF)
 AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
-ifeq ($(CONFIG_DARWIN),yes)
-SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
-endif
 endif
 
 SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)

diff --git a/libavutil/Makefile b/libavutil/Makefile
index d27a369..47ce552 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -24,9 +24,6 @@ LIB= $(LIBPREF)avutil$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVUMAJOR)
 SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
-ifeq ($(CONFIG_DARWIN),yes)
-SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
-endif
 endif
 
 all: $(LIB) $(SLIBNAME)

diff --git a/vhook/Makefile b/vhook/Makefile
index 945b4bd..f473a6e 100644 (file)
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -4,8 +4,9 @@ VPATH=$(SRC_PATH)/vhook
 
 CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
 
+#FIXME: This needs to be in configure/config.mak
 ifeq ($(CONFIG_DARWIN),yes)
-       SHFLAGS += -flat_namespace -undefined suppress
+       SHFLAGS = -dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(libdir)/vhook/$@
 endif
 HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
 
@@ -36,11 +37,7 @@ drawtext$(SLIBSUF): drawtext.o
        $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
 
 %$(SLIBSUF): %.o
-ifeq ($(CONFIG_DARWIN),yes)
-       $(CC) $(LDFLAGS) $(SHFLAGS) -Wl,-install_name,$(libdir)/vhook/$@ -g -o $@ $<
-else
        $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
-endif
 
 clean:
        rm -f *.o *.d .depend *$(SLIBSUF) *~