build: Create section for para_recv.

Similar to the previous patch, this moves the creation of
$recv_cmdline_objs and $recv_errlist_objs to a separate section at
the end of configure.ac and gets rid of the now unused @recv_ldflags@
output variable.

diff --git a/Makefile.in b/Makefile.in
index 8f42f14820fe45eb1acd40ae0151496b6ea1e3f5..72352891eb87f578476b2a8a8b510f5065ad8abb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -327,7 +327,7 @@ para_recv \
 
 para_recv: $(recv_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
-       $(Q) $(CC) $(recv_objs) -o $@ @recv_ldflags@ $(LDFLAGS)
+       $(Q) $(CC) $(recv_objs) -o $@ $(LDFLAGS)
 
 para_filter: $(filter_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'

diff --git a/configure.ac b/configure.ac
index 9f63bc1043c66e2b1046d2c606bf95736f475e51..42a5083492c24f4d122b6253f0fb5a000db27f00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,38 +92,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 executables="recv filter audioc write afh play"
 audio_format_handlers="mp3 wma"
 
-recv_cmdline_objs="
-       recv
-       http_recv
-       dccp_recv
-       udp_recv
-       afh_recv
-"
-
-recv_errlist_objs="
-       http_recv
-       recv_common
-       recv
-       time
-       string
-       net
-       dccp_recv
-       fd
-       sched
-       stdout
-       ggo
-       udp_recv
-       buffer_tree
-       afh_recv
-       afh_common
-       wma_afh
-       wma_common
-       mp3_afh
-       version
-"
-
-recv_ldflags=""
-
 audioc_cmdline_objs="audioc"
 audioc_errlist_objs="
        audioc
@@ -569,7 +537,6 @@ if test "$have_vorbis" = "yes" || \
        fi
        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"
        play_errlist_objs="$play_errlist_objs ogg_afh_common"
 fi
@@ -582,7 +549,6 @@ if test "$have_vorbis" = "yes"; then
        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"
-       recv_errlist_objs="$recv_errlist_objs ogg_afh"
 
        audiod_audio_formats="$audiod_audio_formats ogg"
        audio_format_handlers="$audio_format_handlers ogg"
@@ -598,7 +564,6 @@ if test "$have_speex" = "yes"; then
        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"
-       recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 
        audiod_audio_formats="$audiod_audio_formats spx"
        audio_format_handlers="$audio_format_handlers spx"
@@ -616,7 +581,6 @@ if test "$have_opus" = "yes"; then
        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"
-       recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
 
        audiod_audio_formats="$audiod_audio_formats opus"
        audio_format_handlers="$audio_format_handlers opus"
@@ -655,7 +619,6 @@ if test "$have_faad" = "yes"; then
        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"
-       recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 
        audiod_audio_formats="$audiod_audio_formats aac"
        audio_format_handlers="$audio_format_handlers aac"
@@ -768,7 +731,6 @@ if test "$have_flac" = "yes"; then
        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"
-       recv_errlist_objs="$recv_errlist_objs flac_afh"
        audio_format_handlers="$audio_format_handlers flac"
        audiod_audio_formats="$audiod_audio_formats flac"
 else
@@ -1289,7 +1251,60 @@ if test "$have_samplerate" = "yes"; then
        filter_cmdline_objs="$filter_cmdline_objs resample_filter"
        filters="$filters resample"
 fi
+########################################################################## recv
+recv_cmdline_objs="
+       recv
+       http_recv
+       dccp_recv
+       udp_recv
+       afh_recv
+"
 
+recv_errlist_objs="
+       http_recv
+       recv_common
+       recv
+       time
+       string
+       net
+       dccp_recv
+       fd
+       sched
+       stdout
+       ggo
+       udp_recv
+       buffer_tree
+       afh_recv
+       afh_common
+       wma_afh
+       wma_common
+       mp3_afh
+       version
+"
+if test "$have_vorbis" = "yes" || \
+               test "$have_speex" = "yes" || \
+               test "$have_opus" = "yes"; then
+       recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
+fi
+if test "$have_vorbis" = "yes"; then
+       recv_errlist_objs="$recv_errlist_objs ogg_afh"
+fi
+if test "$have_speex" = "yes"; then
+       recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
+fi
+if test "$have_opus" = "yes"; then
+       recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
+fi
+if test "$have_faad" = "yes"; then
+       recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
+fi
+if test "$have_flac" = "yes"; then
+       recv_errlist_objs="$recv_errlist_objs flac_afh"
+fi
+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)
 ############################################################# error2.h
 # these are always built
 all_errlist_objs="
@@ -1364,7 +1379,6 @@ AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 
 AC_SUBST(executables)
 
-recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
 filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
 audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
 server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
@@ -1375,11 +1389,6 @@ 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"
 
-AC_SUBST(recv_objs, add_dot_o($recv_objs))
-AC_SUBST(recv_ldflags, $recv_ldflags)
-AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
-       errors used by para_recv)
-
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
        objlist_to_errlist($filter_errlist_objs), errors used by para_filter)