don't build cd or sound libs/plugins when not building clients

This commit is contained in:
Bill Currie 2001-06-07 03:37:05 +00:00
parent 6abc7e77ad
commit ab9e025078
4 changed files with 12 additions and 8 deletions

View file

@ -927,7 +927,7 @@ dnl Checks for CD-ROM
dnl ==================================================================
CD_CFLAGS=""
CD_PLUGIN_TARGETS=""
CD_PLUGIN_TARGETS="libcd_null.la"
CDTYPE=""
AC_MSG_CHECKING(for CD audio support)
@ -1369,9 +1369,10 @@ AC_ARG_WITH(server,
CL_TARGETS=""
QW_TARGETS=""
NQ_TARGETS=""
CD_TARGETS=""
SND_TARGETS=""
SND_PLUGIN_TARGETS=""
SND_PLUGIN_TARGETS="libsound_null.la libsound_disk.la"
VID_TARGETS=""
BUILD_GL=no
BUILD_SW=no
@ -1446,7 +1447,7 @@ if test "x$SV_TARGETS" = xyes; then
QW_TARGETS="qw-server\$(EXEEXT) $QW_TARGETS"
# NQ_TARGETS="nq-server\$(EXEEXT) $NQ_TARGETS"
fi
if test -n "$VID_TARGETS"; then
if test -n "$CL_TARGETS"; then
CD_TARGETS="libQFcd.la"
SND_TARGETS="libQFsound.la"
if test "`echo $SOUND_TYPES | grep ALSA0.5`"; then
@ -1476,7 +1477,9 @@ if test -n "$VID_TARGETS"; then
VID_TARGETS="libQFjs.la $VID_TARGETS"
else
CD_TARGETS=""
CD_PLUGIN_TARGETS=""
SND_TARGETS=""
SND_PLUGIN_TARGETS=""
SOUND_TYPES=""
CDTYPE=""
fi

View file

@ -5,7 +5,8 @@ clean-local:
INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFsound.la libQFcd.la
lib_LTLIBRARIES= @CD_TARGETS@ @SND_TARGETS@
EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la
libQFsound_la_LDFLAGS= -version-info 1:0:0
libQFsound_la_SOURCES= snd_common.c snd.c

View file

@ -1,7 +1,7 @@
INCLUDES= -I$(top_srcdir)/include $(SDL_CFLAGS)
pkglib_LTLIBRARIES= @CD_PLUGIN_TARGETS@ libcd_null.la
EXTRA_LTLIBRARIES= libcd_linux.la libcd_sdl.la libcd_sgi.la libcd_win.la
pkglib_LTLIBRARIES= @CD_PLUGIN_TARGETS@
EXTRA_LTLIBRARIES= libcd_linux.la libcd_sdl.la libcd_sgi.la libcd_win.la libcd_null.la
libcd_linux_la_LDFLAGS= -version-info 1:0:0

View file

@ -2,8 +2,8 @@ INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(S
libdir = @PLUGINDIR@
lib_LTLIBRARIES = @SND_PLUGIN_TARGETS@ libsound_null.la libsound_disk.la
EXTRA_LTLIBRARIES = libsound_sdl.la libsound_alsa0_5.la libsound_alsa0_9.la libsound_oss.la libsound_sgi.la libsound_sun.la libsound_win.la
lib_LTLIBRARIES = @SND_PLUGIN_TARGETS@
EXTRA_LTLIBRARIES = libsound_sdl.la libsound_alsa0_5.la libsound_alsa0_9.la libsound_oss.la libsound_sgi.la libsound_sun.la libsound_win.la libsound_null.la libsound_disk.la
common_sound_files= snd_dma.c snd_mem.c snd_mix.c snd_mixa.S