Merge remote branch 'origin/master' into import-gui

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 279db3111c448672e86c01de4054a6a449ca0f56..941a7fea1c2690b36840188c13d19f3933ee7ed7 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -55,10 +55,10 @@ EXTRA_DIST += \
 
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
-bin_PROGRAMS += src/ui/gui/spread-test
+noinst_PROGRAMS += src/ui/gui/spreadsheet-test
 
 src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
-src_ui_gui_spread_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -87,13 +87,13 @@ src_ui_gui_psppire_LDADD = \
        $(GSL_LIBS)
 
 
-src_ui_gui_spread_test_LDADD = \
+src_ui_gui_spreadsheet_test_LDADD = \
        src/libpspp-core.la \
        $(GTK_LIBS) \
        $(GTHREAD_LIBS)
 
 
-src_ui_gui_spread_test_SOURCES = src/ui/gui/sheet-test.c
+src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/psppire-spreadsheet-model.c
 
 
 src_ui_gui_psppiredir = $(pkgdatadir)
@@ -286,6 +286,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 \
@@ -318,11 +320,16 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/split-file-dialog.h \
        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 \
        src/ui/gui/transpose-dialog.c \