qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 23:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of plugin versioning (again).

Browse source 
automake needs -avoid-version to be in Makefile.am, otherwise it doesn't
make libtool do the right thing...or something. My head hurts. ;)
This commit is contained in:
Jeff Teunissen 2010-12-25 04:45:39 -05:00
parent 7161000e10
commit 9defba8d92
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.d/build_control.m4
View file

@ -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=""

3
libs/audio/Makefile.am
View file

@ -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=

3
libs/audio/renderer/Makefile.am
View file

@ -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=

3
libs/audio/targets/Makefile.am
View file

@ -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=

3
libs/console/Makefile.am
View file

@ -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=