Merge commit 'origin/master' into sso

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 11bf9bc723e4693449827db2989016b9d79f7606..fd78196df891d92fa48d2345bb61575db8b714b0 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -3,10 +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 \
@@ -14,16 +19,18 @@ UI_FILES = \
        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.glade \
+       src/ui/gui/output-viewer.ui \
        src/ui/gui/syntax-editor.ui
 
 EXTRA_DIST += \
@@ -35,7 +42,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 = \
@@ -57,6 +64,7 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
+       $(GTKSOURCEVIEW_LIBS) \
        $(CAIRO_LIBS) \
        $(LIBINTL)
 
@@ -67,6 +75,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) ; \
@@ -74,7 +85,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 \
@@ -84,11 +95,9 @@ uninstall-icons:
 
 UNINSTALL_DATA_HOOKS += uninstall-icons
 
-nodist_src_ui_gui_psppire_DATA = \
-       $(top_builddir)/src/ui/gui/output-viewer.ui
-
 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\
@@ -114,12 +123,18 @@ 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 \
        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 \
@@ -263,10 +278,6 @@ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
        $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
 
-SUFFIXES += .glade .ui
-.glade.ui:
-       $(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@
-
 desktopdir = $(datadir)/applications
 desktop_DATA = src/ui/gui/pspp.desktop
 
@@ -274,3 +285,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