From: Andre Noll <maan@systemlinux.org>
Date: Fri, 13 Sep 2013 06:07:09 +0000 (+0000)
Subject: build: ldflags conversion: alsa.
X-Git-Tag: v0.5.1~1^2~38
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ecac89f28f533dca1565c9638a7e6645217cd1f1;p=paraslash.git

build: ldflags conversion: alsa.

Again, a straight-forward transformation.
---

diff --git a/Makefile.in b/Makefile.in
index f329b65a..9c9f1f15 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,6 +31,7 @@ faad_ldflags := @faad_ldflags@
 mad_ldflags := @mad_ldflags@
 flac_ldflags := @flac_ldflags@
 oss_ldflags := @oss_ldflags@
+alsa_ldflags := @alsa_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -266,7 +267,14 @@ endif
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_audiod para_filter para_play: LDFLAGS += $(mad_ldflags)
-para_write para_play para_audiod para_fade: LDFLAGS += $(oss_ldflags)
+
+para_write \
+para_play \
+para_audiod \
+para_fade \
+: LDFLAGS += \
+	$(oss_ldflags) \
+	$(alsa_ldflags)
 
 para_server \
 para_filter \
diff --git a/configure.ac b/configure.ac
index 4d0501b5..9d2edaaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -911,18 +911,16 @@ if test "$have_alsa" = "yes"; then
 fi
 
 if test "$have_alsa" = "yes"; then
+	alsa_ldflags="-lasound"
+	AC_SUBST(alsa_ldflags)
 	audiod_errlist_objs="$audiod_errlist_objs alsa_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
-	audiod_ldflags="$audiod_ldflags -lasound"
 	play_errlist_objs="$play_errlist_objs alsa_write"
 	play_cmdline_objs="$play_cmdline_objs alsa_write"
-	play_ldflags="$play_ldflags -lasound"
 
 	write_errlist_objs="$write_errlist_objs alsa_write"
 	write_cmdline_objs="$write_cmdline_objs alsa_write"
-	write_ldflags="$write_ldflags -lasound"
 	fade_errlist_objs="$fade_errlist_objs alsa_mix"
-	fade_ldflags="$fade_ldflags -lasound"
 
 	writers="$writers alsa"
 	default_writer="ALSA_WRITE"