Merge commit 'origin/stable'

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 1a2b4af13113f08098b3be0a585e6444999dc1a7..110ef43f04ac2d53551ba457153a75fd0208888b 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -29,8 +29,7 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
-       @LIBINTL@ \
-       $(LIB_CLOSE)
+       @LIBINTL@
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -62,6 +61,7 @@ nodist_src_ui_gui_psppire_DATA = \
        $(top_builddir)/src/ui/gui/descriptives-dialog.ui \
        $(top_builddir)/src/ui/gui/data-editor.ui \
        $(top_builddir)/src/ui/gui/examine.ui \
+       $(top_builddir)/src/ui/gui/find.ui \
        $(top_builddir)/src/ui/gui/frequencies.ui \
        $(top_builddir)/src/ui/gui/message-dialog.ui \
        $(top_builddir)/src/ui/gui/psppire.ui \
@@ -70,6 +70,7 @@ nodist_src_ui_gui_psppire_DATA = \
        $(top_builddir)/src/ui/gui/rank.ui \
        $(top_builddir)/src/ui/gui/recode.ui \
        $(top_builddir)/src/ui/gui/regression.ui \
+       $(top_builddir)/src/ui/gui/reliability.ui \
        $(top_builddir)/src/ui/gui/syntax-editor.ui \
        $(top_builddir)/src/ui/gui/text-data-import.ui \
        $(top_builddir)/src/ui/gui/t-test.ui \
@@ -123,6 +124,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/dict-display.c \
        src/ui/gui/examine-dialog.c \
        src/ui/gui/examine-dialog.h \
+       src/ui/gui/executor.c \
+       src/ui/gui/executor.h \
        src/ui/gui/find-dialog.c \
        src/ui/gui/find-dialog.h \
        src/ui/gui/frequencies-dialog.c \
@@ -179,6 +182,8 @@ 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/select-cases-dialog.c \
        src/ui/gui/select-cases-dialog.h \
        src/ui/gui/sort-cases-dialog.c \
@@ -217,6 +222,7 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/descriptives-dialog.glade \
        src/ui/gui/data-editor.glade \
        src/ui/gui/examine.glade \
+       src/ui/gui/find.glade \
        src/ui/gui/frequencies.glade \
        src/ui/gui/message-dialog.glade \
        src/ui/gui/psppire.glade \
@@ -225,6 +231,7 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/rank.glade \
        src/ui/gui/recode.glade \
        src/ui/gui/regression.glade \
+       src/ui/gui/reliability.glade \
        src/ui/gui/syntax-editor.glade \
        src/ui/gui/text-data-import.glade \
        src/ui/gui/t-test.glade \
@@ -252,7 +259,8 @@ PHONY += yelp-check
 AM_CPPFLAGS += -Isrc
 
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
-       glib-genmarshal --body --prefix=psppire_marshal $< > $@
+       echo '#include <config.h>' > $@
+       glib-genmarshal --body --prefix=psppire_marshal $< >> $@
 
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
        glib-genmarshal --header --prefix=psppire_marshal $< > $@