From 49f8787450c51eab2dd85f38481a5a33dee2f7cf Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sun, 4 Apr 2004 05:34:20 +0000
Subject: [PATCH] fix up some accidental asm compilation when it's not wanted

---
 libs/util/Makefile.am | 15 ++++++++-------
 nq/source/Makefile.am |  2 +-
 qw/source/Makefile.am |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am
index 1bbb0da27..9f4d79f2d 100644
--- a/libs/util/Makefile.am
+++ b/libs/util/Makefile.am
@@ -6,14 +6,15 @@ INCLUDES= -I$(top_srcdir)/include
 lib_LTLIBRARIES= libQFutil.la
 
 if ASM_ARCH
-noinst_LTLIBRARIES=	libasm.la
+asm= libasm.la
 else
-noinst_LTLIBRARIES=
+asm=
 endif
 
-asm_src= math.S sys_ia32.S
+#noinst_LTLIBRARIES=	$(asm)
+EXTRA_LTLIBRARIES= libasm.la
 
-libasm_la_SOURCES=	$(asm_src)
+libasm_la_SOURCES=	math.S sys_ia32.S
 
 
 fnmatch_src=	fnmatch.c dirent.c
@@ -31,8 +32,8 @@ getopt=
 endif
 
 libQFutil_la_LDFLAGS=		-version-info 1:0:0 -no-undefined
-libQFutil_la_LIBADD=		libasm.la $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS)
-libQFutil_la_DEPENDENCIES=	libasm.la
+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 \
@@ -40,4 +41,4 @@ libQFutil_la_SOURCES= \
 	qfplist.c quakefs.c quakeio.c riff.c sizebuf.c string.c sys.c \
 	va.c ver_check.c wad.c wadfile.c zone.c $(fnmatch) $(getopt)
 
-EXTRA_DIST= $(asm_src) $(fnmatch_src) $(getopt_src)
+EXTRA_DIST= $(fnmatch_src) $(getopt_src)
diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am
index c37390a53..779881300 100644
--- a/nq/source/Makefile.am
+++ b/nq/source/Makefile.am
@@ -69,7 +69,7 @@ server_LIBFILES= \
 		$(top_builddir)/libs/models/libQFmodels.la
 
 common_LIBFILES= \
-		libasm.a \
+		$(asm) \
 		$(top_builddir)/libs/net/libnet_main.la \
 		$(top_builddir)/libs/console/libQFconsole.la \
 		$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am
index 0117a142c..6c231326b 100644
--- a/qw/source/Makefile.am
+++ b/qw/source/Makefile.am
@@ -87,9 +87,9 @@ qw_server_LIBS= \
 		$(top_builddir)/libs/util/libQFutil.la
 
 qw_server_SOURCES=	
-qw_server_LDADD=	libqw_server.a libqw_common.a libasm.a $(qw_server_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
+qw_server_LDADD=	libqw_server.a libqw_common.a $(asm) $(qw_server_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS)
 qw_server_LDFLAGS=	$(common_ldflags)
-qw_server_DEPENDENCIES=	libqw_common.a libqw_server.a libasm.a $(qw_server_LIBS)
+qw_server_DEPENDENCIES=	libqw_common.a libqw_server.a $(asm) $(qw_server_LIBS)
 
 qw_master_SOURCES=	master.c
 qw_master_LDADD=	$(top_builddir)/libs/util/libQFutil.la $(NET_LIBS)
@@ -112,7 +112,7 @@ qw_client_LIBS= \
 		$(top_builddir)/libs/util/libQFutil.la \
 		$(top_builddir)/libs/gib/libQFgib.la
 
-client_LIBS= libasm.a $(qw_client_LIBS)
+client_LIBS= $(asm) $(qw_client_LIBS)
 client_libs= libqw_client.a libqw_common.a
 
 libqw_client_a_SOURCES= \