link libQFutil.so against libz so the clients (and tools) don't need to worry

about it
This commit is contained in:
Bill Currie 2001-03-31 03:51:25 +00:00
parent d5345b7db9
commit 7cb6245efa
3 changed files with 5 additions and 5 deletions

View file

@ -1,6 +1,6 @@
lib_LTLIBRARIES = libQFutil.la
libQFutil_la_LDFLAGS = -version-info 1:0:0
libQFutil_la_LDFLAGS = -version-info 1:0:0 $(Z_LIBS)
libQFutil_la_SOURCES = \
checksum.c cmd.c console.c crc.c cvar.c hash.c info.c link.c math.S \
mathlib.c \

View file

@ -127,7 +127,7 @@ libqfnet_a_SOURCES= net_bsd.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= $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la -L. -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet $(SOUND_LIBS) $(NET_LIBS) $(Z_LIBS)
client_LIBS= $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la -L. -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet $(SOUND_LIBS) $(NET_LIBS)
client_LIB_DEPS= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
@ -260,7 +260,7 @@ nq_wgl_DEPENDENCIES=$(client_LIB_DEPS)
ded_SOURCES=sys_unixd.c sv_ded.c
nq_server_SOURCES=$(common_SOURCES) $(server_SOURCES) $(ded_SOURCES)
nq_server_LDADD= libqfnet.a $(Z_LIBS)
nq_server_LDADD= libqfnet.a
nq_server_DEPENDENCIES=libqfnet.a
#

View file

@ -86,7 +86,7 @@ server_SOURCES= sv_ccmds.c sv_cvar.c \
sv_user.c world.c $(world_ASM)
qw_server_SOURCES= $(common_SOURCES) $(server_SOURCES)
qw_server_LDADD= $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/libQFgamecode.la -L. -lqfnet -lqfsys_sv $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)
qw_server_LDADD= $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/libQFgamecode.la -L. -lqfnet -lqfsys_sv $(NET_LIBS) $(DL_LIBS)
qw_server_DEPENDENCIES= libqfnet.a libqfsys_sv.a
#
@ -170,7 +170,7 @@ endif
libqfjs_a_CFLAGS= $(JOY_CFLAGS)
EXTRA_libqfjs_a_SOURCES= joy_linux.c joy_win.c joy_null.c
CLIENT_LIBS= $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/libQFgamecode.la -L. -lqfnet -lqfsys_cl -lqfsnd -lqfcd -lqfjs $(SOUND_LIBS) $(NET_LIBS) $(CD_LIBS) $(JOY_LIBS) $(Z_LIBS)
CLIENT_LIBS= $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/libQFgamecode.la -L. -lqfnet -lqfsys_cl -lqfsnd -lqfcd -lqfjs $(SOUND_LIBS) $(NET_LIBS) $(CD_LIBS) $(JOY_LIBS)
CLIENT_LIB_DEPS= libqfnet.a libqfsys_cl.a libqfsnd.a libqfcd.a libqfjs.a
if ASM_ARCH