From 3cb4cb59b54fc1459395506be73d5f0bdb2b704f Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 13 Feb 2012 15:05:31 +0900 Subject: [PATCH] Link QFgamecode directly into QFruamoko. First step in the library "merge down". QFgamecode is now a convenience library. The only things that mention it directly now are ruamoko and qfcc. --- config.d/build_control.m4 | 3 +-- libs/Makefile.am | 6 +++--- libs/audio/Makefile.am | 2 +- libs/audio/test/Makefile.am | 3 +-- libs/console/Makefile.am | 2 +- libs/gamecode/Makefile.am | 5 ++--- libs/gib/Makefile.am | 2 +- nq/source/Makefile.am | 1 - qw/source/Makefile.am | 14 ++++++-------- 9 files changed, 16 insertions(+), 22 deletions(-) diff --git a/config.d/build_control.m4 b/config.d/build_control.m4 index dfa14cff3..e559c2f22 100644 --- a/config.d/build_control.m4 +++ b/config.d/build_control.m4 @@ -465,14 +465,13 @@ QF_DEPS(QFVIS, QF_DEPS(QWAQ, [], [$(top_builddir)/libs/ruamoko/libQFruamoko.la - $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la], [$(WIN32_LIBS)], ) QF_DEPS(CARNE, [], [$(top_builddir)/libs/gib/libQFgib.la - $(top_builddir)/libs/gamecode/libQFgamecode.la + $(top_builddir)/libs/ruamoko/libQFruamoko.la $(top_builddir)/libs/util/libQFutil.la], [$(WIN32_LIBS)], ) diff --git a/libs/Makefile.am b/libs/Makefile.am index b1fb688c5..6843e9e79 100644 --- a/libs/Makefile.am +++ b/libs/Makefile.am @@ -2,10 +2,10 @@ AUTOMAKE_OPTIONS= foreign # everything depends on util # ruamoko depends on gamecode -# gib depends on gamecode +# gib depends on ruamoko # audio depends on gamecode # models depends on image -# video depends on models(?), image(?) and gamecode +# video depends on models(?), image(?) and ruamoko # console depends on video, ruamoko and audio -SUBDIRS=util gamecode gib ruamoko image models audio video console \ +SUBDIRS=util gamecode ruamoko gib image models audio video console \ net qw diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am index 9eef52ffd..bdff7edea 100644 --- a/libs/audio/Makefile.am +++ b/libs/audio/Makefile.am @@ -59,7 +59,7 @@ cd_xmms_la_SOURCES= cd_xmms.c sound_libs= \ @snd_output_static_plugin_libs@ \ @snd_render_static_plugin_libs@ \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ + $(top_builddir)/libs/ruamoko/libQFruamoko.la \ $(top_builddir)/libs/util/libQFutil.la cd_libs= \ diff --git a/libs/audio/test/Makefile.am b/libs/audio/test/Makefile.am index 72cbb63d1..ebee1ef13 100644 --- a/libs/audio/test/Makefile.am +++ b/libs/audio/test/Makefile.am @@ -8,8 +8,7 @@ EXTRA_PROGRAMS= testsound test_libs= \ $(top_builddir)/libs/audio/libQFsound.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ + $(top_builddir)/libs/ruamoko/libQFruamoko.la \ $(top_builddir)/libs/util/libQFutil.la testsound_SOURCES= testsound.c diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am index 6d3a3091f..00cef5c5c 100644 --- a/libs/console/Makefile.am +++ b/libs/console/Makefile.am @@ -23,7 +23,7 @@ client_deps= libQFconsole.la \ $(top_builddir)/libs/audio/libQFsound.la \ $(top_builddir)/libs/ruamoko/libQFruamoko.la \ $(top_builddir)/libs/gib/libQFgib.la \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ + $(top_builddir)/libs/ruamoko/libQFruamoko.la \ $(console_deps) server_deps= libQFconsole.la $(console_deps) diff --git a/libs/gamecode/Makefile.am b/libs/gamecode/Makefile.am index a1fba7dee..3222ff473 100644 --- a/libs/gamecode/Makefile.am +++ b/libs/gamecode/Makefile.am @@ -2,12 +2,11 @@ AUTOMAKE_OPTIONS= foreign AM_CFLAGS= @PREFER_PIC@ INCLUDES= -I$(top_srcdir)/include -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined +lib_ldflags= gc_deps=$(top_builddir)/libs/util/libQFutil.la -lib_LTLIBRARIES= libQFgamecode.la +noinst_LTLIBRARIES= libQFgamecode.la libQFgamecode_la_LDFLAGS= $(lib_ldflags) libQFgamecode_la_LIBADD= $(gc_deps) diff --git a/libs/gib/Makefile.am b/libs/gib/Makefile.am index 824f60cf0..58f6433ff 100644 --- a/libs/gib/Makefile.am +++ b/libs/gib/Makefile.am @@ -6,7 +6,7 @@ lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ -rpath $(libdir) -no-undefined gib_deps= \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ + $(top_builddir)/libs/ruamoko/libQFruamoko.la \ $(top_builddir)/libs/util/libQFutil.la lib_LTLIBRARIES= libQFgib.la diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am index 333ef1fad..f838a905f 100644 --- a/nq/source/Makefile.am +++ b/nq/source/Makefile.am @@ -67,7 +67,6 @@ common_LIBFILES= \ $(top_builddir)/libs/image/libQFimage.la \ $(top_builddir)/libs/gib/libQFgib.la \ $(top_builddir)/libs/ruamoko/libQFruamoko.la \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ $(top_builddir)/libs/util/libQFutil.la client_LIBS= $(client_LIBFILES) $(common_LIBFILES) diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index 53c22d6bd..2ae0c7e9a 100644 --- a/qw/source/Makefile.am +++ b/qw/source/Makefile.am @@ -72,12 +72,11 @@ qw_server_LIBS= \ @server_static_plugin_libs@ \ $(top_builddir)/libs/qw/libqw.a \ $(top_builddir)/libs/net/libnet_chan.la \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la \ $(top_builddir)/libs/models/libQFmodels.la \ $(top_builddir)/libs/image/libQFimage.la \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ - $(top_builddir)/libs/console/libQFconsole.la \ $(top_builddir)/libs/gib/libQFgib.la \ + $(top_builddir)/libs/ruamoko/libQFruamoko.la \ + $(top_builddir)/libs/console/libQFconsole.la \ $(top_builddir)/libs/util/libQFutil.la qw_server_deps=libqw_server.a libqw_common.a $(qw_server_LIBS) @@ -93,20 +92,19 @@ qw_master_DEPENDENCIES= $(qw_master_deps) qw_master_LDFLAGS= $(common_ldflags) cl_plugin_LIBS= \ - @client_static_plugin_libs@ \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la + @client_static_plugin_libs@ qw_client_LIBS= \ $(top_builddir)/libs/qw/libqw.a \ $(top_builddir)/libs/net/libnet_chan.la \ $(top_builddir)/libs/console/libQFconsole.la \ $(top_builddir)/libs/video/targets/libQFjs.la \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ $(top_builddir)/libs/audio/libQFcd.la \ $(top_builddir)/libs/audio/libQFsound.la \ $(top_builddir)/libs/image/libQFimage.la \ - $(top_builddir)/libs/util/libQFutil.la \ - $(top_builddir)/libs/gib/libQFgib.la + $(top_builddir)/libs/gib/libQFgib.la \ + $(top_builddir)/libs/ruamoko/libQFruamoko.la \ + $(top_builddir)/libs/util/libQFutil.la client_LIBS= $(qw_client_LIBS) client_libs= libqw_client.a libqw_common.a