X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=11106640d66db78c5e685b112048da79042eae88;hb=9e9fc05c2f9be73f053d9c669827c73ea1dc394c;hp=9246b79fa99d2136322dd69667e52dbe1ec17b41;hpb=493be05e2d65454fc7f14f417146049f56147709;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 9246b79fa9..11106640d6 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -5,7 +5,9 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 bin_PROGRAMS += src/ui/gui/psppire 
 
 src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \
-	-DINSTALLDIR=\"$(bindir)\" -DGDK_MULTIHEAD_SAFE=1
+	-DINSTALLDIR=\"$(bindir)\"  \
+	-DDOCDIR=\"$(docdir)\"  \
+	-DGDK_MULTIHEAD_SAFE=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -27,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)
 
@@ -70,7 +71,10 @@ nodist_src_ui_gui_psppire_DATA = \
 	$(top_builddir)/src/ui/gui/regression.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
+	$(top_builddir)/src/ui/gui/t-test.ui \
+	$(top_builddir)/src/ui/gui/var-sheet-dialogs.ui \
+	$(top_builddir)/src/ui/gui/variable-info-dialog.ui
+
 
 dist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
@@ -114,8 +118,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/descriptives-dialog.h \
 	src/ui/gui/dialog-common.c \
 	src/ui/gui/dialog-common.h \
-	src/ui/gui/dict-display.c \
 	src/ui/gui/dict-display.h \
+	src/ui/gui/dict-display.c \
 	src/ui/gui/examine-dialog.c \
 	src/ui/gui/examine-dialog.h \
 	src/ui/gui/find-dialog.c \
@@ -148,6 +152,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dialog.h \
 	src/ui/gui/psppire-dict.c \
 	src/ui/gui/psppire-dict.h \
+	src/ui/gui/psppire-dictview.c \
+	src/ui/gui/psppire-dictview.h \
 	src/ui/gui/psppire-hbuttonbox.h \
 	src/ui/gui/psppire-keypad.h \
 	src/ui/gui/psppire-output-window.c \
@@ -220,7 +226,9 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/regression.glade \
 	src/ui/gui/syntax-editor.glade \
 	src/ui/gui/text-data-import.glade \
-	src/ui/gui/t-test.glade
+	src/ui/gui/t-test.glade \
+	src/ui/gui/var-sheet-dialogs.glade \
+	src/ui/gui/variable-info-dialog.glade
 
 
 nodist_src_ui_gui_psppire_SOURCES = \
@@ -243,7 +251,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 $< > $@