From: Andre Noll <maan@systemlinux.org>
Date: Fri, 13 Sep 2013 05:47:41 +0000 (+0000)
Subject: build: ldflags conversion: libfaad.
X-Git-Tag: v0.5.1~1^2~42
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=91ed862b92c24c305f772ca6a5d6c7bd4f9f9159

build: ldflags conversion: libfaad.

This adds the linker flags for libfaad to LDFLAGS in Makefile.in
for those targets that need it. This avoids some duplication in
configure.ac. No cppflags conversion in this patch.
---

diff --git a/Makefile.in b/Makefile.in
index 64307594..5a255a77 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,6 +27,7 @@ ogg_ldflags := @ogg_ldflags@
 vorbis_ldflags := @vorbis_ldflags@
 speex_ldflags := @speex_ldflags@
 opus_ldflags := @opus_ldflags@
+faad_ldflags := @faad_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -268,8 +269,12 @@ para_audiod \
 para_play \
 para_afh \
 para_recv \
-: LDFLAGS += $(ogg_ldflags) $(vorbis_ldflags) $(speex_ldflags) $(opus_ldflags)
-
+: LDFLAGS += \
+	$(ogg_ldflags) \
+	$(vorbis_ldflags) \
+	$(speex_ldflags) \
+	$(opus_ldflags) \
+	$(faad_ldflags)
 
 para_recv: $(recv_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
diff --git a/configure.ac b/configure.ac
index 82a0d8cb..50beb2e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -708,6 +708,10 @@ AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
 AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no)
 if test "$have_faad" = "yes"; then
 	AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
+	AC_SUBST(faad_cppflags)
+	faad_ldflags="$faad_libs -lfaad"
+	AC_SUBST(faad_ldflags)
+
 	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
 	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
 	audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
@@ -715,17 +719,9 @@ if test "$have_faad" = "yes"; then
 	server_errlist_objs="$server_errlist_objs aac_afh aac_common"
 	recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 
-	server_ldflags="$server_ldflags $faad_libs -lfaad"
-	filter_ldflags="$filter_ldflags $faad_libs -lfaad"
-	audiod_ldflags="$audiod_ldflags $faad_libs -lfaad"
-	play_ldflags="$play_ldflags $faad_libs -lfaad"
-	afh_ldflags="$afh_ldflags $faad_libs -lfaad"
-	recv_ldflags="$afh_ldflags $faad_libs -lfaad"
-
 	audiod_audio_formats="$audiod_audio_formats aac"
 	audio_format_handlers="$audio_format_handlers aac"
 	filters="$filters aacdec"
-	AC_SUBST(faad_cppflags)
 else
 	AC_MSG_WARN([no aac support in para_audiod/para_filter])
 fi