From: Andre Noll <maan@tuebingen.mpg.de>
Date: Thu, 22 Jun 2023 15:54:43 +0000 (+0200)
Subject: build: Construct gui object list in Makefile.
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=c80a3a764a0ba35e1ba7fb910e2c40bf76e40bb3;p=paraslash.git

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

diff --git a/Makefile.in b/Makefile.in
index a0d37d14..75996d9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,12 +31,12 @@ HAVE_AO := @HAVE_AO@
 HAVE_PTHREAD := @HAVE_PTHREAD@
 HAVE_OSS := @HAVE_OSS@
 HAVE_ALSA := @HAVE_ALSA@
+HAVE_CURSES := @HAVE_CURSES@
 
 executables := @executables@
 
 recv_objs := @recv_objs@
 filter_objs := @filter_objs@
-gui_objs := @gui_objs@
 audioc_objs := @audioc_objs@
 write_objs := @write_objs@
 afh_objs := @afh_objs@
diff --git a/Makefile.real b/Makefile.real
index b28619f1..8f00f27c 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -138,6 +138,10 @@ ifneq ($(HAVE_OSS)-$(HAVE_ALSA),no-no)
 		mixer_objs += alsa_mix.o
 	endif
 endif
+ifeq ($(HAVE_CURSES),yes)
+	gui_objs := $(addsuffix .o, exec signal string stat ringbuffer fd \
+		gui gui_theme lsu time sched version)
+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 a9dbf98b..64440600 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,24 +414,6 @@ fi
 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="