qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-25 05:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

avoid mutually exclusive options causing long Makefile.in lines:

Browse source 
simplify the logic
This commit is contained in:
Bill Currie 2000-05-24 07:29:16 +00:00
parent b1da890046
commit 1cee02c55c
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.in
View file

@ -588,6 +588,7 @@ fi
AM_CONDITIONAL(CDTYPE_WIN32, test "$CDTYPE" = "WIN32") AM_CONDITIONAL(CDTYPE_WIN32, test "$CDTYPE" = "WIN32")
AM_CONDITIONAL(CDTYPE_LINUX, test "$CDTYPE" = "LINUX") AM_CONDITIONAL(CDTYPE_LINUX, test "$CDTYPE" = "LINUX")
AM_CONDITIONAL(CDTYPE_NULL, test "$CDTYPE" != "WIN32" -a "$CDTYPE" != "LINUX")
dnl ================================================================== dnl ==================================================================

12
source/Makefile.am
View file

@ -22,25 +22,23 @@ EXTRA_libqfsys_sv_a_SOURCES = sv_sys_unix.c sv_sys_win.c sys_win.c sys_unix.c fn
if SNDTYPE_WIN32 if SNDTYPE_WIN32
libqfsnd_a_SOURCES = snd_win.c libqfsnd_a_SOURCES = snd_win.c
else endif
if SNDTYPE_OSS if SNDTYPE_OSS
libqfsnd_a_SOURCES = snd_oss.c libqfsnd_a_SOURCES = snd_oss.c
else endif
if SNDTYPE_ALSA if SNDTYPE_ALSA
libqfsnd_a_SOURCES = snd_alsa.c libqfsnd_a_SOURCES = snd_alsa.c
endif endif
endif
endif
EXTRA_libqfsnd_a_SOURCES = snd_win.c snd_oss.c snd_alsa.c EXTRA_libqfsnd_a_SOURCES = snd_win.c snd_oss.c snd_alsa.c
if CDTYPE_WIN32 if CDTYPE_WIN32
libqfcd_a_SOURCES = cd_win.c libqfcd_a_SOURCES = cd_win.c
else endif
if CDTYPE_LINUX if CDTYPE_LINUX
libqfcd_a_SOURCES = cd_linux.c libqfcd_a_SOURCES = cd_linux.c
else
libqfcd_a_SOURCES = cd_null.c
endif endif
if CDTYPE_NULL
libqfcd_a_SOURCES = cd_null.c
endif endif
EXTRA_libqfcd_a_SOURCES = cd_win.c cd_linux.c cd_null.c EXTRA_libqfcd_a_SOURCES = cd_win.c cd_linux.c cd_null.c