From 28610c08e374257f4d4454646acb8522333a8fce Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 30 Jul 2011 15:03:19 +0900 Subject: [PATCH] Do not try to build testsound when not building sound libs. --- config.d/build_control.m4 | 3 +++ libs/audio/test/Makefile.am | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config.d/build_control.m4 b/config.d/build_control.m4 index 52e6c1d86..86eea3d44 100644 --- a/config.d/build_control.m4 +++ b/config.d/build_control.m4 @@ -298,6 +298,7 @@ SND_OUTPUT_DEFAULT="" if test -n "$CL_TARGETS"; then CD_TARGETS="libQFcd.la" SND_TARGETS="libQFsound.la" + AUDIO_TARGETS="testsound" JOY_TARGETS="libQFjs.la" if test "`echo $SOUND_TYPES | grep ALSA`"; then SND_PLUGIN_TARGETS="$SND_PLUGIN_TARGETS snd_output_alsa.la" @@ -364,6 +365,7 @@ else SND_PLUGIN_TARGETS="" SND_REND_TARGETS="" SND_TARGETS="" + AUDIO_TARGETS="" unset SOUND_TYPES fi AC_DEFINE_UNQUOTED(SND_OUTPUT_DEFAULT, "$SND_OUTPUT_DEFAULT", [Define this to the default sound output driver.]) @@ -510,6 +512,7 @@ AC_SUBST(SND_REND_STATIC) AC_SUBST(SND_REND_STATIC_LIBS) AC_SUBST(SND_REND_TARGETS) AC_SUBST(SND_TARGETS) +AC_SUBST(AUDIO_TARGETS) AC_SUBST(VID_MODEL_TARGETS) AC_SUBST(VID_REND_TARGETS) AC_SUBST(VID_REND_NOINST_TARGETS) diff --git a/libs/audio/test/Makefile.am b/libs/audio/test/Makefile.am index 91d45a2f8..532aef98f 100644 --- a/libs/audio/test/Makefile.am +++ b/libs/audio/test/Makefile.am @@ -2,7 +2,9 @@ AUTOMAKE_OPTIONS= foreign INCLUDES= -I$(top_srcdir)/include -noinst_PROGRAMS= testsound +noinst_PROGRAMS= @AUDIO_TARGETS@ + +EXTRA_PROGRAMS= testsound testsound_SOURCES= testsound.c testsound_LDADD= $(top_builddir)/libs/audio/libQFsound.la $(top_builddir)/libs/util/libQFutil.la