Converted output-viewer from .glade to .ui

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 3fbf46520d2137e18d934c86f16e0ce4b1f553c4..263e621b77b06f0cb23fde2c42f2ae3444154d6e 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -2,6 +2,37 @@
 
 include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
+UI_FILES = \
+       src/ui/gui/correlation.ui \
+       src/ui/gui/crosstabs.ui \
+       src/ui/gui/descriptives.ui \
+       src/ui/gui/examine.ui \
+       src/ui/gui/factor.ui \
+       src/ui/gui/find.ui \
+       src/ui/gui/frequencies.ui \
+       src/ui/gui/oneway.ui \
+       src/ui/gui/psppire.ui \
+       src/ui/gui/rank.ui \
+       src/ui/gui/sort.ui \
+       src/ui/gui/recode.ui \
+       src/ui/gui/regression.ui \
+       src/ui/gui/reliability.ui \
+       src/ui/gui/roc.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 -DGDK_MULTIHEAD_SAFE=1
@@ -53,34 +84,6 @@ uninstall-icons:
 
 UNINSTALL_DATA_HOOKS += uninstall-icons
 
-
-UI_FILES = \
-       src/ui/gui/correlation.ui \
-       src/ui/gui/crosstabs.ui \
-       src/ui/gui/descriptives.ui \
-       src/ui/gui/examine.ui \
-       src/ui/gui/find.ui \
-       src/ui/gui/frequencies.ui \
-       src/ui/gui/message-dialog.ui \
-       src/ui/gui/oneway.ui \
-       src/ui/gui/psppire.ui \
-       src/ui/gui/rank.ui \
-       src/ui/gui/sort.ui \
-       src/ui/gui/recode.ui \
-       src/ui/gui/regression.ui \
-       src/ui/gui/reliability.ui \
-       src/ui/gui/roc.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
-
-nodist_src_ui_gui_psppire_DATA = \
-       $(top_builddir)/src/ui/gui/data-editor.ui \
-       $(top_builddir)/src/ui/gui/output-viewer.ui \
-       $(top_builddir)/src/ui/gui/syntax-editor.ui
-
-
 dist_src_ui_gui_psppire_DATA = \
        $(UI_FILES) \
        $(top_srcdir)/src/ui/gui/pspplogo.png \
@@ -108,8 +111,6 @@ 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/checkbox-treeview.c \
        src/ui/gui/checkbox-treeview.h \
        src/ui/gui/comments-dialog.c \
@@ -134,15 +135,17 @@ src_ui_gui_psppire_SOURCES = \
        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/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 \
@@ -229,11 +232,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/data-editor.glade \
-       src/ui/gui/output-viewer.glade \
-       src/ui/gui/syntax-editor.glade
-
+       src/ui/gui/widgets.h
 
 nodist_src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-marshal.c \
@@ -256,25 +255,15 @@ AM_CPPFLAGS += -Isrc
 
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
        echo '#include <config.h>' > $@
-       glib-genmarshal --body --prefix=psppire_marshal $? >> $@
+       $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
 
 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 $< $@
+       $(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