build: Construct gui object list in Makefile.

diff --git a/Makefile.in b/Makefile.in
index a0d37d1491eb615b6ff051e4f4574d3d32ecb5b7..75996d9ab72e94508c41fdac2d8a16eee2897f9e 100644 (file)
--- 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 b28619f19a3e65e4dc50d8c6d64d6d100f58e1c7..8f00f27c59630275902fc8c1e80f48accad3b3ee 100644 (file)
--- 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 a9dbf98bd3e7632b7510e44f1fb91fc2a9fd101e..644406003cf1ed2e4716928e9139a1a5579ae1db 100644 (file)
--- 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="