From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 24 Jun 2023 17:33:26 +0000 (+0200)
Subject: build: Construct mixer object list in Makefile.
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=9754ebd9540aa3766af5e8a22410bf62b6eac6fe;hp=84cfc1dd51755251776fb9438288eef25e0e9542;p=paraslash.git

build: Construct mixer object list in Makefile.
---

diff --git a/Makefile.in b/Makefile.in
index 4c49b339..a0d37d14 100644
--- 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 a261fa6f..b28619f1 100644
--- 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 e574cf79..a9dbf98b 100644
--- 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