gtk-contrib: Remove GtkSheet-derived PsppireSheet.

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 70e76a268b6b4a8bd62ad12b6f2093e31d6fe5b0..b852ceabde40c6f1a1c888bdd9f152421fb24f98 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 \
@@ -18,6 +17,7 @@ UI_FILES = \
        src/ui/gui/factor.ui \
        src/ui/gui/find.ui \
        src/ui/gui/frequencies.ui \
+       src/ui/gui/indep-samples.ui \
        src/ui/gui/k-means.ui \
        src/ui/gui/k-related.ui \
        src/ui/gui/ks-one-sample.ui \
@@ -41,7 +41,8 @@ UI_FILES = \
        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/syntax-editor.ui \
+       src/ui/gui/var-sheet.ui
 
 EXTRA_DIST += \
        src/ui/gui/OChangeLog \
@@ -68,12 +69,12 @@ 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 \
        $(GTK_LIBS) \
+       $(GTHREAD_LIBS) \
        $(GTKSOURCEVIEW_LIBS) \
        $(CAIRO_LIBS) \
        $(LIBINTL) \
@@ -187,8 +188,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/factor-dialog.c \
-       src/ui/gui/factor-dialog.h \
        src/ui/gui/frequencies-dialog.c \
        src/ui/gui/frequencies-dialog.h \
        src/ui/gui/goto-case-dialog.c \
@@ -216,6 +215,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 \
@@ -229,20 +230,26 @@ src_ui_gui_psppire_SOURCES = \
        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-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-means.c \
        src/ui/gui/psppire-dialog-action-means.h \
        src/ui/gui/psppire-dialog-action-rank.c \
        src/ui/gui/psppire-dialog-action-rank.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-sort.c \
        src/ui/gui/psppire-dialog-action-sort.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-roc.c \
-       src/ui/gui/psppire-dialog-action-roc.h \
        src/ui/gui/psppire-dict.c \
        src/ui/gui/psppire-dict.h \
        src/ui/gui/psppire-dictview.c \
@@ -287,8 +294,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-window-register.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/runs-dialog.c \
        src/ui/gui/runs-dialog.h \
        src/ui/gui/select-cases-dialog.c \
@@ -299,8 +304,6 @@ src_ui_gui_psppire_SOURCES = \
        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/t-test-options.c \
@@ -382,3 +385,4 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
        mv $@-t $@
 CLEANFILES += src/ui/gui/include/gtk/gtk.h
 EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
+