Merge remote-tracking branch 'origin/master' into gtk3

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index b8d574ffddb0059683c1455f00677dcf81dee0a4..2b3e2e399e0ce2672f4efbd84ebc90931913dfe4 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -57,8 +57,8 @@ 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_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 -DGDK_DISABLE_DEPRECATION_WARNINGS=1
+src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 -DGDK_DISABLE_DEPRECATION_WARNINGS=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -315,6 +315,18 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/select-cases-dialog.h \
        src/ui/gui/split-file-dialog.c \
        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 \