Converted the correlations dialog to a PsppireDialogAction object

[pspp-builds.git] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 0ff301b89411811c195877f6feb85d7cb2a7b4b4..deafc52a5f606795695c04c013d6602c987cb350 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -35,6 +35,7 @@ UI_FILES = \
        src/ui/gui/select-cases.ui \
        src/ui/gui/t-test.ui \
        src/ui/gui/text-data-import.ui \
+       src/ui/gui/univariate.ui \
        src/ui/gui/var-sheet-dialogs.ui \
        src/ui/gui/variable-info.ui \
        src/ui/gui/data-editor.ui \
@@ -73,7 +74,8 @@ src_ui_gui_psppire_LDADD = \
        $(GTK_LIBS) \
        $(GTKSOURCEVIEW_LIBS) \
        $(CAIRO_LIBS) \
-       $(LIBINTL)
+       $(LIBINTL) \
+       $(GSL_LIBS)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -83,14 +85,14 @@ context = pspp
 
 
 install-lang:
-       $(INSTALL) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir)
+       $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir)
 
 install-icons:
        for size in 16x16 ; do \
          $(MKDIR_P) $(themedir)/$$size/$(context) ; \
-          $(INSTALL) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
+          $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
          $(MKDIR_P) $(themedir)/$$size/apps ; \
-         $(INSTALL) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \
+         $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \
        done 
        gtk-update-icon-cache --ignore-theme-index $(themedir)
 
@@ -142,6 +144,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/aggregate-dialog.h \
        src/ui/gui/binomial-dialog.c \
        src/ui/gui/binomial-dialog.h \
+       src/ui/gui/builder-wrapper.c \
+       src/ui/gui/builder-wrapper.h \
        src/ui/gui/checkbox-treeview.c \
        src/ui/gui/checkbox-treeview.h \
        src/ui/gui/comments-dialog.c \
@@ -150,16 +154,12 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/compute-dialog.h \
        src/ui/gui/chi-square-dialog.c \
        src/ui/gui/chi-square-dialog.h \
-       src/ui/gui/correlation-dialog.c \
-       src/ui/gui/correlation-dialog.h \
        src/ui/gui/count-dialog.c \
        src/ui/gui/count-dialog.h \
        src/ui/gui/crosstabs-dialog.c \
        src/ui/gui/crosstabs-dialog.h \
        src/ui/gui/customentry.c \
        src/ui/gui/customentry.h \
-       src/ui/gui/descriptives-dialog.c \
-       src/ui/gui/descriptives-dialog.h \
        src/ui/gui/dialog-common.c \
        src/ui/gui/dialog-common.h \
        src/ui/gui/dict-display.h \
@@ -208,6 +208,14 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-data-window.c \
        src/ui/gui/psppire-data-window.h \
        src/ui/gui/psppire-dialog.h \
+       src/ui/gui/psppire-dialog-action.c \
+       src/ui/gui/psppire-dialog-action.h \
+       src/ui/gui/psppire-dialog-action-correlation.c \
+       src/ui/gui/psppire-dialog-action-correlation.h \
+       src/ui/gui/psppire-dialog-action-descriptives.c \
+       src/ui/gui/psppire-dialog-action-descriptives.h \
+       src/ui/gui/psppire-dialog-action-var-info.c \
+       src/ui/gui/psppire-dialog-action-var-info.h \
        src/ui/gui/psppire-dict.c \
        src/ui/gui/psppire-dict.h \
        src/ui/gui/psppire-dictview.c \
@@ -216,6 +224,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-encoding-selector.h \
        src/ui/gui/psppire-hbuttonbox.h \
        src/ui/gui/psppire-keypad.h \
+       src/ui/gui/psppire-lex-reader.c \
+       src/ui/gui/psppire-lex-reader.h \
        src/ui/gui/psppire-output-window.c \
        src/ui/gui/psppire-output-window.h \
        src/ui/gui/psppire-var-view.c \
@@ -270,12 +280,12 @@ src_ui_gui_psppire_SOURCES = \
        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/univariate-dialog.c \
+       src/ui/gui/univariate-dialog.h \
        src/ui/gui/val-labs-dialog.c \
        src/ui/gui/val-labs-dialog.h \
        src/ui/gui/var-display.c \
        src/ui/gui/var-display.h \
-       src/ui/gui/variable-info-dialog.c \
-       src/ui/gui/variable-info-dialog.h \
        src/ui/gui/var-type-dialog.c \
        src/ui/gui/var-type-dialog.h \
        src/ui/gui/weight-cases-dialog.c \