Nuke the engine dicrectory from gamecode.

Not the contents, of course :) Anyway, finally, that totally useless
directory is gone.

config.d/ac_config_files.m4

@@ -10,7 +10,6 @@
 	libs/audio/test/Makefile
 	libs/console/Makefile
 	libs/gamecode/Makefile
-	libs/gamecode/engine/Makefile
 	libs/gib/Makefile
 	libs/image/Makefile
 	libs/models/Makefile

config.d/build_control.m4

@@ -553,7 +553,7 @@ QF_DEPS(QFBSP,
 )
 QF_DEPS(QFCC,
 	[-I$(top_srcdir)/tools/qfcc/include],
-	[$(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la],
+	[$(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la],
 	[$(WIN32_LIBS)],
 )
 QF_DEPS(QFLIGHT,
@@ -578,7 +578,7 @@ QF_DEPS(QFVIS,
 )
 QF_DEPS(QWAQ,
 	[],
-	[$(top_builddir)/libs/ruamoko/libQFruamoko.la $(top_builddir)/libs/gamecode/engine/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/gib/libQFgib.la $(top_builddir)/libs/util/libQFutil.la],
 	[$(WIN32_LIBS)],
 )
 QF_DEPS(CARNE,

libs/audio/Makefile.am

@@ -46,7 +46,7 @@ cd_xmms_la_SOURCES=	cd_xmms.c
 sound_libs= \
 	@SND_PLUGIN_STATIC_LIBS@ \
 	@SND_REND_STATIC_LIBS@ \
-	$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
+	$(top_builddir)/libs/gamecode/libQFgamecode.la \
 	$(top_builddir)/libs/util/libQFutil.la
 
 cd_libs= \

libs/audio/test/Makefile.am

@@ -7,5 +7,5 @@ noinst_PROGRAMS= @AUDIO_TARGETS@
 EXTRA_PROGRAMS= testsound
 
 testsound_SOURCES= testsound.c
-testsound_LDADD= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/gamecode/engine/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la
+testsound_LDADD= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la
 testsound_DEPENDENCIES= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/util/libQFutil.la

libs/gamecode/Makefile.am

@@ -1,6 +1,12 @@
 AUTOMAKE_OPTIONS= foreign
 
-SUBDIRS=	engine
+AM_CFLAGS= @PREFER_PIC@
+INCLUDES= -I$(top_srcdir)/include
 
-clean-local:
-	rm -f *.a
+lib_LTLIBRARIES=	libQFgamecode.la
+
+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 \
+		pr_opcode.c pr_resolve.c pr_resource.c pr_strings.c pr_zone.c

libs/gamecode/engine/Makefile.am

@@ -1,12 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-INCLUDES= -I$(top_srcdir)/include
-
-lib_LTLIBRARIES=	libQFgamecode.la
-
-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 \
-		pr_opcode.c pr_resolve.c pr_resource.c pr_strings.c pr_zone.c

libs/ruamoko/Makefile.am

@@ -6,7 +6,7 @@ INCLUDES= -I$(top_srcdir)/include
 lib_LTLIBRARIES= libQFruamoko.la
 
 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_LIBADD=		$(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/gib/libQFgib.la $(top_builddir)/libs/util/libQFutil.la
 libQFruamoko_la_SOURCES= \
 		bi_gib.c pr_cmds.c \
 		rua_cbuf.c rua_cmd.c rua_cvar.c rua_file.c rua_hash.c rua_init.c \

nq/source/Makefile.am

@@ -67,7 +67,7 @@ common_LIBFILES= \
 		$(top_builddir)/libs/image/libQFimage.la \
 		$(top_builddir)/libs/gib/libQFgib.la \
 		$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-		$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
+		$(top_builddir)/libs/gamecode/libQFgamecode.la \
 		$(top_builddir)/libs/util/libQFutil.la
 
 client_LIBS=	$(client_LIBFILES) $(common_LIBFILES)

qw/source/Makefile.am

@@ -74,7 +74,7 @@ qw_server_LIBS= \
 		$(top_builddir)/libs/ruamoko/libQFruamoko.la \
 		$(top_builddir)/libs/models/libQFmodels.la \
 		$(top_builddir)/libs/image/libQFimage.la \
-		$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
+		$(top_builddir)/libs/gamecode/libQFgamecode.la \
 		$(top_builddir)/libs/console/libQFconsole.la \
 		$(top_builddir)/libs/gib/libQFgib.la \
 		$(top_builddir)/libs/util/libQFutil.la
@@ -97,7 +97,7 @@ qw_client_LIBS= \
 		$(top_builddir)/libs/net/libnet_chan.la \
 		$(top_builddir)/libs/console/libQFconsole.la \
 		$(top_builddir)/libs/video/targets/libQFjs.la \
-		$(top_builddir)/libs/gamecode/engine/libQFgamecode.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 \