From: Andre Noll <maan@systemlinux.org>
Date: Sat, 14 Sep 2013 03:47:56 +0000 (+0000)
Subject: build: Move relevant parts to fade section.
X-Git-Tag: v0.5.1~1^2~18
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=1781ccab442ef44d7abc8b94b4dee67d62816c92;p=paraslash.git

build: Move relevant parts to fade section.

configure.ac already has a section for para_fade, but the construction
of $fade_errlist_objs was still spread out over the whole file. Move
everything to the existing section and remove @fade_ldflags@.

This also kills the $mixer_summary variable, which was not very useful.
---

diff --git a/Makefile.in b/Makefile.in
index dd964bca..f3be1163 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -351,7 +351,7 @@ para_audioc: $(audioc_objs)
 
 para_fade: $(fade_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(fade_objs) @fade_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(fade_objs) $(LDFLAGS)
 
 para_server: $(server_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
diff --git a/configure.ac b/configure.ac
index abf8c071..cc0273ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -594,11 +594,6 @@ have_oss="yes"
 msg="=> will not build oss writer"
 
 AC_CHECK_HEADER(sys/soundcard.h, [
-	fade_errlist_objs="$fade_errlist_objs oss_mix"
-
-	mixers="${mixers}oss "
-	default_mixer="OSS_MIX"
-
 	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
 			oss_ldflags="-lossaudio"
 			AC_SUBST(oss_ldflags)
@@ -642,10 +637,6 @@ fi
 if test "$have_alsa" = "yes"; then
 	alsa_ldflags="-lasound"
 	AC_SUBST(alsa_ldflags)
-	fade_errlist_objs="$fade_errlist_objs alsa_mix"
-
-	mixers="${mixers}alsa "
-	default_mixer="ALSA_MIX"
 fi
 
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -1035,14 +1026,23 @@ else
 	build_audiod="no"
 fi
 ########################################################################### fade
-if test -n "$mixers"; then
+if test "$have_oss" = "yes" -o "$have_alsa" = "yes"; then
 	build_fade="yes"
 	executables="$executables fade"
-	fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
 	fade_cmdline_objs="fade"
+	fade_errlist_objs="fade exec string fd version ggo"
+	if test "$have_oss" = "yes"; then
+		fade_errlist_objs="$fade_errlist_objs oss_mix"
+		mixers="${mixers}oss "
+		default_mixer="OSS_MIX"
+	fi
+	if test "$have_alsa" = "yes"; then
+		fade_errlist_objs="$fade_errlist_objs alsa_mix"
+		mixers="${mixers}alsa "
+		default_mixer="ALSA_MIX"
+	fi
 	fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
 	AC_SUBST(fade_objs, add_dot_o($fade_objs))
-	AC_SUBST(fade_ldflags, $fade_ldflags)
 	AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
 		objlist_to_errlist($fade_errlist_objs),
 		errors used by para_fade)
@@ -1066,11 +1066,9 @@ if test -n "$mixers"; then
 		init functions of the supported mixers)
 	array="$(for i in $mixers; do printf '{.init = '$i'_mix_init},'; done)"
 	AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers)
-	mixer_summary="supported mixers:: $mixers, default: $default_mixer"
 else
 	build_fade="no"
 	AC_MSG_WARN([no mixer support])
-	mixer_summary="para_fade: no"
 fi
 ########################################################################### gui
 if test "$have_curses" = "yes"; then
@@ -1540,7 +1538,7 @@ id3 version2 support: $have_libid3tag
 filters: $(echo $filters)
 writers: $writers
 
-$mixer_summary
+para_fade: $build_fade
 para_server: $build_server
 para_gui: $build_gui
 para_fade: $build_fade