Merge branch 'master' into output

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 22e2350b5156cfd02d2e198abdde130dd5d9175a..3fbf46520d2137e18d934c86f16e0ce4b1f553c4 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -26,6 +26,7 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
+       $(CAIRO_LIBS) \
        $(LIBINTL)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
@@ -54,6 +55,7 @@ UNINSTALL_DATA_HOOKS += uninstall-icons
 
 
 UI_FILES = \
+       src/ui/gui/correlation.ui \
        src/ui/gui/crosstabs.ui \
        src/ui/gui/descriptives.ui \
        src/ui/gui/examine.ui \
@@ -114,6 +116,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/comments-dialog.h \
        src/ui/gui/compute-dialog.c \
        src/ui/gui/compute-dialog.h \
+       src/ui/gui/correlation-dialog.c \
+       src/ui/gui/correlation-dialog.h \
        src/ui/gui/crosstabs-dialog.c \
        src/ui/gui/crosstabs-dialog.h \
        src/ui/gui/customentry.c \
@@ -167,6 +171,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-var-view.c \
        src/ui/gui/psppire-var-view.h \
        src/ui/gui/psppire-selector.h \
+       src/ui/gui/psppire-select-dest.c \
+       src/ui/gui/psppire-select-dest.h \
        src/ui/gui/psppire-syntax-window.c \
        src/ui/gui/psppire-syntax-window.h \
        src/ui/gui/psppire-var-ptr.c \