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

build: ldflags conversion: libao.
---

diff --git a/Makefile.in b/Makefile.in
index 9c9f1f15..833af847 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,6 +32,7 @@ mad_ldflags := @mad_ldflags@
 flac_ldflags := @flac_ldflags@
 oss_ldflags := @oss_ldflags@
 alsa_ldflags := @alsa_ldflags@
+ao_ldflags := @ao_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -267,6 +268,7 @@ 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: LDFLAGS += $(ao_ldflags)
 
 para_write \
 para_play \
diff --git a/configure.ac b/configure.ac
index 9d2edaaf..d72b9797 100644
--- a/configure.ac
+++ b/configure.ac
@@ -975,19 +975,19 @@ if test "$have_ao" = "yes"; then
 	])
 fi
 if test "$have_ao" = "yes"; then
+	AC_SUBST(ao_cppflags)
+	ao_ldflags="$ao_libs -lao -lpthread"
+	AC_SUBST(ao_ldflags)
+
 	audiod_errlist_objs="$audiod_errlist_objs ao_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
-	audiod_ldflags="$audiod_ldflags -lao -lpthread"
 
 	play_errlist_objs="$play_errlist_objs ao_write"
 	play_cmdline_objs="$play_cmdline_objs ao_write"
-	play_ldflags="$play_ldflags -lao -lpthread"
 
 	write_errlist_objs="$write_errlist_objs ao_write"
 	write_cmdline_objs="$write_cmdline_objs ao_write"
-	write_ldflags="$write_ldflags $ao_libs -lao -lpthread"
 	writers="$writers ao"
-	AC_SUBST(ao_cppflags)
 fi
 
 CPPFLAGS="$OLD_CPPFLAGS"