Merge commit 'HEAD'; commit 'savannah/master'

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 2183e4e8af619cb69eeaeaf4749f0efab242adc9..6440215a7667f684edceb3f647314b136d0efb1f 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -61,7 +61,8 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp-core.la \
        $(GTK_LIBS) \
        $(GLADE_LIBS) \
-       @LIBINTL@
+       @LIBINTL@ \
+       $(LIB_CLOSE)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -130,8 +131,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/frequencies-dialog.h \
        src/ui/gui/goto-case-dialog.c \
        src/ui/gui/goto-case-dialog.h \
-       src/ui/gui/data-editor.c \
-       src/ui/gui/data-editor.h \
        src/ui/gui/descriptives-dialog.c \
        src/ui/gui/descriptives-dialog.h \
        src/ui/gui/examine-dialog.c \
@@ -153,8 +152,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/missing-val-dialog.h \
         src/ui/gui/oneway-anova-dialog.c \
         src/ui/gui/oneway-anova-dialog.h \
-       src/ui/gui/output-viewer.c \
-       src/ui/gui/output-viewer.h \
        src/ui/gui/psppire-acr.h \
        src/ui/gui/psppire-buttonbox.h \
        src/ui/gui/psppire-hbuttonbox.h \
@@ -186,8 +183,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/sort-cases-dialog.h \
        src/ui/gui/split-file-dialog.c \
        src/ui/gui/split-file-dialog.h \
-       src/ui/gui/syntax-editor.c \
-       src/ui/gui/syntax-editor.h \
        src/ui/gui/syntax-editor-source.c \
        src/ui/gui/syntax-editor-source.h \
        src/ui/gui/text-data-import-dialog.c \
@@ -214,8 +209,16 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/weight-cases-dialog.h \
        src/ui/gui/widget-io.c \
        src/ui/gui/widget-io.h \
-       src/ui/gui/window-manager.c \
-       src/ui/gui/window-manager.h
+       src/ui/gui/psppire-data-window.c \
+       src/ui/gui/psppire-data-window.h \
+       src/ui/gui/psppire-output-window.c \
+       src/ui/gui/psppire-output-window.h \
+       src/ui/gui/psppire-window.c \
+       src/ui/gui/psppire-window.h \
+       src/ui/gui/psppire-window-register.c \
+       src/ui/gui/psppire-window-register.h \
+       src/ui/gui/psppire-syntax-window.c \
+       src/ui/gui/psppire-syntax-window.h
 
 nodist_src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-marshal.c \