build: Construct play object list in Makefile.

diff --git a/Makefile.in b/Makefile.in
index 4529779bbb3975e4eebc65cd05c62da9a59432e3..a01e8cf1ba734109adad475baf6303d60c95bbc0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,7 +37,6 @@ executables := @executables@
 
 audioc_objs := @audioc_objs@
 write_objs := @write_objs@
-play_objs := @play_objs@
 
 speex_cppflags := @speex_cppflags@
 opus_cppflags := @opus_cppflags@

diff --git a/Makefile.real b/Makefile.real
index 6ab2065c654eb6655c7f6c5812db6d420df01eae..50b9ee5be6fca5afd4327aadd17dc810dbcbc82a 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -221,6 +221,50 @@ ifeq ($(HAVE_FAAD),yes)
        audio_format_handlers += aac
 endif
 
+play_objs := $(addsuffix .o, \
+       play fd sched buffer_tree time string net afh_recv afh_common \
+       wma_afh wma_common mp3_afh recv_common udp_recv http_recv dccp_recv \
+       filter_common fec bitstream imdct wav_filter compress_filter \
+       amp_filter prebuffer_filter fecdec_filter wmadec_filter write_common \
+       file_write version sync_filter lsu \
+)
+ifeq ($(NEED_OGG_OBJECTS),yes)
+       play_objs += ogg_afh_common.o
+endif
+ifeq ($(NEED_VORBIS_OBJECTS),yes)
+       play_objs += oggdec_filter.o ogg_afh.o
+endif
+ifeq ($(NEED_SPEEX_OBJECTS),yes)
+       play_objs += spxdec_filter.o spx_afh.o spx_common.o
+endif
+ifeq ($(NEED_OPUS_OBJECTS),yes)
+       play_objs += opusdec_filter.o opus_afh.o opus_common.o
+endif
+ifeq ($(NEED_FLAC_OBJECTS),yes)
+       play_objs += flacdec_filter.o flac_afh.o
+endif
+ifeq ($(HAVE_FAAD),yes)
+       play_objs += aac_afh.o aacdec_filter.o mp4.o
+endif
+ifeq ($(HAVE_MAD),yes)
+       play_objs += mp3dec_filter.o
+endif
+ifeq ($(HAVE_OSS),yes)
+       play_objs += oss_write.o
+endif
+ifeq ($(HAVE_ALSA),yes)
+       play_objs += alsa_write.o
+endif
+ifeq ($(NEED_AO_OBJECTS),yes)
+       play_objs += ao_write.o
+endif
+ifeq ($(HAVE_READLINE),yes)
+       play_objs += interactive.o
+endif
+ifeq ($(HAVE_SAMPLERATE),yes)
+       play_objs += resample_filter.o check_wav.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 6d42f87ba980ecad08a51dcef73a42889988f1d4..124dda7dce4e5f962a7ae026d162f0494d500217 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -415,71 +415,6 @@ if test $HAVE_CURSES = yes; then
        build_gui="yes"
        executables="$executables gui"
 fi
-########################################################################## play
-play_objs="
-       play
-       fd
-       sched
-       buffer_tree
-       time
-       string
-       net
-       afh_recv
-       afh_common
-       wma_afh
-       wma_common
-       mp3_afh
-       recv_common
-       udp_recv
-       http_recv
-       dccp_recv
-       filter_common
-       fec
-       bitstream
-       imdct
-       wav_filter
-       compress_filter
-       amp_filter
-       prebuffer_filter
-       fecdec_filter
-       wmadec_filter
-       write_common
-       file_write
-       version
-       sync_filter
-       lsu
-"
-AS_IF([test $NEED_OGG_OBJECTS = yes], [play_objs="$play_objs ogg_afh_common"])
-AS_IF([test $NEED_VORBIS_OBJECTS = yes],
-       [play_objs="$play_objs oggdec_filter ogg_afh"])
-AS_IF([test $NEED_SPEEX_OBJECTS = yes],
-       [play_objs="$play_objs spxdec_filter spx_afh spx_common"])
-AS_IF([test $NEED_OPUS_OBJECTS = yes],
-       [play_objs="$play_objs opusdec_filter opus_afh opus_common"])
-AS_IF([test $NEED_FLAC_OBJECTS = yes],
-       [play_objs="$play_objs flacdec_filter flac_afh"])
-if test $HAVE_FAAD = yes; then
-       play_objs="$play_objs aac_afh aacdec_filter mp4"
-fi
-if test $HAVE_MAD = yes; then
-       play_objs="$play_objs mp3dec_filter"
-fi
-if test $HAVE_OSS = yes; then
-       play_objs="$play_objs oss_write"
-fi
-if test $HAVE_ALSA = yes; then
-       play_objs="$play_objs alsa_write"
-fi
-if test $NEED_AO_OBJECTS = yes; then
-       play_objs="$play_objs ao_write"
-fi
-if test $HAVE_READLINE = yes; then
-       play_objs="$play_objs interactive"
-fi
-if test $HAVE_SAMPLERATE = yes; then
-       play_objs="$play_objs resample_filter check_wav"
-fi
-AC_SUBST(play_objs, add_dot_o($play_objs))
 ######################################################################### write
 write_objs="
        write