From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 24 Jun 2023 17:34:56 +0000 (+0200)
Subject: build: Construct audioc object list in Makefile.
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=142ee7011b66ad76e7a3be47ccd9e9ab24d7f174;p=paraslash.git

build: Construct audioc object list in Makefile.

This removes the last caller of add_dot_o() in configure.ac, so remove
this function.
---

diff --git a/Makefile.in b/Makefile.in
index 5ee52deb..6e732500 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,8 +35,6 @@ HAVE_CURSES := @HAVE_CURSES@
 
 executables := @executables@
 
-audioc_objs := @audioc_objs@
-
 speex_cppflags := @speex_cppflags@
 opus_cppflags := @opus_cppflags@
 vorbis_cppflags := @vorbis_cppflags@
diff --git a/Makefile.real b/Makefile.real
index 67107744..1d671dbe 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -277,6 +277,10 @@ ifeq ($(HAVE_ALSA),yes)
 	write_objs += alsa_write.o
 endif
 
+audioc_objs := $(addsuffix .o, audioc string lsu net fd time version)
+ifeq ($(HAVE_READLINE),yes)
+	audioc_objs += buffer_tree.o interactive.o sched.o
+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 5906f69e..97fcafc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,6 @@ AC_INIT([paraslash], [m4_esyscmd_s(./GIT-VERSION-GEN)],
 AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([Makefile])
-AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
 AC_DEFUN([LIB_ARG_WITH], [
 	AC_ARG_WITH($1-headers, [AS_HELP_STRING(--with-$1-headers=dir,
 		[look for $1 headers in dir])])
@@ -416,24 +415,6 @@ if test $HAVE_CURSES = yes; then
 	executables="$executables gui"
 fi
 ######################################################################## audioc
-audioc_objs="
-	audioc
-	string
-	lsu
-	net
-	fd
-	time
-	version
-"
-if test $HAVE_READLINE = yes; then
-	audioc_objs="$audioc_objs
-		buffer_tree
-		interactive
-		sched
-	"
-fi
-AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
-
 AC_SUBST(executables)
 
 AC_OUTPUT