From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 5 Sep 2020 02:31:28 +0000 (+0200)
Subject: src/ui/*/automake.mk: Conditionally include the gui automake file
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e836244020a2ce2ef9da69a3a49ff7e4766ee69;p=pspp

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

diff --git a/src/ui/automake.mk b/src/ui/automake.mk
index a341ce6cec..a531cf3c74 100644
--- 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 9a21f3f8c7..a334d2ff8e 100644
--- 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: