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 3af7038e2e36651c37489f66d793dbaded3e016d..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 \
@@ -42,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 \
@@ -69,8 +69,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 \
@@ -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 \