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

seems automake isn't too happy about nested conditionals and main vars

Browse source
This commit is contained in:
Bill Currie 2001-10-02 22:36:08 +00:00
parent 256f6e94c1
commit b866bcae61
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -1515,6 +1515,7 @@ AC_SUBST(VID_TARGETS_NOINST)
AM_CONDITIONAL(BUILD_GL, test "$BUILD_GL" = "yes")
AM_CONDITIONAL(BUILD_SW, test "$BUILD_SW" = "yes")
AM_CONDITIONAL(BUILD_SW_ASM, test "$BUILD_SW" = "yes" -a "$ASM_ARCH" = "yes")
AM_CONDITIONAL(BUILD_SW32, test "$BUILD_SW32" = "yes")
dnl Finalization of CFLAGS, LDFLAGS, and LIBS

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

@ -14,17 +14,16 @@ EXTRA_libsw_la_SOURCES= \
sw_redge.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c sw_rsprite.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
if BUILD_SW_ASM
libasm_la_SOURCES= $(EXTRA_libasm_la_SOURCES)
else
libasm_la_SOURCES=
endif
if BUILD_SW
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