qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 15:22:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

libasm cleanups

Browse source
This commit is contained in:
Bill Currie 2001-09-25 22:12:55 +00:00
parent 875a0eab1b
commit a439170dcf
4 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libs/audio/renderer/Makefile.am
View file

@ -12,17 +12,16 @@ lib_LTLIBRARIES = $(SND_RENDERER)
EXTRA_LTLIBRARIES =
if ASM_ARCH
ASM = libasm.la
noinst_LTLIBRARIES = libasm.la
else
ASM =
noinst_LTLIBRARIES =
endif
noinst_LTLIBRARIES = $(ASM)
libasm_la_SOURCES = snd_mixa.S
libsnd_render_default_la_LDFLAGS= -version-info 1:0:0
libsnd_render_default_la_LIBADD = $(ASM)
libsnd_render_default_la_LIBADD = libasm.la
libsnd_render_default_la_DEPENDENCIES = libasm.la
libsnd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c
libsnd_render_default.la: $(libsnd_render_default_la_OBJECTS) $(libsnd_render_default_la_DEPENDENCIES)
$(LINK) -rpath $(pluginpath) $(libsnd_render_default_la_LDFLAGS) $(libsnd_render_default_la_OBJECTS) $(libsnd_render_default_la_LIBADD) $(LIBS)

13
libs/util/Makefile.am
View file

@ -8,18 +8,17 @@ else
fnmatch_SRC =
endif
noinst_LTLIBRARIES = libasm.la
if ASM_ARCH
ASM = libasm.la
libasm_la_SOURCES = math.S
else
ASM =
libasm_la_SOURCES =
endif
noinst_LTLIBRARIES = $(ASM)
libasm_la_SOURCES = math.S
libQFutil_la_LDFLAGS = -version-info 1:0:0 $(Z_LIBS) $(DL_LIBS)
libQFutil_la_LIBADD = $(ASM)
libQFutil_la_LIBADD = libasm.la
libQFutil_la_DEPENDENCIES = libasm.la
libQFutil_la_SOURCES = \
checksum.c cmd.c console.c con_print.c crc.c cvar.c fendian.c hash.c \
info.c link.c \

16
libs/video/renderer/sw/Makefile.am
View file

@ -5,20 +5,20 @@ SW = libsw.la
else
SW =
endif
noinst_LTLIBRARIES = $(SW) libasm.la
if ASM_ARCH
ASM = libasm.la
else
ASM =
endif
noinst_LTLIBRARIES = $(SW) $(ASM)
libasm_la_SOURCES = d_draw.S d_draw16.S d_parta.S d_polysa.S d_scana.S \
d_spr8.S d_varsa.S surf16.S surf8.S sw_raclipa.S sw_raliasa.S \
sw_rdrawa.S sw_redgea.S sw_rvarsa.S transform.S
else
libasm_la_SOURCES =
endif
libsw_la_LDFLAGS = -version-info 1:0:0
libsw_la_LIBADD = $(ASM)
libsw_la_LIBADD = libasm.la
libsw_la_DEPENDENCIES = libasm.la
libsw_la_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 \
nonintel.c screen.c sw_graph.c sw_raclip.c sw_ralias.c sw_rbsp.c \

9
libs/video/targets/Makefile.am
View file

@ -5,13 +5,11 @@ lib_LTLIBRARIES = @VID_TARGETS@
EXTRA_LTLIBRARIES = libQFjs.la libQFfbdev.la libQFsvga.la libQFx11.la libQFglx.la libQFsdl.la libQFsdl32.la libQFsgl.la libQFtdfx.la libQFwgl.la libQFmgl.la
if ASM_ARCH
ASM = libasm.la
noinst_LTLIBRARIES = libasm.la
else
ASM =
noinst_LTLIBRARIES =
endif
noinst_LTLIBRARIES = $(ASM)
libasm_la_SOURCES = d_copy.S
libQFjs_la_LDFLAGS= -version-info 1:0:0
@ -74,7 +72,8 @@ libQFsgl.la: $(libQFsgl_la_OBJECTS) $(libQFsgl_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libQFsgl_la_LDFLAGS) $(libQFsgl_la_OBJECTS) $(libQFsgl_la_LIBADD) $(LIBS)
libQFsvga_la_LDFLAGS= -version-info 1:0:0
libQFsvga_la_LIBADD=$(ASM)
libQFsvga_la_LIBADD= libasm.la
libQFsvga_la_DEPENDENCIES= libasm.la
libQFsvga_la_SOURCES= $(in_common_SOURCE) in_svgalib.c vid.c vid_common_sw.c vid_svgalib.c
libQFsvga.la: $(libQFsvga_la_OBJECTS) $(libQFsvga_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libQFsvga_la_LDFLAGS) $(libQFsvga_la_OBJECTS) $(libQFsvga_la_LIBADD) $(LIBS)