From f5e248b5d3250f72e3665ba93e5dfbe7c8eb104b Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@tuebingen.mpg.de>
Date: Thu, 22 Jun 2023 19:17:59 +0200
Subject: [PATCH] build: Construct recv object list in Makefile.

para_recv is always built, which makes the patch comparably small.
---
 Makefile.in   |  1 -
 Makefile.real | 23 +++++++++++++++++++++++
 configure.ac  | 33 ---------------------------------
 3 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 75996d9a..d46bbbdb 100644
--- 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 8f00f27c..5d715d0c 100644
--- 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 64440600..135ef983 100644
--- 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="
-- 
2.39.2