various make dist related cleanups

Makefile.am

@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = include source doc
+SUBDIRS = include source doc RPM
 
-EXTRA_DIST = RPM/build_rpm.in RPM/nuq.spec.in \
+EXTRA_DIST = tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
-	tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
 	tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \
-	tools/gas2masm/gas2masm.mak tools/gas2masm/gas2masm.mdp
+	tools/gas2masm/gas2masm.mak tools/gas2masm/gas2masm.mdp \
+	bootstrap

RPM/.gitignore

@@ -1,2 +1,4 @@
+Makefile
+Makefile.in
 build_rpm
 nuq.spec

RPM/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = build_rpm.in nuq.spec.in

configure.in

@@ -974,6 +974,7 @@ AC_SUBST(TARGETS)
 
 dnl Output files
 AC_OUTPUT(
+	RPM/Makefile
 	RPM/nuq.spec
 	RPM/build_rpm
 	doc/Makefile

include/Makefile.am

@@ -1,14 +1,18 @@
 ## Process this file with automake to produce Makefile.in
-EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h asm_ia32.h block16.h \
+EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h asm_ia32.h \
-	block8.h bspfile.h cdaudio.h \
+	bspfile.h block16.h cdaudio.h chase.h client.h cmd.h compat.h \
-	client.h cmd.h compat.h console.h crc.h \
+	conproc.h console.h context_x11.h crc.h cvar.h \
-	cvar.h d_iface.h d_ifacea.h d_local.h draw.h  gl_warp_sin.h \
+	dga_check.h d_iface.h d_ifacea.h d_local.h dosisms.h draw.h \
-	glquake.h info.h input.h keys.h link.h \
+	gcc_attr.h gib_error.h gib.h gib_instructions.h \
-	mathlib.h mdfour.h menu.h model.h modelgen.h msg.h net.h \
+	gib_interpret.h gib_modules.h gib_parse.h gib_vars.h glquake.h \
-	pr_comp.h progdefs.h progs.h protocol.h qargs.h \
+	gl_warp_sin.h host.h info.h input.h keys.h link.h mathlib.h mdfour.h menu.h \
-	qdefs.h qendian.h qtypes.h quakeasm.h \
+	modelgen.h model.h mpdosock.h msg.h net_bw.h net_dgrm.h net.h \
-	quakefs.h quakeio.h r_local.h r_shared.h render.h resource.h \
+	net_ipx.h net_loop.h net_mp.h net_ser.h net_udp.h net_vcr.h \
-	sbar.h screen.h server.h sizebuf.h sound.h spritegn.h sys.h \
+	net_wins.h net_wipx.h pr_comp.h progdefs.h progdefs.q1 \
-	uint32.h vid.h view.h wad.h winquake.h world.h zone.h \
+	progdefs.q2 progs.h protocol.h qargs.h quakeasm.h qdefs.h \
-	win32/fnmatch.h win32/bc/config.h win32/vc/config.h win32/vc/dirent.h \
+	qendian.h qtypes.h quakefs.h quakeio.h render.h resource.h \
-	win32/version.h context_x11.h dga_check.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

include/common.h

@@ -1,48 +0,0 @@
-/*
-	sizebuf.h
-
-	@description@
-
-	Copyright (C) 1996-1997  Id Software, Inc.
-
-	This program 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$
-*/
-
-#ifndef __sizebuf_h
-#define __sizebuf_h
-
-typedef struct sizebuf_s
-{
-	qboolean	allowoverflow;	// if false, do a Sys_Error
-	qboolean	overflowed;		// set to true if the buffer size failed
-	byte	*data;
-	int		maxsize;
-	int		cursize;
-} sizebuf_t;
-
-void SZ_Alloc (sizebuf_t *buf, int startsize);
-void SZ_Free (sizebuf_t *buf);
-void SZ_Clear (sizebuf_t *buf);
-void *SZ_GetSpace (sizebuf_t *buf, int length);
-void SZ_Write (sizebuf_t *buf, void *data, int length);
-void SZ_Print (sizebuf_t *buf, char *data);	// strcats onto the sizebuf
-
-#endif // __sizebuf_h

include/model.h

@@ -77,7 +77,7 @@ typedef struct
 #define	SIDE_ON		2
 
 // plane_t structure
-// !!! if this is changed, it must be changed in asm_i386.h too !!!
+// !!! if this is changed, it must be changed in asm_ia32.h too !!!
 typedef struct mplane_s
 {
 	vec3_t	normal;
@@ -207,7 +207,7 @@ typedef struct mleaf_s
 	byte		ambient_sound_level[NUM_AMBIENTS];
 } mleaf_t;
 
-// !!! if this is changed, it must be changed in asm_i386.h too !!!
+// !!! if this is changed, it must be changed in asm_ia32.h too !!!
 typedef struct
 {
 	dclipnode_t	*clipnodes;

source/dosasm.S

@@ -1,4 +1,4 @@
-#include "asm_i386.h"
+#include "asm_ia32.h"
 
 .data
 fpenv:	.long	0, 0, 0, 0, 0, 0, 0, 0