Merge 'master' into 'gtk3'.

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index addbbe2cad9a5491df23453dbc8f07a4a7defcd5..b19ea4b3f99748172a59951fe78084fe1d992a94 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 
+src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -139,8 +139,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/builder-wrapper.h \
        src/ui/gui/comments-dialog.c \
        src/ui/gui/comments-dialog.h \
-       src/ui/gui/count-dialog.c \
-       src/ui/gui/count-dialog.h \
        src/ui/gui/dialog-common.c \
        src/ui/gui/dialog-common.h \
        src/ui/gui/dict-display.h \
@@ -160,10 +158,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/main.c \
        src/ui/gui/missing-val-dialog.c \
        src/ui/gui/missing-val-dialog.h \
-        src/ui/gui/oneway-anova-dialog.c \
-        src/ui/gui/oneway-anova-dialog.h \
-       src/ui/gui/paired-dialog.c \
-       src/ui/gui/paired-dialog.h \
        src/ui/gui/psppire.c \
        src/ui/gui/psppire.h \
        src/ui/gui/psppire-acr.h \
@@ -191,6 +185,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-chisquare.h \
        src/ui/gui/psppire-dialog-action-compute.c \
        src/ui/gui/psppire-dialog-action-compute.h \
+       src/ui/gui/psppire-dialog-action-count.c \
+       src/ui/gui/psppire-dialog-action-count.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 \
@@ -215,6 +211,10 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-k-related.h \
        src/ui/gui/psppire-dialog-action-means.c \
        src/ui/gui/psppire-dialog-action-means.h \
+       src/ui/gui/psppire-dialog-action-oneway.c \
+       src/ui/gui/psppire-dialog-action-oneway.h \
+       src/ui/gui/psppire-dialog-action-paired.c \
+       src/ui/gui/psppire-dialog-action-paired.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 \
@@ -229,6 +229,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-sort.h \
        src/ui/gui/psppire-dialog-action-tt1s.c \
        src/ui/gui/psppire-dialog-action-tt1s.h \
+       src/ui/gui/psppire-dialog-action-two-sample.c \
+       src/ui/gui/psppire-dialog-action-two-sample.h \
        src/ui/gui/psppire-dialog-action-univariate.c \
        src/ui/gui/psppire-dialog-action-univariate.h \
        src/ui/gui/psppire-dialog-action-var-info.c \
@@ -297,10 +299,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/text-data-import-dialog.h \
        src/ui/gui/t-test-options.c \
        src/ui/gui/t-test-options.h \
-       src/ui/gui/t-test-paired-samples.c \
-       src/ui/gui/t-test-paired-samples.h \
-       src/ui/gui/npar-two-sample-related.c \
-       src/ui/gui/npar-two-sample-related.h \
        src/ui/gui/val-labs-dialog.c \
        src/ui/gui/val-labs-dialog.h \
        src/ui/gui/var-display.c \
@@ -347,6 +345,9 @@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
 desktopdir = $(datadir)/applications
 desktop_DATA = src/ui/gui/pspp.desktop
 
+appdatadir = $(datadir)/appdata
+dist_appdata_DATA = src/ui/gui/pspp.appdata.xml
+
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
        $(nodist_src_ui_gui_psppire_DATA)