X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=a290c22be2c85a54d577aa73f22a8b8bd4f81d81;hp=648f2a635bc0e99f50b8c7010ac7106eb62f848d;hb=15d4c69ddcf88dd9046ed8d2847a428145a32045;hpb=870fcd0379ab096184f42481541d668694da7c83 diff --git a/configure.ac b/configure.ac index 648f2a63..a290c22b 100644 --- a/configure.ac +++ b/configure.ac @@ -506,9 +506,6 @@ if test -n "$CRYPTOLIB"; then build_audiod="yes" executables="$executables audiod" audiod_audio_formats="wma" - audiod_cmdline_objs="$audiod_cmdline_objs - audiod - " audiod_errlist_objs="$audiod_errlist_objs audiod signal @@ -535,7 +532,6 @@ if test -n "$CRYPTOLIB"; then audiod_command fecdec_filter client_common - ggo udp_recv color fec @@ -592,7 +588,7 @@ if test -n "$CRYPTOLIB"; then if test $HAVE_SAMPLERATE = yes; then audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav" fi - audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs" + audiod_objs="$audiod_errlist_objs" AC_SUBST(audiod_objs, add_dot_o($audiod_objs)) enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)" @@ -648,7 +644,6 @@ fi if test $HAVE_CURSES = yes; then build_gui="yes" executables="$executables gui" - gui_cmdline_objs="gui" gui_errlist_objs=" exec signal @@ -661,9 +656,8 @@ if test $HAVE_CURSES = yes; then time sched version - ggo " - gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs" + gui_objs="$gui_errlist_objs" AC_SUBST(gui_objs, add_dot_o($gui_objs)) else build_gui="no" @@ -681,7 +675,6 @@ filter_errlist_objs=" sched fd amp_filter - ggo fecdec_filter fec version @@ -695,9 +688,6 @@ filter_errlist_objs=" net sync_filter " -filter_cmdline_objs=" - filter -" NEED_VORBIS_OBJECTS && filter_errlist_objs="$filter_errlist_objs oggdec_filter" NEED_SPEEX_OBJECTS && filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common" NEED_OPUS_OBJECTS && filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common" @@ -711,14 +701,10 @@ fi if test $HAVE_SAMPLERATE = yes; then filter_errlist_objs="$filter_errlist_objs resample_filter check_wav" fi -filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs" +filter_objs="$filter_errlist_objs" AC_SUBST(filter_objs, add_dot_o($filter_objs)) ########################################################################## recv -recv_cmdline_objs=" - recv -" - recv_errlist_objs=" http_recv recv_common @@ -748,11 +734,10 @@ NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh" if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then recv_errlist_objs="$recv_errlist_objs aac_afh aac_common" fi -recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs" +recv_objs="$recv_errlist_objs" AC_SUBST(recv_objs, add_dot_o($recv_objs)) ########################################################################### afh audio_format_handlers="mp3 wma" -afh_cmdline_objs="afh" afh_errlist_objs=" afh string @@ -763,7 +748,6 @@ afh_errlist_objs=" wma_afh wma_common version - ggo " NEED_OGG_OBJECTS && afh_errlist_objs="$afh_errlist_objs ogg_afh_common" NEED_VORBIS_OBJECTS && { @@ -787,7 +771,7 @@ if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then audio_format_handlers="$audio_format_handlers aac" fi -afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs" +afh_objs="$afh_errlist_objs" AC_SUBST(afh_objs, add_dot_o($afh_objs)) ########################################################################## play @@ -873,9 +857,6 @@ fi play_objs="$play_errlist_objs" AC_SUBST(play_objs, add_dot_o($play_objs)) ######################################################################### write -write_cmdline_objs=" - write -" write_errlist_objs=" write write_common @@ -886,7 +867,6 @@ write_errlist_objs=" sched stdin buffer_tree - ggo check_wav version " @@ -903,7 +883,7 @@ fi if test $HAVE_ALSA = yes; then write_errlist_objs="$write_errlist_objs alsa_write" fi -write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs" +write_objs="$write_errlist_objs" AC_SUBST(write_objs, add_dot_o($write_objs)) ######################################################################## audioc audioc_errlist_objs="