Merge "output" into "master"

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index f69cad5b93a61edba147d2e8ff2c937a1f27182f..a9b6f2123caa9573c35824858ddef552ed3bbb89 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)
@@ -58,9 +59,9 @@ UI_FILES = \
        src/ui/gui/crosstabs.ui \
        src/ui/gui/descriptives.ui \
        src/ui/gui/examine.ui \
+       src/ui/gui/factor.ui \
        src/ui/gui/find.ui \
        src/ui/gui/frequencies.ui \
-       src/ui/gui/message-dialog.ui \
        src/ui/gui/oneway.ui \
        src/ui/gui/psppire.ui \
        src/ui/gui/rank.ui \
@@ -133,6 +134,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/executor.h \
        src/ui/gui/find-dialog.c \
        src/ui/gui/find-dialog.h \
+       src/ui/gui/factor-dialog.c \
+       src/ui/gui/factor-dialog.h \
        src/ui/gui/frequencies-dialog.c \
        src/ui/gui/frequencies-dialog.h \
        src/ui/gui/goto-case-dialog.c \
@@ -140,8 +143,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/helper.c \
        src/ui/gui/helper.h \
        src/ui/gui/main.c \
-       src/ui/gui/message-dialog.c \
-       src/ui/gui/message-dialog.h \
        src/ui/gui/missing-val-dialog.c \
        src/ui/gui/missing-val-dialog.h \
         src/ui/gui/oneway-anova-dialog.c \
@@ -170,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 \