diff --git a/config.d/versions.m4 b/config.d/versions.m4 index 56e3b9465..2dde3f192 100644 --- a/config.d/versions.m4 +++ b/config.d/versions.m4 @@ -19,3 +19,9 @@ AC_SUBST(NQ_VERSION) AC_SUBST(NQ_QSG_VERSION) AC_SUBST(QW_VERSION) AC_SUBST(QW_QSG_VERSION) + +AC_ARG_ENABLE([version-info], AC_HELP_STRING([--enable-version-info=CURRENT:REVISION:AGE], + [Override the value passed to libtool -version-info.]), + [], [enable_version_info=1:0:0]) +QUAKE_LIBRARY_VERSION_INFO=$enable_version_info +AC_SUBST([QUAKE_LIBRARY_VERSION_INFO]) diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am index 66fb7da98..12e8416e0 100644 --- a/libs/audio/Makefile.am +++ b/libs/audio/Makefile.am @@ -43,12 +43,12 @@ cd_xmms_la_LIBADD= $(XMMS_LIBS) $(top_builddir)/libs/util/libQFutil.la cd_xmms_la_CFLAGS= $(XMMS_CFLAGS) cd_xmms_la_SOURCES= cd_xmms.c -libQFsound_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFsound_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) libQFsound_la_LIBADD= @SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@ $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/engine/libQFgamecode.la libQFsound_la_SOURCES= snd.c snd_progs.c libQFsound_la_DEPENDENCIES= @SND_PLUGIN_STATIC_LIBS@ @SND_REND_STATIC_LIBS@ -libQFcd_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFcd_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) libQFcd_la_LIBADD= @CD_PLUGIN_STATIC_LIBS@ $(top_builddir)/libs/util/libQFutil.la libQFcd_la_SOURCES= cd.c libQFcd_la_DEPENDENCIES= @CD_PLUGIN_STATIC_LIBS@ diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am index 60b3231a7..2a1188fa4 100644 --- a/libs/console/Makefile.am +++ b/libs/console/Makefile.am @@ -16,7 +16,7 @@ common_sources= \ client_sources= bi_inputline.c client.c menu.c pr_keys.c server_sources= server.c -libQFconsole_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) -no-undefined +libQFconsole_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) -no-undefined libQFconsole_la_LIBADD= $(plugin_libadd) $(top_builddir)/libs/util/libQFutil.la libQFconsole_la_SOURCES= $(common_sources) diff --git a/libs/gamecode/engine/Makefile.am b/libs/gamecode/engine/Makefile.am index 54907278c..334910d86 100644 --- a/libs/gamecode/engine/Makefile.am +++ b/libs/gamecode/engine/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFgamecode.la -libQFgamecode_la_LDFLAGS= -version-info 1:0:0 -no-undefined +libQFgamecode_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined libQFgamecode_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la libQFgamecode_la_SOURCES= \ pr_builtins.c pr_edict.c pr_debug.c pr_exec.c pr_load.c pr_parse.c \ diff --git a/libs/gib/Makefile.am b/libs/gib/Makefile.am index c85395b9f..6aada10ad 100644 --- a/libs/gib/Makefile.am +++ b/libs/gib/Makefile.am @@ -4,7 +4,7 @@ INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFgib.la -libQFgib_la_LDFLAGS= -version-info 1:0:0 -no-undefined +libQFgib_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined libQFgib_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la libQFgib_la_SOURCES= \ gib_buffer.c gib_builtin.c gib_classes.c gib_execute.c gib_function.c gib_parse.c gib_handle.c \ diff --git a/libs/image/Makefile.am b/libs/image/Makefile.am index 4625e6996..0891d79c0 100644 --- a/libs/image/Makefile.am +++ b/libs/image/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFimage.la -libQFimage_la_LDFLAGS= -version-info 1:0:0 -no-undefined +libQFimage_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined libQFimage_la_LIBADD= $(PNG_LIBS) $(top_builddir)/libs/util/libQFutil.la libQFimage_la_DEPENDENCIES= libQFimage_la_SOURCES= \ diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am index 9b20ffbeb..e11fb0b2b 100644 --- a/libs/models/Makefile.am +++ b/libs/models/Makefile.am @@ -9,21 +9,21 @@ EXTRA_LTLIBRARIES= libQFmodels_gl.la libQFmodels_sw.la models_sources = clip_hull.c model.c trace.c -libQFmodels_la_LDFLAGS= -version-info 1:0:0 -no-undefined +libQFmodels_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined libQFmodels_la_LIBADD= brush/libbrush.la $(top_builddir)/libs/util/libQFutil.la libQFmodels_la_SOURCES= $(models_sources) null_model.c libQFmodels_la_DEPENDENCIES= brush/libbrush.la gl_LIBS= \ alias/libalias_gl.la brush/libbrush_gl.la sprite/libsprite_gl.la -libQFmodels_gl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFmodels_gl_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) libQFmodels_gl_la_LIBADD= $(gl_LIBS) $(top_builddir)/libs/util/libQFutil.la libQFmodels_gl_la_SOURCES= $(models_sources) gl_model_fullbright.c libQFmodels_gl_la_DEPENDENCIES= $(gl_LIBS) sw_LIBS= \ alias/libalias_sw.la brush/libbrush_sw.la sprite/libsprite_sw.la -libQFmodels_sw_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) -no-undefined +libQFmodels_sw_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) -no-undefined libQFmodels_sw_la_LIBADD= $(sw_LIBS) $(top_builddir)/libs/util/libQFutil.la libQFmodels_sw_la_SOURCES= $(models_sources) libQFmodels_sw_la_DEPENDENCIES= $(sw_LIBS) diff --git a/libs/object/Makefile.am b/libs/object/Makefile.am index 87196d26d..7bb611127 100644 --- a/libs/object/Makefile.am +++ b/libs/object/Makefile.am @@ -4,7 +4,7 @@ INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFobject.la -libQFobject_la_LDFLAGS= -version-info 1:0:0 -no-undefined +libQFobject_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined libQFobject_la_LIBADD= $(top_builddir)/libs/util/libQFutil.la libQFobject_la_SOURCES= \ ArrayList.c Collection.c Double.c Integer.c Iterator.c \ diff --git a/libs/ruamoko/Makefile.am b/libs/ruamoko/Makefile.am index ccf8891ee..c7269c4a5 100644 --- a/libs/ruamoko/Makefile.am +++ b/libs/ruamoko/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFruamoko.la -libQFruamoko_la_LDFLAGS= -version-info 1:0:0 -no-undefined +libQFruamoko_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined libQFruamoko_la_LIBADD= $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/util/libQFutil.la libQFruamoko_la_SOURCES= \ bi_gib.c pr_cmds.c \ diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am index 11eafb74c..97804d64c 100644 --- a/libs/util/Makefile.am +++ b/libs/util/Makefile.am @@ -34,7 +34,7 @@ else getopt= endif -libQFutil_la_LDFLAGS= -version-info 1:0:0 -no-undefined +libQFutil_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -no-undefined libQFutil_la_LIBADD= $(asm) $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS) libQFutil_la_DEPENDENCIES= $(asm) libQFutil_la_SOURCES= \ diff --git a/libs/video/renderer/Makefile.am b/libs/video/renderer/Makefile.am index e49ef89b8..dff00f987 100644 --- a/libs/video/renderer/Makefile.am +++ b/libs/video/renderer/Makefile.am @@ -12,7 +12,7 @@ common_sources= \ r_cvar.c r_efrag.c r_ent.c r_graph.c r_light.c r_main.c \ r_part.c r_progs.c r_screen.c -libQFrenderer_gl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFrenderer_gl_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) libQFrenderer_gl_la_LIBADD= gl/libgl.la libQFrenderer_gl_la_SOURCES= $(common_sources) libQFrenderer_gl_la_DEPENDENCIES= gl/libgl.la @@ -22,7 +22,7 @@ libQFrenderer_sw_la_LIBADD= sw/libsw.la libQFrenderer_sw_la_SOURCES= $(common_sources) libQFrenderer_sw_la_DEPENDENCIES= sw/libsw.la -libQFrenderer_sw32_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFrenderer_sw32_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) libQFrenderer_sw32_la_LIBADD= sw32/libsw32.la libQFrenderer_sw32_la_SOURCES= $(common_sources) libQFrenderer_sw32_la_DEPENDENCIES= sw32/libsw32.la diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am index e3bc2b20b..5eb2fe9a6 100644 --- a/libs/video/targets/Makefile.am +++ b/libs/video/targets/Makefile.am @@ -34,7 +34,7 @@ joy_src= $(joy_null_src) endif endif -libQFjs_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFjs_la_LDFLAGS= -version-info $(QUAKE_LIBRARY_VERSION_INFO) -rpath $(libdir) libQFjs_la_CFLAGS= @PREFER_PIC@ $(JOY_CFLAGS) libQFjs_la_SOURCES= joy.c $(joy_src) EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)