X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=5eccb206b9ea57749d84ae14e9f8eeaae878250d;hb=4233ff9b1569035a8b748b3695cb865e6412e5b2;hp=7c06b8e47bf33c5811f4ea486d7e27454499f47d;hpb=c3580361c52f0246f71d9b727cb9e5bd0d8497bb;p=pspp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 7c06b8e47b..5eccb206b9 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -2,6 +2,46 @@ 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/entry-dialog.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 -DGDK_MULTIHEAD_SAFE=1 @@ -26,7 +66,7 @@ src_ui_gui_psppire_LDADD = \ src/libpspp.la \ src/libpspp-core.la \ $(GTK_LIBS) \ - $(LIBINTL) + $(CAIRO_LIBS) src_ui_gui_psppiredir = $(pkgdatadir) @@ -52,31 +92,6 @@ uninstall-icons: UNINSTALL_DATA_HOOKS += uninstall-icons - -UI_FILES = \ - 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/recode.ui \ - src/ui/gui/regression.ui \ - src/ui/gui/reliability.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 \ @@ -104,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 \ @@ -122,21 +143,27 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/dialog-common.h \ src/ui/gui/dict-display.h \ src/ui/gui/dict-display.c \ + src/ui/gui/entry-dialog.c \ + src/ui/gui/entry-dialog.h \ 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 \ @@ -158,13 +185,21 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-dict.h \ src/ui/gui/psppire-dictview.c \ src/ui/gui/psppire-dictview.h \ + src/ui/gui/psppire-encoding-selector.c \ + src/ui/gui/psppire-encoding-selector.h \ src/ui/gui/psppire-hbuttonbox.h \ 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-val-chooser.c \ + src/ui/gui/psppire-val-chooser.h \ src/ui/gui/psppire-var-ptr.c \ src/ui/gui/psppire-var-ptr.h \ src/ui/gui/psppire-var-sheet.c \ @@ -184,14 +219,14 @@ src_ui_gui_psppire_SOURCES = \ 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 \ @@ -217,17 +252,12 @@ 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 \ src/ui/gui/psppire-marshal.h - yelp-check: @if ! yelp --version > /dev/null 2>&1 ; then \ echo ; \ @@ -244,25 +274,36 @@ AM_CPPFLAGS += -Isrc src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list echo '#include ' > $@ - 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 + +#ensure the installcheck passes even if there is no X server available +installcheck-local: + DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS + +# wrapper +src_ui_gui_psppire_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include +BUILT_SOURCES += src/ui/gui/include/gtk/gtk.h +src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h + @$(MKDIR_P) src/ui/gui/include/gtk + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_GTK_GTK_H''@|$(NEXT_GTK_GTK_H)|g' \ + < $(srcdir)/src/ui/gui/include/gtk/gtk.in.h; \ + } > $@-t && \ + mv $@-t $@ +CLEANFILES += src/ui/gui/include/gtk/gtk.h +EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h