From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 24 Jun 2023 17:34:21 +0000 (+0200)
Subject: build: Construct write object list in Makefile.
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=195357a1ff778e24feb88ce4cf6c130a9200ebe3;p=paraslash.git

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

diff --git a/Makefile.in b/Makefile.in
index a01e8cf1..5ee52deb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,6 @@ HAVE_CURSES := @HAVE_CURSES@
 executables := @executables@
 
 audioc_objs := @audioc_objs@
-write_objs := @write_objs@
 
 speex_cppflags := @speex_cppflags@
 opus_cppflags := @opus_cppflags@
diff --git a/Makefile.real b/Makefile.real
index 50b9ee5b..67107744 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -265,6 +265,19 @@ ifeq ($(HAVE_SAMPLERATE),yes)
 	play_objs += resample_filter.o check_wav.o
 endif
 
+write_objs := $(addsuffix .o, write write_common file_write time fd \
+	string sched stdin buffer_tree check_wav version)
+ifeq ($(NEED_AO_OBJECTS),yes)
+	write_objs += ao_write.o
+endif
+ifeq ($(HAVE_OSS),yes)
+	write_objs += oss_write.o
+endif
+ifeq ($(HAVE_ALSA),yes)
+	write_objs += alsa_write.o
+endif
+
+
 # sort removes duplicate words, which is all we need here
 all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
 	$(audiod_objs) $(audioc_objs) $(mixer_objs) $(server_objs) \
diff --git a/configure.ac b/configure.ac
index 124dda7d..5906f69e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,31 +415,6 @@ if test $HAVE_CURSES = yes; then
 	build_gui="yes"
 	executables="$executables gui"
 fi
-######################################################################### write
-write_objs="
-	write
-	write_common
-	file_write
-	time
-	fd
-	string
-	sched
-	stdin
-	buffer_tree
-	check_wav
-	version
-"
-
-if test $NEED_AO_OBJECTS = yes; then
-	write_objs="$write_objs ao_write"
-fi
-if test $HAVE_OSS = yes; then
-	write_objs="$write_objs oss_write"
-fi
-if test $HAVE_ALSA = yes; then
-	write_objs="$write_objs alsa_write"
-fi
-AC_SUBST(write_objs, add_dot_o($write_objs))
 ######################################################################## audioc
 audioc_objs="
 	audioc