From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 16 Apr 2010 03:39:47 +0000 (-0700)
Subject: Move definition of UI_FILES out of HAVE_GUI.
X-Git-Tag: v0.7.5~56
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91946022cdf4716dee3d802dd9827169cf995912;p=pspp-builds.git

Move definition of UI_FILES out of HAVE_GUI.

UI_FILES needs to be defined regardless of whether the GUI is being built,
because the .ui files are needed to generate pspp.pot.  (We don't want
pspp.pot to depend on whether the GUI is configured, either.)

Problem reported by Michel Boaventura <michel.boaventura@gmail.com>.
---

diff --git a/src/ui/automake.mk b/src/ui/automake.mk
index 124380cf..a4eeebf1 100644
--- a/src/ui/automake.mk
+++ b/src/ui/automake.mk
@@ -1,9 +1,7 @@
 ## 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 003437bf..d312e16f 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -2,6 +2,37 @@
 
 include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
+UI_FILES = \
+	src/ui/gui/correlation.ui \
+	src/ui/gui/crosstabs.ui \
+	src/ui/gui/descriptives.ui \
+	src/ui/gui/examine.ui \
+	src/ui/gui/factor.ui \
+	src/ui/gui/find.ui \
+	src/ui/gui/frequencies.ui \
+	src/ui/gui/oneway.ui \
+	src/ui/gui/psppire.ui \
+	src/ui/gui/rank.ui \
+	src/ui/gui/sort.ui \
+	src/ui/gui/recode.ui \
+	src/ui/gui/regression.ui \
+	src/ui/gui/reliability.ui \
+	src/ui/gui/roc.ui \
+	src/ui/gui/t-test.ui \
+	src/ui/gui/text-data-import.ui \
+	src/ui/gui/var-sheet-dialogs.ui \
+	src/ui/gui/variable-info.ui \
+	src/ui/gui/data-editor.glade \
+	src/ui/gui/output-viewer.glade \
+	src/ui/gui/syntax-editor.glade
+
+EXTRA_DIST += \
+	src/ui/gui/OChangeLog \
+	src/ui/gui/psppicon.png \
+	src/ui/gui/marshaller-list \
+	src/ui/gui/pspp.desktop
+
+if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
 
 src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
@@ -53,32 +84,6 @@ uninstall-icons:
 
 UNINSTALL_DATA_HOOKS += uninstall-icons
 
-
-UI_FILES = \
-	src/ui/gui/correlation.ui \
-	src/ui/gui/crosstabs.ui \
-	src/ui/gui/descriptives.ui \
-	src/ui/gui/examine.ui \
-	src/ui/gui/factor.ui \
-	src/ui/gui/find.ui \
-	src/ui/gui/frequencies.ui \
-	src/ui/gui/oneway.ui \
-	src/ui/gui/psppire.ui \
-	src/ui/gui/rank.ui \
-	src/ui/gui/sort.ui \
-	src/ui/gui/recode.ui \
-	src/ui/gui/regression.ui \
-	src/ui/gui/reliability.ui \
-	src/ui/gui/roc.ui \
-	src/ui/gui/t-test.ui \
-	src/ui/gui/text-data-import.ui \
-	src/ui/gui/var-sheet-dialogs.ui \
-	src/ui/gui/variable-info.ui \
-	src/ui/gui/data-editor.glade \
-	src/ui/gui/output-viewer.glade \
-	src/ui/gui/syntax-editor.glade
-
-
 nodist_src_ui_gui_psppire_DATA = \
 	$(top_builddir)/src/ui/gui/data-editor.ui \
 	$(top_builddir)/src/ui/gui/output-viewer.ui \
@@ -268,13 +273,7 @@ SUFFIXES += .glade .ui
 desktopdir = $(datadir)/applications
 desktop_DATA = src/ui/gui/pspp.desktop
 
-EXTRA_DIST += src/ui/gui/OChangeLog\
-	src/ui/gui/psppicon.png \
-	src/ui/gui/marshaller-list \
-	$(desktop_DATA)
-
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
 	$(nodist_src_ui_gui_psppire_DATA)
-
-
+endif HAVE_GUI
diff --git a/src/ui/gui/sheet/automake.mk b/src/ui/gui/sheet/automake.mk
index b95de451..1043a573 100644
--- a/src/ui/gui/sheet/automake.mk
+++ b/src/ui/gui/sheet/automake.mk
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
+if HAVE_GUI
 noinst_LTLIBRARIES += src/ui/gui/sheet/libsheet.la
 
 src_ui_gui_sheet_libsheet_la_CFLAGS = $(GTK_CFLAGS)
@@ -9,4 +10,4 @@ src_ui_gui_sheet_libsheet_la_SOURCES = \
 	src/ui/gui/sheet/psppire-axis.h \
 	src/ui/gui/sheet/psppire-sheetmodel.c \
 	src/ui/gui/sheet/psppire-sheetmodel.h
-
+endif