[build] Move to non-recursive make

There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2025-04-12 20:35:48 +00:00 · 2020-06-21 23:15:17 +09:00 · 2020-06-21 23:15:17 +09:00 · 6d5ffa9f8e
commit 6d5ffa9f8e
parent df89e37afc
535 changed files with 4528 additions and 64841 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,15 +1,9 @@
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign

 ACLOCAL_AMFLAGS = -I m4

-SUBDIRS=desktop pkg-config include @top_dirs@
-DIST_SUBDIRS=desktop pkg-config include \
-			 libs hw nq qtv qw tools ruamoko\
-			 RPM debian doc vc2005 vc2008
-
-## configure.ac needs to be listed here for older autoconfs
-EXTRA_DIST=	ChangeLog configure.ac bootstrap \
+EXTRA_DIST = \
+		ChangeLog configure.ac bootstrap \
 		$(top_srcdir)/.version \
 		config.d/git-version-gen \
 		tools/cross/droid/cross-configure.sh \
@ -26,9 +20,109 @@ EXTRA_DIST=	ChangeLog configure.ac bootstrap \
 		tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \
 		tools/gas2masm/gas2masm.mak tools/gas2masm/gas2masm.mdp

-NOCONV_DIST=	$(distdir)/include/win32/resources/icon1Vista.ico \
+NOCONV_DIST= \
+	$(distdir)/include/win32/resources/icon1Vista.ico \
 	$(distdir)/include/win32/resources/icon1XP.ico

+BUILT_SOURCES = $(top_srcdir)/.version
+#AM_CFLAGS= @PREFER_NON_PIC@
+AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS)
+
+common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@
+
+TESTS =
+XFAIL_TESTS =
+bin_PROGRAMS =
+bin_SCRIPTS =
+check_PROGRAMS =
+lib_LTLIBRARIES =
+man_MANS =
+noinst_LTLIBRARIES =
+noinst_LIBRARIES =
+noinst_PROGRAMS =
+noinst_HEADERS =
+plugin_LTLIBRARIES =
+
+RANLIB=touch
+
+EXTRA_HEADERS =
+EXTRA_LTLIBRARIES =
+EXTRA_PROGRAMS =
+EXTRA_LIBRARIES =
+
+CLEANFILES =
+DISTCLEANFILES =
+
+YFLAGS = -v -d -Wno-yacc -Werror
+PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
+PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
+
+lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
+			-rpath $(libdir) -no-undefined
+plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
+plugin_libadd= @plugin_libadd@
+
+SDL_LIBS= @SDL_LIBS@
+XMMS_LIBS= @XMMS_LIBS@
+
+PAK=$(top_builddir)/pak$(EXEEXT)
+QFCC_DEP=qfcc$(EXEEXT)
+QFCC=$(top_builddir)/$(QFCC_DEP)
+GZ=@progs_gz@
+
+QCSYSTEM=--no-default-paths -I$(top_srcdir) -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
+QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide
+QCPPFLAGS=$(QCSYSTEM)
+QCLINKFLAGS=--no-default-paths -Lruamoko/lib
+QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS)
+QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS)
+MKDIR_P = @MKDIR_P@
+
+am__mv = mv -f
+
+SUFFIXES=.o .r .pas
+.r.o:
+	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
+	$(am__mv) $$depbase.Tqo $$depbase.Qo
+.pas.o:
+	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\
+	sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\
+	$(am__mv) $$depbase.Tqo $$depbase.Qo
+
+qcautodep = $(join $(addsuffix $(DEPDIR)/,$(dir $(basename $(1)))),$(addsuffix .Qo,$(notdir $(basename $(basename $(1))))))
+r_depfiles_remade=
+pas_depfiles_remade=
+
+include doc/Makemodule.am
+include RPM/Makemodule.am
+include debian/Makemodule.am
+include desktop/Makemodule.am
+include pkg-config/Makemodule.am
+include include/Makemodule.am
+include libs/Makemodule.am
+include hw/Makemodule.am
+include nq/Makemodule.am
+include qtv/Makemodule.am
+include qw/Makemodule.am
+include tools/Makemodule.am
+include ruamoko/Makemodule.am
+
+DISTCLEANFILES += $(r_depfiles_remade) $(pas_depfiles_remade)
+
+$(r_depfiles_remade):
+	$(MKDIR_P) $(@D)
+	echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.r qfcc@' >$@-t && $(am__mv) $@-t $@
+
+$(pas_depfiles_remade):
+	$(MKDIR_P) $(@D)
+	echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.pas qfcc@' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) $(pas_depfiles_remade)
+	echo findme $(ruamoko_gui_libgui_a_dep)
+
 changelog: ChangeLog
 ChangeLog: FORCE
 	@if test -d "$(top_srcdir)/.git"; then \
@ -63,7 +157,6 @@ dist-all-local: distdir
 	ZIP="-r9ql" zip $(distdir).zip $(distdir)
 	-rm -rf $(distdir)

-BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
 	echo $(VERSION) > $@-t && mv $@-t $@
 dist-hook:
--- a/RPM/Makefile.am
+++ b/RPM/Makefile.am
@ -1,9 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-
-EXTRA_DIST=	build_rpm.in quakeforge.conf.in quakeforge.spec.in
-
-rpm: build_rpm quakeforge.conf quakeforge.spec
-	./build_rpm
-
-CLEANFILES = *.rpm
--- a/RPM/Makemodule.am
+++ b/RPM/Makemodule.am
@ -0,0 +1,6 @@
+EXTRA_DIST += RPM/build_rpm.in RPM/quakeforge.conf.in RPM/quakeforge.spec.in
+
+rpm: RPM/build_rpm RPM/quakeforge.conf RPM/quakeforge.spec
+	cd RPM && ./build_rpm
+
+CLEANFILES += rpm/*.rpm
--- a/2
+++ b/2
@ -18,7 +18,7 @@ if test "$1" = "clean"; then
 	find . -name '*.orig' -type f -print0 | xargs $ARGS rm -f
 	rm -f aclocal.m4 build-stamp changelog-stamp config.cache config.log \
 		  config.status configure configure-stamp install-sh libtool missing \
-		  mkinstalldirs quakeforge-config quakeforge.lsm
+		  mkinstalldirs quakeforge-config quakeforge.lsm test-driver
 	rm -f compile config.guess config.sub depcomp ltmain.sh ylwrap
 	rm -rf autom4te.cache
 	rm -f m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \
--- a/config.d/ac_config_files.m4
+++ b/config.d/ac_config_files.m4
@ -1,102 +1,4 @@
 	Makefile
-
-	include/Makefile
-	include/QF/Makefile
-
-	libs/Makefile
-	libs/audio/Makefile
-	libs/audio/targets/Makefile
-	libs/audio/renderer/Makefile
-	libs/audio/test/Makefile
-	libs/console/Makefile
-	libs/client/Makefile
-	libs/gamecode/Makefile
-	libs/gib/Makefile
-	libs/image/Makefile
-	libs/models/Makefile
-	libs/models/alias/Makefile
-	libs/models/brush/Makefile
-	libs/models/iqm/Makefile
-	libs/models/sprite/Makefile
-	libs/models/test/Makefile
-	libs/net/Makefile
-	libs/net/nc/Makefile
-	libs/net/nm/Makefile
-	libs/qw/Makefile
-	libs/ruamoko/Makefile
-	libs/util/Makefile
-	libs/util/test/Makefile
-	libs/video/Makefile
-	libs/video/renderer/Makefile
-	libs/video/renderer/gl/Makefile
-	libs/video/renderer/glsl/Makefile
-	libs/video/renderer/sw/Makefile
-	libs/video/renderer/sw32/Makefile
-	libs/video/targets/Makefile
-
-	hw/Makefile
-	hw/include/Makefile
-	hw/source/Makefile
-
-	nq/Makefile
-	nq/include/Makefile
-	nq/source/Makefile
-
-	qtv/Makefile
-	qtv/include/Makefile
-	qtv/source/Makefile
-
-	qw/Makefile
-	qw/include/Makefile
-	qw/source/Makefile
-
-	tools/Makefile
-	tools/bsp2img/Makefile
-	tools/carne/Makefile
-	tools/pak/Makefile
-	tools/qfbsp/Makefile
-	tools/qfbsp/include/Makefile
-	tools/qfbsp/source/Makefile
-	tools/qfcc/Makefile
-	tools/qfcc/doc/Makefile
-	tools/qfcc/doc/man/Makefile
-	tools/qfcc/include/Makefile
-	tools/qfcc/source/Makefile
-	tools/qfcc/test/Makefile
-	tools/qflight/Makefile
-	tools/qflight/include/Makefile
-	tools/qflight/source/Makefile
-	tools/qflmp/Makefile
-	tools/qfmodelgen/Makefile
-	tools/qfmodelgen/include/Makefile
-	tools/qfmodelgen/source/Makefile
-	tools/qfspritegen/Makefile
-	tools/qfvis/Makefile
-	tools/qfvis/include/Makefile
-	tools/qfvis/source/Makefile
-	tools/wad/Makefile
-	tools/wav/Makefile
-
-	ruamoko/Makefile
-	ruamoko/Doxyfile
-	ruamoko/include/Makefile
-	ruamoko/lib/Makefile
-	ruamoko/game/Makefile
-	ruamoko/gui/Makefile
-	ruamoko/cl_menu/Makefile
-	ruamoko/scheme/Makefile
-	ruamoko/qwaq/Makefile
-
-	pkg-config/Makefile
 	pkg-config/qfcc.pc
 	pkg-config/quakeforge.pc
-
-	doc/Makefile
 	doc/quakeforge.dox.conf
-	doc/man/Makefile
-
-	debian/Makefile
-	desktop/Makefile
-
-	vc2005/Makefile
-	vc2008/Makefile
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@ -39,7 +39,7 @@ if test "x$HAVE_FBDEV" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-fbdev\$(EXEEXT)"
 		NQ_TARGETS="$NQ_TARGETS nq-fbdev\$(EXEEXT)"
 		CL_TARGETS="$CL_TARGETS FBDEV"
-		VID_TARGETS="$VID_TARGETS libQFfbdev.la"
+		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFfbdev.la"
 		QF_NEED(vid_render, [sw])
 		QF_NEED(models, [sw])
 		QF_NEED(alias, [sw])
@ -66,11 +66,11 @@ if test "x$HAVE_X" = xyes; then
 	if test "x$ENABLE_clients_x11" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)"
 		NQ_TARGETS="$NQ_TARGETS nq-x11\$(EXEEXT)"
-		QWAQ_TARGETS="$QWAQ_TARGETS qwaq-x11\$(EXEEXT)"
-		QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-x11.desktop"
-		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-x11.desktop"
+		QWAQ_TARGETS="$QWAQ_TARGETS ruamoko/qwaq/qwaq-x11\$(EXEEXT)"
+		QW_DESKTOP_DATA="$QW_DESKTOP_DATA desktop/quakeforge-qw-x11.desktop"
+		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA desktop/quakeforge-nq-x11.desktop"
 		CL_TARGETS="$CL_TARGETS X11"
-		VID_TARGETS="$VID_TARGETS libQFx11.la"
+		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFx11.la"
 		QF_NEED(vid_render, [sw sw32 gl glsl])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
@ -91,10 +91,10 @@ if test "x$HAVE_SDL" = xyes; then
 	if test "x$ENABLE_clients_sdl" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-sdl\$(EXEEXT)"
 		NQ_TARGETS="$NQ_TARGETS nq-sdl\$(EXEEXT)"
-		QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-sdl.desktop"
-		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-sdl.desktop"
+		QW_DESKTOP_DATA="$QW_DESKTOP_DATA desktop/quakeforge-qw-sdl.desktop"
+		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA desktop/quakeforge-nq-sdl.desktop"
 		CL_TARGETS="$CL_TARGETS SDL"
-		VID_TARGETS="$VID_TARGETS libQFsdl.la"
+		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsdl.la"
 		QF_NEED(vid_render, [sw sw32 gl glsl])
 		QF_NEED(models, [sw gl glsl])
 		QF_NEED(alias, [sw gl glsl])
@ -116,7 +116,7 @@ if test "x$HAVE_SVGA" = xyes; then
 		QW_TARGETS="$QW_TARGETS qw-client-svga\$(EXEEXT)"
 		NQ_TARGETS="$NQ_TARGETS nq-svga\$(EXEEXT)"
 		CL_TARGETS="$CL_TARGETS SVGAlib"
-		VID_TARGETS="$VID_TARGETS libQFsvga.la"
+		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsvga.la"
 		QF_NEED(vid_render, [sw])
 		QF_NEED(models, [sw])
 		QF_NEED(alias, [sw])
@ -138,7 +138,7 @@ fi
 #		QW_TARGETS="$QW_TARGETS qw-client-wgl\$(EXEEXT)"
 #		NQ_TARGETS="$NQ_TARGETS nq-wgl\$(EXEEXT)"
 #		CL_TARGETS="$CL_TARGETS WGL"
-#		VID_TARGETS="$VID_TARGETS libQFwgl.la"
+#		VID_TARGETS="$VID_TARGETS libs/video/targets/libQFwgl.la"
 #		QF_NEED(vid_render, [gl])
 #		QF_NEED(models, [gl])
 #		QF_NEED(alias, [gl])
@ -163,8 +163,8 @@ if test "x$ENABLE_servers_nq" = xyes; then
 	QF_NEED(libs,[util gamecode ruamoko gib image models console net])
 fi
 if test "x$ENABLE_servers_qtv" = xyes; then
-	QTV_TARGETS="qtv\$(EXEEXT) $QTV_TARGETS"
-	SV_TARGETS="$SV_TARGETS qtv"
+	QTV_TARGETS="qtv-server\$(EXEEXT) $QTV_TARGETS"
+	SV_TARGETS="$SV_TARGETS qtv-server"
 #	QF_NEED(qtv, [common server])
 	QF_NEED(console, [server])
 	QF_NEED(top, [qtv])
@ -228,7 +228,7 @@ if test "x$ENABLE_tools_qfvis" = xyes; then
 fi
 if test "x$ENABLE_tools_qwaq" = xyes; then
 	if test "x$HAVE_PANEL" = xyes -a "x$HAVE_PTHREAD" = xyes; then
-		QWAQ_TARGETS="$QWAQ_TARGETS qwaq-curses\$(EXEEXT)"
+		QWAQ_TARGETS="$QWAQ_TARGETS ruamoko/qwaq/qwaq-curses\$(EXEEXT)"
 	fi
 	QF_NEED(tools,[qfcc])
 	QF_NEED(ruamoko,[qwaq])
@ -254,14 +254,22 @@ QF_PROCESS_NEED_DIRS(ruamoko,[qwaq])

 if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then
 	QF_NEED(top, [ruamoko])
-	qfcc_include_qf="\$(qfcc_include_qf)"
+	qfac_qfcc_include_qf="\$(qfcc_include_qf)"
 fi
-QF_SUBST(qfcc_include_qf)
+QF_SUBST(qfac_qfcc_include_qf)

 if test x"${top_need_libs}" = xyes; then
-	include_qf="\$(include_qf)"
+	qfac_include_qf="\$(include_qf)"
+	qfac_include_qf_gl="\$(include_qf_gl)"
+	qfac_include_qf_glsl="\$(include_qf_glsl)"
+	qfac_include_qf_math="\$(include_qf_math)"
+	qfac_include_qf_plugin="\$(include_qf_plugin)"
 fi
-QF_SUBST(include_qf)
+QF_SUBST(qfac_include_qf)
+QF_SUBST(qfac_include_qf_gl)
+QF_SUBST(qfac_include_qf_glsl)
+QF_SUBST(qfac_include_qf_math)
+QF_SUBST(qfac_include_qf_plugin)

 progs_gz=
 if test "$HAVE_ZLIB" = "yes"; then
@ -273,21 +281,21 @@ QF_PROCESS_NEED_DIRS(top, [libs hw nq qtv qw tools ruamoko])

 QF_PROCESS_NEED_LIBS(swrend, [asm])
 QF_PROCESS_NEED_DIRS(vid_render, [gl glsl sw sw32])
-QF_PROCESS_NEED_LIBS(models, [gl glsl sw])
-QF_PROCESS_NEED_LIBS(alias, [gl glsl sw])
-QF_PROCESS_NEED_LIBS(brush, [gl glsl sw])
-QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw])
-QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw])
+QF_PROCESS_NEED_LIBS(models, [gl glsl sw], [libs/models])
+QF_PROCESS_NEED_LIBS(alias, [gl glsl sw], [libs/models/alias])
+QF_PROCESS_NEED_LIBS(brush, [gl glsl sw], [libs/models/brush])
+QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw], [libs/models/iqm])
+QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw], [libs/models/sprite])

-QF_PROCESS_NEED_LIBS(vid, [common sdl svga x11])
-QF_PROCESS_NEED_LIBS(qw, [client common sdl server], a)
-QF_PROCESS_NEED_LIBS(nq, [client common sdl server], a)
+QF_PROCESS_NEED_LIBS(vid, [common sdl svga x11], [libs/video/targets])
+QF_PROCESS_NEED_LIBS(qw, [client common sdl server], [qw/source], a)
+QF_PROCESS_NEED_LIBS(nq, [client common sdl server], [nq/source], a)

 if test -n "$CL_TARGETS"; then
-	CD_TARGETS="libQFcd.la"
-	SND_TARGETS="libQFsound.la"
+	CD_TARGETS="libs/audio/libQFcd.la"
+	SND_TARGETS="libs/audio/libQFsound.la"
 	AUDIO_TARGETS="testsound\$(EXEEXT)"
-	JOY_TARGETS="libQFjs.la"
+	JOY_TARGETS="libs/video/targets/libQFjs.la"
 else
 	unset CDTYPE
 	unset SOUND_TYPES
@ -322,13 +330,13 @@ if test "x$static_plugins" = xauto; then
 	fi
 fi
 if test "x$static_plugins" = xyes; then
-	QF_PROCESS_NEED_STATIC_PLUGINS(vid_render, [sw sw32 glsl gl])
-	QF_PROCESS_NEED_STATIC_PLUGINS(console, [server], [\$(top_builddir)/libs/console], [server])
-	QF_PROCESS_NEED_STATIC_PLUGINS(console, [client], [\$(top_builddir)/libs/console], [client])
+	QF_PROCESS_NEED_STATIC_PLUGINS(vid_render, [sw sw32 glsl gl], [libs/video/renderer])
+	QF_PROCESS_NEED_STATIC_PLUGINS(console, [server], [libs/console], [server])
+	QF_PROCESS_NEED_STATIC_PLUGINS(console, [client], [libs/console], [client])

-	QF_PROCESS_NEED_STATIC_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa], [targets])
-	QF_PROCESS_NEED_STATIC_PLUGINS(snd_render, [jack default], [renderer])
-	QF_PROCESS_NEED_STATIC_PLUGINS(cd, [xmms sdl sgi win linux file])
+	QF_PROCESS_NEED_STATIC_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa], [libs/audio/targets])
+	QF_PROCESS_NEED_STATIC_PLUGINS(snd_render, [jack default], [libs/audio/renderer])
+	QF_PROCESS_NEED_STATIC_PLUGINS(cd, [xmms sdl sgi win linux file], [libs/audio])
 	AC_DEFINE(STATIC_PLUGINS, 1, [Define this if you are building static plugins])
 	if test -n "$SOUND_TYPES"; then
 		SOUND_TYPES="$SOUND_TYPES (static)"
@ -337,12 +345,12 @@ if test "x$static_plugins" = xyes; then
 		CDTYPE="$CDTYPE (static)"
 	fi
 else
-	QF_PROCESS_NEED_PLUGINS(vid_render, [sw sw32 glsl gl])
-	QF_PROCESS_NEED_PLUGINS(console, [server], [server])
-	QF_PROCESS_NEED_PLUGINS(console, [client], [client])
-	QF_PROCESS_NEED_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa])
-	QF_PROCESS_NEED_PLUGINS(snd_render, [jack default])
-	QF_PROCESS_NEED_PLUGINS(cd, [xmms sdl sgi win linux file])
+	QF_PROCESS_NEED_PLUGINS(vid_render, [sw sw32 glsl gl], [libs/video/renderer])
+	QF_PROCESS_NEED_PLUGINS(console, [server], [libs/console], [server])
+	QF_PROCESS_NEED_PLUGINS(console, [client], [libs/console], [client])
+	QF_PROCESS_NEED_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa], [libs/audio/targets])
+	QF_PROCESS_NEED_PLUGINS(snd_render, [jack default], [libs/audio/renderer])
+	QF_PROCESS_NEED_PLUGINS(cd, [xmms sdl sgi win linux file], [libs/audio])
 fi

 dnl Do not use -module here, it belongs in makefile.am due to automake
@ -419,7 +427,7 @@ QF_DEPS(QFVIS,
 	[$(WIN32_LIBS)],
 )
 QF_DEPS(QWAQ,
-	[],
+	[-I$(top_srcdir)/ruamoko/qwaq],
 	[$(top_builddir)/libs/ruamoko/libQFruamoko.la
 	 $(top_builddir)/libs/gamecode/libQFgamecode.la
 	 $(top_builddir)/libs/util/libQFutil.la],
--- a/config.d/rpm.m4
+++ b/config.d/rpm.m4
@ -1,2 +1,2 @@
-AC_CONFIG_FILES(RPM/Makefile RPM/quakeforge.conf RPM/quakeforge.spec)
+AC_CONFIG_FILES(RPM/quakeforge.conf RPM/quakeforge.spec)
 AC_CONFIG_FILES(RPM/build_rpm, [chmod +x RPM/build_rpm])
--- a/configure.ac
+++ b/configure.ac
@ -3,7 +3,7 @@ AC_PREREQ(2.61)

 dnl This is the only place where the package name and version appear
 AC_INIT([QuakeForge], m4_esyscmd([config.d/git-version-gen --prefix '' .tarball-version]))
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])

 dnl LT_INIT messes with CFLAGS (evil bastard)
 if test "x${CFLAGS-unset}" = xunset; then
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@ -1,23 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-
-# find -type f | sed -e 's:^\./::g' | grep -v Makefile | sort >> Makefile.am
-
-EXTRA_DIST= \
-	changelog control copyright quakeforge.conf rules source/format \
-	qfcc.install \
-	quakeforge-alsa.install quakeforge-alsa.postinst quakeforge-alsa.prerm \
-	quakeforge-common.install quakeforge-common.postinst \
-	quakeforge-dev.install \
-	quakeforge-gl.install \
-	quakeforge-glsl.install \
-	quakeforge-jack.install \
-	quakeforge-maptools.install \
-	quakeforge-oss.install quakeforge-oss.postinst quakeforge-oss.prerm \
-	quakeforge-sdl.install \
-	quakeforge-servers.install \
-	quakeforge-stub.postinst \
-	quakeforge-sw32.install \
-	quakeforge-sw.install \
-	quakeforge-utils.install \
-	quakeforge-x11.install
--- a/debian/Makemodule.am
+++ b/debian/Makemodule.am
@ -0,0 +1,28 @@
+EXTRA_DIST += \
+	debian/changelog \
+	debian/control \
+	debian/copyright \
+	debian/quakeforge.conf \
+	debian/rules \
+	debian/source/format \
+	debian/qfcc.install \
+	debian/quakeforge-alsa.install \
+	debian/quakeforge-alsa.postinst \
+	debian/quakeforge-alsa.prerm \
+	debian/quakeforge-common.install \
+	debian/quakeforge-common.postinst \
+	debian/quakeforge-dev.install \
+	debian/quakeforge-gl.install \
+	debian/quakeforge-glsl.install \
+	debian/quakeforge-jack.install \
+	debian/quakeforge-maptools.install \
+	debian/quakeforge-oss.install \
+	debian/quakeforge-oss.postinst \
+	debian/quakeforge-oss.prerm \
+	debian/quakeforge-sdl.install \
+	debian/quakeforge-servers.install \
+	debian/quakeforge-stub.postinst \
+	debian/quakeforge-sw32.install \
+	debian/quakeforge-sw.install \
+	debian/quakeforge-utils.install \
+	debian/quakeforge-x11.install
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@ -1,49 +0,0 @@
-## Process this file with automake to produce Makefile.in
-#
-#	Makefile.am
-#
-#	Automake-using build system for QuakeForge
-#
-#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
-#
-#	This Makefile is free software; you can redistribute it and/or
-#	modify it under the terms of the GNU General Public License
-#	as published by the Free Software Foundation; either version 2
-#	of the License, or (at your option) any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	See the GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to:
-#
-#		Free Software Foundation, Inc.
-#		59 Temple Place - Suite 330
-#		Boston, MA  02111-1307, USA
-#
-#	$Id$
-#
-
-AUTOMAKE_OPTIONS=	foreign
-
-# Stuff that is common to both client and server
-# Desktop files
-if HAVE_XDG
-desktopdir=$(datarootdir)/applications
-desktop_DATA= @NQ_DESKTOP_DATA@ @QW_DESKTOP_DATA@
-endif
-
-# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
-# or it won't be distributed with 'make dist'
-
-EXTRA_DIST= quakeforge-nq-glx.desktop quakeforge-nq-sdl.desktop \
-	quakeforge-nq-sdl32.desktop quakeforge-nq-sgl.desktop \
-	quakeforge-nq-x11.desktop quakeforge-qw-glx.desktop \
-	quakeforge-qw-sdl.desktop quakeforge-qw-sdl32.desktop \
-	quakeforge-qw-sgl.desktop quakeforge-qw-x11.desktop
-
-# Kill the temp files, hopefully.
-CLEANFILES	= *.i *.s $(YACCLEX_CLEANFILES)
--- a/desktop/Makemodule.am
+++ b/desktop/Makemodule.am
@ -0,0 +1,10 @@
+if HAVE_XDG
+desktopdir=$(datarootdir)/applications
+desktop_DATA = @NQ_DESKTOP_DATA@ @QW_DESKTOP_DATA@
+endif
+
+EXTRA_DIST += \
+	desktop/quakeforge-nq-sdl.desktop \
+	desktop/quakeforge-nq-x11.desktop \
+	desktop/quakeforge-qw-sdl.desktop \
+	desktop/quakeforge-qw-x11.desktop
--- a/desktop/quakeforge-nq-glx.desktop
+++ b/desktop/quakeforge-nq-glx.desktop
@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge (GLX)
-GenericName=Quake (GLX)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=Game;ActionGame;
-
-Exec=nq-glx
-TryExec=nq-glx
-Terminal=false
-StartupNotify=false
--- a/desktop/quakeforge-nq-sdl32.desktop
+++ b/desktop/quakeforge-nq-sdl32.desktop
@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge (SDL32)
-GenericName=Quake (SDL32)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=SDL;Game;ActionGame;
-
-Exec=nq-sdl32
-TryExec=nq-sdl32
-Terminal=false
-StartupNotify=false
--- a/desktop/quakeforge-nq-sgl.desktop
+++ b/desktop/quakeforge-nq-sgl.desktop
@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge (SDL GL)
-GenericName=Quake (SDL GL)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=SDL;Game;ActionGame;
-
-Exec=nq-sgl
-TryExec=nq-sgl
-Terminal=false
-StartupNotify=false
--- a/desktop/quakeforge-qw-glx.desktop
+++ b/desktop/quakeforge-qw-glx.desktop
@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge QuakeWorld (GLX)
-GenericName=QuakeWorld (GLX)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=Game;ActionGame;
-
-Exec=qw-client-glx
-TryExec=qw-client-glx
-Terminal=false
-StartupNotify=false
--- a/desktop/quakeforge-qw-sdl32.desktop
+++ b/desktop/quakeforge-qw-sdl32.desktop
@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge QuakeWorld (SDL32)
-GenericName=QuakeWorld (SDL32)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=SDL;Game;ActionGame;
-
-Exec=qw-client-sdl32
-TryExec=qw-client-sdl32
-Terminal=false
-StartupNotify=false
--- a/desktop/quakeforge-qw-sgl.desktop
+++ b/desktop/quakeforge-qw-sgl.desktop
@ -1,18 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=QuakeForge QuakeWorld (SDL GL)
-GenericName=QuakeWorld (SDL GL)
-Comment=A first person shooter game
-Comment[fr]=Un jeu de tir subjectif
-Comment[it]=Sparatutto in prima persona
-Icon=quake
-
-Categories=SDL;Game;ActionGame;
-
-Exec=qw-client-sgl
-TryExec=qw-client-sgl
-Terminal=false
-StartupNotify=false
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -1,55 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= man
-
-DOX= \
-	bind.dox config.dox connect.dox cshifts.dox dirconf.dox faq.dox \
-	filesystem.dox mapformat.dox property-list.dox qtv.dox quakeforge.dox \
-	qw-cap-spec.dox qw-download-spec.dox sound.dox specifications.dox \
-	surround-sound.dox timestamps.dox
-
-GIB= \
-	gib/GIB.lyx gib/break.gib gib/continue.gib gib/curly.gib gib/examples.sh \
-	gib/for.gib gib/gib_head.eps gib/if-chain.gib gib/if-else.gib \
-	gib/if-simple.gib gib/while.gib
-
-PROGS= \
-	progs/vm-exec.c progs/vm-mem.fig
-
-EXTRA_DIST= qf.ico \
-	\
-	skybox.fig template.c template.h \
-	quakeforge.dox.conf.in \
-	\
-	${DOX} ${GIB} ${PROGS} \
-	\
-	config/glspeed-v1.cfg config/glspeed-v3.cfg config/swspeed.cfg \
-	\
-	config/gib/adjustvolume.gib config/gib/infobot.gib config/gib/ln.gib \
-	config/gib/qfadmin.gib config/gib/sshot.gib config/gib/zoom.gib \
-	\
-	qtv/qwtv.fig
-
-SUFFIXES=.eps .fig .png
-.fig.png:
-	@mkdir -p `dirname $@`
-	fig2dev -L png $< $@
-
-.fig.eps:
-	@mkdir -p `dirname $@`
-	fig2dev -L ps $< $@
-
-.fig.svg:
-	@mkdir -p `dirname $@`
-	fig2dev -L svg $< $@
-
-clean-local:
-	-rm -fr doxygen
-
-progs/vm-mem.svg: progs/vm-mem.fig
-progs/vm-mem.eps: progs/vm-mem.fig
-qtv/qwtv.svg: qtv/qwtv.fig
-qtv/qwtv.eps: qtv/qwtv.fig
-
-doc: quakeforge.dox.conf progs/vm-mem.svg progs/vm-mem.eps qtv/qwtv.svg qtv/qwtv.eps ${DOX}
-	doxygen quakeforge.dox.conf
--- a/doc/Makemodule.am
+++ b/doc/Makemodule.am
@ -0,0 +1,80 @@
+man_MANS += doc/man/quakeforge.1
+
+DOX= \
+	doc/bind.dox \
+	doc/config.dox \
+	doc/connect.dox \
+	doc/cshifts.dox \
+	doc/dirconf.dox \
+	doc/faq.dox \
+	doc/filesystem.dox \
+	doc/mapformat.dox \
+	doc/property-list.dox \
+	doc/qtv.dox \
+	doc/quakeforge.dox \
+	doc/qw-cap-spec.dox \
+	doc/qw-download-spec.dox \
+	doc/sound.dox \
+	doc/specifications.dox \
+	doc/surround-sound.dox \
+	doc/timestamps.dox
+
+GIB= \
+	doc/gib/GIB.lyx \
+	doc/gib/break.gib \
+	doc/gib/continue.gib \
+	doc/gib/curly.gib \
+	doc/gib/examples.sh \
+	doc/gib/for.gib \
+	doc/gib/gib_head.eps \
+	doc/gib/if-chain.gib \
+	doc/gib/if-else.gib \
+	doc/gib/if-simple.gib \
+	doc/gib/while.gib
+
+PROGS= \
+	doc/progs/vm-exec.c \
+	doc/progs/vm-mem.fig
+
+EXTRA_DIST += \
+	${DOX} ${GIB} ${PROGS} \
+	doc/qf.ico \
+	doc/skybox.fig \
+	doc/template.c \
+	doc/template.h \
+	doc/quakeforge.dox.conf.in \
+	doc/config/glspeed-v1.cfg \
+	doc/config/glspeed-v3.cfg \
+	doc/config/swspeed.cfg \
+	doc/config/gib/adjustvolume.gib \
+	doc/config/gib/infobot.gib \
+	doc/config/gib/ln.gib \
+	doc/config/gib/qfadmin.gib \
+	doc/config/gib/sshot.gib \
+	doc/config/gib/zoom.gib \
+	doc/man/quakeforge.1 \
+	doc/qtv/qwtv.fig
+
+SUFFIXES += .eps .fig .png
+.fig.png:
+	@mkdir -p `dirname $@`
+	fig2dev -L png $< $@
+
+.fig.eps:
+	@mkdir -p `dirname $@`
+	fig2dev -L ps $< $@
+
+.fig.svg:
+	@mkdir -p `dirname $@`
+	fig2dev -L svg $< $@
+
+clean-local:
+	-rm -fr doxygen
+
+doc/progs/vm-mem.svg: doc/progs/vm-mem.fig
+doc/progs/vm-mem.eps: doc/progs/vm-mem.fig
+doc/qtv/qwtv.svg: doc/qtv/qwtv.fig
+doc/qtv/qwtv.eps: doc/qtv/qwtv.fig
+
+doc: doc/quakeforge.dox.conf doc/progs/vm-mem.svg doc/progs/vm-mem.eps doc/qtv/qwtv.svg qtv/qwtv.eps ${DOX}
+	doxygen doc/quakeforge.dox.conf
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-EXTRA_DIST= quakeforge.1
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
--- a/hw/Makemodule.am
+++ b/hw/Makemodule.am
@ -0,0 +1 @@
+include hw/source/Makemodule.am
--- a/hw/include/Makefile.am
+++ b/hw/include/Makefile.am
@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-
-EXTRA_DIST =
--- a/hw/source/Makemodule.am
+++ b/hw/source/Makemodule.am
@ -27,27 +27,17 @@
 #	$Id$
 #

-AUTOMAKE_OPTIONS=	foreign
+bin_PROGRAMS +=	@HW_TARGETS@

-# Stuff that is common to both client and server
-AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/hw/include
-SDL_LIBS = @SDL_LIBS@
+EXTRA_PROGRAMS += hw-master

-bin_PROGRAMS=	@HW_TARGETS@
-
-EXTRA_PROGRAMS= hw-master
-
-common_ldflags= -export-dynamic
 hw_master_libs= \
-	$(top_builddir)/libs/net/libnet_chan.la \
+	libs/net/libnet_chan.la \
 	@server_static_plugin_libs@ \
-	$(top_builddir)/libs/console/libQFconsole.la \
-	$(top_builddir)/libs/util/libQFutil.la
+	libs/console/libQFconsole.la \
+	libs/util/libQFutil.la

 hw_master_LDFLAGS=		$(common_ldflags)
 hw_master_LDADD=		$(hw_master_libs) $(NET_LIBS)
 hw_master_DEPENDENCIES=	$(hw_master_libs)
-hw_master_SOURCES=		master.c
-
-# Kill the temp files, hopefully.
-CLEANFILES	= *.i *.s
+hw_master_SOURCES=		hw/source/master.c
--- a/include/Makefile.am
+++ b/include/Makefile.am
@ -1,26 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS=	foreign
-SUBDIRS = QF
-EXTRA_DIST = \
-	adivtab.h alsa_funcs_list.h anorm_dots.h anorms.h asm_draw.h asm_i386.h \
-	block16.h block8.h buildnum.h clview.h compat.h context_sdl.h \
-	context_x11.h d_iface.h d_ifacea.h d_local.h dga_check.h exp.h fbset.h \
-	garbage.h getopt.h gib_buffer.h gib_builtin.h gib_classes.h \
-	gib_execute.h gib_function.h gib_handle.h gib_object.h gib_parse.h \
-	gib_process.h gib_regex.h gib_semantics.h gib_thread.h gib_tree.h \
-	gib_vars.h gl_warp_sin.h in_win.h logos.h mod_internal.h net_dgrm.h \
-	net_loop.h net_udp.h net_vcr.h net_wins.h netchan.h netmain.h \
-	noisetextures.h old_keys.h ops.h pstdint.h qfalloca.h qstring.h \
-	quakeasm.h r_cvar.h r_dynamic.h r_internal.h r_local.h r_screen.h \
-	r_shared.h regex.h rua_internal.h sbar.h skin_stencil.h snd_internal.h \
-	sv_console.h varrays.h vgamodes.h vid_internal.h vregset.h winquake.h \
-	world.h \
-	\
-	client/entities.h \
-	\
-	qw/bothdefs.h qw/msg_backbuf.h qw/msg_ucmd.h qw/pmove.h qw/protocol.h \
-	\
-	win32/dirent.h win32/fnmatch.h win32/stdint.h \
-	\
-	win32/resources/icon1Vista.ico win32/resources/icon1XP.ico \
-	win32/resources/quakeforge.rc win32/resources/resource.h
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@ -0,0 +1,88 @@
+## Process this file with automake to produce Makefile.in
+include include/QF/Makemodule.am
+
+EXTRA_DIST += \
+	include/adivtab.h \
+	include/alsa_funcs_list.h \
+	include/anorm_dots.h \
+	include/anorms.h \
+	include/asm_draw.h \
+	include/asm_i386.h \
+	include/block16.h \
+	include/block8.h \
+	include/buildnum.h \
+	include/clview.h \
+	include/compat.h \
+	include/context_sdl.h \
+	include/context_x11.h \
+	include/d_iface.h \
+	include/d_ifacea.h \
+	include/d_local.h \
+	include/dga_check.h \
+	include/exp.h \
+	include/fbset.h \
+	include/garbage.h \
+	include/getopt.h \
+	include/gib_buffer.h \
+	include/gib_builtin.h \
+	include/gib_classes.h \
+	include/gib_execute.h \
+	include/gib_function.h \
+	include/gib_handle.h \
+	include/gib_object.h \
+	include/gib_parse.h \
+	include/gib_process.h \
+	include/gib_regex.h \
+	include/gib_semantics.h \
+	include/gib_thread.h \
+	include/gib_tree.h \
+	include/gib_vars.h \
+	include/gl_warp_sin.h \
+	include/in_win.h \
+	include/logos.h \
+	include/mod_internal.h \
+	include/net_dgrm.h \
+	include/net_loop.h \
+	include/net_udp.h \
+	include/net_vcr.h \
+	include/net_wins.h \
+	include/netchan.h \
+	include/netmain.h \
+	include/noisetextures.h \
+	include/old_keys.h \
+	include/ops.h \
+	include/pstdint.h \
+	include/qfalloca.h \
+	include/qstring.h \
+	include/quakeasm.h \
+	include/r_cvar.h \
+	include/r_dynamic.h \
+	include/r_internal.h \
+	include/r_local.h \
+	include/r_screen.h \
+	include/r_shared.h \
+	include/regex.h \
+	include/rua_internal.h \
+	include/sbar.h \
+	include/skin_stencil.h \
+	include/snd_internal.h \
+	include/sv_console.h \
+	include/varrays.h \
+	include/vgamodes.h \
+	include/vid_internal.h \
+	include/vregset.h \
+	include/winquake.h \
+	include/world.h \
+	include/client/entities.h \
+	include/qw/bothdefs.h \
+	include/qw/msg_backbuf.h \
+	include/qw/msg_ucmd.h \
+	include/qw/pmove.h \
+	include/qw/protocol.h \
+	include/win32/dirent.h \
+	include/win32/fnmatch.h \
+	include/win32/stdint.h \
+	include/win32/resources/icon1Vista.ico \
+	include/win32/resources/icon1XP.ico \
+	include/win32/resources/quakeforge.rc \
+	include/win32/resources/resource.h
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@ -1,38 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-pkgincludedir = $(includedir)/QF
-#for header files that qfcc (ruamoko) will use
-pkgdatadir = $(datarootdir)/qfcc/include/QF
-
-include_qf= \
-	alloc.h bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
-	console.h crc.h csqc.h cvar.h darray.h dstring.h draw.h gib.h hash.h \
-	idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \
-	link.h llist.h locs.h mathlib.h mdfour.h mersenne.h model.h modelgen.h \
-	msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \
-	pr_obj.h pr_type.h progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h \
-	quakefs.h \
-	quakeio.h render.h riff.h ringbuffer.h ruamoko.h \
-	screen.h script.h segtext.h set.h \
-	sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h va.h \
-	ver_check.h vid.h vrect.h view.h wad.h wadfile.h winding.h zone.h \
-	\
-	GL/ati.h GL/defines.h GL/extensions.h GL/funcs.h GL/qf_draw.h \
-	GL/qf_explosions.h GL/qf_funcs_list.h GL/qf_iqm.h GL/qf_lightmap.h \
-	GL/qf_rlight.h GL/qf_rmain.h GL/qf_rsurf.h GL/qf_sky.h GL/qf_textures.h \
-	GL/qf_vid.h GL/types.h \
-	\
-	GLSL/defines.h GLSL/funcs.h GLSL/qf_alias.h GLSL/qf_bsp.h GLSL/qf_draw.h \
-	GLSL/qf_funcs_list.h GLSL/qf_iqm.h GLSL/qf_lightmap.h GLSL/qf_particles.h \
-	GLSL/qf_textures.h GLSL/qf_vid.h GLSL/types.h \
-	\
-	math/dual.h math/half.h math/matrix3.h math/matrix4.h math/quaternion.h \
-	math/vector.h \
-	\
-	plugin/cd.h plugin/console.h plugin/general.h plugin/input.h \
-	plugin/snd_output.h plugin/snd_render.h plugin/vid_render.h
-
-qfcc_include_qf=keys.h
-nobase_pkginclude_HEADERS = @include_qf@
-pkgdata_DATA=@qfcc_include_qf@
-
-EXTRA_HEADERS = $(include_qf) $(qfcc_include_qf)
--- a/include/QF/Makemodule.am
+++ b/include/QF/Makemodule.am
@ -0,0 +1,151 @@
+include_qf = \
+	include/QF/alloc.h \
+	include/QF/bspfile.h \
+	include/QF/cbuf.h \
+	include/QF/cdaudio.h \
+	include/QF/checksum.h \
+	include/QF/clip_hull.h \
+	include/QF/cmd.h \
+	include/QF/console.h \
+	include/QF/crc.h \
+	include/QF/csqc.h \
+	include/QF/cvar.h \
+	include/QF/darray.h \
+	include/QF/dstring.h \
+	include/QF/draw.h \
+	include/QF/gib.h \
+	include/QF/hash.h \
+	include/QF/idparse.h \
+	include/QF/image.h \
+	include/QF/in_event.h \
+	include/QF/info.h \
+	include/QF/input.h \
+	include/QF/iqm.h \
+	include/QF/joystick.h \
+	include/QF/keys.h \
+	include/QF/link.h \
+	include/QF/llist.h \
+	include/QF/locs.h \
+	include/QF/mathlib.h \
+	include/QF/mdfour.h \
+	include/QF/mersenne.h \
+	include/QF/model.h \
+	include/QF/modelgen.h \
+	include/QF/msg.h \
+	include/QF/object.h \
+	include/QF/pak.h \
+	include/QF/pakfile.h \
+	include/QF/pcx.h \
+	include/QF/png.h \
+	include/QF/plugin.h \
+	include/QF/pr_comp.h \
+	include/QF/pr_debug.h \
+	include/QF/pr_obj.h \
+	include/QF/pr_type.h \
+	include/QF/progs.h \
+	include/QF/qargs.h \
+	include/QF/qdefs.h \
+	include/QF/qendian.h \
+	include/QF/qfplist.h \
+	include/QF/qtypes.h \
+	include/QF/quakefs.h \
+	include/QF/quakeio.h \
+	include/QF/render.h \
+	include/QF/riff.h \
+	include/QF/ringbuffer.h \
+	include/QF/ruamoko.h \
+	include/QF/screen.h \
+	include/QF/script.h \
+	include/QF/segtext.h \
+	include/QF/set.h \
+	include/QF/sizebuf.h \
+	include/QF/skin.h \
+	include/QF/sound.h \
+	include/QF/spritegn.h \
+	include/QF/sys.h \
+	include/QF/teamplay.h \
+	include/QF/tga.h \
+	include/QF/txtbuffer.h \
+	include/QF/va.h \
+	include/QF/ver_check.h \
+	include/QF/vid.h \
+	include/QF/vrect.h \
+	include/QF/view.h \
+	include/QF/wad.h \
+	include/QF/wadfile.h \
+	include/QF/winding.h \
+	include/QF/zone.h
+
+include_qf_gl = \
+	include/QF/GL/ati.h \
+	include/QF/GL/defines.h \
+	include/QF/GL/extensions.h \
+	include/QF/GL/funcs.h \
+	include/QF/GL/qf_draw.h \
+	include/QF/GL/qf_explosions.h \
+	include/QF/GL/qf_funcs_list.h \
+	include/QF/GL/qf_iqm.h \
+	include/QF/GL/qf_lightmap.h \
+	include/QF/GL/qf_rlight.h \
+	include/QF/GL/qf_rmain.h \
+	include/QF/GL/qf_rsurf.h \
+	include/QF/GL/qf_sky.h \
+	include/QF/GL/qf_textures.h \
+	include/QF/GL/qf_vid.h \
+	include/QF/GL/types.h
+
+include_qf_glsl = \
+	include/QF/GLSL/defines.h \
+	include/QF/GLSL/funcs.h \
+	include/QF/GLSL/qf_alias.h \
+	include/QF/GLSL/qf_bsp.h \
+	include/QF/GLSL/qf_draw.h \
+	include/QF/GLSL/qf_funcs_list.h \
+	include/QF/GLSL/qf_iqm.h \
+	include/QF/GLSL/qf_lightmap.h \
+	include/QF/GLSL/qf_particles.h \
+	include/QF/GLSL/qf_textures.h \
+	include/QF/GLSL/qf_vid.h \
+	include/QF/GLSL/types.h
+
+include_qf_math = \
+	include/QF/math/dual.h \
+	include/QF/math/half.h \
+	include/QF/math/matrix3.h \
+	include/QF/math/matrix4.h \
+	include/QF/math/quaternion.h \
+	include/QF/math/vector.h
+
+include_qf_plugin = \
+	include/QF/plugin/cd.h \
+	include/QF/plugin/console.h \
+	include/QF/plugin/general.h \
+	include/QF/plugin/input.h \
+	include/QF/plugin/snd_output.h \
+	include/QF/plugin/snd_render.h \
+	include/QF/plugin/vid_render.h
+
+# headers shared with ruamoko
+qfcc_include_qf = include/QF/keys.h
+
+qf_includedir = $(includedir)/QF
+qf_gl_includedir = $(includedir)/QF/GL
+qf_glsl_includedir = $(includedir)/QF/GLSL
+qf_math_includedir = $(includedir)/QF/math
+qf_plugin_includedir = $(includedir)/QF/plugin
+qf_include_HEADERS = @qfac_include_qf@
+qf_gl_include_HEADERS = @qfac_include_qf_gl@
+qf_glsl_include_HEADERS = @qfac_include_qf_glsl@
+qf_math_include_HEADERS = @qfac_include_qf_math@
+qf_plugin_include_HEADERS = @qfac_include_qf_plugin@
+
+ruamoko_qf_includedir = $(ruamoko_includedir)/QF
+ruamoko_qf_include_HEADERS = @qfac_qfcc_include_qf@
+
+EXTRA_HEADERS += \
+	$(include_qf) \
+	$(include_qf_gl) \
+	$(include_qf_glsl) \
+	$(include_qf_math) \
+	$(include_qf_plugin) \
+	$(qfcc_include_qf)
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@ -1,12 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-# everything depends on util
-# ruamoko depends on gamecode
-# gib depends on ruamoko
-# audio depends on gamecode
-# models depends on image
-# video depends on models(?), image(?) and ruamoko
-# console depends on video, ruamoko and audio
-SUBDIRS=@libs_dirs@
-DIST_SUBDIRS=util gamecode ruamoko gib audio image models video console \
-			 net qw client
--- a/libs/Makemodule.am
+++ b/libs/Makemodule.am
@ -0,0 +1,13 @@
+include libs/util/Makemodule.am
+include libs/gamecode/Makemodule.am
+include libs/ruamoko/Makemodule.am
+include libs/gib/Makemodule.am
+include libs/audio/Makemodule.am
+include libs/image/Makemodule.am
+include libs/models/Makemodule.am
+include libs/video/Makemodule.am
+include libs/console/Makemodule.am
+
+include libs/net/Makemodule.am
+include libs/client/Makemodule.am
+include libs/qw/Makemodule.am
--- a/libs/audio/Makefile.am
+++ b/libs/audio/Makefile.am
@ -1,77 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= targets renderer . test
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-SDL_LIBS= @SDL_LIBS@
-XMMS_LIBS= @XMMS_LIBS@
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-EXEEXT=
-
-plugin_LTLIBRARIES=	@cd_plugins@
-noinst_LTLIBRARIES=	@cd_static_plugins@
-lib_LTLIBRARIES=	@CD_TARGETS@ @SND_TARGETS@
-EXTRA_LTLIBRARIES=	libQFsound.la libQFcd.la \
-					cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la \
-					cd_xmms.la
-
-cd_plug_libs=$(top_builddir)/libs/util/libQFutil.la
-
-cd_file_libs= \
-	libQFsound.la \
-	$(cd_plug_libs)
-
-cd_file_la_LDFLAGS=			$(plugin_ldflags)
-cd_file_la_LIBADD=			$(cd_file_libs)
-cd_file_la_DEPENDENCIES=	$(cd_file_libs)
-cd_file_la_SOURCES=			cd_file.c
-
-cd_linux_la_LDFLAGS=		$(plugin_ldflags)
-cd_linux_la_LIBADD=			$(cd_plug_libs)
-cd_linux_la_DEPENDENCIES=	$(cd_plug_libs)
-cd_linux_la_SOURCES=		cd_linux.c
-
-cd_sdl_la_LDFLAGS=			$(plugin_ldflags)
-cd_sdl_la_LIBADD=			$(cd_plug_libs) $(SDL_LIBS) $(plugin_libadd)
-cd_sdl_la_DEPENDENCIES=		$(cd_plug_libs)
-cd_sdl_la_CFLAGS=			$(SDL_CFLAGS)
-cd_sdl_la_SOURCES=			cd_sdl.c
-
-cd_sgi_la_LDFLAGS=			$(plugin_ldflags)
-cd_sgi_la_LIBADD=			$(cd_plug_libs) $(SGI_CD_LIBS)
-cd_sgi_la_DEPENDENCIES=		$(cd_plug_libs)
-cd_sgi_la_SOURCES=			cd_sgi.c
-
-cd_win_la_LDFLAGS=			$(plugin_ldflags)
-cd_win_la_LIBADD=			$(cd_plug_libs) $(plugin_libadd)
-cd_win_la_DEPENDENCIES=		$(cd_plug_libs)
-cd_win_la_SOURCES=			cd_win.c
-
-cd_xmms_la_LDFLAGS=			$(plugin_ldflags)
-cd_xmms_la_LIBADD=			$(cd_plug_libs) $(XMMS_LIBS)
-cd_xmms_la_DEPENDENCIES=	$(cd_plug_libs)
-cd_xmms_la_CFLAGS=			$(XMMS_CFLAGS)
-cd_xmms_la_SOURCES=			cd_xmms.c
-
-sound_libs= \
-	@snd_output_static_plugin_libs@ \
-	@snd_render_static_plugin_libs@ \
-	$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-	$(top_builddir)/libs/util/libQFutil.la
-
-cd_libs= \
-	@cd_static_plugin_libs@ \
-	$(top_builddir)/libs/util/libQFutil.la
-
-libQFsound_la_LDFLAGS=		$(lib_ldflags)
-libQFsound_la_LIBADD=		$(sound_libs)
-libQFsound_la_DEPENDENCIES=	$(sound_libs)
-libQFsound_la_SOURCES=		snd.c snd_progs.c
-
-libQFcd_la_LDFLAGS=			$(lib_ldflags)
-libQFcd_la_LIBADD=			$(cd_libs)
-libQFcd_la_DEPENDENCIES=	$(cd_libs)
-libQFcd_la_SOURCES=			cd.c
--- a/libs/audio/Makemodule.am
+++ b/libs/audio/Makemodule.am
@ -0,0 +1,67 @@
+include libs/audio/targets/Makemodule.am
+include libs/audio/renderer/Makemodule.am
+
+plugin_LTLIBRARIES +=	@cd_plugins@
+noinst_LTLIBRARIES +=	@cd_static_plugins@
+lib_LTLIBRARIES +=	@CD_TARGETS@ @SND_TARGETS@
+EXTRA_LTLIBRARIES += \
+	libs/audio/libQFsound.la \
+	libs/audio/libQFcd.la \
+	libs/audio/cd_file.la \
+	libs/audio/cd_linux.la \
+	libs/audio/cd_sdl.la \
+	libs/audio/cd_sgi.la \
+	libs/audio/cd_win.la \
+	libs/audio/cd_xmms.la
+
+cd_plug_libs=libs/util/libQFutil.la
+
+cd_file_libs= \
+	libs/audio/libQFsound.la \
+	$(cd_plug_libs)
+
+libs_audio_cd_file_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_file_la_LIBADD=			$(cd_file_libs)
+libs_audio_cd_file_la_SOURCES=			libs/audio/cd_file.c
+
+libs_audio_cd_linux_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_cd_linux_la_LIBADD=			$(cd_plug_libs)
+libs_audio_cd_linux_la_SOURCES=		libs/audio/cd_linux.c
+
+libs_audio_cd_sdl_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_sdl_la_LIBADD=			$(cd_plug_libs) $(SDL_LIBS) $(plugin_libadd)
+libs_audio_cd_sdl_la_CFLAGS=			$(SDL_CFLAGS)
+libs_audio_cd_sdl_la_SOURCES=			libs/audio/cd_sdl.c
+
+libs_audio_cd_sgi_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_sgi_la_LIBADD=			$(cd_plug_libs) $(SGI_CD_LIBS)
+libs_audio_cd_sgi_la_SOURCES=			libs/audio/cd_sgi.c
+
+libs_audio_cd_win_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_win_la_LIBADD=			$(cd_plug_libs) $(plugin_libadd)
+libs_audio_cd_win_la_SOURCES=			libs/audio/cd_win.c
+
+libs_audio_cd_xmms_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_cd_xmms_la_LIBADD=			$(cd_plug_libs) $(XMMS_LIBS)
+libs_audio_cd_xmms_la_CFLAGS=			$(XMMS_CFLAGS)
+libs_audio_cd_xmms_la_SOURCES=			libs/audio/cd_xmms.c
+
+sound_libs= \
+	@snd_output_static_plugin_libs@ \
+	@snd_render_static_plugin_libs@ \
+	libs/ruamoko/libQFruamoko.la \
+	libs/util/libQFutil.la
+
+cd_libs= \
+	@cd_static_plugin_libs@ \
+	libs/util/libQFutil.la
+
+libs_audio_libQFsound_la_LDFLAGS=		$(lib_ldflags)
+libs_audio_libQFsound_la_DEPENDENCIES=	$(sound_libs)
+libs_audio_libQFsound_la_LIBADD=		$(sound_libs)
+libs_audio_libQFsound_la_SOURCES=		libs/audio/snd.c libs/audio/snd_progs.c
+
+libs_audio_libQFcd_la_LDFLAGS=			$(lib_ldflags)
+libs_audio_libQFcd_la_DEPENDENCIES=		$(cd_libs)
+libs_audio_libQFcd_la_LIBADD=			$(cd_libs)
+libs_audio_libQFcd_la_SOURCES=			libs/audio/cd.c
--- a/libs/audio/renderer/Makefile.am
+++ b/libs/audio/renderer/Makefile.am
@ -1,55 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@ \
-	$(VORBIS_CFLAGS) $(OGG_CFLAGS) $(SAMPLERATE_CFLAGS) $(JACK_CFLAGS)
-AM_CPPFLAGS= -I$(top_srcdir)/include
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-EXEEXT=
-
-plugin_LTLIBRARIES=	@snd_render_plugins@
-noinst_LTLIBRARIES=	@snd_render_static_plugins@
-EXTRA_LTLIBRARIES=	snd_render_default.la snd_render_jack.la
-
-flac_src=flac.c
-midi_src=midi.c
-vorbis_src=vorbis.c
-wav_src=wav.c
-
-if HAVE_FLAC
-have_flac_src=$(flac_src)
-else
-have_flac_src=
-endif
-if HAVE_MIDI
-have_midi_src=$(midi_src)
-else
-have_midi_src=
-endif
-if HAVE_VORBIS
-have_vorbis_src=$(vorbis_src)
-else
-have_vorbis_src=
-endif
-have_wav_src=$(wav_src)
-
-format_src=$(have_flac_src) $(have_midi_src) $(have_vorbis_src) $(have_wav_src)
-format_libs= \
-	$(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) \
-	$(OGG_LIBS) $(WM_LIBS)
-extra_format_src=flac.c midi.c vorbis.c wav.c
-snd_common=snd_channels.c snd_mem.c snd_mix.c snd_resample.c snd_sfx.c
-snd_libs= \
-	$(top_builddir)/libs/util/libQFutil.la
-
-snd_render_default_la_LDFLAGS=		$(plugin_ldflags)
-snd_render_default_la_SOURCES=		snd_dma.c $(snd_common) $(format_src)
-snd_render_default_la_LIBADD=		$(snd_libs) $(format_libs)
-snd_render_default_la_DEPENDENCIES=	$(snd_libs)
-EXTRA_snd_render_default_la_SOURCES=$(extra_format_src)
-
-snd_render_jack_la_LDFLAGS=			$(plugin_ldflags)
-snd_render_jack_la_SOURCES=			snd_jack.c $(snd_common) $(format_src)
-snd_render_jack_la_LIBADD=			$(snd_libs) $(format_libs) $(JACK_LIBS)
-snd_render_jack_la_DEPENDENCIES=	$(snd_libs)
-EXTRA_snd_render_jack_la_SOURCES=	$(extra_format_src)
--- a/libs/audio/renderer/Makemodule.am
+++ b/libs/audio/renderer/Makemodule.am
@ -0,0 +1,46 @@
+plugin_LTLIBRARIES +=	@snd_render_plugins@
+noinst_LTLIBRARIES +=	@snd_render_static_plugins@
+EXTRA_LTLIBRARIES +=	libs/audio/renderer/snd_render_default.la libs/audio/renderer/snd_render_jack.la
+
+flac_src=libs/audio/renderer/flac.c
+midi_src=libs/audio/renderer/midi.c
+vorbis_src=libs/audio/renderer/vorbis.c
+wav_src=libs/audio/renderer/wav.c
+
+if HAVE_FLAC
+have_flac_src=$(flac_src)
+else
+have_flac_src=
+endif
+if HAVE_MIDI
+have_midi_src=$(midi_src)
+else
+have_midi_src=
+endif
+if HAVE_VORBIS
+have_vorbis_src=$(vorbis_src)
+else
+have_vorbis_src=
+endif
+have_wav_src=$(wav_src)
+
+format_src=$(have_flac_src) $(have_midi_src) $(have_vorbis_src) $(have_wav_src)
+format_libs= \
+	$(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) \
+	$(OGG_LIBS) $(WM_LIBS)
+extra_format_src=libs/audio/renderer/flac.c libs/audio/renderer/midi.c libs/audio/renderer/vorbis.c libs/audio/renderer/wav.c
+snd_common=libs/audio/renderer/snd_channels.c libs/audio/renderer/snd_mem.c libs/audio/renderer/snd_mix.c libs/audio/renderer/snd_resample.c libs/audio/renderer/snd_sfx.c
+snd_libs= \
+	libs/util/libQFutil.la
+
+libs_audio_renderer_snd_render_default_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_renderer_snd_render_default_la_SOURCES=		libs/audio/renderer/snd_dma.c $(snd_common) $(format_src)
+libs_audio_renderer_snd_render_default_la_LIBADD=		$(snd_libs) $(format_libs)
+libs_audio_renderer_snd_render_default_la_DEPENDENCIES=	$(snd_libs)
+EXTRA_libs_audio_renderer_snd_render_default_la_SOURCES=$(extra_format_src)
+
+libs_audio_renderer_snd_render_jack_la_LDFLAGS=			$(plugin_ldflags)
+libs_audio_renderer_snd_render_jack_la_SOURCES=			libs/audio/renderer/snd_jack.c $(snd_common) $(format_src)
+libs_audio_renderer_snd_render_jack_la_LIBADD=			$(snd_libs) $(format_libs) $(JACK_LIBS)
+libs_audio_renderer_snd_render_jack_la_DEPENDENCIES=	$(snd_libs)
+EXTRA_libs_audio_renderer_snd_render_jack_la_SOURCES=	$(extra_format_src)
--- a/libs/audio/targets/Makefile.am
+++ b/libs/audio/targets/Makefile.am
@ -1,62 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-SDL_LIBS = @SDL_LIBS@
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-EXEEXT=
-snd_deps=$(top_builddir)/libs/util/libQFutil.la
-
-plugin_LTLIBRARIES=	@snd_output_plugins@
-noinst_LTLIBRARIES=	@snd_output_static_plugins@
-EXTRA_LTLIBRARIES= \
-	snd_output_sdl.la snd_output_alsa.la snd_output_oss.la snd_output_sgi.la \
-	snd_output_sun.la snd_output_win.la snd_output_dx.la snd_output_disk.la
-
-snd_output_sdl_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_sdl_la_LIBADD=		$(snd_deps) $(SDL_LIBS) $(plugin_libadd)
-snd_output_sdl_la_DEPENDENCIES=	$(snd_deps)
-snd_output_sdl_la_CFLAGS=		$(SDL_CFLAGS)
-snd_output_sdl_la_SOURCES=		snd_sdl.c
-
-snd_output_alsa_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_alsa_la_LIBADD=		$(snd_deps)
-snd_output_alsa_la_DEPENDENCIES=$(snd_deps)
-snd_output_alsa_la_CFLAGS=		$(ALSA_CFLAGS)
-snd_output_alsa_la_SOURCES=		snd_alsa.c
-
-snd_output_oss_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_oss_la_LIBADD=		$(snd_deps) $(OSS_LIBS)
-snd_output_oss_la_DEPENDENCIES=	$(snd_deps)
-snd_output_oss_la_CFLAGS=		$(OSS_CFLAGS)
-snd_output_oss_la_SOURCES=		snd_oss.c
-
-snd_output_sgi_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_sgi_la_LIBADD=		$(snd_deps) $(SGISND_LIBS)
-snd_output_sgi_la_DEPENDENCIES=	$(snd_deps)
-snd_output_sgi_la_CFLAGS=		$(SGISND_CFLAGS)
-snd_output_sgi_la_SOURCES=		snd_sgi.c
-
-snd_output_sun_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_sun_la_DEPENDENCIES=	$(snd_deps)
-snd_output_sun_la_CFLAGS=		$(SUNSND_CFLAGS)
-snd_output_sun_la_SOURCES=		snd_sun.c
-
-snd_output_win_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_win_la_LIBADD=		$(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
-snd_output_win_la_DEPENDENCIES=	$(snd_deps)
-snd_output_win_la_CFLAGS=		$(WIN32SND_CFLAGS)
-snd_output_win_la_SOURCES=		snd_win.c
-
-snd_output_dx_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_dx_la_LIBADD=		$(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
-snd_output_dx_la_DEPENDENCIES=	$(snd_deps)
-snd_output_dx_la_CFLAGS=		$(WIN32SND_CFLAGS)
-snd_output_dx_la_SOURCES=		snd_dx.c
-
-snd_output_disk_la_LDFLAGS=		$(plugin_ldflags)
-snd_output_disk_la_LIBADD=		$(snd_deps) $(plugin_libadd)
-snd_output_disk_la_DEPENDENCIES=$(snd_deps)
-snd_output_disk_la_CFLAGS=
-snd_output_disk_la_SOURCES=		snd_disk.c
--- a/libs/audio/targets/Makemodule.am
+++ b/libs/audio/targets/Makemodule.am
@ -0,0 +1,54 @@
+plugin_LTLIBRARIES += @snd_output_plugins@
+noinst_LTLIBRARIES += @snd_output_static_plugins@
+EXTRA_LTLIBRARIES += \
+	libs/audio/targets/snd_output_sdl.la libs/audio/targets/snd_output_alsa.la libs/audio/targets/snd_output_oss.la libs/audio/targets/snd_output_sgi.la \
+	libs/audio/targets/snd_output_sun.la libs/audio/targets/snd_output_win.la libs/audio/targets/snd_output_dx.la libs/audio/targets/snd_output_disk.la
+
+snd_deps=libs/util/libQFutil.la
+
+libs_audio_targets_snd_output_sdl_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_sdl_la_LIBADD=		$(snd_deps) $(SDL_LIBS) $(plugin_libadd)
+libs_audio_targets_snd_output_sdl_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_sdl_la_CFLAGS=		$(SDL_CFLAGS)
+libs_audio_targets_snd_output_sdl_la_SOURCES=		libs/audio/targets/snd_sdl.c
+
+libs_audio_targets_snd_output_alsa_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_alsa_la_LIBADD=		$(snd_deps)
+libs_audio_targets_snd_output_alsa_la_DEPENDENCIES=$(snd_deps)
+libs_audio_targets_snd_output_alsa_la_CFLAGS=		$(ALSA_CFLAGS)
+libs_audio_targets_snd_output_alsa_la_SOURCES=		libs/audio/targets/snd_alsa.c
+
+libs_audio_targets_snd_output_oss_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_oss_la_LIBADD=		$(snd_deps) $(OSS_LIBS)
+libs_audio_targets_snd_output_oss_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_oss_la_CFLAGS=		$(OSS_CFLAGS)
+libs_audio_targets_snd_output_oss_la_SOURCES=		libs/audio/targets/snd_oss.c
+
+libs_audio_targets_snd_output_sgi_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_sgi_la_LIBADD=		$(snd_deps) $(SGISND_LIBS)
+libs_audio_targets_snd_output_sgi_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_sgi_la_CFLAGS=		$(SGISND_CFLAGS)
+libs_audio_targets_snd_output_sgi_la_SOURCES=		libs/audio/targets/snd_sgi.c
+
+libs_audio_targets_snd_output_sun_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_sun_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_sun_la_CFLAGS=		$(SUNSND_CFLAGS)
+libs_audio_targets_snd_output_sun_la_SOURCES=		libs/audio/targets/snd_sun.c
+
+libs_audio_targets_snd_output_win_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_win_la_LIBADD=		$(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
+libs_audio_targets_snd_output_win_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_win_la_CFLAGS=		$(WIN32SND_CFLAGS)
+libs_audio_targets_snd_output_win_la_SOURCES=		libs/audio/targets/snd_win.c
+
+libs_audio_targets_snd_output_dx_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_dx_la_LIBADD=		$(snd_deps) $(WINSND_LIBS) $(plugin_libadd)
+libs_audio_targets_snd_output_dx_la_DEPENDENCIES=	$(snd_deps)
+libs_audio_targets_snd_output_dx_la_CFLAGS=		$(WIN32SND_CFLAGS)
+libs_audio_targets_snd_output_dx_la_SOURCES=		libs/audio/targets/snd_dx.c
+
+libs_audio_targets_snd_output_disk_la_LDFLAGS=		$(plugin_ldflags)
+libs_audio_targets_snd_output_disk_la_LIBADD=		$(snd_deps) $(plugin_libadd)
+libs_audio_targets_snd_output_disk_la_DEPENDENCIES=$(snd_deps)
+libs_audio_targets_snd_output_disk_la_CFLAGS=
+libs_audio_targets_snd_output_disk_la_SOURCES=		libs/audio/targets/snd_disk.c
--- a/libs/audio/test/Makefile.am
+++ b/libs/audio/test/Makefile.am
@ -7,9 +7,9 @@ noinst_PROGRAMS= @AUDIO_TARGETS@
 EXTRA_PROGRAMS= testsound

 test_libs= \
-	$(top_builddir)/libs/audio/libQFsound.la \
-	$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-	$(top_builddir)/libs/util/libQFutil.la
+	libs/audio/libQFsound.la \
+	libs/ruamoko/libQFruamoko.la \
+	libs/util/libQFutil.la

 testsound_SOURCES=		testsound.c
 testsound_LDADD=		$(test_libs)
--- a/libs/client/Makefile.am
+++ b/libs/client/Makefile.am
@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES= libQFclient.la
-
-libQFclient_la_LDFLAGS=	@STATIC@
-libQFclient_la_LIBADD=	$(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la
-libQFclient_la_SOURCES= \
-		cl_entities.c
--- a/libs/client/Makemodule.am
+++ b/libs/client/Makemodule.am
@ -0,0 +1,6 @@
+noinst_LTLIBRARIES += libs/client/libQFclient.la
+
+libs_client_libQFclient_la_LDFLAGS=	@STATIC@
+libs_client_libQFclient_la_LIBADD=	libs/gamecode/libQFgamecode.la libs/util/libQFutil.la
+libs_client_libQFclient_la_SOURCES= \
+		libs/client/cl_entities.c
--- a/libs/console/Makefile.am
+++ b/libs/console/Makefile.am
@ -1,43 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-EXEEXT=
-
-lib_LTLIBRARIES=	libQFconsole.la
-plugin_LTLIBRARIES= @console_plugins@
-noinst_LTLIBRARIES= @client_static_plugins@ @server_static_plugins@
-EXTRA_LTLIBRARIES=  console_server.la console_client.la
-
-common_sources= \
-	buffer.c complete.c console.c inputline.c list.c filelist.c view.c
-client_sources= bi_inputline.c client.c menu.c
-server_sources= server.c
-
-console_deps=$(top_builddir)/libs/util/libQFutil.la
-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/ruamoko/libQFruamoko.la \
-	$(console_deps)
-server_deps= libQFconsole.la $(console_deps)
-
-libQFconsole_la_LDFLAGS=		$(lib_ldflags)
-libQFconsole_la_LIBADD=			$(console_deps) $(plugin_libadd)
-libQFconsole_la_DEPENDENCIES=	$(console_deps)
-libQFconsole_la_SOURCES=		$(common_sources)
-
-console_client_la_LDFLAGS=		$(plugin_ldflags)
-console_client_la_LIBADD=		$(client_deps) $(plugin_libadd)
-console_client_la_DEPENDENCIES=	$(client_deps)
-console_client_la_SOURCES=		$(client_sources)
-
-console_server_la_LDFLAGS=		$(plugin_ldflags)
-console_server_la_LIBADD=		$(server_deps) $(CURSES_LIBS) $(plugin_libadd)
-console_server_la_DEPENDENCIES=	$(server_deps)
-console_server_la_SOURCES=		$(server_sources)
--- a/libs/console/Makemodule.am
+++ b/libs/console/Makemodule.am
@ -0,0 +1,33 @@
+lib_LTLIBRARIES += libs/console/libQFconsole.la
+plugin_LTLIBRARIES += @console_plugins@
+noinst_LTLIBRARIES += @client_static_plugins@ @server_static_plugins@
+EXTRA_LTLIBRARIES +=  libs/console/console_server.la libs/console/console_client.la
+
+console_common_sources= \
+	libs/console/buffer.c libs/console/complete.c libs/console/console.c libs/console/inputline.c libs/console/list.c libs/console/filelist.c libs/console/view.c
+client_sources= libs/console/bi_inputline.c libs/console/client.c libs/console/menu.c
+server_sources= libs/console/server.c
+
+console_deps=libs/util/libQFutil.la
+client_deps= libs/console/libQFconsole.la \
+	libs/audio/libQFsound.la \
+	libs/ruamoko/libQFruamoko.la \
+	libs/gib/libQFgib.la \
+	libs/ruamoko/libQFruamoko.la \
+	$(console_deps)
+server_deps= libs/console/libQFconsole.la $(console_deps)
+
+libs_console_libQFconsole_la_LDFLAGS=		$(lib_ldflags)
+libs_console_libQFconsole_la_LIBADD=			$(console_deps) $(plugin_libadd)
+libs_console_libQFconsole_la_DEPENDENCIES=	$(console_deps)
+libs_console_libQFconsole_la_SOURCES=		$(console_common_sources)
+
+libs_console_console_client_la_LDFLAGS=		$(plugin_ldflags)
+libs_console_console_client_la_LIBADD=		$(client_deps) $(plugin_libadd)
+libs_console_console_client_la_DEPENDENCIES=	$(client_deps)
+libs_console_console_client_la_SOURCES=		$(client_sources)
+
+libs_console_console_server_la_LDFLAGS=		$(plugin_ldflags)
+libs_console_console_server_la_LIBADD=		$(server_deps) $(CURSES_LIBS) $(plugin_libadd)
+libs_console_console_server_la_DEPENDENCIES=	$(server_deps)
+libs_console_console_server_la_SOURCES=		$(server_sources)
--- a/libs/gamecode/Makefile.am
+++ b/libs/gamecode/Makefile.am
@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-lib_ldflags=
-
-gc_deps=$(top_builddir)/libs/util/libQFutil.la
-
-noinst_LTLIBRARIES=	libQFgamecode.la
-
-libQFgamecode_la_LDFLAGS=		$(lib_ldflags)
-libQFgamecode_la_LIBADD=		$(gc_deps)
-libQFgamecode_la_DEPENDENCIES=	$(gc_deps)
-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
--- a/libs/gamecode/Makemodule.am
+++ b/libs/gamecode/Makemodule.am
@ -0,0 +1,19 @@
+gc_deps=libs/util/libQFutil.la
+
+noinst_LTLIBRARIES += libs/gamecode/libQFgamecode.la
+
+libs_gamecode_libQFgamecode_la_LDFLAGS=
+libs_gamecode_libQFgamecode_la_LIBADD=		$(gc_deps)
+libs_gamecode_libQFgamecode_la_DEPENDENCIES=$(gc_deps)
+libs_gamecode_libQFgamecode_la_SOURCES= \
+	libs/gamecode/pr_builtins.c \
+	libs/gamecode/pr_edict.c \
+	libs/gamecode/pr_debug.c \
+	libs/gamecode/pr_exec.c \
+	libs/gamecode/pr_load.c \
+	libs/gamecode/pr_parse.c \
+	libs/gamecode/pr_opcode.c \
+	libs/gamecode/pr_resolve.c \
+	libs/gamecode/pr_resource.c \
+	libs/gamecode/pr_strings.c \
+	libs/gamecode/pr_zone.c
--- a/libs/gib/Makefile.am
+++ b/libs/gib/Makefile.am
@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-gib_deps= \
-	$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-	$(top_builddir)/libs/util/libQFutil.la
-
-lib_LTLIBRARIES= libQFgib.la
-
-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 \
-	gib_semantics.c ops.c exp.c regex.c
--- a/libs/gib/Makemodule.am
+++ b/libs/gib/Makemodule.am
@ -0,0 +1,29 @@
+gib_deps= \
+	libs/ruamoko/libQFruamoko.la \
+	libs/util/libQFutil.la
+
+lib_LTLIBRARIES += libs/gib/libQFgib.la
+
+libs_gib_libQFgib_la_LDFLAGS=		$(lib_ldflags)
+libs_gib_libQFgib_la_LIBADD=		$(gib_deps)
+libs_gib_libQFgib_la_DEPENDENCIES=	$(gib_deps)
+libs_gib_libQFgib_la_SOURCES= \
+	libs/gib/bi_gib.c \
+	libs/gib/gib_buffer.c \
+	libs/gib/gib_builtin.c \
+	libs/gib/gib_classes.c \
+	libs/gib/gib_execute.c \
+	libs/gib/gib_function.c \
+	libs/gib/gib_parse.c \
+	libs/gib/gib_handle.c \
+	libs/gib/gib_object.c \
+	libs/gib/gib_process.c \
+	libs/gib/gib_regex.c \
+	libs/gib/gib_thread.c \
+	libs/gib/gib_vars.c \
+	libs/gib/gib_init.c \
+	libs/gib/gib_tree.c \
+	libs/gib/gib_semantics.c \
+	libs/gib/ops.c \
+	libs/gib/exp.c \
+	libs/gib/regex.c
--- a/libs/image/Makefile.am
+++ b/libs/image/Makefile.am
@ -1,18 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-AM_CFLAGS= @PREFER_PIC@ $(Z_CFLAGS) $(PNG_CFLAGS)
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-image_deps=$(top_builddir)/libs/util/libQFutil.la
-
-lib_LTLIBRARIES= libQFimage.la
-
-libQFimage_la_LDFLAGS=		$(lib_ldflags)
-libQFimage_la_LIBADD=		$(image_deps) $(PNG_LIBS)
-libQFimage_la_DEPENDENCIES=	$(pmage_deps)
-libQFimage_la_SOURCES= \
-	image.c pcx.c png.c tga.c
-
-EXTRA_DIST=
--- a/libs/image/Makemodule.am
+++ b/libs/image/Makemodule.am
@ -0,0 +1,9 @@
+image_deps=libs/util/libQFutil.la
+
+lib_LTLIBRARIES += libs/image/libQFimage.la
+
+libs_image_libQFimage_la_LDFLAGS=		$(lib_ldflags)
+libs_image_libQFimage_la_LIBADD=		$(image_deps) $(PNG_LIBS)
+libs_image_libQFimage_la_DEPENDENCIES=	$(image_deps)
+libs_image_libQFimage_la_SOURCES= \
+	libs/image/image.c libs/image/pcx.c libs/image/png.c libs/image/tga.c
--- a/libs/models/Makefile.am
+++ b/libs/models/Makefile.am
@ -1,58 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= alias brush iqm sprite . test
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-lib_LTLIBRARIES=	libQFmodels.la
-noinst_LTLIBRARIES= @models_libs@
-EXTRA_LTLIBRARIES=	libmodels_gl.la libmodels_glsl.la libmodels_sw.la
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-models_sources = clip_hull.c model.c portal.c trace.c winding.c
-
-common_libs = \
-	$(top_builddir)/libs/util/libQFutil.la
-
-models_libs=brush/libbrush.la $(common_libs)
-
-libQFmodels_la_LDFLAGS= 			$(lib_ldflags)
-libQFmodels_la_LIBADD=				$(models_libs)
-libQFmodels_la_DEPENDENCIES=		$(models_libs)
-libQFmodels_la_SOURCES= 			$(models_sources)
-
-gl_sources=gl_model_fullbright.c gl_skin.c skin.c
-gl_libs= \
-	alias/libalias_gl.la \
-	brush/libbrush_gl.la \
-	iqm/libiqm_gl.la \
-	sprite/libsprite_gl.la \
-	$(top_builddir)/libs/image/libQFimage.la
-libmodels_gl_la_LDFLAGS=		
-libmodels_gl_la_LIBADD=			$(gl_libs)
-libmodels_gl_la_DEPENDENCIES=	$(gl_libs)
-libmodels_gl_la_SOURCES=		$(gl_sources)
-
-glsl_libs= \
-	alias/libalias_glsl.la \
-	brush/libbrush_glsl.la \
-	iqm/libiqm_glsl.la \
-	sprite/libsprite_glsl.la \
-	$(top_builddir)/libs/image/libQFimage.la
-libmodels_glsl_la_LDFLAGS=		
-libmodels_glsl_la_LIBADD=		$(glsl_libs)
-libmodels_glsl_la_DEPENDENCIES=	$(glsl_libs)
-libmodels_glsl_la_SOURCES=		glsl_skin.c skin.c
-
-sw_libs= \
-	alias/libalias_sw.la \
-	brush/libbrush_sw.la \
-	iqm/libiqm_sw.la \
-	sprite/libsprite_sw.la \
-	$(top_builddir)/libs/image/libQFimage.la
-libmodels_sw_la_LDFLAGS=		
-libmodels_sw_la_LIBADD=			$(sw_libs)
-libmodels_sw_la_DEPENDENCIES=	$(sw_libs)
-libmodels_sw_la_SOURCES=		sw_skin.c skin.c
--- a/libs/models/Makemodule.am
+++ b/libs/models/Makemodule.am
@ -0,0 +1,55 @@
+include libs/models/alias/Makemodule.am
+include libs/models/brush/Makemodule.am
+include libs/models/iqm/Makemodule.am
+include libs/models/sprite/Makemodule.am
+include libs/models/test/Makemodule.am
+
+lib_LTLIBRARIES +=	libs/models/libQFmodels.la
+noinst_LTLIBRARIES += @models_libs@
+EXTRA_LTLIBRARIES += libs/models/libmodels_gl.la libs/models/libmodels_glsl.la libs/models/libmodels_sw.la
+
+models_sources = libs/models/clip_hull.c libs/models/model.c libs/models/portal.c libs/models/trace.c libs/models/winding.c
+
+common_libs = \
+	libs/util/libQFutil.la
+
+models_libs=libs/models/brush/libbrush.la $(common_libs)
+
+libs_models_libQFmodels_la_LDFLAGS= 			$(lib_ldflags)
+libs_models_libQFmodels_la_LIBADD=				$(models_libs)
+libs_models_libQFmodels_la_DEPENDENCIES=		$(models_libs)
+libs_models_libQFmodels_la_SOURCES= 			$(models_sources)
+
+gl_sources=libs/models/gl_model_fullbright.c libs/models/gl_skin.c libs/models/skin.c
+gl_libs= \
+	libs/models/alias/libalias_gl.la \
+	libs/models/brush/libbrush_gl.la \
+	libs/models/iqm/libiqm_gl.la \
+	libs/models/sprite/libsprite_gl.la \
+	libs/image/libQFimage.la
+libs_models_libmodels_gl_la_LDFLAGS=
+libs_models_libmodels_gl_la_LIBADD=			$(gl_libs)
+libs_models_libmodels_gl_la_DEPENDENCIES=	$(gl_libs)
+libs_models_libmodels_gl_la_SOURCES=		$(gl_sources)
+
+glsl_libs= \
+	libs/models/alias/libalias_glsl.la \
+	libs/models/brush/libbrush_glsl.la \
+	libs/models/iqm/libiqm_glsl.la \
+	libs/models/sprite/libsprite_glsl.la \
+	libs/image/libQFimage.la
+libs_models_libmodels_glsl_la_LDFLAGS=
+libs_models_libmodels_glsl_la_LIBADD=		$(glsl_libs)
+libs_models_libmodels_glsl_la_DEPENDENCIES=	$(glsl_libs)
+libs_models_libmodels_glsl_la_SOURCES=		libs/models/glsl_skin.c libs/models/skin.c
+
+sw_libs= \
+	libs/models/alias/libalias_sw.la \
+	libs/models/brush/libbrush_sw.la \
+	libs/models/iqm/libiqm_sw.la \
+	libs/models/sprite/libsprite_sw.la \
+	libs/image/libQFimage.la
+libs_models_libmodels_sw_la_LDFLAGS=
+libs_models_libmodels_sw_la_LIBADD=			$(sw_libs)
+libs_models_libmodels_sw_la_DEPENDENCIES=	$(sw_libs)
+libs_models_libmodels_sw_la_SOURCES=		libs/models/sw_skin.c libs/models/skin.c
--- a/libs/models/alias/Makefile.am
+++ b/libs/models/alias/Makefile.am
@ -1,20 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	@alias_libs@
-EXTRA_LTLIBRARIES=libalias_gl.la libalias_glsl.la libalias_sw.la
-
-alias_src= model_alias.c
-gl_src= gl_mesh.c gl_model_alias.c floodfill.c
-glsl_src= glsl_model_alias.c floodfill.c
-sw_src= sw_model_alias.c
-
-libalias_gl_la_SOURCES= $(gl_src) $(alias_src)
-
-libalias_glsl_la_SOURCES= $(glsl_src) $(alias_src)
-
-libalias_sw_la_SOURCES= $(sw_src) $(alias_src)
-
-EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(alias_src)
--- a/libs/models/alias/Makemodule.am
+++ b/libs/models/alias/Makemodule.am
@ -0,0 +1,15 @@
+noinst_LTLIBRARIES +=	@alias_libs@
+EXTRA_LTLIBRARIES += libs/models/alias/libalias_gl.la libs/models/alias/libalias_glsl.la libs/models/alias/libalias_sw.la
+
+alias_src= libs/models/alias/model_alias.c
+alias_gl_src= libs/models/alias/gl_mesh.c libs/models/alias/gl_model_alias.c libs/models/alias/floodfill.c
+alias_glsl_src= libs/models/alias/glsl_model_alias.c libs/models/alias/floodfill.c
+alias_sw_src= libs/models/alias/sw_model_alias.c
+
+libs_models_alias_libalias_gl_la_SOURCES= $(alias_gl_src) $(alias_src)
+
+libs_models_alias_libalias_glsl_la_SOURCES= $(alias_glsl_src) $(alias_src)
+
+libs_models_alias_libalias_sw_la_SOURCES= $(alias_sw_src) $(alias_src)
+
+EXTRA_DIST += $(alias_gl_src) $(alias_glsl_src) $(alias_sw_src) $(alias_src)
--- a/libs/models/brush/Makefile.am
+++ b/libs/models/brush/Makefile.am
@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libbrush.la @brush_libs@
-EXTRA_LTLIBRARIES=libbrush_gl.la libbrush_glsl.la libbrush_sw.la
-
-brush_src= model_brush.c
-gl_src= gl_model_brush.c
-glsl_src= glsl_model_brush.c
-sw_src= sw_model_brush.c
-
-libbrush_la_SOURCES= $(brush_src)
-
-libbrush_gl_la_SOURCES= $(gl_src) $(brush_src)
-
-libbrush_glsl_la_SOURCES= $(glsl_src) $(brush_src)
-
-libbrush_sw_la_SOURCES= $(sw_src) $(brush_src)
-
-EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(brush_src)
--- a/libs/models/brush/Makemodule.am
+++ b/libs/models/brush/Makemodule.am
@ -0,0 +1,17 @@
+noinst_LTLIBRARIES += libs/models/brush/libbrush.la @brush_libs@
+EXTRA_LTLIBRARIES += libs/models/brush/libbrush_gl.la libs/models/brush/libbrush_glsl.la libs/models/brush/libbrush_sw.la
+
+brush_src= libs/models/brush/model_brush.c
+brush_gl_src= libs/models/brush/gl_model_brush.c
+brush_glsl_src= libs/models/brush/glsl_model_brush.c
+brush_sw_src= libs/models/brush/sw_model_brush.c
+
+libs_models_brush_libbrush_la_SOURCES= $(brush_src)
+
+libs_models_brush_libbrush_gl_la_SOURCES= $(brush_gl_src) $(brush_src)
+
+libs_models_brush_libbrush_glsl_la_SOURCES= $(brush_glsl_src) $(brush_src)
+
+libs_models_brush_libbrush_sw_la_SOURCES= $(brush_sw_src) $(brush_src)
+
+EXTRA_DIST += $(brush_gl_src) $(brush_glsl_src) $(brush_sw_src) $(brush_src)
--- a/libs/models/iqm/Makefile.am
+++ b/libs/models/iqm/Makefile.am
@ -1,20 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	@iqm_libs@
-EXTRA_LTLIBRARIES=libiqm_gl.la libiqm_glsl.la libiqm_sw.la
-
-iqm_src= model_iqm.c
-gl_src= gl_model_iqm.c
-glsl_src= glsl_model_iqm.c
-sw_src= sw_model_iqm.c
-
-libiqm_gl_la_SOURCES= $(gl_src) $(iqm_src)
-
-libiqm_glsl_la_SOURCES= $(glsl_src) $(iqm_src)
-
-libiqm_sw_la_SOURCES= $(sw_src) $(iqm_src)
-
-EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(iqm_src)
--- a/libs/models/iqm/Makemodule.am
+++ b/libs/models/iqm/Makemodule.am
@ -0,0 +1,15 @@
+noinst_LTLIBRARIES += @iqm_libs@
+EXTRA_LTLIBRARIES += libs/models/iqm/libiqm_gl.la libs/models/iqm/libiqm_glsl.la libs/models/iqm/libiqm_sw.la
+
+iqm_src= libs/models/iqm/model_iqm.c
+iqm_gl_src= libs/models/iqm/gl_model_iqm.c
+iqm_glsl_src= libs/models/iqm/glsl_model_iqm.c
+iqm_sw_src= libs/models/iqm/sw_model_iqm.c
+
+libs_models_iqm_libiqm_gl_la_SOURCES= $(iqm_gl_src) $(iqm_src)
+
+libs_models_iqm_libiqm_glsl_la_SOURCES= $(iqm_glsl_src) $(iqm_src)
+
+libs_models_iqm_libiqm_sw_la_SOURCES= $(iqm_sw_src) $(iqm_src)
+
+EXTRA_DIST += $(iqm_gl_src) $(iqm_glsl_src) $(iqm_sw_src) $(iqm_src)
--- a/libs/models/sprite/Makefile.am
+++ b/libs/models/sprite/Makefile.am
@ -1,20 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	@sprite_libs@
-EXTRA_LTLIBRARIES=libsprite_gl.la libsprite_glsl.la libsprite_sw.la
-
-sprite_src= model_sprite.c
-gl_src= gl_model_sprite.c
-glsl_src= glsl_model_sprite.c
-sw_src= sw_model_sprite.c
-
-libsprite_gl_la_SOURCES=	$(gl_src) $(sprite_src)
-
-libsprite_glsl_la_SOURCES=	$(glsl_src) $(sprite_src)
-
-libsprite_sw_la_SOURCES=	$(sw_src) $(sprite_src)
-
-EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(sprite_src)
--- a/libs/models/sprite/Makemodule.am
+++ b/libs/models/sprite/Makemodule.am
@ -0,0 +1,15 @@
+noinst_LTLIBRARIES += @sprite_libs@
+EXTRA_LTLIBRARIES += libs/models/sprite/libsprite_gl.la libs/models/sprite/libsprite_glsl.la libs/models/sprite/libsprite_sw.la
+
+sprite_src= libs/models/sprite/model_sprite.c
+sprite_gl_src= libs/models/sprite/gl_model_sprite.c
+sprite_glsl_src= libs/models/sprite/glsl_model_sprite.c
+sprite_sw_src= libs/models/sprite/sw_model_sprite.c
+
+libs_models_sprite_libsprite_gl_la_SOURCES=	$(sprite_gl_src) $(sprite_src)
+
+libs_models_sprite_libsprite_glsl_la_SOURCES=	$(sprite_glsl_src) $(sprite_src)
+
+libs_models_sprite_libsprite_sw_la_SOURCES=	$(sprite_sw_src) $(sprite_src)
+
+EXTRA_DIST += $(sprite_gl_src) $(sprite_glsl_src) $(sprite_sw_src) $(sprite_src)
--- a/libs/models/test/Makefile.am
+++ b/libs/models/test/Makefile.am
@ -1,24 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/include
-
-check_PROGRAMS=testclip testcontents testportals
-EXTRA_DIST=	trace-id.c trace-qf-bad.c hulls.h main.c
-
-test_libs= \
-	$(top_builddir)/libs/models/libQFmodels.la \
-	$(top_builddir)/libs/util/libQFutil.la
-
-testclip_SOURCES=			testclip.c hulls.c
-testclip_LDADD=				$(test_libs)
-testclip_DEPENDENCIES=		$(test_libs)
-
-testcontents_SOURCES=		testcontents.c hulls.c
-testcontents_LDADD=			$(test_libs)
-testcontents_DEPENDENCIES=	$(test_libs)
-
-testportals_SOURCES=		testportals.c hulls.c
-testportals_LDADD=			$(test_libs)
-testportals_DEPENDENCIES=	$(test_libs)
-
-TESTS=$(check_PROGRAMS)
--- a/libs/models/test/Makemodule.am
+++ b/libs/models/test/Makemodule.am
@ -0,0 +1,36 @@
+libs_model_tests = \
+	libs/models/test/testclip \
+	libs/models/test/testcontents \
+	libs/models/test/testportals
+
+TESTS += $(libs_model_tests)
+
+check_PROGRAMS += $(libs_model_tests)
+
+EXTRA_DIST += \
+	libs/models/test/trace-id.c \
+	libs/models/test/trace-qf-bad.c \
+	libs/models/test/hulls.h \
+	libs/models/test/main.c
+
+test_libs= \
+	libs/models/libQFmodels.la \
+	libs/util/libQFutil.la
+
+libs_models_test_testclip_SOURCES= \
+	libs/models/test/testclip.c \
+	libs/models/test/hulls.c
+libs_models_test_testclip_LDADD=			$(test_libs)
+libs_models_test_testclip_DEPENDENCIES=		$(test_libs)
+
+libs_models_test_testcontents_SOURCES= \
+	libs/models/test/testcontents.c \
+	libs/models/test/hulls.c
+libs_models_test_testcontents_LDADD=		$(test_libs)
+libs_models_test_testcontents_DEPENDENCIES=	$(test_libs)
+
+libs_models_test_testportals_SOURCES= \
+	libs/models/test/testportals.c \
+	libs/models/test/hulls.c
+libs_models_test_testportals_LDADD=			$(test_libs)
+libs_models_test_testportals_DEPENDENCIES=	$(test_libs)
--- a/libs/net/Makefile.am
+++ b/libs/net/Makefile.am
@ -1,19 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= nc nm
-AM_CFLAGS= @PREFER_NON_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libnet_chan.la libnet_main.la
-
-nc_libs=nc/libnc.la
-libnet_chan_la_LDFLAGS=		@STATIC@
-libnet_chan_la_LIBADD=		$(nc_libs)
-libnet_chan_la_DEPENDENCIES=$(nc_libs)
-libnet_chan_la_SOURCES= 	net_chan.c
-
-nm_libs=nm/libnm.la
-libnet_main_la_LDFLAGS=		@STATIC@
-libnet_main_la_LIBADD=		$(nm_libs)
-libnet_main_la_DEPENDENCIES=$(nm_libs)
-libnet_main_la_SOURCES=		net_main.c
--- a/libs/net/Makemodule.am
+++ b/libs/net/Makemodule.am
@ -0,0 +1,14 @@
+
+noinst_LTLIBRARIES +=	libs/net/libnet_chan.la libs/net/libnet_main.la
+
+include libs/net/nc/Makemodule.am
+include libs/net/nm/Makemodule.am
+
+libs_net_libnet_chan_la_LDFLAGS=		@STATIC@
+libs_net_libnet_chan_la_SOURCES= 	libs/net/net_chan.c ${nc_src}
+EXTRA_libs_net_libnet_chan_la_SOURCES = $(ipv4_src) $(ipv6_src)
+
+nm_libs=nm/libnm.la
+libs_net_libnet_main_la_LDFLAGS=		@STATIC@
+libs_net_libnet_main_la_SOURCES=		libs/net/net_main.c ${nm_src}
+EXTRA_libs_net_libnet_main_la_SOURCES = $(nm_extra)
--- a/libs/net/nc/Makefile.am
+++ b/libs/net/nc/Makefile.am
@ -1,17 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_NON_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libnc.la
-
-ipv6_src= net_udp6.c
-ipv4_src= net_udp.c
-if NETTYPE_IPV6
-ipvX_src= $(ipv6_src)
-else
-ipvX_src= $(ipv4_src)
-endif
-libnc_la_SOURCES= $(ipvX_src)
-libnc_la_LDFLAGS= @STATIC@
-EXTRA_libnc_la_SOURCES= $(ipv4_src) $(ipv6_src)
--- a/libs/net/nc/Makemodule.am
+++ b/libs/net/nc/Makemodule.am
@ -0,0 +1,8 @@
+ipv6_src= libs/net/nc/net_udp6.c
+ipv4_src= libs/net/nc/net_udp.c
+if NETTYPE_IPV6
+ipvX_src= $(ipv6_src)
+else
+ipvX_src= $(ipv4_src)
+endif
+nc_src= $(ipvX_src)
--- a/libs/net/nm/Makefile.am
+++ b/libs/net/nm/Makefile.am
@ -1,18 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_NON_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libnm.la
-
-if SYSTYPE_WIN32
-net_sources= net_win.c net_wins.c
-else
-net_sources= net_bsd.c net_udp.c
-endif
-libnm_la_SOURCES= net_dgrm.c net_loop.c net_vcr.c $(net_sources)
-libnm_la_LDFLAGS= @STATIC@
-
-
-EXTRA_libnm_la_SOURCES= \
-		net_bsd.c net_win.c net_wins.c net_udp.c
--- a/libs/net/nm/Makemodule.am
+++ b/libs/net/nm/Makemodule.am
@ -0,0 +1,8 @@
+if SYSTYPE_WIN32
+net_sources= libs/net/nm/net_win.c libs/net/nm/net_wins.c
+else
+net_sources= libs/net/nm/net_bsd.c libs/net/nm/net_udp.c
+endif
+nm_src= libs/net/nm/net_dgrm.c libs/net/nm/net_loop.c libs/net/nm/net_vcr.c $(net_sources)
+
+nm_extra = libs/net/nm/net_bsd.c libs/net/nm/net_win.c libs/net/nm/net_wins.c libs/net/nm/net_udp.c
--- a/libs/qw/Makefile.am
+++ b/libs/qw/Makefile.am
@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LIBRARIES= libqw.a
-
-libqw_a_SOURCES= \
-		msg_backbuf.c msg_ucmd.c
--- a/libs/qw/Makemodule.am
+++ b/libs/qw/Makemodule.am
@ -0,0 +1,4 @@
+noinst_LIBRARIES += libs/qw/libqw.a
+
+libs_qw_libqw_a_SOURCES= \
+		libs/qw/msg_backbuf.c libs/qw/msg_ucmd.c
--- a/libs/ruamoko/Makefile.am
+++ b/libs/ruamoko/Makefile.am
@ -1,21 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-rua_libs= \
-	$(top_builddir)/libs/gamecode/libQFgamecode.la \
-	$(top_builddir)/libs/util/libQFutil.la
-
-lib_LTLIBRARIES= libQFruamoko.la
-
-libQFruamoko_la_LDFLAGS=		$(lib_ldflags)
-libQFruamoko_la_LIBADD=			$(rua_libs)
-libQFruamoko_la_DEPENDENCIES=	$(rua_libs)
-libQFruamoko_la_SOURCES= \
-		pr_cmds.c \
-		rua_cbuf.c rua_cmd.c rua_cvar.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_runtime.c rua_script.c rua_set.c rua_string.c
--- a/libs/ruamoko/Makemodule.am
+++ b/libs/ruamoko/Makemodule.am
@ -0,0 +1,26 @@
+ruamoko_rua_libs= \
+	libs/gamecode/libQFgamecode.la \
+	libs/util/libQFutil.la
+
+lib_LTLIBRARIES += libs/ruamoko/libQFruamoko.la
+
+libs_ruamoko_libQFruamoko_la_LDFLAGS=		$(lib_ldflags)
+libs_ruamoko_libQFruamoko_la_LIBADD=		$(ruamoko_rua_libs)
+libs_ruamoko_libQFruamoko_la_DEPENDENCIES=	$(ruamoko_rua_libs)
+libs_ruamoko_libQFruamoko_la_SOURCES= \
+	libs/ruamoko/pr_cmds.c \
+	libs/ruamoko/rua_cbuf.c \
+	libs/ruamoko/rua_cmd.c \
+	libs/ruamoko/rua_cvar.c \
+	libs/ruamoko/rua_hash.c \
+	libs/ruamoko/rua_init.c \
+	libs/ruamoko/rua_math.c \
+	libs/ruamoko/rua_msgbuf.c \
+	libs/ruamoko/rua_obj.c \
+	libs/ruamoko/rua_plist.c \
+	libs/ruamoko/rua_qfile.c \
+	libs/ruamoko/rua_qfs.c \
+	libs/ruamoko/rua_runtime.c \
+	libs/ruamoko/rua_script.c \
+	libs/ruamoko/rua_set.c \
+	libs/ruamoko/rua_string.c
--- a/libs/util/Makefile.am
+++ b/libs/util/Makefile.am
@ -1,60 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= . test
-
-AM_CFLAGS= @PREFER_PIC@
-CCASFLAGS+= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(Z_CFLAGS) $(FNM_FLAGS)
-
-lib_LTLIBRARIES= libQFutil.la
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-if ASM_ARCH
-asm= libasm.la
-else
-asm=
-endif
-
-noinst_LTLIBRARIES=	$(asm)
-#EXTRA_LTLIBRARIES= libasm.la
-
-libasm_la_SOURCES=	math.S sys_ia32.S
-
-
-dirent_src=		dirent.c
-fnmatch_src=	fnmatch.c
-getopt_src=		getopt.c getopt1.c
-
-if BUILD_DIRENT
-dirent= $(dirent_src)
-else
-dirent=
-endif
-
-if BUILD_FNMATCH
-fnmatch= $(fnmatch_src)
-else
-fnmatch=
-endif
-
-if BUILD_GETOPT
-getopt= $(getopt_src)
-else
-getopt=
-endif
-
-libQFutil_la_LDFLAGS=		$(lib_ldflags)
-libQFutil_la_LIBADD=		$(asm) $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS)
-libQFutil_la_DEPENDENCIES=	$(asm)
-libQFutil_la_SOURCES= \
-	bspfile.c buildnum.c cbuf.c checksum.c cmd.c crc.c cvar.c dstring.c \
-	fendian.c hash.c idparse.c info.c link.c llist.c \
-	mathlib.c mdfour.c mersenne.c msg.c pakfile.c plugin.c qargs.c qendian.c \
-	qfplist.c quakefs.c quakeio.c riff.c script.c segtext.c set.c sizebuf.c \
-	string.c sys.c txtbuffer.c va.c ver_check.c vrect.c wad.c wadfile.c \
-	zone.c \
-	$(dirent) $(fnmatch) $(getopt)
-
-EXTRA_DIST= $(fnmatch_src) $(getopt_src)
--- a/libs/util/Makemodule.am
+++ b/libs/util/Makemodule.am
@ -0,0 +1,84 @@
+include libs/util/test/Makemodule.am
+
+lib_LTLIBRARIES += libs/util/libQFutil.la
+
+if ASM_ARCH
+util_asm= libs/util/libasm.la
+else
+util_asm=
+endif
+
+noinst_LTLIBRARIES +=	$(util_asm)
+#EXTRA_LTLIBRARIES += libasm.la
+
+libs_util_libasm_la_SOURCES =	libs/util/math.S libs/util/sys_ia32.S
+
+
+dirent_src=		libs/util/dirent.c
+fnmatch_src=	libs/util/fnmatch.c
+getopt_src=		libs/util/getopt.c libs/util/getopt1.c
+
+if BUILD_DIRENT
+dirent= $(dirent_src)
+else
+dirent=
+endif
+
+if BUILD_FNMATCH
+fnmatch= $(fnmatch_src)
+else
+fnmatch=
+endif
+
+if BUILD_GETOPT
+getopt= $(getopt_src)
+else
+getopt=
+endif
+
+libs_util_libQFutil_la_LDFLAGS=		$(lib_ldflags)
+libs_util_libQFutil_la_LIBADD=		$(util_asm) $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS)
+libs_util_libQFutil_la_DEPENDENCIES=	$(util_asm)
+libs_util_libQFutil_la_SOURCES= \
+	libs/util/bspfile.c \
+	libs/util/buildnum.c \
+	libs/util/cbuf.c \
+	libs/util/checksum.c \
+	libs/util/cmd.c \
+	libs/util/crc.c \
+	libs/util/cvar.c \
+	libs/util/dstring.c \
+	libs/util/fendian.c \
+	libs/util/hash.c \
+	libs/util/idparse.c \
+	libs/util/info.c \
+	libs/util/link.c \
+	libs/util/llist.c \
+	libs/util/mathlib.c \
+	libs/util/mdfour.c \
+	libs/util/mersenne.c \
+	libs/util/msg.c \
+	libs/util/pakfile.c \
+	libs/util/plugin.c \
+	libs/util/qargs.c \
+	libs/util/qendian.c \
+	libs/util/qfplist.c \
+	libs/util/quakefs.c \
+	libs/util/quakeio.c \
+	libs/util/riff.c \
+	libs/util/script.c \
+	libs/util/segtext.c \
+	libs/util/set.c \
+	libs/util/sizebuf.c \
+	libs/util/string.c \
+	libs/util/sys.c \
+	libs/util/txtbuffer.c \
+	libs/util/va.c \
+	libs/util/ver_check.c \
+	libs/util/vrect.c \
+	libs/util/wad.c \
+	libs/util/wadfile.c \
+	libs/util/zone.c \
+	$(dirent) $(fnmatch) $(getopt)
+
+EXTRA_DIST += $(fnmatch_src) $(getopt_src)
--- a/libs/util/test/Makefile.am
+++ b/libs/util/test/Makefile.am
@ -1,70 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-check_PROGRAMS= \
-	test-bary test-cs test-darray test-dq test-half test-mat3 test-mat4 \
-	test-plist test-qfs test-quat test-seb test-seg test-set test-txtbuffer \
-	test-vrect
-
-test_bary_SOURCES=test-bary.c
-test_bary_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_bary_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_cs_SOURCES=test-cs.c
-test_cs_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_cs_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_darray_SOURCES=test-darray.c
-test_darray_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_darray_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_dq_SOURCES=test-dq.c
-test_dq_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_dq_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_half_SOURCES=test-half.c
-test_half_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_half_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_mat3_SOURCES=test-mat3.c
-test_mat3_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_mat3_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_mat4_SOURCES=test-mat4.c
-test_mat4_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_mat4_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_plist_SOURCES=test-plist.c
-test_plist_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_plist_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_qfs_SOURCES=test-qfs.c
-test_qfs_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_qfs_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_quat_SOURCES=test-quat.c
-test_quat_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_quat_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_seb_SOURCES=test-seb.c
-test_seb_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_seb_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_seg_SOURCES=test-seg.c
-test_seg_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_seg_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_set_SOURCES=test-set.c
-test_set_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_set_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_txtbuffer_SOURCES=test-txtbuffer.c
-test_txtbuffer_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_txtbuffer_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-test_vrect_SOURCES=test-vrect.c
-test_vrect_LDADD=$(top_builddir)/libs/util/libQFutil.la
-test_vrect_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
-
-TESTS=$(check_PROGRAMS)
--- a/libs/util/test/Makemodule.am
+++ b/libs/util/test/Makemodule.am
@ -0,0 +1,79 @@
+libs_util_tests = \
+	libs/util/test/test-bary \
+	libs/util/test/test-cs \
+	libs/util/test/test-darray \
+	libs/util/test/test-dq \
+	libs/util/test/test-half \
+	libs/util/test/test-mat3 \
+	libs/util/test/test-mat4 \
+	libs/util/test/test-plist \
+	libs/util/test/test-qfs \
+	libs/util/test/test-quat \
+	libs/util/test/test-seb \
+	libs/util/test/test-seg \
+	libs/util/test/test-set \
+	libs/util/test/test-txtbuffer \
+	libs/util/test/test-vrect
+check_PROGRAMS += $(libs_util_tests)
+
+TESTS += $(libs_model_tests)
+
+libs_util_test_test_bary_SOURCES=libs/util/test/test-bary.c
+libs_util_test_test_bary_LDADD=libs/util/libQFutil.la
+libs_util_test_test_bary_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_cs_SOURCES=libs/util/test/test-cs.c
+libs_util_test_test_cs_LDADD=libs/util/libQFutil.la
+libs_util_test_test_cs_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_darray_SOURCES=libs/util/test/test-darray.c
+libs_util_test_test_darray_LDADD=libs/util/libQFutil.la
+libs_util_test_test_darray_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_dq_SOURCES=libs/util/test/test-dq.c
+libs_util_test_test_dq_LDADD=libs/util/libQFutil.la
+libs_util_test_test_dq_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_half_SOURCES=libs/util/test/test-half.c
+libs_util_test_test_half_LDADD=libs/util/libQFutil.la
+libs_util_test_test_half_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_mat3_SOURCES=libs/util/test/test-mat3.c
+libs_util_test_test_mat3_LDADD=libs/util/libQFutil.la
+libs_util_test_test_mat3_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_mat4_SOURCES=libs/util/test/test-mat4.c
+libs_util_test_test_mat4_LDADD=libs/util/libQFutil.la
+libs_util_test_test_mat4_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_plist_SOURCES=libs/util/test/test-plist.c
+libs_util_test_test_plist_LDADD=libs/util/libQFutil.la
+libs_util_test_test_plist_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_qfs_SOURCES=libs/util/test/test-qfs.c
+libs_util_test_test_qfs_LDADD=libs/util/libQFutil.la
+libs_util_test_test_qfs_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_quat_SOURCES=libs/util/test/test-quat.c
+libs_util_test_test_quat_LDADD=libs/util/libQFutil.la
+libs_util_test_test_quat_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_seb_SOURCES=libs/util/test/test-seb.c
+libs_util_test_test_seb_LDADD=libs/util/libQFutil.la
+libs_util_test_test_seb_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_seg_SOURCES=libs/util/test/test-seg.c
+libs_util_test_test_seg_LDADD=libs/util/libQFutil.la
+libs_util_test_test_seg_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_set_SOURCES=libs/util/test/test-set.c
+libs_util_test_test_set_LDADD=libs/util/libQFutil.la
+libs_util_test_test_set_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_txtbuffer_SOURCES=libs/util/test/test-txtbuffer.c
+libs_util_test_test_txtbuffer_LDADD=libs/util/libQFutil.la
+libs_util_test_test_txtbuffer_DEPENDENCIES=libs/util/libQFutil.la
+
+libs_util_test_test_vrect_SOURCES=libs/util/test/test-vrect.c
+libs_util_test_test_vrect_LDADD=libs/util/libQFutil.la
+libs_util_test_test_vrect_DEPENDENCIES=libs/util/libQFutil.la
--- a/libs/video/Makefile.am
+++ b/libs/video/Makefile.am
@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= targets renderer
-
-clean-local:
-	rm -f *.a
--- a/libs/video/Makemodule.am
+++ b/libs/video/Makemodule.am
@ -0,0 +1,2 @@
+include libs/video/renderer/Makemodule.am
+include libs/video/targets/Makemodule.am
--- a/libs/video/renderer/Makefile.am
+++ b/libs/video/renderer/Makefile.am
@ -1,65 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS= @vid_render_dirs@
-DIST_SUBDIRS= gl glsl sw sw32
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
-plugin_libadd= @plugin_libadd@
-EXEEXT=
-
-#lib_LTLIBRARIES= @VID_REND_TARGETS@
-plugin_LTLIBRARIES= @vid_render_plugins@
-noinst_LTLIBRARIES= libQFrenderer.la @vid_render_static_plugins@
-
-EXTRA_LTLIBRARIES=	\
-					vid_render_sw.la vid_render_sw32.la \
-					vid_render_gl.la vid_render_glsl.la
-
-common_sources= \
-	crosshair.c noisetextures.c r_alias.c r_bsp.c r_cvar.c r_dyn_textures.c \
-	r_efrag.c r_ent.c r_graph.c r_iqm.c r_light.c r_main.c r_part.c \
-	r_screen.c vid_common.c
-
-renderer_libs= \
-	@vid_render_static_plugin_libs@ \
-	$(top_builddir)/libs/util/libQFutil.la
-
-libQFrenderer_la_LDFLAGS=		@STATIC@
-libQFrenderer_la_LIBADD=		$(renderer_libs)
-libQFrenderer_la_DEPENDENCIES=	$(renderer_libs)
-libQFrenderer_la_SOURCES=		r_init.c r_progs.c
-
-gl_libs= \
-	gl/libgl.la \
-	$(top_builddir)/libs/models/libmodels_gl.la
-vid_render_gl_la_LDFLAGS=		$(plugin_ldflags)
-vid_render_gl_la_LIBADD=		$(gl_libs)
-vid_render_gl_la_DEPENDENCIES=	$(gl_libs)
-vid_render_gl_la_SOURCES=		$(common_sources) vid_render_gl.c
-
-glsl_libs= \
-	glsl/libglsl.la \
-	$(top_builddir)/libs/models/libmodels_glsl.la
-vid_render_glsl_la_LDFLAGS=		$(plugin_ldflags)
-vid_render_glsl_la_LIBADD=		$(glsl_libs)
-vid_render_glsl_la_DEPENDENCIES=$(glsl_libs)
-vid_render_glsl_la_SOURCES=		$(common_sources) vid_render_glsl.c
-
-sw_libs= \
-	sw/libsw.la \
-	$(top_builddir)/libs/models/libmodels_sw.la
-vid_render_sw_la_LDFLAGS=		$(plugin_ldflags)
-vid_render_sw_la_LIBADD=		$(sw_libs)
-vid_render_sw_la_DEPENDENCIES=	$(sw_libs)
-vid_render_sw_la_SOURCES=		$(common_sources) vid_render_sw.c
-
-sw32_libs= \
-	sw32/libsw32.la \
-	$(top_builddir)/libs/models/libmodels_sw.la
-vid_render_sw32_la_LDFLAGS=		$(plugin_ldflags)
-vid_render_sw32_la_LIBADD=		$(sw32_libs)
-vid_render_sw32_la_DEPENDENCIES=$(sw32_libs)
-vid_render_sw32_la_SOURCES=		$(common_sources) vid_render_sw32.c
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@ -0,0 +1,185 @@
+#lib_LTLIBRARIES += @VID_REND_TARGETS@
+plugin_LTLIBRARIES += @vid_render_plugins@
+noinst_LTLIBRARIES += libs/video/renderer/libQFrenderer.la @vid_render_static_plugins@
+
+EXTRA_LTLIBRARIES +=	\
+					libs/video/renderer/vid_render_sw.la libs/video/renderer/vid_render_sw32.la \
+					libs/video/renderer/vid_render_gl.la libs/video/renderer/vid_render_glsl.la
+
+video_renderer_common_sources= \
+	libs/video/renderer/crosshair.c libs/video/renderer/noisetextures.c libs/video/renderer/r_alias.c libs/video/renderer/r_bsp.c libs/video/renderer/r_cvar.c libs/video/renderer/r_dyn_textures.c \
+	libs/video/renderer/r_efrag.c libs/video/renderer/r_ent.c libs/video/renderer/r_graph.c libs/video/renderer/r_iqm.c libs/video/renderer/r_light.c libs/video/renderer/r_main.c libs/video/renderer/r_part.c \
+	libs/video/renderer/r_screen.c libs/video/renderer/vid_common.c
+
+renderer_libs= \
+	@vid_render_static_plugin_libs@ \
+	libs/util/libQFutil.la
+
+libs_video_renderer_libQFrenderer_la_LDFLAGS=		@STATIC@
+libs_video_renderer_libQFrenderer_la_LIBADD=		$(renderer_libs)
+libs_video_renderer_libQFrenderer_la_DEPENDENCIES=	$(renderer_libs)
+libs_video_renderer_libQFrenderer_la_SOURCES=\
+	libs/video/renderer/r_init.c \
+	libs/video/renderer/r_progs.c
+
+video_renderer_gl_libs= \
+	libs/models/libmodels_gl.la
+libs_video_renderer_vid_render_gl_la_LDFLAGS=		$(plugin_ldflags)
+libs_video_renderer_vid_render_gl_la_LIBADD=		$(video_renderer_gl_libs)
+libs_video_renderer_vid_render_gl_la_DEPENDENCIES=	$(video_renderer_gl_libs)
+libs_video_renderer_vid_render_gl_la_SOURCES=\
+	$(video_renderer_common_sources) \
+	libs/video/renderer/vid_render_gl.c \
+	libs/video/renderer/gl/gl_draw.c \
+	libs/video/renderer/gl/gl_dyn_lights.c \
+	libs/video/renderer/gl/gl_dyn_part.c \
+	libs/video/renderer/gl/gl_dyn_textures.c \
+	libs/video/renderer/gl/gl_fog.c \
+	libs/video/renderer/gl/gl_graph.c \
+	libs/video/renderer/gl/gl_lightmap.c \
+	libs/video/renderer/gl/gl_mod_alias.c \
+	libs/video/renderer/gl/gl_mod_iqm.c \
+	libs/video/renderer/gl/gl_mod_sprite.c \
+	libs/video/renderer/gl/gl_rmain.c \
+	libs/video/renderer/gl/gl_rmisc.c \
+	libs/video/renderer/gl/gl_rsurf.c \
+	libs/video/renderer/gl/gl_screen.c \
+	libs/video/renderer/gl/gl_sky.c \
+	libs/video/renderer/gl/gl_sky_clip.c \
+	libs/video/renderer/gl/gl_textures.c \
+	libs/video/renderer/gl/gl_warp.c \
+	libs/video/renderer/gl/namehack.h \
+	libs/video/renderer/gl/qfgl_ext.c \
+	libs/video/renderer/gl/vid_common_gl.c \
+	libs/video/renderer/gl/vtxarray.c
+
+shader_src= libs/video/renderer/glsl/quakeforge.glsl
+shader_gen= libs/video/renderer/glsl/quakeforge.slc
+
+BUILT_SOURCES += $(shader_gen)
+
+SUFFICES=.frag .vert .fc .vc .slc .glsl
+.glsl.slc:
+	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
+
+video_renderer_glsl_libs= \
+	libs/models/libmodels_glsl.la
+libs_video_renderer_vid_render_glsl_la_LDFLAGS=		$(plugin_ldflags)
+libs_video_renderer_vid_render_glsl_la_LIBADD=		$(video_renderer_glsl_libs)
+libs_video_renderer_vid_render_glsl_la_DEPENDENCIES=$(video_renderer_glsl_libs)
+libs_video_renderer_vid_render_glsl_la_SOURCES=\
+	$(video_renderer_common_sources) \
+	libs/video/renderer/vid_render_glsl.c \
+	libs/video/renderer/glsl/glsl_alias.c \
+	libs/video/renderer/glsl/glsl_bsp.c \
+	libs/video/renderer/glsl/glsl_draw.c \
+	libs/video/renderer/glsl/glsl_fog.c \
+	libs/video/renderer/glsl/glsl_iqm.c \
+	libs/video/renderer/glsl/glsl_lightmap.c \
+	libs/video/renderer/glsl/glsl_main.c \
+	libs/video/renderer/glsl/glsl_particles.c \
+	libs/video/renderer/glsl/glsl_screen.c \
+	libs/video/renderer/glsl/glsl_shader.c \
+	libs/video/renderer/glsl/glsl_sprite.c \
+	libs/video/renderer/glsl/glsl_textures.c \
+	libs/video/renderer/glsl/namehack.h \
+	libs/video/renderer/glsl/qfglsl.c \
+	libs/video/renderer/glsl/quakeforge.glsl \
+	libs/video/renderer/glsl/vid_common_glsl.c
+
+video_renderer_sw_libs= \
+	libs/models/libmodels_sw.la
+libs_video_renderer_vid_render_sw_la_LDFLAGS=		$(plugin_ldflags)
+libs_video_renderer_vid_render_sw_la_LIBADD=		$(video_renderer_sw_libs)
+libs_video_renderer_vid_render_sw_la_DEPENDENCIES=	$(video_renderer_sw_libs)
+libs_video_renderer_vid_render_sw_la_SOURCES=\
+	$(video_renderer_common_sources) \
+	libs/video/renderer/vid_render_sw.c \
+	libs/video/renderer/sw/d_copy.S \
+	libs/video/renderer/sw/d_draw.S \
+	libs/video/renderer/sw/d_edge.c \
+	libs/video/renderer/sw/d_fill.c \
+	libs/video/renderer/sw/d_init.c \
+	libs/video/renderer/sw/d_modech.c \
+	libs/video/renderer/sw/d_part.c \
+	libs/video/renderer/sw/d_parta.S \
+	libs/video/renderer/sw/d_polysa.S \
+	libs/video/renderer/sw/d_polyse.c \
+	libs/video/renderer/sw/d_scan.c \
+	libs/video/renderer/sw/d_scana.S \
+	libs/video/renderer/sw/d_sky.c \
+	libs/video/renderer/sw/d_spr8.S \
+	libs/video/renderer/sw/d_sprite.c \
+	libs/video/renderer/sw/d_surf.c \
+	libs/video/renderer/sw/d_vars.c \
+	libs/video/renderer/sw/d_varsa.S \
+	libs/video/renderer/sw/d_zpoint.c \
+	libs/video/renderer/sw/draw.c \
+	libs/video/renderer/sw/fpu.c \
+	libs/video/renderer/sw/fpua.S \
+	libs/video/renderer/sw/nonintel.c \
+	libs/video/renderer/sw/screen.c \
+	libs/video/renderer/sw/surf8.S \
+	libs/video/renderer/sw/sw_graph.c \
+	libs/video/renderer/sw/sw_raclip.c \
+	libs/video/renderer/sw/sw_raclipa.S \
+	libs/video/renderer/sw/sw_ralias.c \
+	libs/video/renderer/sw/sw_raliasa.S \
+	libs/video/renderer/sw/sw_rbsp.c \
+	libs/video/renderer/sw/sw_rdraw.c \
+	libs/video/renderer/sw/sw_rdrawa.S \
+	libs/video/renderer/sw/sw_redge.c \
+	libs/video/renderer/sw/sw_redgea.S \
+	libs/video/renderer/sw/sw_riqm.c \
+	libs/video/renderer/sw/sw_rmain.c \
+	libs/video/renderer/sw/sw_rmisc.c \
+	libs/video/renderer/sw/sw_rpart.c \
+	libs/video/renderer/sw/sw_rsky.c \
+	libs/video/renderer/sw/sw_rsprite.c \
+	libs/video/renderer/sw/sw_rsurf.c \
+	libs/video/renderer/sw/sw_rvarsa.S \
+	libs/video/renderer/sw/transform.S \
+	libs/video/renderer/sw/vid_common_sw.c
+
+video_renderer_sw32_libs= \
+	libs/models/libmodels_sw.la
+libs_video_renderer_vid_render_sw32_la_LDFLAGS=		$(plugin_ldflags)
+libs_video_renderer_vid_render_sw32_la_LIBADD=		$(video_renderer_sw32_libs)
+libs_video_renderer_vid_render_sw32_la_DEPENDENCIES=$(video_renderer_sw32_libs)
+libs_video_renderer_vid_render_sw32_la_SOURCES=\
+	$(video_renderer_common_sources) \
+	libs/video/renderer/vid_render_sw32.c \
+	libs/video/renderer/sw32/d_edge.c \
+	libs/video/renderer/sw32/d_fill.c \
+	libs/video/renderer/sw32/d_init.c \
+	libs/video/renderer/sw32/d_modech.c \
+	libs/video/renderer/sw32/d_part.c \
+	libs/video/renderer/sw32/d_polyse.c \
+	libs/video/renderer/sw32/d_scan.c \
+	libs/video/renderer/sw32/d_sky.c \
+	libs/video/renderer/sw32/d_sprite.c \
+	libs/video/renderer/sw32/d_surf.c \
+	libs/video/renderer/sw32/d_vars.c \
+	libs/video/renderer/sw32/d_zpoint.c \
+	libs/video/renderer/sw32/draw.c \
+	libs/video/renderer/sw32/namehack.h \
+	libs/video/renderer/sw32/screen.c \
+	libs/video/renderer/sw32/sw32_graph.c \
+	libs/video/renderer/sw32/sw32_raclip.c \
+	libs/video/renderer/sw32/sw32_ralias.c \
+	libs/video/renderer/sw32/sw32_rbsp.c \
+	libs/video/renderer/sw32/sw32_rdraw.c \
+	libs/video/renderer/sw32/sw32_redge.c \
+	libs/video/renderer/sw32/sw32_riqm.c \
+	libs/video/renderer/sw32/sw32_rmain.c \
+	libs/video/renderer/sw32/sw32_rmisc.c \
+	libs/video/renderer/sw32/sw32_rpart.c \
+	libs/video/renderer/sw32/sw32_rsky.c \
+	libs/video/renderer/sw32/sw32_rsprite.c \
+	libs/video/renderer/sw32/sw32_rsurf.c \
+	libs/video/renderer/sw32/vid_common_sw32.c
+
+CLEANFILES += \
+	libs/video/renderer/glsl/*.vc \
+	libs/video/renderer/glsl/*.fc \
+	libs/video/renderer/glsl/*.slc
--- a/libs/video/renderer/gl/Makefile.am
+++ b/libs/video/renderer/gl/Makefile.am
@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
-
-noinst_LTLIBRARIES=	libgl.la
-
-gl_src = \
-	gl_draw.c gl_dyn_lights.c gl_dyn_part.c gl_dyn_textures.c \
-	gl_fog.c gl_graph.c gl_lightmap.c gl_mod_alias.c gl_mod_iqm.c \
-	gl_mod_sprite.c gl_rmain.c gl_rmisc.c gl_rsurf.c gl_screen.c gl_sky.c \
-	gl_sky_clip.c gl_textures.c gl_warp.c qfgl_ext.c vid_common_gl.c vtxarray.c
-
-libgl_la_SOURCES= $(gl_src)
-
-EXTRA_DIST = $(gl_src) namehack.h
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@ -1,28 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
-
-shader_src= quakeforge.glsl
-shader_gen= quakeforge.slc
-
-glsl_src = \
-	glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \
-	glsl_main.c glsl_particles.c glsl_screen.c glsl_shader.c glsl_sprite.c \
-	glsl_textures.c qfglsl.c vid_common_glsl.c
-
-noinst_LTLIBRARIES=	libglsl.la
-BUILT_SOURCES= $(shader_gen)
-
-SUFFICES=.frag .vert .fc .vc .slc .glsl
-.glsl.slc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
-.frag.fc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
-.vert.vc:
-	sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@
-
-libglsl_la_SOURCES= $(glsl_src)
-
-EXTRA_DIST = $(glsl_src) $(shader_src) namehack.h
-CLEANFILES= *.vc *.fc *.slc
--- a/libs/video/renderer/glsl/vid_common_glsl.c
+++ b/libs/video/renderer/glsl/vid_common_glsl.c
@ -57,7 +57,7 @@
 #include "r_internal.h"

 static const char quakeforge_effect[] =
-#include "quakeforge.slc"
+#include "libs/video/renderer/glsl/quakeforge.slc"
 ;

 int					glsl_palette;
--- a/libs/video/renderer/sw/Makefile.am
+++ b/libs/video/renderer/sw/Makefile.am
@ -1,33 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-CCASFLAGS+= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-asm = @swrend_libs@
-
-noinst_LTLIBRARIES=	libsw.la $(asm)
-EXTRA_LTLIBRARIES=libswrend_asm.la
-
-asm_src= \
-	d_copy.S d_draw.S d_parta.S d_polysa.S d_scana.S d_spr8.S d_varsa.S \
-	fpua.S surf8.S sw_raclipa.S sw_raliasa.S sw_rdrawa.S sw_redgea.S \
-	sw_rvarsa.S transform.S
-
-sw_src= \
-	d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c d_scan.c \
-	d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c draw.c fpu.c nonintel.c \
-	screen.c sw_graph.c sw_raclip.c sw_ralias.c sw_rbsp.c sw_rdraw.c \
-	sw_redge.c sw_riqm.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c \
-	sw_rsprite.c sw_rsurf.c \
-	vid_common_sw.c
-
-libswrend_asm_la_LDFLAGS= @STATIC@
-libswrend_asm_la_SOURCES= $(asm_src)
-
-libsw_la_LDFLAGS= @STATIC@
-libsw_la_SOURCES= $(sw_src)
-libsw_la_LIBADD= $(asm)
-libsw_la_DEPENDENCIES= $(asm)
-
-EXTRA_DIST= $(sw_src) $(asm_src)
--- a/libs/video/renderer/sw32/Makefile.am
+++ b/libs/video/renderer/sw32/Makefile.am
@ -1,18 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CFLAGS= @PREFER_PIC@
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES=	libsw32.la
-
-sw32_src= \
-	d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c d_scan.c \
-	d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c draw.c screen.c \
-	sw32_graph.c sw32_raclip.c sw32_ralias.c sw32_rbsp.c sw32_rdraw.c \
-	sw32_redge.c sw32_riqm.c sw32_rmain.c sw32_rmisc.c sw32_rpart.c \
-	sw32_rsky.c sw32_rsprite.c sw32_rsurf.c \
-	vid_common_sw32.c
-
-libsw32_la_SOURCES= $(sw32_src)
-
-EXTRA_DIST= $(sw32_src) namehack.h
--- a/libs/video/targets/Makefile.am
+++ b/libs/video/targets/Makefile.am
@ -1,117 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-AM_CPPFLAGS= -I$(top_srcdir)/include
-
-lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-			-rpath $(libdir) -no-undefined
-
-lib_LTLIBRARIES= @JOY_TARGETS@
-
-noinst_LTLIBRARIES= @VID_TARGETS@ @vid_libs@
-
-EXTRA_LTLIBRARIES= \
-	libQFjs.la libQFfbdev.la libQFsvga.la libQFx11.la libQFsdl.la libQFwgl.la \
-	libvid_common.la libvid_sdl.la \
-	libvid_svga.la libvid_x11.la
-
-joy_linux_src= joy_linux.c
-joy_win_src= joy_win.c
-joy_null_src= joy_null.c
-if JOYTYPE_LINUX
-joy_src=      $(joy_linux_src)
-else
-if JOYTYPE_WIN32
-joy_src=      $(joy_win_src)
-else
-joy_src=      $(joy_null_src)
-endif
-endif
-
-js_libs=$(top_builddir)/libs/util/libQFutil.la
-
-libQFjs_la_LDFLAGS=		$(lib_ldflags)
-libQFjs_la_LIBADD=		$(js_libs)
-libQFjs_la_DEPENDENCIES=$(js_libs)
-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)
-
-libvid_common_la_SOURCES=	\
-		in_common.c in_event.c keys.c old_keys.c pr_keys.c vid.c
-libvid_common_la_CFLAGS=	@PREFER_NON_PIC@
-libvid_common_la_LDFLAGS=	@STATIC@
-
-libvid_x11_la_SOURCES=		in_x11.c context_x11.c dga_check.c
-libvid_x11_la_CFLAGS=		@PREFER_NON_PIC@ $(X_CFLAGS)
-libvid_x11_la_LDFLAGS=		@STATIC@
-
-libvid_svga_la_SOURCES=		in_svgalib.c
-libvid_svga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
-libvid_svga_la_LDFLAGS=		@STATIC@
-
-libvid_sdl_la_SOURCES=		in_sdl.c context_sdl.c
-libvid_sdl_la_CFLAGS=		@PREFER_NON_PIC@ $(SDL_CFLAGS)
-libvid_sdl_la_LDFLAGS=		@STATIC@
-
-#
-# Linux FBdev
-#
-fbdev_c= fbset_modes_y.c fbset_modes_l.c
-fbdev_h= fbset_modes_y.h
-YFLAGS = -d
-YACCLEX_CLEANFILES=	$(fbdev_c) $(fbdev_h)
-BUILT_SOURCES= $(fbdev_c) $(fbdev_h)
-
-fbdev_libs=libvid_common.la
-libQFfbdev_la_CFLAGS=		@PREFER_NON_PIC@
-libQFfbdev_la_SOURCES=		fbset.c fbset_modes_y.y fbset_modes_l.l \
-							in_fbdev.c vid_fbdev.c
-libQFfbdev_la_LDFLAGS=		@STATIC@
-libQFfbdev_la_LIBADD=		$(fbdev_libs)
-libQFfbdev_la_DEPENDENCIES=	$(fbdev_libs)
-
-
-#
-# Simple DirectMedia Library
-#
-sdl_libs=libvid_common.la libvid_sdl.la
-libQFsdl_la_CFLAGS=			@PREFER_NON_PIC@ $(SDL_CFLAGS)
-libQFsdl_la_SOURCES=		vid_sdl.c
-libQFsdl_la_LDFLAGS=		@STATIC@
-libQFsdl_la_LIBADD=			$(sdl_libs)
-libQFsdl_la_DEPENDENCIES=	$(sdl_libs)
-
-#
-# SVGAlib
-#
-svga_libs=libvid_common.la libvid_svga.la
-libQFsvga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
-libQFsvga_la_SOURCES=		vid_svgalib.c
-libQFsvga_la_LDFLAGS=		@STATIC@
-libQFsvga_la_LIBADD=		$(svga_libs)
-libQFsvga_la_DEPENDENCIES=	$(svga_libs)
-
-#
-# OpenGL in Win32
-#
-wgl_libs=libvid_common.la libvid_gl.la
-libQFwgl_la_CFLAGS=			@PREFER_NON_PIC@ $(WGL_CFLAGS)
-libQFwgl_la_SOURCES=		in_win.c vid_wgl.c
-libQFwgl_la_LDFLAGS=		@STATIC@
-libQFwgl_la_LIBADD=			$(wgl_libs)
-libQFwgl_la_DEPENDENCIES=	$(wgl_libs)
-
-#
-# X11 software rendering
-#
-x11_libs=libvid_common.la libvid_x11.la
-libQFx11_la_CFLAGS=			@PREFER_NON_PIC@ $(X_CFLAGS)
-libQFx11_la_SOURCES=		vid_x11.c
-libQFx11_la_LDFLAGS=		@STATIC@
-libQFx11_la_LIBADD=			$(x11_libs)
-libQFx11_la_DEPENDENCIES=	$(x11_libs)
-
-# Kill the temp files, hopefully.
-CLEANFILES  = *.i *.s $(YACCLEX_CLEANFILES)
-
-EXTRA_DIST= $(fbdev_c) $(fbdev_h)
--- a/libs/video/targets/Makemodule.am
+++ b/libs/video/targets/Makemodule.am
@ -0,0 +1,115 @@
+lib_LTLIBRARIES += @JOY_TARGETS@
+
+noinst_LTLIBRARIES += @VID_TARGETS@ @vid_libs@
+
+EXTRA_LTLIBRARIES += \
+	libs/video/targets/libQFjs.la \
+	libs/video/targets/libQFfbdev.la \
+	libs/video/targets/libQFsvga.la \
+	libs/video/targets/libQFx11.la \
+	libs/video/targets/libQFsdl.la \
+	libs/video/targets/libQFwgl.la \
+	libs/video/targets/libvid_common.la \
+	libs/video/targets/libvid_sdl.la \
+	libs/video/targets/libvid_svga.la \
+	libs/video/targets/libvid_x11.la
+
+joy_linux_src= libs/video/targets/joy_linux.c
+joy_win_src= libs/video/targets/joy_win.c
+joy_null_src= libs/video/targets/joy_null.c
+if JOYTYPE_LINUX
+joy_src=      $(joy_linux_src)
+else
+if JOYTYPE_WIN32
+joy_src=      $(joy_win_src)
+else
+joy_src=      $(joy_null_src)
+endif
+endif
+
+js_libs=libs/util/libQFutil.la
+
+libs_video_targets_libQFjs_la_LDFLAGS=		$(lib_ldflags)
+libs_video_targets_libQFjs_la_LIBADD=		$(js_libs)
+libs_video_targets_libQFjs_la_DEPENDENCIES=$(js_libs)
+libs_video_targets_libQFjs_la_CFLAGS=		@PREFER_PIC@ $(JOY_CFLAGS)
+libs_video_targets_libQFjs_la_SOURCES=		libs/video/targets/joy.c $(joy_src)
+EXTRA_libs_video_targets_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
+
+libs_video_targets_libvid_common_la_SOURCES=	\
+		libs/video/targets/in_common.c libs/video/targets/in_event.c libs/video/targets/keys.c libs/video/targets/old_keys.c libs/video/targets/pr_keys.c libs/video/targets/vid.c
+libs_video_targets_libvid_common_la_CFLAGS=	@PREFER_NON_PIC@
+libs_video_targets_libvid_common_la_LDFLAGS=	@STATIC@
+
+libs_video_targets_libvid_x11_la_SOURCES=		libs/video/targets/in_x11.c libs/video/targets/context_x11.c libs/video/targets/dga_check.c
+libs_video_targets_libvid_x11_la_CFLAGS=		@PREFER_NON_PIC@ $(X_CFLAGS)
+libs_video_targets_libvid_x11_la_LDFLAGS=		@STATIC@
+
+libs_video_targets_libvid_svga_la_SOURCES=		libs/video/targets/in_svgalib.c
+libs_video_targets_libvid_svga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
+libs_video_targets_libvid_svga_la_LDFLAGS=		@STATIC@
+
+libs_video_targets_libvid_sdl_la_SOURCES=		libs/video/targets/in_sdl.c libs/video/targets/context_sdl.c
+libs_video_targets_libvid_sdl_la_CFLAGS=		@PREFER_NON_PIC@ $(SDL_CFLAGS)
+libs_video_targets_libvid_sdl_la_LDFLAGS=		@STATIC@
+
+#
+# Linux FBdev
+#
+fbdev_c= libs/video/targets/fbset_modes_y.c libs/video/targets/fbset_modes_l.c
+fbdev_h= libs/video/targets/fbset_modes_y.h
+YACCLEX_CLEANFILES = $(fbdev_c) $(fbdev_h)
+BUILT_SOURCES += $(fbdev_c) $(fbdev_h)
+
+fbdev_libs=libs/video/targets/libvid_common.la
+libs_video_targets_libQFfbdev_la_CFLAGS=		@PREFER_NON_PIC@
+libs_video_targets_libQFfbdev_la_SOURCES=		libs/video/targets/fbset.c libs/video/targets/fbset_modes_y.y libs/video/targets/fbset_modes_l.l \
+							libs/video/targets/in_fbdev.c libs/video/targets/vid_fbdev.c
+libs_video_targets_libQFfbdev_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFfbdev_la_LIBADD=		$(fbdev_libs)
+libs_video_targets_libQFfbdev_la_DEPENDENCIES=	$(fbdev_libs)
+
+
+#
+# Simple DirectMedia Library
+#
+sdl_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_sdl.la
+libs_video_targets_libQFsdl_la_CFLAGS=			@PREFER_NON_PIC@ $(SDL_CFLAGS)
+libs_video_targets_libQFsdl_la_SOURCES=		libs/video/targets/vid_sdl.c
+libs_video_targets_libQFsdl_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFsdl_la_LIBADD=			$(sdl_libs)
+libs_video_targets_libQFsdl_la_DEPENDENCIES=	$(sdl_libs)
+
+#
+# SVGAlib
+#
+svga_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_svga.la
+libs_video_targets_libQFsvga_la_CFLAGS=		@PREFER_NON_PIC@ $(SVGA_CFLAGS)
+libs_video_targets_libQFsvga_la_SOURCES=		libs/video/targets/vid_svgalib.c
+libs_video_targets_libQFsvga_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFsvga_la_LIBADD=		$(svga_libs)
+libs_video_targets_libQFsvga_la_DEPENDENCIES=	$(svga_libs)
+
+#
+# OpenGL in Win32
+#
+wgl_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_gl.la
+libs_video_targets_libQFwgl_la_CFLAGS=			@PREFER_NON_PIC@ $(WGL_CFLAGS)
+libs_video_targets_libQFwgl_la_SOURCES=		libs/video/targets/in_win.c libs/video/targets/vid_wgl.c
+libs_video_targets_libQFwgl_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFwgl_la_LIBADD=			$(wgl_libs)
+libs_video_targets_libQFwgl_la_DEPENDENCIES=	$(wgl_libs)
+
+#
+# X11 software rendering
+#
+x11_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_x11.la
+libs_video_targets_libQFx11_la_CFLAGS=			@PREFER_NON_PIC@ $(X_CFLAGS)
+libs_video_targets_libQFx11_la_SOURCES=		libs/video/targets/vid_x11.c
+libs_video_targets_libQFx11_la_LDFLAGS=		@STATIC@
+libs_video_targets_libQFx11_la_LIBADD=			$(x11_libs)
+libs_video_targets_libQFx11_la_DEPENDENCIES=	$(x11_libs)
+
+CLEANFILES += *.i *.s $(YACCLEX_CLEANFILES)
+
+EXTRA_DIST += $(fbdev_c) $(fbdev_h)
--- a/m4/quakeforge.m4
+++ b/m4/quakeforge.m4
@ -93,7 +93,7 @@ AC_DEFUN([QF_NEED], [m4_map_args_w([$2], [$1_need_], [=yes], [;])])
 AC_DEFUN([QF_PROCESS_NEED_subroutine],
 [m4_foreach_w([qfn_need], [$5],
 [if test x"${$2[_need_]qfn_need}" = xyes; then
-	$4="${$4} $1[]qfn_need[]$3"
+	$4="${$4} m4_join([/],[$6],[$1])[]qfn_need[]$3"
 fi
 ])])

@ -105,8 +105,8 @@ fi
 ])])

 AC_DEFUN([QF_PROCESS_NEED_LIBS],
-[m4_define([qfn_ext], m4_default($3,[la]))
-QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2])
+[m4_define([qfn_ext], m4_default($4,[la]))
+QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2],[$3])
 QF_SUBST([$1_libs])])

 AC_DEFUN([QF_PROCESS_NEED_DIRS],
@ -122,11 +122,11 @@ AC_DEFINE_UNQUOTED(m4_toupper(qfn_default), ["${qfn_default}"], [Define to defau
 ])

 AC_DEFUN([QF_PROCESS_NEED_PLUGINS],
-[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],[$1_plugins],[$2])
+[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],[$1_plugins],[$2],[$3])
 QF_SUBST([$1_plugins])
-QF_DEFAULT_PLUGIN([$1],[$2],[$3])
-AC_DEFINE_UNQUOTED(m4_toupper(m4_default($3,$1)[_plugin_protos]), [], [list of $1 plugin prototypes])
-AC_DEFINE_UNQUOTED(m4_toupper(m4_default($3,$1)[_plugin_list]), [{0, 0}], [list of $1 plugins])
+QF_DEFAULT_PLUGIN([$1],[$2],[$4])
+AC_DEFINE_UNQUOTED(m4_toupper(m4_default($4,$1)[_plugin_protos]), [], [list of $1 plugin prototypes])
+AC_DEFINE_UNQUOTED(m4_toupper(m4_default($4,$1)[_plugin_list]), [{0, 0}], [list of $1 plugins])
 ])

 AC_DEFUN([QF_STATIC_PLUGIN_LIBS],
@ -147,7 +147,7 @@ fi
 AC_DEFINE_UNQUOTED(m4_toupper([$1_plugin_list]), [${$1_plugin_list}], [list of $1 plugins])])

 AC_DEFUN([QF_PROCESS_NEED_STATIC_PLUGINS],
-[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],m4_default($4,$1)[_static_plugins],[$2])
+[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],m4_default($4,$1)[_static_plugins],[$2],[$3])
 QF_SUBST(m4_default($4,$1)[_static_plugins])
 QF_DEFAULT_PLUGIN([$1],[$2],[$4])
 QF_STATIC_PLUGIN_LIBS(m4_default($4,$1),[$1],[$2],[$3])
--- a/nq/Makefile.am
+++ b/nq/Makefile.am
@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS= foreign
-
-SUBDIRS=	include source
--- a/nq/Makemodule.am
+++ b/nq/Makemodule.am
@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+include nq/include/Makemodule.am
+include nq/source/Makemodule.am
--- a/nq/include/Makefile.am
+++ b/nq/include/Makefile.am
@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS= foreign
-
-## Process this file with automake to produce Makefile.in
-EXTRA_DIST=	chase.h cl_skin.h client.h game.h host.h protocol.h server.h \
-		sv_pr_cmds.h sv_progs.h
--- a/nq/include/Makemodule.am
+++ b/nq/include/Makemodule.am
@ -0,0 +1,11 @@
+## Process this file with automake to produce Makefile.in
+EXTRA_DIST += \
+	nq/include/chase.h \
+	nq/include/cl_skin.h \
+	nq/include/client.h \
+	nq/include/game.h \
+	nq/include/host.h \
+	nq/include/protocol.h \
+	nq/include/server.h \
+	nq/include/sv_pr_cmds.h \
+	nq/include/sv_progs.h
--- a/nq/source/Makefile.am
+++ b/nq/source/Makefile.am
@ -1,176 +0,0 @@
-## Process this file with automake to produce Makefile.in
-#
-#	Makefile.am
-#
-#	Automake-using build system for QuakeForge
-#
-#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
-#
-#	This Makefile is free software; you can redistribute it and/or
-#	modify it under the terms of the GNU General Public License
-#	as published by the Free Software Foundation; either version 2
-#	of the License, or (at your option) any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	See the GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to:
-#
-#		Free Software Foundation, Inc.
-#		59 Temple Place - Suite 330
-#		Boston, MA  02111-1307, USA
-#
-#	$Id$
-#
-AUTOMAKE_OPTIONS= foreign
-
-# Stuff that is common to both client and server
-#
-AM_CPPFLAGS=	-I$(top_srcdir)/include -I$(top_srcdir)/nq/include
-SDL_LIBS = @SDL_LIBS@
-AM_CFLAGS= @PTHREAD_CFLAGS@
-
-bin_PROGRAMS=	@NQ_TARGETS@
-
-EXTRA_PROGRAMS= nq-fbdev nq-sdl nq-svga nq-wgl nq-x11 nq-server
-
-noinst_LIBRARIES= @nq_libs@
-EXTRA_LIBRARIES=libnq_client.a libnq_common.a libnq_sdl.a libnq_server.a
-
-libnq_common_a_SOURCES=game.c world.c
-libnq_sdl_a_SOURCES=	sys_sdl.c
-libnq_sdl_a_CFLAGS=	$(SDL_CFLAGS)
-
-common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@
-
-cl_plugin_LIBS= \
-		@server_static_plugin_libs@ \
-		@client_static_plugin_libs@
-
-client_LIBFILES= \
-		$(top_builddir)/libs/video/targets/libQFjs.la \
-		$(top_builddir)/libs/audio/libQFcd.la \
-		$(top_builddir)/libs/audio/libQFsound.la
-
-server_LIBFILES= \
-		@server_static_plugin_libs@ \
-		$(top_builddir)/libs/models/libQFmodels.la
-
-common_LIBFILES= \
-		$(top_builddir)/libs/net/libnet_main.la \
-		$(top_builddir)/libs/console/libQFconsole.la \
-		$(top_builddir)/libs/image/libQFimage.la \
-		$(top_builddir)/libs/gib/libQFgib.la \
-		$(top_builddir)/libs/ruamoko/libQFruamoko.la \
-		$(top_builddir)/libs/util/libQFutil.la
-
-client_LIBS=	$(client_LIBFILES) $(common_LIBFILES)
-
-server_LIBS=	$(server_LIBFILES) $(common_LIBFILES) $(NET_LIBS)
-server_LIB_DEPS=$(server_LIBFILES) $(common_LIBFILES)
-
-libnq_client_a_SOURCES= \
-		cl_chase.c cl_cmd.c cl_demo.c cl_ents.c cl_input.c cl_main.c \
-		cl_screen.c cl_parse.c cl_tent.c cl_view.c sbar.c
-
-libnq_server_a_SOURCES= \
-		host.c host_cmd.c sv_cl_phys.c sv_cvar.c sv_main.c \
-		sv_move.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_user.c
-
-client_libs= libnq_server.a libnq_client.a libnq_common.a \
-			$(top_builddir)/libs/client/libQFclient.la
-server_libs = libnq_server.a libnq_common.a
-
-# Software-rendering targets
-
-# ... Linux FBDev
-nq_fbdev_libs=  \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFfbdev.la \
-			$(client_LIBS)
-nq_fbdev_SOURCES=	sys_unix.c
-nq_fbdev_LDADD= $(nq_fbdev_libs) $(NET_LIBS)
-nq_fbdev_LDFLAGS=	$(common_ldflags)
-nq_fbdev_DEPENDENCIES=	$(nq_fbdev_libs)
-
-# ... SDL, version 1.2 and higher
-nq_sdl_libs=  \
-			libnq_sdl.a \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFsdl.la \
-			$(client_LIBS)
-nq_sdl_SOURCES=sdl_link.c
-nq_sdl_LDADD=		$(nq_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
-nq_sdl_LDFLAGS= 	$(common_ldflags)
-nq_sdl_DEPENDENCIES=	$(nq_sdl_libs)
-
-# ... Linux SVGAlib
-nq_svga_libs=  \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFsvga.la \
-			$(client_LIBS)
-nq_svga_SOURCES=	sys_unix.c
-nq_svga_LDADD=		$(nq_svga_libs) $(SVGA_LIBS) $(NET_LIBS)
-nq_svga_LDFLAGS=	$(common_ldflags)
-nq_svga_DEPENDENCIES=	$(nq_svga_libs)
-
-# ... X11
-nq_x11_libs=  \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(top_builddir)/libs/video/renderer/libQFrenderer.la \
-			$(top_builddir)/libs/models/libQFmodels.la \
-			$(top_builddir)/libs/video/targets/libQFx11.la \
-			$(client_LIBS)
-nq_x11_SOURCES= 	sys_unix.c
-nq_x11_LDADD=		$(nq_x11_libs) \
-			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(DL_LIBS)
-nq_x11_LDFLAGS= 	$(common_ldflags)
-nq_x11_DEPENDENCIES=	$(nq_x11_libs)
-
-# OpenGL-using targets
-							
-# ... SGI/Microsoft WGL (Windows OpenGL)
-nq_wgl_libs=  \
-			$(client_libs) \
-			$(cl_plugin_LIBS) \
-			$(opengl_QFLIBS) \
-			$(top_builddir)/libs/video/targets/libQFwgl.la \
-			$(client_LIBS)
-nq_wgl_SOURCES= 	sys_win.c
-nq_wgl_LDADD=		$(nq_wgl_libs) -lgdi32 -lcomctl32 -lwinmm $(NET_LIBS)
-nq_wgl_LDFLAGS= 	$(common_ldflags)
-nq_wgl_DEPENDENCIES=	$(nq_wgl_libs)
-
-# Dedicated Server
-if SYSTYPE_WIN32
-ded_sources=	sys_wind.c sv_ded.c
-else
-ded_sources=	sys_unixd.c sv_ded.c
-endif
-EXTRA_DIST=sys_wind.c sys_unixd.c sv_ded.c
-
-nq_server_LDFLAGS=	$(common_ldflags)
-nq_server_SOURCES=	$(ded_sources)
-nq_server_LDADD=	$(server_libs) $(server_LIBS)
-nq_server_DEPENDENCIES=	$(server_libs) $(server_LIB_DEPS)
-
-# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
-# or it won't be distributed with 'make dist'
-
-# Kill the temp files, hopefully.
-CLEANFILES  = *.i *.s $(YACCLEX_CLEANFILES)
--- a/nq/source/Makemodule.am
+++ b/nq/source/Makemodule.am
@ -0,0 +1,164 @@
+## Process this file with automake to produce Makefile.in
+#
+#	Makefile.am
+#
+#	Automake-using build system for QuakeForge
+#
+#	Copyright (C) 2000 Jeff Teunissen <deek@quakeforge.net>
+#
+#	This Makefile is free software; you can redistribute it and/or
+#	modify it under the terms of the GNU General Public License
+#	as published by the Free Software Foundation; either version 2
+#	of the License, or (at your option) any later version.
+#
+#	This program is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#	See the GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with this program; if not, write to:
+#
+#		Free Software Foundation, Inc.
+#		59 Temple Place - Suite 330
+#		Boston, MA  02111-1307, USA
+#
+#	$Id$
+#
+
+# Stuff that is common to both client and server
+#
+bin_PROGRAMS +=	@NQ_TARGETS@
+
+EXTRA_PROGRAMS += nq-fbdev nq-sdl nq-svga nq-wgl nq-x11 nq-server
+
+noinst_LIBRARIES += @nq_libs@
+EXTRA_LIBRARIES += nq/source/libnq_client.a nq/source/libnq_common.a nq/source/libnq_sdl.a nq/source/libnq_server.a
+
+nq_source_libnq_common_a_SOURCES= nq/source/game.c nq/source/world.c
+nq_source_libnq_sdl_a_SOURCES=	nq/source/sys_sdl.c
+nq_source_libnq_sdl_a_CFLAGS=	$(SDL_CFLAGS)
+
+nq_cl_plugin_LIBS= \
+		@server_static_plugin_libs@ \
+		@client_static_plugin_libs@
+
+nq_client_LIBFILES= \
+		libs/video/targets/libQFjs.la \
+		libs/audio/libQFcd.la \
+		libs/audio/libQFsound.la
+
+nq_server_LIBFILES= \
+		@server_static_plugin_libs@ \
+		libs/models/libQFmodels.la
+
+nq_common_LIBFILES= \
+		libs/net/libnet_main.la \
+		libs/console/libQFconsole.la \
+		libs/image/libQFimage.la \
+		libs/gib/libQFgib.la \
+		libs/ruamoko/libQFruamoko.la \
+		libs/gamecode/libQFgamecode.la \
+		libs/util/libQFutil.la
+
+nq_client_LIBS=	$(nq_client_LIBFILES) $(nq_common_LIBFILES)
+
+nq_server_LIBS=	$(nq_server_LIBFILES) $(nq_common_LIBFILES) $(NET_LIBS)
+nq_server_LIB_DEPS=$(nq_server_LIBFILES) $(nq_common_LIBFILES)
+
+nq_source_libnq_client_a_SOURCES= \
+		nq/source/cl_chase.c nq/source/cl_cmd.c nq/source/cl_demo.c nq/source/cl_ents.c nq/source/cl_input.c nq/source/cl_main.c \
+		nq/source/cl_screen.c nq/source/cl_parse.c nq/source/cl_tent.c nq/source/cl_view.c nq/source/sbar.c
+
+nq_source_libnq_server_a_SOURCES= \
+		nq/source/host.c nq/source/host_cmd.c nq/source/sv_cl_phys.c nq/source/sv_cvar.c nq/source/sv_main.c \
+		nq/source/sv_move.c nq/source/sv_phys.c nq/source/sv_pr_cmds.c nq/source/sv_progs.c nq/source/sv_user.c
+
+nq_client_libs= nq/source/libnq_server.a nq/source/libnq_client.a nq/source/libnq_common.a \
+			libs/client/libQFclient.la
+server_libs = nq/source/libnq_server.a nq/source/libnq_common.a
+
+# Software-rendering targets
+
+# ... Linux FBDev
+nq_fbdev_libs=  \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFfbdev.la \
+			$(nq_client_LIBS)
+nq_fbdev_SOURCES=	nq/source/sys_unix.c
+nq_fbdev_LDADD= $(nq_fbdev_libs) $(NET_LIBS)
+nq_fbdev_LDFLAGS=	$(common_ldflags)
+nq_fbdev_DEPENDENCIES=	$(nq_fbdev_libs)
+
+# ... SDL, version 1.2 and higher
+nq_sdl_libs=  \
+			nq/source/libnq_sdl.a \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFsdl.la \
+			$(nq_client_LIBS)
+nq_sdl_SOURCES=nq/source/sdl_link.c
+nq_sdl_LDADD=		$(nq_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
+nq_sdl_LDFLAGS= 	$(common_ldflags)
+nq_sdl_DEPENDENCIES=	$(nq_sdl_libs)
+
+# ... Linux SVGAlib
+nq_svga_libs=  \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFsvga.la \
+			$(nq_client_LIBS)
+nq_svga_SOURCES=	nq/source/sys_unix.c
+nq_svga_LDADD=		$(nq_svga_libs) $(SVGA_LIBS) $(NET_LIBS)
+nq_svga_LDFLAGS=	$(common_ldflags)
+nq_svga_DEPENDENCIES=	$(nq_svga_libs)
+
+# ... X11
+nq_x11_libs=  \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			libs/video/renderer/libQFrenderer.la \
+			libs/models/libQFmodels.la \
+			libs/video/targets/libQFx11.la \
+			$(nq_client_LIBS)
+nq_x11_SOURCES= 	nq/source/sys_unix.c
+nq_x11_LDADD=		$(nq_x11_libs) \
+			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
+			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(DL_LIBS)
+nq_x11_LDFLAGS= 	$(common_ldflags)
+nq_x11_DEPENDENCIES=	$(nq_x11_libs)
+
+# OpenGL-using targets
+
+# ... SGI/Microsoft WGL (Windows OpenGL)
+nq_wgl_libs=  \
+			$(nq_client_libs) \
+			$(nq_cl_plugin_LIBS) \
+			$(opengl_QFLIBS) \
+			libs/video/targets/libQFwgl.la \
+			$(nq_client_LIBS)
+nq_wgl_SOURCES= 	nq/source/sys_win.c
+nq_wgl_LDADD=		$(nq_wgl_libs) -lgdi32 -lcomctl32 -lwinmm $(NET_LIBS)
+nq_wgl_LDFLAGS= 	$(common_ldflags)
+nq_wgl_DEPENDENCIES=	$(nq_wgl_libs)
+
+# Dedicated Server
+if SYSTYPE_WIN32
+ded_sources=	nq/source/sys_wind.c nq/source/sv_ded.c
+else
+ded_sources=	nq/source/sys_unixd.c nq/source/sv_ded.c
+endif
+EXTRA_DIST += nq/source/sys_wind.c nq/source/sys_unixd.c nq/source/sv_ded.c
+
+nq_server_LDFLAGS=	$(common_ldflags)
+nq_server_SOURCES=	$(ded_sources)
+nq_server_LDADD=	$(server_libs) $(nq_server_LIBS)
+nq_server_DEPENDENCIES=	$(server_libs) $(nq_server_LIB_DEPS)
--- a/nq/source/cl_chase.c
+++ b/nq/source/cl_chase.c
@ -42,10 +42,11 @@

 #include "QF/plugin/vid_render.h"

-#include "chase.h"
-#include "client.h"
 #include "world.h"

+#include "nq/include/chase.h"
+#include "nq/include/client.h"
+
 vec3_t camera_origin = {0,0,0};
 vec3_t camera_angles = {0,0,0};
 vec3_t player_origin = {0,0,0};
--- a/nq/source/cl_cmd.c
+++ b/nq/source/cl_cmd.c
@ -40,7 +40,7 @@
 #include "QF/sizebuf.h"
 #include "QF/sys.h"

-#include "client.h"
+#include "nq/include/client.h"


 /*
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@ -46,9 +46,10 @@
 #include "QF/sys.h"
 #include "QF/va.h"

-#include "client.h"
 #include "compat.h"
-#include "host.h"
+
+#include "nq/include/client.h"
+#include "nq/include/host.h"

 typedef struct {
 	int         frames;
--- a/nq/source/cl_ents.c
+++ b/nq/source/cl_ents.c
@ -44,12 +44,13 @@

 #include "QF/plugin/vid_render.h"

-#include "chase.h"
-#include "client.h"
 #include "compat.h"
-#include "host.h"
-#include "host.h"
-#include "server.h"
+
+#include "nq/include/chase.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"
+#include "nq/include/host.h"
+#include "nq/include/server.h"

 entity_t        cl_entities[MAX_EDICTS];
 double          cl_msgtime[MAX_EDICTS];
--- a/nq/source/cl_input.c
+++ b/nq/source/cl_input.c
@ -44,10 +44,11 @@

 #include "QF/plugin/vid_render.h"

-#include "chase.h"
-#include "client.h"
 #include "compat.h"
-#include "host.h"
+
+#include "nq/include/chase.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"

 /*
 	KEY BUTTONS
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@ -48,16 +48,17 @@
 #include "QF/plugin/console.h"
 #include "QF/plugin/vid_render.h"

-#include "chase.h"
-#include "cl_skin.h"
-#include "client.h"
-#include "clview.h"
 #include "compat.h"
-#include "host.h"
-#include "host.h"
-#include "server.h"
+#include "clview.h"
 #include "sbar.h"

+#include "nq/include/chase.h"
+#include "nq/include/cl_skin.h"
+#include "nq/include/client.h"
+#include "nq/include/host.h"
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+
 CLIENT_PLUGIN_PROTOS
 static plugin_list_t client_plugin_list[] = {
 		CLIENT_PLUGIN_LIST
--- a/nq/source/cl_parse.c
+++ b/nq/source/cl_parse.c
@ -53,12 +53,13 @@

 #include "QF/plugin/vid_render.h"

-#include "client.h"
 #include "compat.h"
-#include "host.h"
 #include "sbar.h"
-#include "server.h"
-#include "game.h"
+
+#include "nq/include/client.h"
+#include "nq/include/host.h"
+#include "nq/include/server.h"
+#include "nq/include/game.h"

 const char *svc_strings[] = {
 	"svc_bad",
--- a/nq/source/cl_screen.c
+++ b/nq/source/cl_screen.c
@ -46,9 +46,10 @@

 #include "QF/plugin/vid_render.h"

-#include "client.h"
 #include "sbar.h"

+#include "nq/include/client.h"
+
 static qpic_t  *scr_net;

 static void
--- a/Show more
+++ b/Show more