X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=e184975e5c2533b86b8cb694f18fbff1cd6945c5;hb=f9035ac5308961fa6957894b5660bdb3adad60d0;hp=cb730ec2def0bee1c0cde000f67294a4db7df2e4;hpb=ddb7b52128d8f1f54d9632dc3a15c7869e0fbcce;p=pspp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index cb730ec2de..e184975e5c 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -2,9 +2,57 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk +UI_FILES = \ + src/ui/gui/aggregate.ui \ + src/ui/gui/autorecode.ui \ + src/ui/gui/binomial.ui \ + src/ui/gui/compute.ui \ + src/ui/gui/correlation.ui \ + src/ui/gui/count.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-means.ui \ + src/ui/gui/k-related.ui \ + src/ui/gui/ks-one-sample.ui \ + src/ui/gui/means.ui \ + src/ui/gui/oneway.ui \ + src/ui/gui/paired-samples.ui \ + src/ui/gui/psppire.ui \ + src/ui/gui/rank.ui \ + src/ui/gui/runs.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/univariate.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/marshaller-list \ + src/ui/gui/gen-dot-desktop.sh + + +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 = \ @@ -26,62 +74,47 @@ src_ui_gui_psppire_LDADD = \ src/libpspp.la \ src/libpspp-core.la \ $(GTK_LIBS) \ + $(GTKSOURCEVIEW_LIBS) \ $(CAIRO_LIBS) \ - $(LIBINTL) + $(LIBINTL) \ + $(GSL_LIBS) src_ui_gui_psppiredir = $(pkgdatadir) themedir = $(DESTDIR)$(datadir)/icons/hicolor -context = apps +context = pspp + +install-lang: + $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir) install-icons: for size in 16x16 ; do \ $(MKDIR_P) $(themedir)/$$size/$(context) ; \ - $(INSTALL) $(top_srcdir)/src/ui/gui/psppicon.png $(themedir)/$$size/$(context) ; \ + $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \ + $(MKDIR_P) $(themedir)/$$size/apps ; \ + $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \ done - gtk-update-icon-cache --ignore-theme-index $(themedir) + if test -z "$(DESTDIR)" ; then \ + gtk-update-icon-cache --ignore-theme-index $(themedir); \ + fi -INSTALL_DATA_HOOKS += install-icons +INSTALL_DATA_HOOKS += install-icons install-lang uninstall-icons: for size in 16x16 ; do \ - rm -f $(themedir)/$$size/$(context)/psppicon.png ; \ + rm -r -f $(themedir)/$$size/$(context); \ + rm -f $(themedir)/$$size/apps/pspp.png; \ done gtk-update-icon-cache --ignore-theme-index $(themedir) 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/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/app-icons/16x16/pspp.png \ + $(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\ @@ -96,54 +129,81 @@ dist_src_ui_gui_psppire_DATA = \ $(top_srcdir)/src/ui/gui/icons/16x16/scale.png \ $(top_srcdir)/src/ui/gui/icons/16x16/string.png \ $(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \ - $(top_srcdir)/src/ui/gui/icons/splash.png + $(top_srcdir)/src/ui/gui/icons/splash.png src_ui_gui_psppire_SOURCES = \ + src/ui/gui/pspp-sheet-private.h \ + src/ui/gui/pspp-sheet-selection.c \ + src/ui/gui/pspp-sheet-selection.h \ + src/ui/gui/pspp-sheet-view-column.c \ + src/ui/gui/pspp-sheet-view-column.h \ + src/ui/gui/pspp-sheet-view.c \ + src/ui/gui/pspp-sheet-view.h \ + src/ui/gui/pspp-widget-facade.c \ + src/ui/gui/pspp-widget-facade.h \ src/ui/gui/psppire-dialog.c \ src/ui/gui/psppire-keypad.c \ src/ui/gui/psppire-selector.c \ src/ui/gui/psppire-buttonbox.c \ src/ui/gui/psppire-hbuttonbox.c \ src/ui/gui/psppire-vbuttonbox.c \ + src/ui/gui/psppire-scanf.c \ + src/ui/gui/psppire-scanf.h \ src/ui/gui/psppire-acr.c \ - src/ui/gui/about.c \ - src/ui/gui/about.h \ + src/ui/gui/autorecode-dialog.c \ + src/ui/gui/autorecode-dialog.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/builder-wrapper.c \ + src/ui/gui/builder-wrapper.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/correlation-dialog.c \ - src/ui/gui/correlation-dialog.h \ + src/ui/gui/chi-square-dialog.c \ + src/ui/gui/chi-square-dialog.h \ + src/ui/gui/count-dialog.c \ + src/ui/gui/count-dialog.h \ src/ui/gui/crosstabs-dialog.c \ src/ui/gui/crosstabs-dialog.h \ src/ui/gui/customentry.c \ src/ui/gui/customentry.h \ - src/ui/gui/descriptives-dialog.c \ - src/ui/gui/descriptives-dialog.h \ src/ui/gui/dialog-common.c \ src/ui/gui/dialog-common.h \ src/ui/gui/dict-display.h \ src/ui/gui/dict-display.c \ - src/ui/gui/examine-dialog.c \ - src/ui/gui/examine-dialog.h \ + src/ui/gui/entry-dialog.c \ + src/ui/gui/entry-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/ks-one-sample-dialog.c \ + src/ui/gui/ks-one-sample-dialog.h \ src/ui/gui/main.c \ src/ui/gui/missing-val-dialog.c \ src/ui/gui/missing-val-dialog.h \ src/ui/gui/oneway-anova-dialog.c \ src/ui/gui/oneway-anova-dialog.h \ + src/ui/gui/paired-dialog.c \ + src/ui/gui/paired-dialog.h \ src/ui/gui/psppire.c \ src/ui/gui/psppire.h \ src/ui/gui/psppire-acr.h \ @@ -157,12 +217,42 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-data-window.c \ src/ui/gui/psppire-data-window.h \ src/ui/gui/psppire-dialog.h \ + src/ui/gui/psppire-dialog-action.c \ + src/ui/gui/psppire-dialog-action.h \ + src/ui/gui/psppire-dialog-action-correlation.c \ + src/ui/gui/psppire-dialog-action-correlation.h \ + src/ui/gui/psppire-dialog-action-descriptives.c \ + src/ui/gui/psppire-dialog-action-descriptives.h \ + src/ui/gui/psppire-dialog-action-examine.c \ + src/ui/gui/psppire-dialog-action-examine.h \ + src/ui/gui/psppire-dialog-action-kmeans.c \ + src/ui/gui/psppire-dialog-action-kmeans.h \ + src/ui/gui/psppire-dialog-action-means.c \ + src/ui/gui/psppire-dialog-action-means.h \ + src/ui/gui/psppire-dialog-action-reliability.c \ + src/ui/gui/psppire-dialog-action-reliability.h \ + src/ui/gui/psppire-dialog-action-sort.c \ + src/ui/gui/psppire-dialog-action-sort.h \ + src/ui/gui/psppire-dialog-action-var-info.c \ + src/ui/gui/psppire-dialog-action-var-info.h \ + src/ui/gui/psppire-dialog-action-roc.c \ + src/ui/gui/psppire-dialog-action-roc.h \ src/ui/gui/psppire-dict.c \ src/ui/gui/psppire-dict.h \ src/ui/gui/psppire-dictview.c \ src/ui/gui/psppire-dictview.h \ + src/ui/gui/psppire-empty-list-store.c \ + src/ui/gui/psppire-empty-list-store.h \ + src/ui/gui/psppire-encoding-selector.c \ + src/ui/gui/psppire-encoding-selector.h \ + src/ui/gui/psppire-format.c \ + src/ui/gui/psppire-format.h \ src/ui/gui/psppire-hbuttonbox.h \ src/ui/gui/psppire-keypad.h \ + src/ui/gui/psppire-lex-reader.c \ + src/ui/gui/psppire-lex-reader.h \ + src/ui/gui/psppire-means-layer.c \ + src/ui/gui/psppire-means-layer.h \ src/ui/gui/psppire-output-window.c \ src/ui/gui/psppire-output-window.h \ src/ui/gui/psppire-var-view.c \ @@ -172,6 +262,10 @@ src_ui_gui_psppire_SOURCES = \ 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-value-entry.c \ + src/ui/gui/psppire-value-entry.h \ src/ui/gui/psppire-var-ptr.c \ src/ui/gui/psppire-var-ptr.h \ src/ui/gui/psppire-var-sheet.c \ @@ -181,6 +275,8 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-vbuttonbox.h \ src/ui/gui/psppire-window.c \ src/ui/gui/psppire-window.h \ + src/ui/gui/psppire-window-base.c \ + src/ui/gui/psppire-window-base.h \ src/ui/gui/psppire-window-register.c \ src/ui/gui/psppire-window-register.h \ src/ui/gui/rank-dialog.c \ @@ -189,18 +285,12 @@ 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/runs-dialog.c \ + src/ui/gui/runs-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 \ @@ -213,12 +303,14 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/t-test-options.h \ src/ui/gui/t-test-paired-samples.c \ src/ui/gui/t-test-paired-samples.h \ + src/ui/gui/npar-two-sample-related.c \ + src/ui/gui/npar-two-sample-related.h \ + src/ui/gui/univariate-dialog.c \ + src/ui/gui/univariate-dialog.h \ src/ui/gui/val-labs-dialog.c \ src/ui/gui/val-labs-dialog.h \ src/ui/gui/var-display.c \ src/ui/gui/var-display.h \ - src/ui/gui/variable-info-dialog.c \ - src/ui/gui/variable-info-dialog.h \ src/ui/gui/var-type-dialog.c \ src/ui/gui/var-type-dialog.h \ src/ui/gui/weight-cases-dialog.c \ @@ -226,17 +318,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 ; \ @@ -251,27 +338,43 @@ PHONY += yelp-check AM_CPPFLAGS += -Isrc +src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES) + POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > $@ + +CLEANFILES+=src/ui/gui/pspp.desktop + 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