[FFmpeg-cvslog] r12785 - in trunk: Makefile configure
mru
subversion
Thu Apr 10 21:44:29 CEST 2008
Author: mru
Date: Thu Apr 10 21:44:29 2008
New Revision: 12785
Log:
correct soname for vhooks
Modified:
trunk/Makefile
trunk/configure
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Apr 10 21:44:29 2008
@@ -112,6 +112,7 @@ vhook/%.o vhook/%.d: CFLAGS:=$(VHOOKCFLA
# vhooks compile fine without libav*, but need them nonetheless.
videohook: $(FF_DEP_LIBS) $(HOOKS)
+$(eval VHOOKSHFLAGS=$(VHOOKSHFLAGS))
vhook/%$(SLIBSUF): vhook/%.o
$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Apr 10 21:44:29 2008
@@ -924,7 +924,7 @@ enable stripping
vhook="default"
# build settings
-SHFLAGS='-shared -Wl,-soname,$(SLIBNAME_WITH_MAJOR)'
+SHFLAGS='-shared -Wl,-soname,$$(@F)'
VHOOKSHFLAGS='$(SHFLAGS)'
LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
FFSERVERLDFLAGS=-Wl,-E
@@ -1077,7 +1077,7 @@ case $target_os in
fi ;;
sunos)
FFSERVERLDFLAGS=""
- SHFLAGS='-shared -Wl,-h,$(SLIBNAME_WITH_MAJOR)'
+ SHFLAGS='-shared -Wl,-h,$$(@F)'
network_extralibs="-lsocket -lnsl"
;;
netbsd)
@@ -1104,7 +1104,7 @@ case $target_os in
darwin)
disable need_memalign
SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress'
- VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$$@'
+ VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$$(@F)'
strip="strip -x"
FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
SLIBSUF=".dylib"
More information about the ffmpeg-cvslog
mailing list