src/ui/*/automake.mk: Conditionally include the gui automake file

diff --git a/src/ui/automake.mk b/src/ui/automake.mk
index a341ce6cec455e5df001a5cd9fc6b1d811a3b528..a531cf3c745e0b549fc2622df399fa77c6e615c1 100644 (file)
--- a/src/ui/automake.mk
+++ b/src/ui/automake.mk
@@ -1,5 +1,5 @@
 # PSPP - a program for statistical analysis.
-# Copyright (C) 2017 Free Software Foundation, Inc.
+# Copyright (C) 2017, 2020 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,8 +17,9 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 include $(top_srcdir)/src/ui/terminal/automake.mk
+if HAVE_GUI
 include $(top_srcdir)/src/ui/gui/automake.mk
-
+endif
 
 noinst_LTLIBRARIES += src/ui/libuicommon.la
 

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 9a21f3f8c70101c6dea2331d6d1c882396bc5811..a334d2ff8e0403050bc5a446fbb69f13447617ab 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -87,7 +87,6 @@ EXTRA_DIST += \
 
 src_ui_gui_psppire_CPPFLAGS=
 
-if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire
 noinst_PROGRAMS += src/ui/gui/spreadsheet-test
 
@@ -409,7 +408,6 @@ CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
        src/ui/gui/.deps/psppire-marshal.Plo \
        src/ui/gui/resources.c $(nodist_src_ui_gui_psppire_DATA)
 
-endif HAVE_GUI
 
 #ensure the installcheck passes even if there is no X server available
 installcheck-local: