Browse code

correct soname for vhooks

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

Måns Rullgård authored on 2008/04/11 04:44:29
Showing 2 changed files
... ...
@@ -112,6 +112,7 @@ vhook/%.o vhook/%.d: CFLAGS:=$(VHOOKCFLAGS)
112 112
 # vhooks compile fine without libav*, but need them nonetheless.
113 113
 videohook: $(FF_DEP_LIBS) $(HOOKS)
114 114
 
115
+$(eval VHOOKSHFLAGS=$(VHOOKSHFLAGS))
115 116
 vhook/%$(SLIBSUF): vhook/%.o
116 117
 	$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
117 118
 
... ...
@@ -924,7 +924,7 @@ enable stripping
924 924
 vhook="default"
925 925
 
926 926
 # build settings
927
-SHFLAGS='-shared -Wl,-soname,$(SLIBNAME_WITH_MAJOR)'
927
+SHFLAGS='-shared -Wl,-soname,$$(@F)'
928 928
 VHOOKSHFLAGS='$(SHFLAGS)'
929 929
 LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
930 930
 FFSERVERLDFLAGS=-Wl,-E
... ...
@@ -1077,7 +1077,7 @@ case $target_os in
1077 1077
         fi ;;
1078 1078
     sunos)
1079 1079
         FFSERVERLDFLAGS=""
1080
-        SHFLAGS='-shared -Wl,-h,$(SLIBNAME_WITH_MAJOR)'
1080
+        SHFLAGS='-shared -Wl,-h,$$(@F)'
1081 1081
         network_extralibs="-lsocket -lnsl"
1082 1082
         ;;
1083 1083
     netbsd)
... ...
@@ -1104,7 +1104,7 @@ case $target_os in
1104 1104
     darwin)
1105 1105
         disable need_memalign
1106 1106
         SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress'
1107
-        VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$$@'
1107
+        VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$$(@F)'
1108 1108
         strip="strip -x"
1109 1109
         FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
1110 1110
         SLIBSUF=".dylib"