From: Andre Noll <maan@tuebingen.mpg.de>
Date: Thu, 22 Jun 2023 17:26:10 +0000 (+0200)
Subject: build: Construct filter object list in Makefile.
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ba8727c5857363c70f190ea98f92c41cd041e375;p=paraslash.git

build: Construct filter object list in Makefile.
---

diff --git a/Makefile.in b/Makefile.in
index d46bbbdb..9f6393b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,6 @@ HAVE_CURSES := @HAVE_CURSES@
 
 executables := @executables@
 
-filter_objs := @filter_objs@
 audioc_objs := @audioc_objs@
 write_objs := @write_objs@
 afh_objs := @afh_objs@
diff --git a/Makefile.real b/Makefile.real
index 5d715d0c..2c7cff78 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -142,6 +142,34 @@ ifeq ($(HAVE_CURSES),yes)
 	gui_objs := $(addsuffix .o, exec signal string stat ringbuffer fd \
 		gui gui_theme lsu time sched version)
 endif
+filter_objs := $(addsuffix .o, \
+	filter_common wav_filter compress_filter filter string stdin stdout \
+	sched fd amp_filter fecdec_filter fec lsu version prebuffer_filter \
+	time bitstream imdct wma_common wmadec_filter buffer_tree net \
+	sync_filter \
+)
+ifeq ($(NEED_VORBIS_OBJECTS),yes)
+	filter_objs += oggdec_filter.o
+endif
+ifeq ($(NEED_SPEEX_OBJECTS),yes)
+	filter_objs += spxdec_filter.o spx_common.o
+endif
+ifeq ($(NEED_OPUS_OBJECTS),yes)
+	filter_objs += opusdec_filter.o opus_common.o
+endif
+ifeq ($(NEED_FLAC_OBJECTS),yes)
+	filter_objs += flacdec_filter.o
+endif
+ifeq ($(HAVE_FAAD),yes)
+	filter_objs += aacdec_filter.o
+endif
+ifeq ($(HAVE_MAD),yes)
+	filter_objs += mp3dec_filter.o
+endif
+ifeq ($(HAVE_SAMPLERATE),yes)
+	filter_objs += resample_filter.o check_wav.o
+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 \
diff --git a/configure.ac b/configure.ac
index 135ef983..8ea488c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,50 +415,6 @@ if test $HAVE_CURSES = yes; then
 	build_gui="yes"
 	executables="$executables gui"
 fi
-######################################################################## filter
-filter_objs="
-	filter_common
-	wav_filter
-	compress_filter
-	filter
-	string
-	stdin
-	stdout
-	sched
-	fd
-	amp_filter
-	fecdec_filter
-	fec
-	lsu
-	version
-	prebuffer_filter
-	time
-	bitstream
-	imdct
-	wma_common
-	wmadec_filter
-	buffer_tree
-	net
-	sync_filter
-"
-AS_IF([test $NEED_VORBIS_OBJECTS = yes],
-	[filter_objs="$filter_objs oggdec_filter"])
-AS_IF([test $NEED_SPEEX_OBJECTS = yes],
-	[filter_objs="$filter_objs spxdec_filter spx_common"])
-AS_IF([test $NEED_OPUS_OBJECTS = yes],
-	[filter_objs="$filter_objs opusdec_filter opus_common"])
-AS_IF([test $NEED_FLAC_OBJECTS = yes],
-	[filter_objs="$filter_objs flacdec_filter"])
-if test $HAVE_FAAD = yes; then
-	filter_objs="$filter_objs aacdec_filter"
-fi
-if test $HAVE_MAD = yes; then
-	filter_objs="$filter_objs mp3dec_filter"
-fi
-if test $HAVE_SAMPLERATE = yes; then
-	filter_objs="$filter_objs resample_filter check_wav"
-fi
-AC_SUBST(filter_objs, add_dot_o($filter_objs))
 ########################################################################### afh
 audio_format_handlers="mp3 wma"
 afh_objs="