X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=eb37c16cd66a58c5ad123b38f5e6d833ff241874;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=1a2b4af13113f08098b3be0a585e6444999dc1a7;hpb=c3e2ab6b50eb3b3c7e0852f2a4e2122f695714ff;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 1a2b4af1..eb37c16c 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -2,12 +2,48 @@
 
 include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
+UI_FILES = \
+	src/ui/gui/aggregate.ui \
+	src/ui/gui/binomial.ui \
+	src/ui/gui/compute.ui \
+	src/ui/gui/correlation.ui \
+	src/ui/gui/crosstabs.ui \
+	src/ui/gui/chi-square.ui \
+	src/ui/gui/descriptives.ui \
+	src/ui/gui/examine.ui \
+	src/ui/gui/goto-case.ui \
+	src/ui/gui/factor.ui \
+	src/ui/gui/find.ui \
+	src/ui/gui/frequencies.ui \
+	src/ui/gui/k-related.ui \
+	src/ui/gui/oneway.ui \
+	src/ui/gui/psppire.ui \
+	src/ui/gui/rank.ui \
+	src/ui/gui/sort.ui \
+	src/ui/gui/split-file.ui \
+	src/ui/gui/recode.ui \
+	src/ui/gui/regression.ui \
+	src/ui/gui/reliability.ui \
+	src/ui/gui/roc.ui \
+	src/ui/gui/select-cases.ui \
+	src/ui/gui/t-test.ui \
+	src/ui/gui/text-data-import.ui \
+	src/ui/gui/var-sheet-dialogs.ui \
+	src/ui/gui/variable-info.ui \
+	src/ui/gui/data-editor.ui \
+	src/ui/gui/output-viewer.ui \
+	src/ui/gui/syntax-editor.ui
+
+EXTRA_DIST += \
+	src/ui/gui/OChangeLog \
+	src/ui/gui/psppicon.png \
+	src/ui/gui/marshaller-list \
+	src/ui/gui/pspp.desktop
+
+if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \
-	-DINSTALLDIR=\"$(bindir)\"  \
-	-DDOCDIR=\"$(docdir)\"  \
-	-DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -29,8 +65,8 @@ src_ui_gui_psppire_LDADD = \
 	src/libpspp.la \
 	src/libpspp-core.la \
 	$(GTK_LIBS) \
-	@LIBINTL@ \
-	$(LIB_CLOSE)
+	$(CAIRO_LIBS) \
+	$(LIBINTL)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -50,34 +86,14 @@ INSTALL_DATA_HOOKS += install-icons
 
 uninstall-icons:
 	for size in 16x16 ; do \
-          $(RM) $(themedir)/$$size/$(context)/psppicon.png ; \
+          rm -f $(themedir)/$$size/$(context)/psppicon.png ; \
 	done 
 	gtk-update-icon-cache --ignore-theme-index $(themedir)
 
 UNINSTALL_DATA_HOOKS += uninstall-icons
 
-
-nodist_src_ui_gui_psppire_DATA = \
-	$(top_builddir)/src/ui/gui/crosstabs.ui \
-	$(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/frequencies.ui \
-	$(top_builddir)/src/ui/gui/message-dialog.ui \
-	$(top_builddir)/src/ui/gui/psppire.ui \
-	$(top_builddir)/src/ui/gui/oneway.ui \
-	$(top_builddir)/src/ui/gui/output-viewer.ui \
-	$(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/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/var-sheet-dialogs.ui \
-	$(top_builddir)/src/ui/gui/variable-info-dialog.ui
-
-
 dist_src_ui_gui_psppire_DATA = \
+	$(UI_FILES) \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
 	$(top_srcdir)/src/ui/gui/icons/goto-variable.png\
@@ -103,14 +119,20 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-hbuttonbox.c \
 	src/ui/gui/psppire-vbuttonbox.c \
 	src/ui/gui/psppire-acr.c \
-	src/ui/gui/about.c \
-	src/ui/gui/about.h \
+	src/ui/gui/aggregate-dialog.c \
+	src/ui/gui/aggregate-dialog.h \
+	src/ui/gui/binomial-dialog.c \
+	src/ui/gui/binomial-dialog.h \
 	src/ui/gui/checkbox-treeview.c \
 	src/ui/gui/checkbox-treeview.h \
 	src/ui/gui/comments-dialog.c \
 	src/ui/gui/comments-dialog.h \
 	src/ui/gui/compute-dialog.c \
 	src/ui/gui/compute-dialog.h \
+	src/ui/gui/chi-square-dialog.c \
+	src/ui/gui/chi-square-dialog.h \
+	src/ui/gui/correlation-dialog.c \
+	src/ui/gui/correlation-dialog.h \
 	src/ui/gui/crosstabs-dialog.c \
 	src/ui/gui/crosstabs-dialog.h \
 	src/ui/gui/customentry.c \
@@ -123,17 +145,23 @@ 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/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 \
 	src/ui/gui/goto-case-dialog.h \
 	src/ui/gui/helper.c \
+	src/ui/gui/help-menu.c \
+	src/ui/gui/help-menu.h \
 	src/ui/gui/helper.h \
+	src/ui/gui/k-related-dialog.c \
+	src/ui/gui/k-related-dialog.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 \
@@ -159,7 +187,11 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-keypad.h \
 	src/ui/gui/psppire-output-window.c \
 	src/ui/gui/psppire-output-window.h \
+	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 \
@@ -179,14 +211,16 @@ 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/roc-dialog.c \
+	src/ui/gui/roc-dialog.h \
 	src/ui/gui/select-cases-dialog.c \
 	src/ui/gui/select-cases-dialog.h \
 	src/ui/gui/sort-cases-dialog.c \
 	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-source.c \
-	src/ui/gui/syntax-editor-source.h \
 	src/ui/gui/text-data-import-dialog.c \
 	src/ui/gui/text-data-import-dialog.h \
 	src/ui/gui/transpose-dialog.c \
@@ -212,25 +246,7 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/widget-io.c \
 	src/ui/gui/widget-io.h \
 	src/ui/gui/widgets.c \
-	src/ui/gui/widgets.h \
-	src/ui/gui/crosstabs.glade \
-	src/ui/gui/descriptives-dialog.glade \
-	src/ui/gui/data-editor.glade \
-	src/ui/gui/examine.glade \
-	src/ui/gui/frequencies.glade \
-	src/ui/gui/message-dialog.glade \
-	src/ui/gui/psppire.glade \
-	src/ui/gui/oneway.glade \
-	src/ui/gui/output-viewer.glade \
-	src/ui/gui/rank.glade \
-	src/ui/gui/recode.glade \
-	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/var-sheet-dialogs.glade \
-	src/ui/gui/variable-info-dialog.glade
-
+	src/ui/gui/widgets.h
 
 nodist_src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-marshal.c \
@@ -252,24 +268,20 @@ 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:
-	$(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@
+	$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
 
 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 \
-	$(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)
+endif HAVE_GUI
 
-
+#ensure the installcheck passes even if there is no X server available
+installcheck-local:
+	DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS