From b4b27ee13b4922dfd39c4def1cb71ee3c5175ba0 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 18 Apr 2001 07:18:54 +0000
Subject: [PATCH] move the make dist stuff to the top level Makefile.am and get
 make dist to work in that make doesn't barf. probably missing lots of files

---
 Makefile.am            | 23 ++++++++++++++++++++++-
 nq/include/Makefile.am | 26 +++++++++-----------------
 qw/Makefile.am         | 26 --------------------------
 qw/include/Makefile.am | 22 ++++++++--------------
 4 files changed, 39 insertions(+), 58 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3f299dee2..0689374f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,5 +11,26 @@ EXTRA_DIST=	ChangeLog RPM/build_rpm.in \
 
 changelog::
 	-touch ChangeLog
-	-tools/cvs2cl/cvs2cl.pl -b --utc
+	-$(top_srcdir)/tools/cvs2cl/cvs2cl.pl -b --utc
 	-rm -f ChangeLog.bak
+
+NOCONV_DIST=	$(distdir)/include/win32/resources/icon1.ico
+
+dist-zip: distdir
+	-chmod -R a+r $(distdir)
+	ZIP="-r9q" zip $(distdir).zip $(NOCONV_DIST)
+	ZIP="-r9ql" zip $(distdir).zip $(distdir) -x $(NOCONV_DIST)
+	-rm -rf $(distdir)
+
+dist-bz2: distdir
+	-chmod -R a+r $(distdir)
+	$(TAR) -cho $(distdir) | bzip2 -9 > $(distdir).tar.bz2
+	-rm -rf $(distdir)
+
+dist-all-local: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	$(TAR) -cho $(distdir) | bzip2 -9 > $(distdir).tar.bz2
+	ZIP="-r9q" zip $(distdir).zip $(NOCONV_DIST)
+	ZIP="-r9ql" zip $(distdir).zip $(distdir) -x $(NOCONV_DIST)
+	-rm -rf $(distdir)
diff --git a/nq/include/Makefile.am b/nq/include/Makefile.am
index e8943faf8..9ae40657b 100644
--- a/nq/include/Makefile.am
+++ b/nq/include/Makefile.am
@@ -1,18 +1,10 @@
 ## Process this file with automake to produce Makefile.in
-EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h asm_ia32.h \
-	bspfile.h block16.h chase.h client.h checksum.h cmd.h compat.h \
-	conproc.h console.h context_x11.h crc.h cvar.h \
-	dga_check.h d_iface.h d_ifacea.h d_local.h dosisms.h draw.h \
-	gcc_attr.h gib_error.h gib.h gib_instructions.h \
-	gib_interpret.h gib_modules.h gib_parse.h gib_stack.h  gib_vars.h glquake.h \
-	gl_warp_sin.h host.h info.h input.h keys.h link.h mathlib.h mdfour.h \
-	modelgen.h model.h mpdosock.h msg.h net_bw.h net_dgrm.h net.h \
-	net_ipx.h net_loop.h net_mp.h net_ser.h net_udp.h net_vcr.h \
-	net_wins.h net_wipx.h pr_comp.h progdefs.h progdefs.q1 \
-	progdefs.q2 progs.h protocol.h qargs.h quakeasm.h qdefs.h \
-	qendian.h qtypes.h quakefs.h quakeio.h render.h resource.h \
-	r_local.h r_shared.h sbar.h screen.h server.h sizebuf.h \
-	sound.h spritegn.h sys.h uint32.h va.h vgamodes.h vid_dos.h \
-	vid.h view.h vregset.h wad.h winquake.h world.h zone.h \
-	win32/fnmatch.h win32/version.h win32/version.h.in \
-	win32/bc/borland.c win32/bc/config.h win32/vc/config.h
+EXTRA_DIST = adivtab.h anorm_dots.h anorms.h block16.h block8.h chase.h \
+		client.h config.h.in conproc.h d_iface.h d_ifacea.h d_local.h \
+		draw.h game.h gib.h gib_error.h gib_instructions.h gib_interpret.h \
+		gib_modules.h gib_parse.h gib_stack.h gib_vars.h gl_warp_sin.h \
+		glquake2.h host.h mpdosock.h net.h net_bw.h net_dgrm.h net_ipx.h \
+		net_loop.h net_mp.h net_ser.h net_udp.h net_vcr.h net_wins.h \
+		net_wipx.h progdefs.h progdefs.q1 progdefs.q2 protocol.h r_local.h \
+		r_shared.h render.h resource.h server.h sv_pr_cmds.h sv_progs.h \
+		world.h
diff --git a/qw/Makefile.am b/qw/Makefile.am
index 3dda5ce5e..77e3cbf5b 100644
--- a/qw/Makefile.am
+++ b/qw/Makefile.am
@@ -2,29 +2,3 @@
 AUTOMAKE_OPTIONS= foreign
 
 SUBDIRS=	include source
-
-NOCONV_DIST=	$(distdir)/include/win32/resources/icon1.ico
-
-changelog::
-	-touch $(top_srcdir)/ChangeLog
-	-$(top_srcdir)/tools/cvs2cl/cvs2cl.pl -b --utc
-	-rm -f $(top_srcdir)/ChangeLog.bak
-
-dist-zip: distdir
-	-chmod -R a+r $(distdir)
-	ZIP="-r9q" zip $(distdir).zip $(NOCONV_DIST)
-	ZIP="-r9ql" zip $(distdir).zip $(distdir) -x $(NOCONV_DIST)
-	-rm -rf $(distdir)
-
-dist-bz2: distdir
-	-chmod -R a+r $(distdir)
-	$(TAR) -cho $(distdir) | bzip2 -9 > $(distdir).tar.bz2
-	-rm -rf $(distdir)
-
-dist-all-local: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	$(TAR) -cho $(distdir) | bzip2 -9 > $(distdir).tar.bz2
-	ZIP="-r9q" zip $(distdir).zip $(NOCONV_DIST)
-	ZIP="-r9ql" zip $(distdir).zip $(distdir) -x $(NOCONV_DIST)
-	-rm -rf $(distdir)
diff --git a/qw/include/Makefile.am b/qw/include/Makefile.am
index c246401ed..8f2ec93a2 100644
--- a/qw/include/Makefile.am
+++ b/qw/include/Makefile.am
@@ -1,17 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS=	foreign
 
-EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h block16.h block8.h \
-	bothdefs.h buildnum.h cl_cam.h cl_demo.h cl_ents.h cl_input.h \
-	cl_main.h cl_parse.h cl_pred.h cl_slist.h cl_tent.h client.h \
-	commdef.h config.h.in d_iface.h d_ifacea.h d_local.h draw.h \
-	gcc_attr.h gl_warp_sin.h glquake.h host.h locs.h modelgen.h net.h \
-	pcx.h pmove.h pr_comp.h progdefs.h protocol.h quakeasm.h \
-	r_dynamic.h r_local.h r_shared.h render.h sbar.h screen.h server.h \
-	skin.h sv_pr_cmds.h teamplay.h texture.h tga.h wad.h world.h \
-	\
-	win32/fnmatch.h win32/version.h win32/version.h.in \
-	win32/mingw/config.h \
-	win32/resources/icon1.ico win32/resources/resource.h \
-	win32/resources/quakeforge.rc win32/bc/borland.c win32/bc/config.h \
-	win32/vc/config.h win32/vc/dirent.h
+EXTRA_DIST = adivtab.h anorm_dots.h anorms.h block16.h block8.h bothdefs.h \
+		buildnum.h cl_cam.h cl_demo.h cl_ents.h cl_input.h cl_main.h \
+		cl_parse.h cl_pred.h cl_slist.h cl_tent.h client.h commdef.h \
+		d_iface.h d_ifacea.h d_local.h draw.h game.h gl_warp_sin.h hl.h \
+		host.h locs.h logos.h modelgen.h msg_ucmd.h net.h pcx.h pmove.h \
+		progdefs.h protocol.h r_dynamic.h r_local.h r_shared.h render.h \
+		server.h skin.h sv_pr_cmds.h sv_progs.h teamplay.h texture.h tga.h \
+		world.h