X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=1877263b73eac257ef0354d5f8bdfba91c752b40;hb=5dbf5abcbed01f04422d4dead1c0ae0bb7efde4f;hp=762d37d7c5be2652d472fac7c5d83b5457cc4b39;hpb=48b5d1d1f17f8059c7e91246b3d47ff3122a8f9f;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 762d37d7c5..1877263b73 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -1,3 +1,19 @@
+# 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 = \
@@ -20,6 +36,7 @@ UI_FILES = \
 	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 \
@@ -27,6 +44,7 @@ UI_FILES = \
 	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 \
@@ -54,7 +72,9 @@ UI_FILES = \
 $(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' > $@
+	-e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp
+	test -s $@,tmp
+	mv $@,tmp $@
 
 EXTRA_DIST += doc/help-pages-list
 
@@ -68,11 +88,11 @@ EXTRA_DIST += \
 src_ui_gui_psppire_CPPFLAGS=
 
 if HAVE_GUI
-bin_PROGRAMS += src/ui/gui/psppire 
-noinst_PROGRAMS += src/ui/gui/spreadsheet-test 
+bin_PROGRAMS += src/ui/gui/psppire
+noinst_PROGRAMS += src/ui/gui/spreadsheet-test
 
-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_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(SPREAD_SHEET_WIDGET_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -88,13 +108,13 @@ endif
 
 
 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) \
+	$(SPREAD_SHEET_WIDGET_LIBS) \
 	$(CAIRO_LIBS) \
 	$(LIBINTL) \
 	$(GSL_LIBS)
@@ -118,8 +138,7 @@ 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
+	$(top_srcdir)/src/ui/gui/pspp.lang
 
 src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dialog.c \
@@ -153,6 +172,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/main.c \
 	src/ui/gui/missing-val-dialog.c \
 	src/ui/gui/missing-val-dialog.h \
+	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 \
@@ -209,6 +230,8 @@ src_ui_gui_psppire_SOURCES = \
 	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 \
@@ -255,8 +278,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dict.h \
 	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 \
@@ -279,12 +300,20 @@ src_ui_gui_psppire_SOURCES = \
 	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-delimited-text.c \
+	src/ui/gui/psppire-delimited-text.h \
+	src/ui/gui/psppire-text-file.c \
+	src/ui/gui/psppire-text-file.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-data-sheet.c \
+	src/ui/gui/psppire-data-sheet.h \
+	src/ui/gui/psppire-variable-sheet.c \
+	src/ui/gui/psppire-variable-sheet.h \
 	src/ui/gui/psppire-var-sheet-header.h \
 	src/ui/gui/psppire-var-sheet-header.c \
 	src/ui/gui/psppire-window.c \
@@ -301,6 +330,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/var-display.h \
 	src/ui/gui/var-type-dialog.c \
 	src/ui/gui/var-type-dialog.h \
+	src/ui/gui/value-variant.c \
+	src/ui/gui/value-variant.h \
 	src/ui/gui/widget-io.c \
 	src/ui/gui/widget-io.h \
 	src/ui/gui/widgets.c \
@@ -373,9 +404,8 @@ 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) 
+	src/ui/gui/resources.c $(nodist_src_ui_gui_psppire_DATA)
 
-include $(top_srcdir)/src/ui/gui/efficient-sheet.mk
 endif HAVE_GUI
 
 #ensure the installcheck passes even if there is no X server available