Merge 'master' into 'psppsheet'.

[pspp] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 7468c89038d1e459cdc1aa74921b0219386bd358..b8d574ffddb0059683c1455f00677dcf81dee0a4 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-include $(top_srcdir)/src/ui/gui/sheet/automake.mk
-
 UI_FILES = \
        src/ui/gui/aggregate.ui \
        src/ui/gui/autorecode.ui \
@@ -11,6 +9,7 @@ UI_FILES = \
        src/ui/gui/count.ui \
        src/ui/gui/crosstabs.ui \
        src/ui/gui/chi-square.ui \
+       src/ui/gui/data-sheet.ui \
        src/ui/gui/descriptives.ui \
        src/ui/gui/entry-dialog.ui \
        src/ui/gui/examine.ui \
@@ -22,7 +21,9 @@ UI_FILES = \
        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/paired-samples.ui \
        src/ui/gui/psppire.ui \
@@ -39,11 +40,11 @@ UI_FILES = \
        src/ui/gui/text-data-import.ui \
        src/ui/gui/univariate.ui \
        src/ui/gui/val-labs-dialog.ui \
-       src/ui/gui/var-sheet-dialogs.ui \
        src/ui/gui/variable-info.ui \
        src/ui/gui/data-editor.ui \
        src/ui/gui/output-viewer.ui \
        src/ui/gui/syntax-editor.ui \
+       src/ui/gui/var-sheet.ui \
        src/ui/gui/var-type-dialog.ui
 
 EXTRA_DIST += \
@@ -54,8 +55,10 @@ EXTRA_DIST += \
 
 if HAVE_GUI
 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_LDFLAGS = \
@@ -71,8 +74,7 @@ endif
 
 
 src_ui_gui_psppire_LDADD = \
-        src/ui/gui/sheet/libsheet.la \
-       lib/gtk-contrib/libgtksheet.a \
+       lib/gtk-contrib/libxpaned.a \
        src/ui/libuicommon.la \
        src/libpspp.la \
        src/libpspp-core.la \
@@ -83,6 +85,16 @@ src_ui_gui_psppire_LDADD = \
        $(LIBINTL) \
        $(GSL_LIBS)
 
+
+src_ui_gui_spreadsheet_test_LDADD = \
+       src/libpspp-core.la \
+       $(GTK_LIBS) \
+       $(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)
 
 
@@ -163,8 +175,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/autorecode-dialog.h \
        src/ui/gui/aggregate-dialog.c \
        src/ui/gui/aggregate-dialog.h \
-       src/ui/gui/binomial-dialog.c \
-       src/ui/gui/binomial-dialog.h \
        src/ui/gui/builder-wrapper.c \
        src/ui/gui/builder-wrapper.h \
        src/ui/gui/checkbox-treeview.c \
@@ -177,10 +187,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/chi-square-dialog.h \
        src/ui/gui/count-dialog.c \
        src/ui/gui/count-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/dialog-common.c \
        src/ui/gui/dialog-common.h \
        src/ui/gui/dict-display.h \
@@ -191,8 +197,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/executor.h \
        src/ui/gui/find-dialog.c \
        src/ui/gui/find-dialog.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/helper.c \
@@ -218,6 +222,8 @@ src_ui_gui_psppire_SOURCES = \
        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-data-window.c \
@@ -225,18 +231,26 @@ src_ui_gui_psppire_SOURCES = \
        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-binomial.c \
+       src/ui/gui/psppire-dialog-action-binomial.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-frequencies.c \
+       src/ui/gui/psppire-dialog-action-frequencies.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-means.c \
        src/ui/gui/psppire-dialog-action-means.h \
        src/ui/gui/psppire-dialog-action-rank.c \
@@ -271,6 +285,8 @@ src_ui_gui_psppire_SOURCES = \
        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 \
@@ -284,8 +300,6 @@ src_ui_gui_psppire_SOURCES = \
        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/psppire-vbuttonbox.h \
        src/ui/gui/psppire-window.c \
        src/ui/gui/psppire-window.h \