X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=f78a7205966c5188f8b6a72cd976d24d8830e109;hb=cfcf8c20ca72f9cc8c05e1e51ec94d27af9370ab;hp=4774e2ae5ec320a0ece1073c3c197b794ab5fb3e;hpb=006e4c8eef534aa82d28869a34c49a382076371d;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 4774e2ae5e..f78a720596 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -3,12 +3,15 @@
 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 \
@@ -20,6 +23,7 @@ UI_FILES = \
 	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 \
@@ -37,7 +41,7 @@ EXTRA_DIST += \
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -59,6 +63,7 @@ src_ui_gui_psppire_LDADD = \
 	src/libpspp.la \
 	src/libpspp-core.la \
 	$(GTK_LIBS) \
+	$(GTKSOURCEVIEW_LIBS) \
 	$(CAIRO_LIBS) \
 	$(LIBINTL)
 
@@ -69,6 +74,9 @@ themedir = $(DESTDIR)$(datadir)/icons/hicolor
 context = apps
 
 
+install-lang:
+	$(INSTALL) $(top_srcdir)/src/ui/gui/pspp.lang $(pkgdatadir)
+	
 install-icons:
 	for size in 16x16 ; do \
 	  $(MKDIR_P) $(themedir)/$$size/$(context) ; \
@@ -76,7 +84,7 @@ install-icons:
 	done 
 	gtk-update-icon-cache --ignore-theme-index $(themedir)
 
-INSTALL_DATA_HOOKS += install-icons
+INSTALL_DATA_HOOKS += install-icons install-lang
 
 uninstall-icons:
 	for size in 16x16 ; do \
@@ -88,6 +96,7 @@ UNINSTALL_DATA_HOOKS += uninstall-icons
 
 dist_src_ui_gui_psppire_DATA = \
 	$(UI_FILES) \
+	$(top_srcdir)/src/ui/gui/pspp.lang \
 	$(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\
@@ -113,6 +122,8 @@ 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/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 \
@@ -273,3 +284,7 @@ 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