From 06acd3db1cadf2b5d57faa6df806f43950c014b9 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 18 Apr 2001 21:02:02 +0000
Subject: [PATCH] massivly speed up qw/source/Makefile creation, and
 Makefile.in, too. ASM_ARCH and PACKETLOG are gone from Makefile.am as the
 first was really redundant and the latter now is.

---
 configure.in              |  3 ---
 nq/source/Makefile.am     |  2 --
 qw/source/Makefile.am     | 35 +++++++++--------------------------
 qw/source/net_packetlog.c |  4 ++++
 4 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/configure.in b/configure.in
index aac563a25..b39e00611 100644
--- a/configure.in
+++ b/configure.in
@@ -730,7 +730,6 @@ case "${host}" in
 		;;
 	*) AC_MSG_RESULT(no)
 esac
-AM_CONDITIONAL(ASM_ARCH, test "$ASM_ARCH")
 
 dnl ==================================================================
 dnl Checks for sound
@@ -1186,8 +1185,6 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-AM_CONDITIONAL(PACKETLOG, test "x$packetlog" = "xyes")
-
 dnl CFLAGS for release and devel versions
 AC_ARG_ENABLE(profile,
 	[  --enable-profile        compile with profiling (for development)],
diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am
index 39c004888..436b440e8 100644
--- a/nq/source/Makefile.am
+++ b/nq/source/Makefile.am
@@ -40,13 +40,11 @@ EXTRA_PROGRAMS= nq-3dfx nq-fbdev nq-glx nq-mgl nq-sdl \
 
 noinst_LIBRARIES= libqfnet.a
 
-#if ASM_ARCH
 math_ASM= 	cl_math.S
 soft_ASM=	d_draw.S d_draw16.S d_parta.S d_polysa.S d_scana.S d_spr8.S \
 		d_varsa.S sw_raclipa.S sw_raliasa.S sw_rdrawa.S sw_redgea.S sw_rvarsa.S \
 		surf16.S surf8.S
 common_ASM=	sys_ia32.S worlda.S $(math_ASM)
-#endif
 
 common_SOURCES= game.c wad.c world.c \
 		model.c model_alias.c model_brush.c model_sprite.c \
diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am
index 7bcca0ee3..2b28420c9 100644
--- a/qw/source/Makefile.am
+++ b/qw/source/Makefile.am
@@ -41,17 +41,10 @@ EXTRA_PROGRAMS= qw-client-3dfx qw-client-fbdev \
 
 noinst_LIBRARIES= libqfnet.a
 
-if PACKETLOG
-packetlogger = net_packetlog.c
-endif
-
-if ASM_ARCH
-math_ASM = sys_x86.S
-endif
 common_SOURCES= buildnum.c com.c \
 	game.c model.c model_brush.c msg_ucmd.c \
 	pmove.c pmovetst.c \
-	$(math_ASM) $(packetlogger)
+	sys_x86.S net_packetlog.c
 
 # ... Network type
 if NETTYPE_IPV6
@@ -70,14 +63,10 @@ else
 syssv_SRC=	sv_sys_unix.c
 endif
 
-if ASM_ARCH
-world_ASM=	worlda.S
-endif
-
 server_SOURCES=	sv_ccmds.c sv_cvar.c \
 		sv_ents.c sv_init.c sv_main.c sv_misc.c sv_model.c \
 		sv_move.c sv_nchan.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_send.c \
-		sv_user.c world.c $(world_ASM) $(syssv_SRC)
+		sv_user.c world.c worlda.S $(syssv_SRC)
 
 qw_server_SOURCES=	$(common_SOURCES) $(server_SOURCES)
 qw_server_LDADD= 	$(top_builddir)/libs/util/libQFutil.la \
@@ -104,31 +93,25 @@ CLIENT_LIB_DEPS=	libqfnet.a
 CLIENT_POST_LIBS=$(top_builddir)/libs/video/targets/libQFjs.la
 # libQFjs is seperate because it needs to be linked after when building statically
 
-if ASM_ARCH
-client_ASM=	cl_math.S
-endif
-
 client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
 	cl_main.c cl_misc.c cl_parse.c cl_pred.c cl_slist.c cl_tent.c \
 	console.c keys.c locs.c model_alias.c model_sprite.c nonintel.c \
-	pcx.c r_efrag.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c $(client_ASM) $(syscl_SRC)
+	pcx.c r_efrag.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c cl_math.S $(syscl_SRC)
 
 # Software-rendering clients
 #
 # ... Common stuff
-if ASM_ARCH
-soft_ASM=	d_draw.S d_draw16.S d_parta.S d_polysa.S d_scana.S d_spr8.S \
-		d_varsa.S sw_raclipa.S sw_raliasa.S sw_rdrawa.S sw_redgea.S sw_rvarsa.S \
-		surf16.S surf8.S
-endif
 
 soft_SOURCES=	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 sw_raclip.c sw_ralias.c sw_rbsp.c \
 		sw_rdraw.c sw_redge.c sw_rlight.c sw_rmain.c sw_rmisc.c \
-		sw_rpart.c sw_rsky.c sw_rsprite.c sw_rsurf.c sw_rvars.c sw_skin.c sw_view.c \
-		screen.c $(soft_ASM) sw_model_alias.c sw_model_brush.c \
-		sw_model_sprite.c
+		sw_rpart.c sw_rsky.c sw_rsprite.c sw_rsurf.c sw_rvars.c sw_skin.c \
+		sw_view.c screen.c sw_model_alias.c sw_model_brush.c \
+		sw_model_sprite.c \
+		d_draw.S d_draw16.S d_parta.S d_polysa.S d_scana.S d_spr8.S \
+		d_varsa.S sw_raclipa.S sw_raliasa.S sw_rdrawa.S sw_redgea.S \
+		sw_rvarsa.S surf16.S surf8.S
 
 # ... Linux FBDev
 qw_client_fbdev_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES)
diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c
index 8c4617062..fbbd5147e 100644
--- a/qw/source/net_packetlog.c
+++ b/qw/source/net_packetlog.c
@@ -29,6 +29,9 @@
 */
 
 // FIXME: we did support Quake1 protocol too...
+
+#ifdef PACKET_LOGGING
+
 #define QUAKEWORLD
 
 #ifdef HAVE_CONFIG_H
@@ -977,3 +980,4 @@ Net_Log_Init (void)
 	return 0;
 }
 
+#endif // PACKET_LOGGING