build: Construct mixer object list in Makefile.

diff --git a/Makefile.in b/Makefile.in
index 4c49b3394aad5cc8dd38fdc9ae6046f003aebce9..a0d37d1491eb615b6ff051e4f4574d3d32ecb5b7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,6 @@ recv_objs := @recv_objs@
 filter_objs := @filter_objs@
 gui_objs := @gui_objs@
 audioc_objs := @audioc_objs@
-mixer_objs := @mixer_objs@
 write_objs := @write_objs@
 afh_objs := @afh_objs@
 play_objs := @play_objs@

diff --git a/Makefile.real b/Makefile.real
index a261fa6f8aaff0d1580709f579cd29985b76b07e..b28619f19a3e65e4dc50d8c6d64d6d100f58e1c7 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -129,6 +129,15 @@ ifneq ($(CRYPTOLIB),)
                audiod_objs += resample_filter.o check_wav.o
        endif
 endif
+ifneq ($(HAVE_OSS)-$(HAVE_ALSA),no-no)
+       mixer_objs := $(addsuffix .o, mixer exec string fd time lsu version)
+       ifeq ($(HAVE_OSS),yes)
+               mixer_objs += oss_mix.o
+       endif
+       ifeq ($(HAVE_ALSA),yes)
+               mixer_objs += alsa_mix.o
+       endif
+endif
 
 # sort removes duplicate words, which is all we need here
 all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \

diff --git a/configure.ac b/configure.ac
index e574cf79766a1aba11a98ff5de8b5ef32077c198..a9dbf98bd3e7632b7510e44f1fb91fc2a9fd101e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -409,17 +409,6 @@ 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