mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-17 22:50:51 +00:00
Broken attempt at cleaning up Makefile.am's, for taniwha's perusal.
This commit is contained in:
parent
4699bf6d5b
commit
256f6e94c1
3 changed files with 30 additions and 47 deletions
|
@ -2,18 +2,14 @@ INCLUDES= -I$(top_srcdir)/include $(GLX_CFLAGS)
|
||||||
|
|
||||||
noinst_LTLIBRARIES= libgl.la
|
noinst_LTLIBRARIES= libgl.la
|
||||||
|
|
||||||
if BUILD_GL
|
|
||||||
libgl_la_SOURCES= \
|
|
||||||
gl_draw.c gl_dyn_fires.c gl_dyn_lights.c gl_dyn_part.c \
|
|
||||||
gl_dyn_textures.c gl_graph.c gl_rmain.c gl_rmisc.c gl_rsurf.c \
|
|
||||||
gl_screen.c gl_skin.c gl_sky.c gl_sky_clip.c \
|
|
||||||
gl_textures.c gl_warp.c gl_funcs.c noisetextures.c
|
|
||||||
else
|
|
||||||
libgl_la_SOURCES=
|
|
||||||
endif
|
|
||||||
|
|
||||||
EXTRA_libgl_la_SOURCES= \
|
EXTRA_libgl_la_SOURCES= \
|
||||||
gl_draw.c gl_dyn_fires.c gl_dyn_lights.c gl_dyn_part.c \
|
gl_draw.c gl_dyn_fires.c gl_dyn_lights.c \
|
||||||
gl_dyn_textures.c gl_graph.c gl_rmain.c gl_rmisc.c gl_rsurf.c \
|
gl_dyn_part.c gl_dyn_textures.c gl_graph.c gl_rmain.c gl_rmisc.c \
|
||||||
gl_screen.c gl_skin.c gl_sky.c gl_sky_clip.c \
|
gl_rsurf.c gl_screen.c gl_skin.c gl_sky.c gl_sky_clip.c \
|
||||||
gl_textures.c gl_warp.c gl_funcs.c noisetextures.c
|
gl_textures.c gl_warp.c gl_funcs.c noisetextures.c
|
||||||
|
|
||||||
|
if BUILD_GL
|
||||||
|
libgl_la_SOURCES= $(EXTRA_libgl_la_SOURCES)
|
||||||
|
else
|
||||||
|
libgl_la_SOURCES=
|
||||||
|
endif
|
||||||
|
|
|
@ -2,29 +2,6 @@ INCLUDES= -I$(top_srcdir)/include
|
||||||
|
|
||||||
noinst_LTLIBRARIES= libsw.la libasm.la
|
noinst_LTLIBRARIES= libsw.la libasm.la
|
||||||
|
|
||||||
if BUILD_SW
|
|
||||||
if ASM_ARCH
|
|
||||||
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_LIBADD= 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 sw_rdraw.c \
|
|
||||||
sw_redge.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c sw_rsprite.c \
|
|
||||||
sw_rsurf.c sw_skin.c
|
|
||||||
libsw_la_DEPENDENCIES= libasm.la
|
|
||||||
else
|
|
||||||
libasm_la_SOURCES=
|
|
||||||
libsw_la_SOURCES=
|
|
||||||
endif
|
|
||||||
|
|
||||||
EXTRA_libasm_la_SOURCES= \
|
EXTRA_libasm_la_SOURCES= \
|
||||||
d_draw.S d_draw16.S d_parta.S d_polysa.S d_scana.S d_spr8.S d_varsa.S \
|
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 \
|
surf16.S surf8.S sw_raclipa.S sw_raliasa.S sw_rdrawa.S sw_redgea.S \
|
||||||
|
@ -36,3 +13,18 @@ EXTRA_libsw_la_SOURCES= \
|
||||||
screen.c sw_graph.c sw_raclip.c sw_ralias.c sw_rbsp.c sw_rdraw.c \
|
screen.c sw_graph.c sw_raclip.c sw_ralias.c sw_rbsp.c sw_rdraw.c \
|
||||||
sw_redge.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c sw_rsprite.c \
|
sw_redge.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c sw_rsprite.c \
|
||||||
sw_rsurf.c sw_skin.c
|
sw_rsurf.c sw_skin.c
|
||||||
|
|
||||||
|
if BUILD_SW
|
||||||
|
if ASM_ARCH
|
||||||
|
libasm_la_SOURCES= $(EXTRA_libasm_la_SOURCES)
|
||||||
|
else
|
||||||
|
libasm_la_SOURCES=
|
||||||
|
endif
|
||||||
|
|
||||||
|
libsw_la_LIBADD= libasm.la
|
||||||
|
libsw_la_SOURCES= $(EXTRA_libsw_la_SOURCES)
|
||||||
|
libsw_la_DEPENDENCIES= libasm.la
|
||||||
|
else
|
||||||
|
libasm_la_SOURCES=
|
||||||
|
libsw_la_SOURCES=
|
||||||
|
endif
|
||||||
|
|
|
@ -2,20 +2,15 @@ INCLUDES= -I$(top_srcdir)/include
|
||||||
|
|
||||||
noinst_LTLIBRARIES= libsw32.la
|
noinst_LTLIBRARIES= libsw32.la
|
||||||
|
|
||||||
if BUILD_SW32
|
|
||||||
libsw32_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 screen.c \
|
|
||||||
sw32_graph.c sw32_raclip.c sw32_ralias.c sw32_rbsp.c sw32_rdraw.c \
|
|
||||||
sw32_redge.c sw32_rmain.c sw32_rmisc.c sw32_rpart.c sw32_rsky.c \
|
|
||||||
sw32_rsprite.c sw32_rsurf.c sw32_skin.c
|
|
||||||
else
|
|
||||||
libsw32_la_SOURCES=
|
|
||||||
endif
|
|
||||||
|
|
||||||
EXTRA_libsw32_la_SOURCES= \
|
EXTRA_libsw32_la_SOURCES= \
|
||||||
d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c d_scan.c \
|
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 screen.c \
|
d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c draw.c screen.c \
|
||||||
sw32_graph.c sw32_raclip.c sw32_ralias.c sw32_rbsp.c sw32_rdraw.c \
|
sw32_graph.c sw32_raclip.c sw32_ralias.c sw32_rbsp.c sw32_rdraw.c \
|
||||||
sw32_redge.c sw32_rmain.c sw32_rmisc.c sw32_rpart.c sw32_rsky.c \
|
sw32_redge.c sw32_rmain.c sw32_rmisc.c sw32_rpart.c sw32_rsky.c \
|
||||||
sw32_rsprite.c sw32_rsurf.c sw32_skin.c
|
sw32_rsprite.c sw32_rsurf.c sw32_skin.c
|
||||||
|
|
||||||
|
if BUILD_SW32
|
||||||
|
libsw32_la_SOURCES= $(EXTRA_libsw32_la_SOURCES)
|
||||||
|
else
|
||||||
|
libsw32_la_SOURCES=
|
||||||
|
endif
|
||||||
|
|
Loading…
Reference in a new issue