From 9defba8d928d156d3ef458fd4fe42024004eedee Mon Sep 17 00:00:00 2001
From: Jeff Teunissen <deek@d2dc.net>
Date: Sat, 25 Dec 2010 04:45:39 -0500
Subject: [PATCH] Get rid of plugin versioning (again).

automake needs -avoid-version to be in Makefile.am, otherwise it doesn't
make libtool do the right thing...or something. My head hurts. ;)
---
 config.d/build_control.m4       | 4 ++--
 libs/audio/Makefile.am          | 3 +--
 libs/audio/renderer/Makefile.am | 3 +--
 libs/audio/targets/Makefile.am  | 3 +--
 libs/console/Makefile.am        | 3 +--
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 5290c4a7f..89399e942 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -420,12 +420,12 @@ if test "x$static_plugins" = xyes; then
 	fi
 	plugin_ldflags="$plugin_ldflags"
 else
-	plugin_ldflags="$plugin_ldflags"' -version-info $(plugin_version) -rpath $(plugindir)'
+	plugin_ldflags="$plugin_ldflags"
 fi
 
 dnl Do not use -module here, it belongs in makefile.am due to automake
 dnl needing it there to work correctly
-plugin_ldflags="$plugin_ldflags -avoid-version"
+plugin_ldflags="$plugin_ldflags"
 SERVER_PLUGIN_STATIC_LIBS=""
 CLIENT_PLUGIN_STATIC_LIBS=""
 CD_PLUGIN_STATIC_LIBS=""
diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am
index c6c18e158..f8e8b78bb 100644
--- a/libs/audio/Makefile.am
+++ b/libs/audio/Makefile.am
@@ -5,8 +5,7 @@ CFLAGS+= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 SDL_LIBS= @SDL_LIBS@
 XMMS_LIBS= @XMMS_LIBS@
-plugin_version= 1:0:0
-plugin_ldflags= @plugin_ldflags@ -module -rpath $(plugindir)
+plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
 plugin_libadd= @plugin_libadd@
 EXEEXT=
 
diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am
index ba1cc7cff..1fd80b973 100644
--- a/libs/audio/renderer/Makefile.am
+++ b/libs/audio/renderer/Makefile.am
@@ -2,8 +2,7 @@ AUTOMAKE_OPTIONS= foreign
 
 CFLAGS+= @PREFER_PIC@ @VORBIS_CFLAGS@ @OGG_CFLAGS@
 INCLUDES= -I$(top_srcdir)/include
-plugin_version= 1:0:0
-plugin_ldflags= @plugin_ldflags@ -module -rpath $(plugindir)
+plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
 plugin_libadd= @plugin_libadd@
 EXEEXT=
 
diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am
index 7cc8aa48b..4edcd5ccd 100644
--- a/libs/audio/targets/Makefile.am
+++ b/libs/audio/targets/Makefile.am
@@ -3,8 +3,7 @@ AUTOMAKE_OPTIONS= foreign
 CFLAGS+= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
 SDL_LIBS = @SDL_LIBS@
-plugin_version= 1:0:0
-plugin_ldflags= @plugin_ldflags@ -module -rpath $(plugindir)
+plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
 plugin_libadd= @plugin_libadd@
 EXEEXT=
 
diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am
index 223ee627e..26f3bd52a 100644
--- a/libs/console/Makefile.am
+++ b/libs/console/Makefile.am
@@ -2,8 +2,7 @@ AUTOMAKE_OPTIONS= foreign
 
 CFLAGS+= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
-plugin_version= 1:0:0
-plugin_ldflags= @plugin_ldflags@ -module -rpath $(plugindir)
+plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
 plugin_libadd= @plugin_libadd@
 EXEEXT=