qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix up some accidental asm compilation when it's not wanted

This commit is contained in:
Bill Currie 2004-04-04 05:34:20 +00:00
parent ab52e74874
commit 49f8787450
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/util/Makefile.am
View File

@ -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)

2
nq/source/Makefile.am
View File

@ -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 \

6
qw/source/Makefile.am
View File

@ -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= \