Converted Sort 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 c007a8362c45ad4fbf83f97725a897929ab2eb6d..770a5a9a012635dff906690f47ec351a57252714 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -74,7 +74,8 @@ src_ui_gui_psppire_LDADD = \
        $(GTK_LIBS) \
        $(GTKSOURCEVIEW_LIBS) \
        $(CAIRO_LIBS) \
-       $(LIBINTL)
+       $(LIBINTL) \
+       $(GSL_LIBS)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -84,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)
 
@@ -153,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 \
@@ -187,8 +184,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/helper.h \
        src/ui/gui/k-related-dialog.c \
        src/ui/gui/k-related-dialog.h \
-       src/ui/gui/k-means-dialog.c \
-       src/ui/gui/k-means-dialog.h \
        src/ui/gui/ks-one-sample-dialog.c \
        src/ui/gui/ks-one-sample-dialog.h \
        src/ui/gui/main.c \
@@ -211,6 +206,22 @@ 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-kmeans.c \
+       src/ui/gui/psppire-dialog-action-kmeans.h \
+       src/ui/gui/psppire-dialog-action-reliability.c \
+       src/ui/gui/psppire-dialog-action-reliability.h \
+       src/ui/gui/psppire-dialog-action-sort.c \
+       src/ui/gui/psppire-dialog-action-sort.h \
+       src/ui/gui/psppire-dialog-action-var-info.c \
+       src/ui/gui/psppire-dialog-action-var-info.h \
+       src/ui/gui/psppire-dialog-action-roc.c \
+       src/ui/gui/psppire-dialog-action-roc.h \
        src/ui/gui/psppire-dict.c \
        src/ui/gui/psppire-dict.h \
        src/ui/gui/psppire-dictview.c \
@@ -249,16 +260,10 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/recode-dialog.h \
        src/ui/gui/regression-dialog.c \
        src/ui/gui/regression-dialog.h \
-       src/ui/gui/reliability-dialog.c \
-       src/ui/gui/reliability-dialog.h \
-       src/ui/gui/roc-dialog.c \
-       src/ui/gui/roc-dialog.h \
        src/ui/gui/runs-dialog.c \
        src/ui/gui/runs-dialog.h \
        src/ui/gui/select-cases-dialog.c \
        src/ui/gui/select-cases-dialog.h \
-       src/ui/gui/sort-cases-dialog.c \
-       src/ui/gui/sort-cases-dialog.h \
        src/ui/gui/split-file-dialog.c \
        src/ui/gui/split-file-dialog.h \
        src/ui/gui/text-data-import-dialog.c \
@@ -281,8 +286,6 @@ src_ui_gui_psppire_SOURCES = \
        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 \