[Ffmpeg-cvslog] CVS: ffmpeg common.mak, 1.4, 1.5 configure, 1.267, 1.268

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv23323

Modified Files:
	common.mak configure 
Log Message:
Create shared libraries using versioned filenames and add -rpath-link
to LDFLAGS so linker finds them when using --as-needed (which is default
in some installations).  Using --as-needed is generally a good thing, so
add that explicitly as well.


Index: common.mak
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/common.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- common.mak	27 Apr 2006 03:30:50 -0000	1.4
+++ common.mak	11 May 2006 20:36:00 -0000	1.5
@@ -31,7 +31,10 @@
 	$(AR) rc $@ $^ $(EXTRAOBJS)
 	$(RANLIB) $@
 
-$(SLIBNAME): $(SHARED_OBJS)
+$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
+	ln -sf $^ $@
+
+$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
 	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
 ifeq ($(CONFIG_WIN32),yes)
 	-lib /machine:i386 /def:$(@:.dll=.def)

Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- configure	6 May 2006 10:57:37 -0000	1.267
+++ configure	11 May 2006 20:36:00 -0000	1.268
@@ -228,7 +228,7 @@
 dlfcn="no"
 dlopen="no"
 mpegaudio_hp="yes"
-SHFLAGS='-shared -Wl,-soname,$@.$(LIBMAJOR)'
+SHFLAGS='-shared -Wl,-soname,$@'
 netserver="no"
 need_inet_aton="no"
 protocols="yes"
@@ -383,7 +383,7 @@
 EXESUF=".exe"
 ;;
 Linux)
-LDFLAGS="$LDFLAGS -rdynamic"
+LDFLAGS="$LDFLAGS -rdynamic -Wl,--as-needed -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil"
 ;;
 IRIX*)
 ranlib="echo ignoring ranlib"