From 42e52a70931a919e87b986516d412093827361de Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Thu, 22 Feb 2001 16:53:15 +0000
Subject: [PATCH] %s/libutil.a/libqfutil.a/g due to name space clash found when
 linking SDL.

New naming convention, all libs will be libqf<subsys>.a (should we instead
use libQF<subsys>.a?). The .so libs, when we get to them, will have to be
sorted out then.
---
 libs/util/Makefile.am | 8 ++++----
 nq/source/Makefile.am | 4 ++--
 qw/source/Makefile.am | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am
index 3ab5dfe61..0ad56e6e8 100644
--- a/libs/util/Makefile.am
+++ b/libs/util/Makefile.am
@@ -1,8 +1,8 @@
-noinst_LIBRARIES = libutil.a
+noinst_LIBRARIES = libqfutil.a
 
-libutil_a_SOURCES = cmd.c cvar.c hash.c mdfour.c sizebuf.c va.c zone.c
+libqfutil_a_SOURCES = cmd.c cvar.c hash.c mdfour.c sizebuf.c va.c zone.c
 
-all-local: ../libutil.a
+all-local: ../libqfutil.a
 
-../libutil.a: libutil.a
+../libqfutil.a: libqfutil.a
 	cp $(noinst_LIBRARIES) ..
diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am
index b53dae2bc..b7d982924 100644
--- a/nq/source/Makefile.am
+++ b/nq/source/Makefile.am
@@ -128,8 +128,8 @@ libqfnet_a_SOURCES=	net_bsd.c checksum.c net_dgrm.c net_loop.c \
 EXTRA_libqfcd_a_SOURCES=net_dos.c net_bw.c net_ipx.c net_mp.c net_ser.c \
 			net_win.c net_wins.c net_wipx.c
 
-client_LIBS=	-L. -L../../libs -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet -lutil $(SOUND_LIBS) $(NET_LIBS) $(Z_LIBS)
-client_LIB_DEPS= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a ../../libs/libutil.a
+client_LIBS=	-L. -L../../libs -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet -lqfutil $(SOUND_LIBS) $(NET_LIBS) $(Z_LIBS)
+client_LIB_DEPS= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a ../../libs/libqfutil.a
 
 client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
 		cl_tent.c console.c keys.c menu.c sbar.c r_part.c r_view.c \
diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am
index c3619b224..7635fed8f 100644
--- a/qw/source/Makefile.am
+++ b/qw/source/Makefile.am
@@ -86,8 +86,8 @@ server_SOURCES=	pr_edict.c pr_exec.c pr_offs.c sv_ccmds.c sv_cvar.c \
 		sv_user.c ver_check.c world.c $(world_ASM)
 
 qw_server_SOURCES=	$(common_SOURCES) $(server_SOURCES)
-qw_server_LDADD=	-L. -L../../libs -lqfnet -lqfsys_sv -lutil $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)
-qw_server_DEPENDENCIES= libqfnet.a libqfsys_sv.a ../../libs/libutil.a
+qw_server_LDADD=	-L. -L../../libs -lqfnet -lqfsys_sv -lqfutil $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)
+qw_server_DEPENDENCIES= libqfnet.a libqfsys_sv.a ../../libs/libqfutil.a
 
 #
 # Client builds
@@ -170,8 +170,8 @@ endif
 libqfjs_a_CFLAGS=	$(JOY_CFLAGS)
 EXTRA_libqfjs_a_SOURCES= joy_linux.c joy_win.c joy_null.c
 
-CLIENT_LIBS=	-L. -L../../libs -lqfnet -lqfsys_cl -lqfsnd -lqfcd -lqfjs -lutil $(SOUND_LIBS) $(NET_LIBS) $(CD_LIBS) $(JOY_LIBS) $(Z_LIBS)
-CLIENT_LIB_DEPS= libqfnet.a libqfsys_cl.a libqfsnd.a libqfcd.a libqfjs.a ../../libs/libutil.a
+CLIENT_LIBS=	-L. -L../../libs -lqfnet -lqfsys_cl -lqfsnd -lqfcd -lqfjs -lqfutil $(SOUND_LIBS) $(NET_LIBS) $(CD_LIBS) $(JOY_LIBS) $(Z_LIBS)
+CLIENT_LIB_DEPS= libqfnet.a libqfsys_cl.a libqfsnd.a libqfcd.a libqfjs.a ../../libs/libqfutil.a
 
 if ASM_ARCH
 client_ASM=	snd_mixa.S cl_math.S