X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=cd7c34e6cac90d8df925cbd1331a74e204c301dd;hb=537fdeb3702c011e05d7826a8d556a7beeba2605;hp=5e4bceb2500aa9c16a8676dcdbe5f3177a9074be;hpb=043e0379d35d3eee738f4f85c50b4801d95d6946;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 5e4bceb2..cd7c34e6 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)
 
@@ -68,9 +69,13 @@ 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
+	$(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 +119,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 \
@@ -137,6 +142,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire.h \
 	src/ui/gui/psppire-acr.h \
 	src/ui/gui/psppire-buttonbox.h \
+	src/ui/gui/psppire-conf.c \
+	src/ui/gui/psppire-conf.h \
 	src/ui/gui/psppire-data-editor.c \
 	src/ui/gui/psppire-data-editor.h \
 	src/ui/gui/psppire-data-store.c \
@@ -146,6 +153,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 \
@@ -170,6 +179,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 \
@@ -216,9 +227,12 @@ 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
+	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 = \
@@ -241,18 +255,25 @@ 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 $< > $@
 
 .glade.ui:
-	gtk-builder-convert $< $@
+	$(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@
+
+desktopdir = $(datadir)/applications
+desktop_DATA = src/ui/gui/pspp.desktop
 
 EXTRA_DIST += src/ui/gui/OChangeLog\
 	src/ui/gui/psppicon.png \
-	src/ui/gui/marshaller-list
+	src/ui/gui/marshaller-list \
+	$(desktop_DATA)
 
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
 	$(nodist_src_ui_gui_psppire_DATA)
+
+