X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=3fbf46520d2137e18d934c86f16e0ce4b1f553c4;hb=691a034d7f2139076fa012739dffd40ef5db4a9b;hp=a405e87a61f27bbe510eb5f13c65b33d1c2a3b6c;hpb=06a34a11908066ab5949d4b36c7fc5b7f44e88bb;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index a405e87a61..3d10ed0229 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -1,16 +1,102 @@
+# PSPP - a program for statistical analysis.
+# Copyright (C) 2017 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
+UI_FILES = \
+	src/ui/gui/aggregate.ui \
+	src/ui/gui/autorecode.ui \
+	src/ui/gui/binomial.ui \
+	src/ui/gui/compute.ui \
+	src/ui/gui/barchart.ui \
+	src/ui/gui/correlation.ui \
+	src/ui/gui/count.ui \
+	src/ui/gui/comments.ui \
+	src/ui/gui/crosstabs.ui \
+	src/ui/gui/chi-square.ui \
+	src/ui/gui/descriptives.ui \
+	src/ui/gui/entry-dialog.ui \
+	src/ui/gui/examine.ui \
+	src/ui/gui/goto-case.ui \
+	src/ui/gui/factor.ui \
+	src/ui/gui/find.ui \
+	src/ui/gui/frequencies.ui \
+	src/ui/gui/histogram.ui \
+	src/ui/gui/indep-samples.ui \
+	src/ui/gui/k-independent.ui \
+	src/ui/gui/k-means.ui \
+	src/ui/gui/k-related.ui \
+	src/ui/gui/ks-one-sample.ui \
+	src/ui/gui/logistic.ui \
+	src/ui/gui/means.ui \
+	src/ui/gui/missing-val-dialog.ui \
+	src/ui/gui/oneway.ui \
+	src/ui/gui/options.ui \
+	src/ui/gui/paired-samples.ui \
+	src/ui/gui/rank.ui \
+	src/ui/gui/runs.ui \
+	src/ui/gui/sort.ui \
+	src/ui/gui/split-file.ui \
+	src/ui/gui/recode.ui \
+	src/ui/gui/regression.ui \
+	src/ui/gui/reliability.ui \
+	src/ui/gui/roc.ui \
+	src/ui/gui/scatterplot.ui \
+	src/ui/gui/select-cases.ui \
+	src/ui/gui/t-test.ui \
+	src/ui/gui/text-data-import.ui \
+	src/ui/gui/transpose.ui \
+	src/ui/gui/univariate.ui \
+	src/ui/gui/val-labs-dialog.ui \
+	src/ui/gui/variable-info.ui \
+	src/ui/gui/data-editor.ui \
+	src/ui/gui/output-window.ui \
+	src/ui/gui/syntax-editor.ui \
+	src/ui/gui/var-type-dialog.ui \
+	src/ui/gui/weight.ui
 
 
+$(top_srcdir)/doc/help-pages-list: $(UI_FILES)
+	 $(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
+   $(SED) -e 's% *<property name="help[-_]page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
+	-e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp
+	test -s $@,tmp
+	mv $@,tmp $@
+
+EXTRA_DIST += doc/help-pages-list
+
+
+EXTRA_DIST += \
+	src/ui/gui/memorandum.txt \
+	src/ui/gui/gen-dot-desktop.sh \
+	src/ui/gui/marshaller-list \
+	src/ui/gui/pspplogo.svg
+
+
+if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
+noinst_PROGRAMS += src/ui/gui/spreadsheet-test 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
-	-DINSTALLDIR=\"$(bindir)\"
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 
+src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 
 
 
 src_ui_gui_psppire_LDFLAGS = \
-	$(PG_LDFLAGS) \
-	-export-dynamic
+	$(PSPPIRE_LDFLAGS) \
+	$(PG_LDFLAGS)
 
 
 if RELOCATABLE_VIA_LD
@@ -20,180 +106,268 @@ src_ui_gui_psppire_LDFLAGS += -rpath $(pkglibdir)
 endif
 
 
-pkglib_LTLIBRARIES = src/ui/gui/libpsppire.la
-
-src_ui_gui_libpsppire_la_CFLAGS = $(GLADE_CFLAGS) 
+src_ui_gui_psppire_LDADD = \
+	lib/gtk-contrib/libxpaned.a \
+	src/ui/libuicommon.la \
+	src/libpspp.la \
+	src/libpspp-core.la \
+	$(GTK_LIBS) \
+	$(GTHREAD_LIBS) \
+	$(GTKSOURCEVIEW_LIBS) \
+	$(CAIRO_LIBS) \
+	$(LIBINTL) \
+	$(GSL_LIBS)
 
-src_ui_gui_libpsppire_la_SOURCES = \
-	src/ui/gui/glade-register.c
 
-src_ui_gui_psppire_LDADD = \
-	-dlopen src/ui/gui/libpsppire.la \
-	lib/gtksheet/libgtksheet.a \
-	src/language/liblanguage.a \
-	src/ui/libuicommon.a \
-	src/output/charts/libcharts.a \
-	src/output/liboutput.a \
-	src/math/libpspp_math.a  \
-	src/math/linreg/libpspp_linreg.a  \
-	lib/linreg/liblinreg.a	\
-	lib/gsl-extras/libgsl-extras.a	\
-	src/data/libdata.a \
-	src/libpspp/libpspp.a \
+src_ui_gui_spreadsheet_test_LDADD = \
+	src/libpspp-core.la \
 	$(GTK_LIBS) \
-	$(GLADE_LIBS) \
-	$(PG_LIBS) \
-	gl/libgl.la \
-	@LIBINTL@ @LIBREADLINE@
+	$(GTHREAD_LIBS)
+
+
+src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/psppire-spreadsheet-model.c
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
-dist_src_ui_gui_psppire_DATA = \
-	$(top_srcdir)/src/ui/gui/data-editor.glade \
-	$(top_srcdir)/src/ui/gui/descriptives-dialog.glade \
-	$(top_srcdir)/src/ui/gui/examine.glade \
-	$(top_srcdir)/src/ui/gui/crosstabs.glade \
-	$(top_srcdir)/src/ui/gui/frequencies.glade \
-	$(top_srcdir)/src/ui/gui/message-dialog.glade \
-	$(top_srcdir)/src/ui/gui/oneway.glade \
-	$(top_srcdir)/src/ui/gui/output-viewer.glade \
-	$(top_srcdir)/src/ui/gui/psppire.glade \
-	$(top_srcdir)/src/ui/gui/rank.glade \
-	$(top_srcdir)/src/ui/gui/recode.glade \
-	$(top_srcdir)/src/ui/gui/regression.glade \
-	$(top_srcdir)/src/ui/gui/syntax-editor.glade \
-	$(top_srcdir)/src/ui/gui/text-data-import.glade \
-	$(top_srcdir)/src/ui/gui/t-test.glade \
-	$(top_srcdir)/src/ui/gui/psppicon.png \
-	$(top_srcdir)/src/ui/gui/pspplogo.png \
-	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
-	$(top_srcdir)/src/ui/gui/icons/goto-variable.png\
-	$(top_srcdir)/src/ui/gui/icons/insert-case.png \
-	$(top_srcdir)/src/ui/gui/icons/insert-variable.png \
-	$(top_srcdir)/src/ui/gui/icons/recent-dialogs.png \
-	$(top_srcdir)/src/ui/gui/icons/split-file.png \
-	$(top_srcdir)/src/ui/gui/icons/select-cases.png \
-	$(top_srcdir)/src/ui/gui/icons/weight-cases.png \
-	$(top_srcdir)/src/ui/gui/icons/16x16/nominal.png  \
-	$(top_srcdir)/src/ui/gui/icons/16x16/ordinal.png \
-	$(top_srcdir)/src/ui/gui/icons/16x16/scale.png \
-	$(top_srcdir)/src/ui/gui/icons/16x16/string.png \
-	$(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \
-	$(top_srcdir)/src/ui/gui/icons/splash.png
 
+install-lang:
+	$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir)
+
+INSTALL_DATA_HOOKS += install-lang
+
+dist_src_ui_gui_psppire_DATA = \
+	$(UI_FILES) \
+	$(top_srcdir)/src/ui/gui/pspp.lang \
+	$(top_srcdir)/src/ui/gui/psppire.gtkrc
 
 src_ui_gui_psppire_SOURCES = \
-	src/ui/gui/about.c \
-	src/ui/gui/about.h \
-	src/ui/gui/checkbox-treeview.c \
-	src/ui/gui/checkbox-treeview.h \
-	src/ui/gui/compute-dialog.c \
-	src/ui/gui/compute-dialog.h \
-	src/ui/gui/comments-dialog.c \
-	src/ui/gui/comments-dialog.h \
-	src/ui/gui/crosstabs-dialog.c \
-	src/ui/gui/crosstabs-dialog.h \
-	src/ui/gui/customentry.c \
-	src/ui/gui/customentry.h \
-	src/ui/gui/frequencies-dialog.c \
-	src/ui/gui/frequencies-dialog.h \
-	src/ui/gui/goto-case-dialog.c \
-	src/ui/gui/goto-case-dialog.h \
-	src/ui/gui/data-editor.c \
-	src/ui/gui/data-editor.h \
-	src/ui/gui/descriptives-dialog.c \
-	src/ui/gui/descriptives-dialog.h \
-	src/ui/gui/examine-dialog.c \
-	src/ui/gui/examine-dialog.h \
-	src/ui/gui/find-dialog.c \
-	src/ui/gui/find-dialog.h \
+	src/ui/gui/pspp-sheet-private.h \
+	src/ui/gui/pspp-sheet-selection.c \
+	src/ui/gui/pspp-sheet-selection.h \
+	src/ui/gui/pspp-sheet-view-column.c \
+	src/ui/gui/pspp-sheet-view-column.h \
+	src/ui/gui/pspp-sheet-view.c \
+	src/ui/gui/pspp-sheet-view.h \
+	src/ui/gui/pspp-widget-facade.c \
+	src/ui/gui/pspp-widget-facade.h \
+	src/ui/gui/psppire-button-editable.c \
+	src/ui/gui/psppire-button-editable.h \
+	src/ui/gui/psppire-cell-renderer-button.c \
+	src/ui/gui/psppire-cell-renderer-button.h \
+	src/ui/gui/psppire-dialog.c \
+	src/ui/gui/psppire-keypad.c \
+	src/ui/gui/psppire-selector.c \
+	src/ui/gui/psppire-buttonbox.c \
+	src/ui/gui/psppire-buttonbox.h \
+	src/ui/gui/psppire-scanf.c \
+	src/ui/gui/psppire-scanf.h \
+	src/ui/gui/psppire-acr.c \
+	src/ui/gui/psppire-import-assistant.c \
+	src/ui/gui/psppire-import-assistant.h \
+	src/ui/gui/builder-wrapper.c \
+	src/ui/gui/builder-wrapper.h \
 	src/ui/gui/dialog-common.c \
 	src/ui/gui/dialog-common.h \
-	src/ui/gui/dict-display.c \
 	src/ui/gui/dict-display.h \
-	src/ui/gui/main.c \
-	src/ui/gui/message-dialog.c \
-	src/ui/gui/message-dialog.h \
-	src/ui/gui/psppire.c \
-	src/ui/gui/psppire.h \
+	src/ui/gui/dict-display.c \
+	src/ui/gui/entry-dialog.c \
+	src/ui/gui/entry-dialog.h \
+	src/ui/gui/executor.c \
+	src/ui/gui/executor.h \
+	src/ui/gui/find-dialog.c \
+	src/ui/gui/find-dialog.h \
+	src/ui/gui/goto-case-dialog.c \
+	src/ui/gui/goto-case-dialog.h \
 	src/ui/gui/helper.c \
+	src/ui/gui/help-menu.c \
+	src/ui/gui/help-menu.h \
 	src/ui/gui/helper.h \
+	src/ui/gui/main.c \
 	src/ui/gui/missing-val-dialog.c \
 	src/ui/gui/missing-val-dialog.h \
-        src/ui/gui/oneway-anova-dialog.c \
-        src/ui/gui/oneway-anova-dialog.h \
-	src/ui/gui/output-viewer.c \
-	src/ui/gui/output-viewer.h \
-	src/ui/gui/psppire-acr.c \
+	src/ui/gui/options-dialog.c \
+	src/ui/gui/options-dialog.h \
+	src/ui/gui/psppire.c \
+	src/ui/gui/psppire.h \
 	src/ui/gui/psppire-acr.h \
-	src/ui/gui/psppire-buttonbox.c \
-	src/ui/gui/psppire-buttonbox.h \
-	src/ui/gui/psppire-hbuttonbox.c \
-	src/ui/gui/psppire-hbuttonbox.h \
-	src/ui/gui/psppire-vbuttonbox.c \
-	src/ui/gui/psppire-vbuttonbox.h \
-	src/ui/gui/psppire-case-file.c \
-	src/ui/gui/psppire-case-file.h \
+	src/ui/gui/psppire-checkbox-treeview.c \
+	src/ui/gui/psppire-checkbox-treeview.h \
+	src/ui/gui/psppire-conf.c \
+	src/ui/gui/psppire-conf.h \
 	src/ui/gui/psppire-data-editor.c \
 	src/ui/gui/psppire-data-editor.h \
+	src/ui/gui/psppire-data-sheet.c \
+	src/ui/gui/psppire-data-sheet.h \
 	src/ui/gui/psppire-data-store.c \
 	src/ui/gui/psppire-data-store.h \
-	src/ui/gui/psppire-dialog.c \
+	src/ui/gui/psppire-data-window.c \
+	src/ui/gui/psppire-data-window.h \
 	src/ui/gui/psppire-dialog.h \
+	src/ui/gui/psppire-dialog-action.c \
+	src/ui/gui/psppire-dialog-action.h \
+	src/ui/gui/psppire-dialog-action-aggregate.c \
+	src/ui/gui/psppire-dialog-action-aggregate.h \
+	src/ui/gui/psppire-dialog-action-autorecode.c \
+	src/ui/gui/psppire-dialog-action-autorecode.h \
+	src/ui/gui/psppire-dialog-action-1sks.c \
+	src/ui/gui/psppire-dialog-action-1sks.h \
+	src/ui/gui/psppire-dialog-action-barchart.c \
+	src/ui/gui/psppire-dialog-action-barchart.h \
+	src/ui/gui/psppire-dialog-action-binomial.c \
+	src/ui/gui/psppire-dialog-action-binomial.h \
+	src/ui/gui/psppire-dialog-action-chisquare.c \
+	src/ui/gui/psppire-dialog-action-chisquare.h \
+	src/ui/gui/psppire-dialog-action-compute.c \
+	src/ui/gui/psppire-dialog-action-compute.h \
+	src/ui/gui/psppire-dialog-action-comments.c \
+	src/ui/gui/psppire-dialog-action-comments.h \
+	src/ui/gui/psppire-dialog-action-count.c \
+	src/ui/gui/psppire-dialog-action-count.h \
+	src/ui/gui/psppire-dialog-action-correlation.c \
+	src/ui/gui/psppire-dialog-action-correlation.h \
+	src/ui/gui/psppire-dialog-action-crosstabs.c \
+	src/ui/gui/psppire-dialog-action-crosstabs.h \
+	src/ui/gui/psppire-dialog-action-descriptives.c \
+	src/ui/gui/psppire-dialog-action-descriptives.h \
+	src/ui/gui/psppire-dialog-action-examine.c \
+	src/ui/gui/psppire-dialog-action-examine.h \
+	src/ui/gui/psppire-dialog-action-factor.c \
+	src/ui/gui/psppire-dialog-action-factor.h \
+	src/ui/gui/psppire-dialog-action-flip.c \
+	src/ui/gui/psppire-dialog-action-flip.h \
+	src/ui/gui/psppire-dialog-action-frequencies.c \
+	src/ui/gui/psppire-dialog-action-frequencies.h \
+	src/ui/gui/psppire-dialog-action-histogram.c \
+	src/ui/gui/psppire-dialog-action-histogram.h \
+	src/ui/gui/psppire-dialog-action-indep-samps.c \
+	src/ui/gui/psppire-dialog-action-indep-samps.h \
+	src/ui/gui/psppire-dialog-action-kmeans.c \
+	src/ui/gui/psppire-dialog-action-kmeans.h \
+	src/ui/gui/psppire-dialog-action-logistic.c \
+	src/ui/gui/psppire-dialog-action-logistic.h \
+	src/ui/gui/psppire-dialog-action-k-independent.c \
+	src/ui/gui/psppire-dialog-action-k-independent.h \
+	src/ui/gui/psppire-dialog-action-k-related.c \
+	src/ui/gui/psppire-dialog-action-k-related.h \
+	src/ui/gui/psppire-dialog-action-means.c \
+	src/ui/gui/psppire-dialog-action-means.h \
+	src/ui/gui/psppire-dialog-action-oneway.c \
+	src/ui/gui/psppire-dialog-action-oneway.h \
+	src/ui/gui/psppire-dialog-action-paired.c \
+	src/ui/gui/psppire-dialog-action-paired.h \
+	src/ui/gui/psppire-dialog-action-rank.c \
+	src/ui/gui/psppire-dialog-action-rank.h \
+	src/ui/gui/psppire-dialog-action-recode.c \
+	src/ui/gui/psppire-dialog-action-recode.h \
+	src/ui/gui/psppire-dialog-action-recode-same.c \
+	src/ui/gui/psppire-dialog-action-recode-same.h \
+	src/ui/gui/psppire-dialog-action-recode-different.c \
+	src/ui/gui/psppire-dialog-action-recode-different.h \
+	src/ui/gui/psppire-dialog-action-regression.c \
+	src/ui/gui/psppire-dialog-action-regression.h \
+	src/ui/gui/psppire-dialog-action-reliability.c \
+	src/ui/gui/psppire-dialog-action-reliability.h \
+	src/ui/gui/psppire-dialog-action-roc.c \
+	src/ui/gui/psppire-dialog-action-roc.h \
+	src/ui/gui/psppire-dialog-action-runs.c \
+	src/ui/gui/psppire-dialog-action-runs.h \
+	src/ui/gui/psppire-dialog-action-scatterplot.c \
+	src/ui/gui/psppire-dialog-action-scatterplot.h \
+	src/ui/gui/psppire-dialog-action-sort.c \
+	src/ui/gui/psppire-dialog-action-sort.h \
+	src/ui/gui/psppire-dialog-action-select.c \
+	src/ui/gui/psppire-dialog-action-select.h \
+	src/ui/gui/psppire-dialog-action-split.c \
+	src/ui/gui/psppire-dialog-action-split.h \
+	src/ui/gui/psppire-dialog-action-tt1s.c \
+	src/ui/gui/psppire-dialog-action-tt1s.h \
+	src/ui/gui/psppire-dialog-action-two-sample.c \
+	src/ui/gui/psppire-dialog-action-two-sample.h \
+	src/ui/gui/psppire-dialog-action-univariate.c \
+	src/ui/gui/psppire-dialog-action-univariate.h \
+	src/ui/gui/psppire-dialog-action-var-info.c \
+	src/ui/gui/psppire-dialog-action-var-info.h \
+	src/ui/gui/psppire-dialog-action-weight.c \
+	src/ui/gui/psppire-dialog-action-weight.h \
 	src/ui/gui/psppire-dict.c \
 	src/ui/gui/psppire-dict.h \
-	src/ui/gui/psppire-keypad.c \
+	src/ui/gui/psppire-dictview.c \
+	src/ui/gui/psppire-dictview.h \
+	src/ui/gui/psppire-empty-list-store.c \
+	src/ui/gui/psppire-empty-list-store.h \
+	src/ui/gui/psppire-encoding-selector.c \
+	src/ui/gui/psppire-encoding-selector.h \
+	src/ui/gui/psppire-format.c \
+	src/ui/gui/psppire-format.h \
 	src/ui/gui/psppire-keypad.h \
-	src/ui/gui/psppire-selector.c \
+	src/ui/gui/psppire-lex-reader.c \
+	src/ui/gui/psppire-lex-reader.h \
+	src/ui/gui/psppire-means-layer.c \
+	src/ui/gui/psppire-means-layer.h \
+	src/ui/gui/psppire-output-view.c \
+	src/ui/gui/psppire-output-view.h \
+	src/ui/gui/psppire-output-window.c \
+	src/ui/gui/psppire-output-window.h \
+	src/ui/gui/psppire-var-view.c \
+	src/ui/gui/psppire-var-view.h \
+	src/ui/gui/psppire-spreadsheet-model.c \
+	src/ui/gui/psppire-spreadsheet-model.h \
 	src/ui/gui/psppire-selector.h \
+	src/ui/gui/psppire-select-dest.c \
+	src/ui/gui/psppire-select-dest.h \
+	src/ui/gui/psppire-syntax-window.c \
+	src/ui/gui/psppire-syntax-window.h \
+	src/ui/gui/psppire-val-chooser.c \
+	src/ui/gui/psppire-val-chooser.h \
+	src/ui/gui/psppire-value-entry.c \
+	src/ui/gui/psppire-value-entry.h \
 	src/ui/gui/psppire-var-ptr.c \
 	src/ui/gui/psppire-var-ptr.h \
 	src/ui/gui/psppire-var-sheet.c \
 	src/ui/gui/psppire-var-sheet.h \
-	src/ui/gui/psppire-var-store.c \
-	src/ui/gui/psppire-var-store.h \
-	src/ui/gui/rank-dialog.c \
-	src/ui/gui/rank-dialog.h \
-	src/ui/gui/recode-dialog.c \
-	src/ui/gui/recode-dialog.h \
-	src/ui/gui/regression-dialog.c \
-	src/ui/gui/regression-dialog.h \
-	src/ui/gui/select-cases-dialog.c \
-	src/ui/gui/select-cases-dialog.h \
-	src/ui/gui/sort-cases-dialog.c \
-	src/ui/gui/sort-cases-dialog.h \
-	src/ui/gui/split-file-dialog.c \
-	src/ui/gui/split-file-dialog.h \
-	src/ui/gui/syntax-editor.c \
-	src/ui/gui/syntax-editor.h \
-	src/ui/gui/syntax-editor-source.c \
-	src/ui/gui/syntax-editor-source.h \
-	src/ui/gui/text-data-import-dialog.c \
-	src/ui/gui/text-data-import-dialog.h \
-	src/ui/gui/transpose-dialog.c \
-	src/ui/gui/transpose-dialog.h \
-	src/ui/gui/t-test-independent-samples-dialog.c \
-	src/ui/gui/t-test-independent-samples-dialog.h \
-	src/ui/gui/t-test-one-sample.c \
-	src/ui/gui/t-test-one-sample.h \
+	src/ui/gui/psppire-window.c \
+	src/ui/gui/psppire-window.h \
+	src/ui/gui/psppire-window-base.c \
+	src/ui/gui/psppire-window-base.h \
+	src/ui/gui/psppire-window-register.c \
+	src/ui/gui/psppire-window-register.h \
 	src/ui/gui/t-test-options.c \
 	src/ui/gui/t-test-options.h \
-	src/ui/gui/t-test-paired-samples.c \
-	src/ui/gui/t-test-paired-samples.h \
 	src/ui/gui/val-labs-dialog.c \
 	src/ui/gui/val-labs-dialog.h \
 	src/ui/gui/var-display.c \
 	src/ui/gui/var-display.h \
 	src/ui/gui/var-type-dialog.c \
 	src/ui/gui/var-type-dialog.h \
-	src/ui/gui/variable-info-dialog.c \
-	src/ui/gui/variable-info-dialog.h \
-	src/ui/gui/weight-cases-dialog.c \
-	src/ui/gui/weight-cases-dialog.h \
 	src/ui/gui/widget-io.c \
 	src/ui/gui/widget-io.h \
-	src/ui/gui/window-manager.c \
-	src/ui/gui/window-manager.h
+	src/ui/gui/widgets.c \
+	src/ui/gui/widgets.h \
+	src/ui/gui/windows-menu.c \
+	src/ui/gui/windows-menu.h
+
+
+OBSOLETE = \
+	src/ui/gui/page-assistant.c \
+	src/ui/gui/page-intro.c \
+	src/ui/gui/page-intro.h \
+	src/ui/gui/page-file.c \
+	src/ui/gui/page-first-line.c \
+	src/ui/gui/page-first-line.h \
+	src/ui/gui/page-formats.c \
+	src/ui/gui/page-formats.h \
+	src/ui/gui/page-separators.c \
+	src/ui/gui/page-separators.h \
+	src/ui/gui/page-sheet-spec.c \
+	src/ui/gui/page-sheet-spec.h \
+	src/ui/gui/text-data-import-dialog.c \
+	src/ui/gui/text-data-import-dialog.h
+
+
+nodist_src_ui_gui_psppire_SOURCES = \
+	src/ui/gui/psppire-marshal.c \
+	src/ui/gui/psppire-marshal.h \
+	src/ui/gui/resources.c
 
 yelp-check:
 	@if ! yelp --version > /dev/null 2>&1 ; then \
@@ -204,4 +378,65 @@ yelp-check:
 		echo '    Yelp is available from the GNOME project.  ftp://ftp.gnome.org/pub/gnome/sources/yelp' ; \
 		echo ; \
 	fi
-.PHONY: yelp-check
+
+PHONY += yelp-check
+
+AM_CPPFLAGS += -Isrc
+
+src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
+	$(AM_V_GEN)POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > $@
+
+CLEANFILES+=src/ui/gui/pspp.desktop
+
+src/ui/gui/resources.c: src/ui/gui/resources.xml
+	$(AM_V_at)$(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src/ui/gui --generate-source $< --target=$@,out
+	$(AM_V_GEN)echo '#include <config.h>' > $@,tmp
+	cat $@,out >> $@,tmp
+	$(RM) $@,out
+	mv $@,tmp $@
+
+src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
+	$(AM_V_GEN)echo '#include <config.h>' > $@
+	$(AM_V_at)$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
+
+src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
+
+desktopdir = $(datadir)/applications
+desktop_DATA = src/ui/gui/pspp.desktop
+
+appdatadir = $(datadir)/appdata
+dist_appdata_DATA = src/ui/gui/pspp.appdata.xml
+
+BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h src/ui/gui/resources.c
+
+CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
+	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:
+	DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS
+
+# <gtk/gtk.h> wrapper
+src_ui_gui_psppire_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include
+BUILT_SOURCES += src/ui/gui/include/gtk/gtk.h
+src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
+	@$(MKDIR_P) src/ui/gui/include/gtk
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  $(SED) -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_GTK_GTK_H''@|$(NEXT_GTK_GTK_H)|g' \
+	      < $(srcdir)/src/ui/gui/include/gtk/gtk.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+CLEANFILES += src/ui/gui/include/gtk/gtk.h
+EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h src/ui/gui/resources.xml
+
+include $(top_srcdir)/src/ui/gui/icons/automake.mk
+
+UNINSTALL_DATA_HOOKS += update-icon-cache
+INSTALL_DATA_HOOKS += update-icon-cache
+