build: Construct recv object list in Makefile.

para_recv is always built, which makes the patch comparably small.

diff --git a/Makefile.in b/Makefile.in
index 75996d9ab72e94508c41fdac2d8a16eee2897f9e..d46bbbdb50a95aa4281c29f4e0e0c052295977df 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,6 @@ HAVE_CURSES := @HAVE_CURSES@
 
 executables := @executables@
 
-recv_objs := @recv_objs@
 filter_objs := @filter_objs@
 audioc_objs := @audioc_objs@
 write_objs := @write_objs@

diff --git a/Makefile.real b/Makefile.real
index 8f00f27c59630275902fc8c1e80f48accad3b3ee..5d715d0cb41691fb0ebc381957e305940a344bc9 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -142,6 +142,29 @@ ifeq ($(HAVE_CURSES),yes)
        gui_objs := $(addsuffix .o, exec signal string stat ringbuffer fd \
                gui gui_theme lsu time sched version)
 endif
+recv_objs := $(addsuffix .o, \
+       http_recv recv_common recv time string net dccp_recv fd sched stdout \
+       udp_recv buffer_tree afh_recv afh_common wma_afh wma_common mp3_afh \
+       version \
+)
+ifeq ($(NEED_OGG_OBJECTS),yes)
+       recv_objs += ogg_afh_common.o
+endif
+ifeq ($(NEED_VORBIS_OBJECTS),yes)
+       recv_objs += ogg_afh.o
+endif
+ifeq ($(NEED_SPEEX_OBJECTS),yes)
+       recv_objs += spx_afh.o spx_common.o
+endif
+ifeq ($(NEED_OPUS_OBJECTS),yes)
+       recv_objs += opus_afh.o opus_common.o
+endif
+ifeq ($(NEED_FLAC_OBJECTS),yes)
+       recv_objs += flac_afh.o
+endif
+ifeq ($(HAVE_FAAD),yes)
+       recv_objs += aac_afh.o mp4.o
+endif
 
 # sort removes duplicate words, which is all we need here
 all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \

diff --git a/configure.ac b/configure.ac
index 644406003cf1ed2e4716928e9139a1a5579ae1db..135ef98359a89ef7ecd353c728a5fb73bb40f3f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -459,39 +459,6 @@ if test $HAVE_SAMPLERATE = yes; then
        filter_objs="$filter_objs resample_filter check_wav"
 fi
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
-########################################################################## recv
-recv_objs="
-       http_recv
-       recv_common
-       recv
-       time
-       string
-       net
-       dccp_recv
-       fd
-       sched
-       stdout
-       udp_recv
-       buffer_tree
-       afh_recv
-       afh_common
-       wma_afh
-       wma_common
-       mp3_afh
-       version
-"
-AS_IF([test $NEED_OGG_OBJECTS = yes], [recv_objs="$recv_objs ogg_afh_common"])
-AS_IF([test $NEED_VORBIS_OBJECTS = yes], [recv_objs="$recv_objs ogg_afh"])
-AS_IF([test $NEED_SPEEX_OBJECTS = yes],
-       [recv_objs="$recv_objs spx_afh spx_common"])
-AS_IF([test $NEED_OPUS_OBJECTS = yes],
-       [recv_objs="$recv_objs opus_afh opus_common"])
-AS_IF([test $NEED_FLAC_OBJECTS = yes], [recv_objs="$recv_objs flac_afh"])
-
-if test $HAVE_FAAD = yes; then
-       recv_objs="$recv_objs aac_afh mp4"
-fi
-AC_SUBST(recv_objs, add_dot_o($recv_objs))
 ########################################################################### afh
 audio_format_handlers="mp3 wma"
 afh_objs="