build: Construct afh object list in Makefile.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e574cf79766a1aba11a98ff5de8b5ef32077c198..6d42f87ba980ecad08a51dcef73a42889988f1d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -409,153 +409,12 @@ fi
 if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
        build_mixer="yes"
        executables="$executables mixer"
-       mixer_objs="mixer exec string fd time lsu version"
-       if test $HAVE_OSS = yes; then
-               mixer_objs="$mixer_objs oss_mix"
-       fi
-       if test $HAVE_ALSA = yes; then
-               mixer_objs="$mixer_objs alsa_mix"
-       fi
-       AC_SUBST(mixer_objs, add_dot_o($mixer_objs))
-else
-       build_mixer="no"
-       AC_MSG_WARN([no mixer support])
 fi
 ########################################################################### gui
 if test $HAVE_CURSES = yes; then
        build_gui="yes"
        executables="$executables gui"
-       gui_objs="
-               exec
-               signal
-               string
-               stat
-               ringbuffer
-               fd
-               gui
-               gui_theme
-               lsu
-               time
-               sched
-               version
-       "
-       AC_SUBST(gui_objs, add_dot_o($gui_objs))
-else
-       build_gui="no"
-       AC_MSG_WARN([no curses lib, cannot build para_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))
-########################################################################## 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="
-       afh
-       string
-       fd
-       mp3_afh
-       afh_common
-       time
-       wma_afh
-       wma_common
-       version
-"
-AS_IF([test $NEED_OGG_OBJECTS = yes], [afh_objs="$afh_objs ogg_afh_common"])
-AS_IF([test $NEED_VORBIS_OBJECTS = yes], [
-       afh_objs="$afh_objs ogg_afh"
-       audio_format_handlers="$audio_format_handlers ogg"
-])
-AS_IF([test $NEED_SPEEX_OBJECTS = yes], [
-       afh_objs="$afh_objs spx_afh spx_common"
-       audio_format_handlers="$audio_format_handlers spx"
-])
-AS_IF([test $NEED_OPUS_OBJECTS = yes], [
-       afh_objs="$afh_objs opus_afh opus_common"
-       audio_format_handlers="$audio_format_handlers opus"
-])
-AS_IF([test $NEED_FLAC_OBJECTS = yes], [
-       afh_objs="$afh_objs flac_afh"
-       audio_format_handlers="$audio_format_handlers flac"
-])
-if test $HAVE_FAAD = yes; then
-       afh_objs="$afh_objs aac_afh mp4"
-       audio_format_handlers="$audio_format_handlers aac"
 fi
-AC_SUBST(afh_objs, add_dot_o($afh_objs))
 ########################################################################## play
 play_objs="
        play
@@ -665,8 +524,6 @@ if test $HAVE_READLINE = yes; then
 fi
 AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
 
-AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
-       [formats supported by para_server and para_afh])
 AC_SUBST(executables)
 
 AC_OUTPUT
@@ -677,7 +534,6 @@ crypto lib: ${CRYPTOLIB:-[none]}
 readline (interactive CLIs): $HAVE_READLINE
 id3 version 2 support: $HAVE_ID3TAG
 faad: $HAVE_FAAD
-audio format handlers: $audio_format_handlers
 
 exe: $executables
 para_server: $build_server