From: Andre Noll <maan@systemlinux.org>
Date: Sat, 14 Sep 2013 02:20:00 +0000 (+0000)
Subject: build: Create section for para_afh.
X-Git-Tag: v0.5.1~1^2~25
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=14dee3baf8354f1b113a66bbe8937aa29b07d2f6;p=paraslash.git

build: Create section for para_afh.

This moves those parts of configure.ac related to para_afh to an
own section at the bottom and gets rid of the unused @afh_ldflags@
output variable.
---

diff --git a/Makefile.in b/Makefile.in
index 72352891..4b522b05 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -363,7 +363,7 @@ para_write: $(write_objs)
 
 para_afh: $(afh_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) -o $@ $(afh_objs) @afh_ldflags@ $(LDFLAGS)
+	$(Q) $(CC) -o $@ $(afh_objs) $(LDFLAGS)
 
 para_play: $(play_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
diff --git a/configure.ac b/configure.ac
index 42a50834..e7147ec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,21 +103,6 @@ audioc_errlist_objs="
 "
 audioc_ldflags=""
 
-afh_cmdline_objs="afh"
-afh_errlist_objs="
-	afh
-	string
-	fd
-	mp3_afh
-	afh_common
-	time
-	wma_afh
-	wma_common
-	version
-	ggo
-"
-afh_ldflags=""
-
 write_cmdline_objs="
 	write
 	file_write
@@ -536,7 +521,6 @@ if test "$have_vorbis" = "yes" || \
 		ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"
 	fi
 	AC_SUBST(ogg_ldflags)
-	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 	server_errlist_objs="$server_errlist_objs ogg_afh_common"
 	play_errlist_objs="$play_errlist_objs ogg_afh_common"
 fi
@@ -548,7 +532,6 @@ if test "$have_vorbis" = "yes"; then
 	server_errlist_objs="$server_errlist_objs ogg_afh"
 	audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
 	play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh"
-	afh_errlist_objs="$afh_errlist_objs ogg_afh"
 
 	audiod_audio_formats="$audiod_audio_formats ogg"
 	audio_format_handlers="$audio_format_handlers ogg"
@@ -563,7 +546,6 @@ if test "$have_speex" = "yes"; then
 	server_errlist_objs="$server_errlist_objs spx_afh spx_common"
 	audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
 	play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common"
-	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
 
 	audiod_audio_formats="$audiod_audio_formats spx"
 	audio_format_handlers="$audio_format_handlers spx"
@@ -579,7 +561,6 @@ if test "$have_opus" = "yes"; then
 
 	server_errlist_objs="$server_errlist_objs opus_afh opus_common"
 	audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
-	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
 	play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common"
 
 	audiod_audio_formats="$audiod_audio_formats opus"
@@ -615,7 +596,6 @@ if test "$have_faad" = "yes"; then
 	faad_ldflags="$faad_libs -lfaad"
 	AC_SUBST(faad_ldflags)
 
-	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
 	audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
 	play_errlist_objs="$play_errlist_objs aacdec_filter aac_afh aac_common"
 	server_errlist_objs="$server_errlist_objs aac_afh aac_common"
@@ -729,7 +709,6 @@ if test "$have_flac" = "yes"; then
 
 	audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
 	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
-	afh_errlist_objs="$afh_errlist_objs flac_afh"
 	server_errlist_objs="$server_errlist_objs flac_afh"
 	audio_format_handlers="$audio_format_handlers flac"
 	audiod_audio_formats="$audiod_audio_formats flac"
@@ -1305,6 +1284,46 @@ recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
 	errors used by para_recv)
+########################################################################### afh
+afh_cmdline_objs="afh"
+afh_errlist_objs="
+	afh
+	string
+	fd
+	mp3_afh
+	afh_common
+	time
+	wma_afh
+	wma_common
+	version
+	ggo
+"
+if test "$have_vorbis" = "yes" || \
+		test "$have_speex" = "yes" || \
+		test "$have_opus" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
+fi
+if test "$have_vorbis" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs ogg_afh"
+fi
+if test "$have_speex" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
+fi
+if test "$have_opus" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
+fi
+if test "$have_faad" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
+fi
+if test "$have_flac" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs flac_afh"
+fi
+
+afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
+
+AC_SUBST(afh_objs, add_dot_o($afh_objs))
+AC_DEFINE_UNQUOTED(INIT_AFH_ERRLISTS,
+	objlist_to_errlist($afh_errlist_objs), errors used by para_afh)
 ############################################################# error2.h
 # these are always built
 all_errlist_objs="
@@ -1385,7 +1404,6 @@ server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
 write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
 client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
 audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
-afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
 play_objs="add_cmdline($play_cmdline_objs) $play_errlist_objs"
 gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
 
@@ -1403,11 +1421,6 @@ AC_SUBST(server_ldflags, $server_ldflags)
 AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
 	objlist_to_errlist($server_errlist_objs), errors used by para_server)
 
-AC_SUBST(afh_objs, add_dot_o($afh_objs))
-AC_SUBST(afh_ldflags, $afh_ldflags)
-AC_DEFINE_UNQUOTED(INIT_AFH_ERRLISTS,
-	objlist_to_errlist($afh_errlist_objs), errors used by para_afh)
-
 AC_SUBST(write_objs, add_dot_o($write_objs))
 AC_SUBST(write_ldflags, $write_ldflags)
 AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,