build: Construct write object list in Makefile.

diff --git a/Makefile.in b/Makefile.in
index a01e8cf1ba734109adad475baf6303d60c95bbc0..5ee52deba6a54f216759515e505caa7fd34872cd 100644 (file)
--- 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 50b9ee5be6fca5afd4327aadd17dc810dbcbc82a..67107744e3234e5cad3a0f3dbfc8ec2a2a9777c1 100644 (file)
--- 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 124dda7dce4e5f962a7ae026d162f0494d500217..5906f69eff569f8dce5b773c2b7b1f99f1857923 100644 (file)
--- 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