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

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

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

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 \

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)
 {

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

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 */