From: Andre Noll <maan@systemlinux.org>
Date: Fri, 13 Sep 2013 05:24:07 +0000 (+0000)
Subject: build: ldflags conversion: libogg.
X-Git-Tag: v0.5.1~1^2~46
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=80a6390729b9ba957310c4375945bf213ddec46c;ds=sidebyside

build: ldflags conversion: libogg.

The next step on the way to the removing the per-executable ldflags
variables.  This sets ogg_ldflags in configure.ac, creates an output
variable from it, and adds it to LDFLAGS in Makefile.in for all
executables that need it.
---

diff --git a/Makefile.in b/Makefile.in
index 54cfd441..bb4be2ff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,6 +20,7 @@ HELP2MAN := @help2man@
 MKDIR_P := mkdir -p
 
 id3tag_ldflags := @id3tag_ldflags@
+ogg_ldflags := @ogg_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -255,6 +256,14 @@ endif
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 
+para_server \
+para_filter \
+para_audiod \
+para_play \
+para_afh \
+para_recv \
+: LDFLAGS += $(ogg_ldflags)
+
 para_recv: $(recv_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
 	$(Q) $(CC) $(recv_objs) -o $@ @recv_ldflags@ $(LDFLAGS)
diff --git a/configure.ac b/configure.ac
index f4049373..2f2de09b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -618,16 +618,11 @@ if test "$have_vorbis" = "yes" || \
 		test "$have_speex" = "yes" || \
 		test "$have_opus" = "yes"; then
 	AC_SUBST(ogg_cppflags)
-	ogg_libs="$ogg_libs -logg"
+	ogg_ldflags="$ogg_libs -logg"
 	if test "$OSTYPE" = "Darwin"; then
-		ogg_libs="-Wl,-bind_at_load $ogg_libs"
+		ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"
 	fi
-	server_ldflags="$server_ldflags $ogg_libs"
-	filter_ldflags="$filter_ldflags $ogg_libs"
-	audiod_ldflags="$audiod_ldflags $ogg_libs"
-	play_ldflags="$play_ldflags $ogg_libs"
-	afh_ldflags="$afh_ldflags $ogg_libs"
-	recv_ldflags="$recv_ldflags $ogg_libs"
+	AC_SUBST(ogg_ldflags)
 	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 	recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
 	server_errlist_objs="$server_errlist_objs ogg_afh_common"