Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.219
diff -u -r1.219 configure
--- configure	11 Dec 2005 00:45:33 -0000	1.219
+++ configure	13 Dec 2005 16:16:02 -0000
@@ -215,12 +215,12 @@
 dlfcn="no"
 dlopen="no"
 mpegaudio_hp="yes"
-SHFLAGS='-shared -Wl,-soname,$@.$(LIBVERSION)'
+SHFLAGS='-shared -Wl,-soname,$@.$(LIBMAJOR)'
 netserver="no"
 need_inet_aton="no"
 ffserver="yes"
 ffplay="yes"
-LIBOBJFLAGS=""
+LIBOBJFLAGS='$(PIC)'
 LDFLAGS=-Wl,--warn-common
 FFSLDFLAGS=-Wl,-E
 LDCONFIG="ldconfig"
@@ -228,6 +228,8 @@
 LIBSUF=".a"
 SLIBPREF="lib"
 SLIBSUF=".so"
+SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
+SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
 EXESUF=""
 BUILDSUF=""
 amr_nb="no"
@@ -339,6 +341,8 @@
 installstrip=""
 LDFLAGS="-Wl,-dynamic,-search_paths_first"
 SLIBSUF=".dylib"
+SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
+SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
 FFSLDFLAGS=-Wl,-bind_at_load
 ;;
 MINGW32*)
@@ -1465,6 +1467,8 @@
   echo "LAVFVERSION=$lavf_version" >> config.mak
   echo "LAVUMAJOR=${lavu_version/.*/}" >> config.mak
   echo "LAVUVERSION=$lavu_version" >> config.mak
+  echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
+  echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
 fi
 echo "EXTRALIBS=$extralibs" >> config.mak
 version=`grep '#define FFMPEG_VERSION ' "$source_path/libavcodec/avcodec.h" |
Index: libavcodec/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.215
diff -u -r1.215 Makefile
--- libavcodec/Makefile	10 Dec 2005 17:14:23 -0000	1.215
+++ libavcodec/Makefile	13 Dec 2005 16:16:03 -0000
@@ -488,14 +488,20 @@
 	$(CC) -o $@ $^ $(LIBAVUTIL) -lm
 
 ifeq ($(BUILD_SHARED),yes)
-LIBVERSION=$(LAVCMAJOR)
+LIBVERSION=$(LAVCVERSION)
+LIBMAJOR=$(LAVCMAJOR)
+NAME=avcodec
 install: all install-headers
 ifeq ($(CONFIG_WIN32),yes)
 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
 else
 	install -d $(libdir)
-	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
-	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
+		$(libdir)/$(SLIBNAME_WITH_VERSION)
+	ln -sf $(SLIBNAME_WITH_VERSION) \
+		$(libdir)/$(SLIBNAME_WITH_MAJOR)
+	ln -sf $(SLIBNAME_WITH_VERSION) \
+		$(libdir)/$(SLIBNAME)
 	$(LDCONFIG) || true
 endif
 ifeq ($(CONFIG_PP),yes)
Index: libavformat/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
retrieving revision 1.103
diff -u -r1.103 Makefile
--- libavformat/Makefile	10 Dec 2005 17:14:23 -0000	1.103
+++ libavformat/Makefile	13 Dec 2005 16:16:03 -0000
@@ -80,7 +80,9 @@
 
 LIB= $(LIBPREF)avformat$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
-LIBVERSION=$(LAVFMAJOR)
+LIBVERSION=$(LAVFVERSION)
+LIBMAJOR=$(LAVFMAJOR)
+NAME=avformat
 SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF)
 AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
 ifeq ($(CONFIG_DARWIN),yes)
@@ -114,8 +116,12 @@
 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
 else
 	install -d $(libdir)
-	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/$(SLIBPREF)avformat-$(VERSION)$(SLIBSUF)
-	ln -sf $(SLIBPREF)avformat-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
+		$(libdir)/$(SLIBNAME_WITH_VERSION)
+	ln -sf $(SLIBNAME_WITH_VERSION) \
+		$(libdir)/$(SLIBNAME_WITH_MAJOR)
+	ln -sf $(SLIBNAME_WITH_VERSION) \
+		$(libdir)/$(SLIBNAME)
 	$(LDCONFIG) || true
 endif
 else
Index: libavutil/Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- libavutil/Makefile	10 Dec 2005 17:14:24 -0000	1.5
+++ libavutil/Makefile	13 Dec 2005 16:16:05 -0000
@@ -22,7 +22,9 @@
 
 LIB= $(LIBPREF)avutil$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
-LIBVERSION=$(LAVUMAJOR)
+LIBVERSION=$(LAVUVERSION)
+LIBMAJOR=$(LAVUMAJOR)
+NAME=avutil
 SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
 ifeq ($(CONFIG_DARWIN),yes)
 SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
@@ -65,8 +67,12 @@
 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
 else
 	install -d $(libdir)
-	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavutil-$(VERSION)$(SLIBSUF)
-	ln -sf libavutil-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
+		$(libdir)/$(SLIBNAME_WITH_VERSION)
+	ln -sf $(SLIBNAME_WITH_VERSION) \
+		$(libdir)/$(SLIBNAME_WITH_MAJOR)
+	ln -sf $(SLIBNAME_WITH_VERSION) \
+		$(libdir)/$(SLIBNAME)
 	$(LDCONFIG) || true
 endif
 else