From 7a8f91edda47a70541ffad2c764b5f6b5ffbd5b6 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 9 Feb 2012 09:56:46 +0900
Subject: [PATCH] Move bi_gib.c from ruamoko to gib.

This makes gib depend on gamecode, but removes the dependency on gib from
ruamoko. Unfortunately, carne now needs to be linked against gamecode even
though it never uses it.
---
 config.d/build_control.m4      |  4 ++--
 libs/Makefile.am               |  5 +++--
 libs/gib/Makefile.am           |  5 ++++-
 libs/{ruamoko => gib}/bi_gib.c |  0
 libs/gib/gib_init.c            | 10 +++++++---
 libs/ruamoko/Makefile.am       |  3 +--
 libs/ruamoko/pr_cmds.c         |  5 -----
 7 files changed, 17 insertions(+), 15 deletions(-)
 rename libs/{ruamoko => gib}/bi_gib.c (100%)

diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 37d22ee61..2ac54ab8f 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -550,12 +550,12 @@ QF_DEPS(QFVIS,
 )
 QF_DEPS(QWAQ,
 	[],
-	[$(top_builddir)/libs/ruamoko/libQFruamoko.la $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/util/libQFutil.la],
+	[$(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/util/libQFutil.la],
+	[$(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la],
 	[$(WIN32_LIBS)],
 )
 QF_DEPS(PAK,
diff --git a/libs/Makefile.am b/libs/Makefile.am
index 562d2f1b1..b1fb688c5 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -1,10 +1,11 @@
 AUTOMAKE_OPTIONS= foreign
 
 # everything depends on util
-# ruamoko depends on gamecode and gib
+# ruamoko depends on gamecode
+# gib depends on gamecode
 # audio depends on gamecode
 # models depends on image
 # video depends on models(?), image(?) and gamecode
 # console depends on video, ruamoko and audio
-SUBDIRS=util gib gamecode ruamoko image models audio video console \
+SUBDIRS=util gamecode gib ruamoko image models audio video console \
 		net qw
diff --git a/libs/gib/Makefile.am b/libs/gib/Makefile.am
index 89874fd9c..824f60cf0 100644
--- a/libs/gib/Makefile.am
+++ b/libs/gib/Makefile.am
@@ -5,7 +5,9 @@ INCLUDES= -I$(top_srcdir)/include
 lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
 			-rpath $(libdir) -no-undefined
 
-gib_deps=$(top_builddir)/libs/util/libQFutil.la
+gib_deps= \
+	$(top_builddir)/libs/gamecode/libQFgamecode.la \
+	$(top_builddir)/libs/util/libQFutil.la
 
 lib_LTLIBRARIES= libQFgib.la
 
@@ -13,6 +15,7 @@ libQFgib_la_LDFLAGS=		$(lib_ldflags)
 libQFgib_la_LIBADD=			$(gib_deps)
 libQFgib_la_DEPENDENCIES=	$(gib_deps)
 libQFgib_la_SOURCES= \
+	bi_gib.c \
 	gib_buffer.c gib_builtin.c gib_classes.c gib_execute.c gib_function.c \
 	gib_parse.c gib_handle.c  gib_object.c gib_process.c gib_regex.c \
 	gib_thread.c gib_vars.c gib_init.c gib_tree.c \
diff --git a/libs/ruamoko/bi_gib.c b/libs/gib/bi_gib.c
similarity index 100%
rename from libs/ruamoko/bi_gib.c
rename to libs/gib/bi_gib.c
diff --git a/libs/gib/gib_init.c b/libs/gib/gib_init.c
index b4cb0bb26..63803f76b 100644
--- a/libs/gib/gib_init.c
+++ b/libs/gib/gib_init.c
@@ -32,9 +32,7 @@
 # include "config.h"
 #endif
 
-static __attribute__ ((used))
-const char  rcsid[] =
-	"$Id$";
+static __attribute__ ((used)) const char  rcsid[] = "$Id$";
 
 #include <string.h>
 #include <stdlib.h>
@@ -56,6 +54,12 @@ const char  rcsid[] =
 #include "gib_handle.h"
 #include "gib_object.h"
 
+#include "QF/csqc.h"
+#define U __attribute__ ((used))
+static U void (*const gib_progs_init)(struct progs_s *) = GIB_Progs_Init;
+#undef U
+
+
 static void
 GIB_Exec_Override_f (void)
 {
diff --git a/libs/ruamoko/Makefile.am b/libs/ruamoko/Makefile.am
index ddbc598b2..36847ff1c 100644
--- a/libs/ruamoko/Makefile.am
+++ b/libs/ruamoko/Makefile.am
@@ -7,7 +7,6 @@ lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
 			-rpath $(libdir) -no-undefined
 rua_libs= \
 	$(top_builddir)/libs/gamecode/libQFgamecode.la \
-	$(top_builddir)/libs/gib/libQFgib.la \
 	$(top_builddir)/libs/util/libQFutil.la
 
 lib_LTLIBRARIES= libQFruamoko.la
@@ -16,7 +15,7 @@ libQFruamoko_la_LDFLAGS=		$(lib_ldflags)
 libQFruamoko_la_LIBADD=			$(rua_libs)
 libQFruamoko_la_DEPENDENCIES=	$(rua_libs)
 libQFruamoko_la_SOURCES= \
-		bi_gib.c pr_cmds.c \
+		pr_cmds.c \
 		rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \
 		rua_math.c rua_msgbuf.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c \
 		rua_script.c rua_string.c
diff --git a/libs/ruamoko/pr_cmds.c b/libs/ruamoko/pr_cmds.c
index 52dd7f139..5676c5a2e 100644
--- a/libs/ruamoko/pr_cmds.c
+++ b/libs/ruamoko/pr_cmds.c
@@ -52,11 +52,6 @@ static __attribute__ ((used)) const char rcsid[] =
 
 #include "compat.h"
 
-#include "QF/csqc.h"
-#define U __attribute__ ((used))
-static U void (*const gib_progs_init)(progs_t *) = GIB_Progs_Init;
-#undef U
-
 VISIBLE const char *pr_gametype = "";
 
 /* BUILT-IN FUNCTIONS */