X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=989677f865a1dd11f961fdf4bf9d820f7f4261d0;hb=934ab1787fa4b4799e5bafd39ef650826895d567;hp=be4bf127dfad283a9946ef6c5911c30c8cfb0897;hpb=2dc9682362c99d9206ed6ed39c122c1504f28e33;p=pspp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index be4bf127df..989677f865 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -2,10 +2,47 @@ 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 \ + 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) $(GLADE_CFLAGS) -Wall \ - -DINSTALLDIR=\"$(bindir)\" -DGDK_MULTIHEAD_SAFE=1 +src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 src_ui_gui_psppire_LDFLAGS = \ @@ -20,86 +57,42 @@ src_ui_gui_psppire_LDFLAGS += -rpath $(pkglibdir) endif -# The library libpsppire contains a single function to register our custom widgets with libglade. -# This library is dynamically loaded by libglade. On w32 platforms, dynamic libraries simply -# can't be created unless all of the symbols can be resolved at link time. Thus, all the custom -# widgets have to be available. -# But they can't appear in the library AND the binary, otherwise glib complains about them already -# existing (and its a waste of space). So we have a seperate shared library (statically loaded) -# libpsppwidgets which contains our custom widgets. - -pkglib_LTLIBRARIES = src/ui/gui/libpsppwidgets.la src/ui/gui/libpsppire.la - -src_ui_gui_libpsppwidgets_la_CFLAGS = $(GTK_CFLAGS) -src_ui_gui_libpsppwidgets_la_LDFLAGS = -no-undefined -src_ui_gui_libpsppwidgets_la_LIBADD = $(GTK_LIBS) - -src_ui_gui_libpsppwidgets_la_SOURCES = \ - 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-acr.c - - -src_ui_gui_libpsppire_la_CFLAGS = $(GLADE_CFLAGS) -src_ui_gui_libpsppire_la_LDFLAGS = -no-undefined -src_ui_gui_libpsppire_la_LIBADD = $(GLADE_LIBS) src/ui/gui/libpsppwidgets.la - -src_ui_gui_libpsppire_la_SOURCES = \ - src/ui/gui/glade-register.c - src_ui_gui_psppire_LDADD = \ - -dlopen src/ui/gui/libpsppire.la \ - src/ui/gui/libpsppwidgets.la \ src/ui/gui/sheet/libsheet.la \ lib/gtk-contrib/libgtksheet.a \ src/ui/libuicommon.la \ src/libpspp.la \ src/libpspp-core.la \ $(GTK_LIBS) \ - $(GLADE_LIBS) \ - @LIBINTL@ \ - $(LIB_CLOSE) + $(CAIRO_LIBS) \ + $(LIBINTL) src_ui_gui_psppiredir = $(pkgdatadir) -nodist_src_ui_gui_psppire_DATA = \ - $(top_builddir)/src/ui/gui/crosstabs.ui \ - $(top_builddir)/src/ui/gui/data-editor.ui \ - $(top_builddir)/src/ui/gui/examine.ui \ - $(top_builddir)/src/ui/gui/frequencies.ui \ - $(top_builddir)/src/ui/gui/message-dialog.ui \ - $(top_builddir)/src/ui/gui/psppire.ui \ - $(top_builddir)/src/ui/gui/oneway.ui \ - $(top_builddir)/src/ui/gui/output-viewer.ui \ - $(top_builddir)/src/ui/gui/rank.ui \ - $(top_builddir)/src/ui/gui/recode.ui \ - $(top_builddir)/src/ui/gui/regression.ui \ - $(top_builddir)/src/ui/gui/syntax-editor.ui \ - $(top_builddir)/src/ui/gui/t-test.ui -EXTRA_DIST += \ - $(top_srcdir)/src/ui/gui/crosstabs.glade \ - $(top_srcdir)/src/ui/gui/examine.glade \ - $(top_srcdir)/src/ui/gui/frequencies.glade \ - $(top_srcdir)/src/ui/gui/message-dialog.glade \ - $(top_srcdir)/src/ui/gui/psppire.glade \ - $(top_srcdir)/src/ui/gui/oneway.glade \ - $(top_srcdir)/src/ui/gui/rank.glade \ - $(top_srcdir)/src/ui/gui/recode.glade \ - $(top_srcdir)/src/ui/gui/regression.glade \ - $(top_srcdir)/src/ui/gui/t-test.glade +themedir = $(DESTDIR)$(datadir)/icons/hicolor +context = apps + + +install-icons: + for size in 16x16 ; do \ + $(MKDIR_P) $(themedir)/$$size/$(context) ; \ + $(INSTALL) $(top_srcdir)/src/ui/gui/psppicon.png $(themedir)/$$size/$(context) ; \ + done + gtk-update-icon-cache --ignore-theme-index $(themedir) + +INSTALL_DATA_HOOKS += install-icons + +uninstall-icons: + for size in 16x16 ; do \ + rm -f $(themedir)/$$size/$(context)/psppicon.png ; \ + done + gtk-update-icon-cache --ignore-theme-index $(themedir) + +UNINSTALL_DATA_HOOKS += uninstall-icons dist_src_ui_gui_psppire_DATA = \ - $(top_srcdir)/src/ui/gui/data-editor.glade \ - $(top_srcdir)/src/ui/gui/descriptives-dialog.glade \ - $(top_srcdir)/src/ui/gui/output-viewer.glade \ - $(top_srcdir)/src/ui/gui/syntax-editor.glade \ - $(top_srcdir)/src/ui/gui/text-data-import.glade \ - $(top_srcdir)/src/ui/gui/psppicon.png \ + $(UI_FILES) \ $(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\ @@ -118,66 +111,107 @@ dist_src_ui_gui_psppire_DATA = \ src_ui_gui_psppire_SOURCES = \ - src/ui/gui/about.c \ - src/ui/gui/about.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-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/compute-dialog.c \ - src/ui/gui/compute-dialog.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 \ src/ui/gui/customentry.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/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/executor.c \ + src/ui/gui/executor.h \ src/ui/gui/find-dialog.c \ src/ui/gui/find-dialog.h \ - src/ui/gui/dialog-common.c \ - src/ui/gui/dialog-common.h \ - src/ui/gui/dict-display.c \ - src/ui/gui/dict-display.h \ - src/ui/gui/main.c \ - src/ui/gui/message-dialog.c \ - src/ui/gui/message-dialog.h \ - src/ui/gui/psppire.c \ - src/ui/gui/psppire.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/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/psppire.c \ + src/ui/gui/psppire.h \ src/ui/gui/psppire-acr.h \ src/ui/gui/psppire-buttonbox.h \ - src/ui/gui/psppire-hbuttonbox.h \ - src/ui/gui/psppire-vbuttonbox.h \ + src/ui/gui/psppire-conf.c \ + src/ui/gui/psppire-conf.h \ + src/ui/gui/psppire-data-editor.c \ + src/ui/gui/psppire-data-editor.h \ src/ui/gui/psppire-data-store.c \ src/ui/gui/psppire-data-store.h \ + src/ui/gui/psppire-data-window.c \ + src/ui/gui/psppire-data-window.h \ src/ui/gui/psppire-dialog.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-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-var-ptr.c \ src/ui/gui/psppire-var-ptr.h \ src/ui/gui/psppire-var-sheet.c \ src/ui/gui/psppire-var-sheet.h \ src/ui/gui/psppire-var-store.c \ src/ui/gui/psppire-var-store.h \ + src/ui/gui/psppire-vbuttonbox.h \ + src/ui/gui/psppire-window.c \ + src/ui/gui/psppire-window.h \ + src/ui/gui/psppire-window-register.c \ + src/ui/gui/psppire-window-register.h \ src/ui/gui/rank-dialog.c \ src/ui/gui/rank-dialog.h \ src/ui/gui/recode-dialog.c \ 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/select-cases-dialog.c \ src/ui/gui/select-cases-dialog.h \ src/ui/gui/sort-cases-dialog.c \ @@ -202,26 +236,16 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/val-labs-dialog.h \ src/ui/gui/var-display.c \ src/ui/gui/var-display.h \ - src/ui/gui/var-type-dialog.c \ - src/ui/gui/var-type-dialog.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 \ src/ui/gui/weight-cases-dialog.h \ src/ui/gui/widget-io.c \ src/ui/gui/widget-io.h \ - src/ui/gui/psppire-data-editor.c \ - src/ui/gui/psppire-data-editor.h \ - src/ui/gui/psppire-data-window.c \ - src/ui/gui/psppire-data-window.h \ - src/ui/gui/psppire-output-window.c \ - src/ui/gui/psppire-output-window.h \ - src/ui/gui/psppire-window.c \ - src/ui/gui/psppire-window.h \ - src/ui/gui/psppire-window-register.c \ - src/ui/gui/psppire-window-register.h \ - src/ui/gui/psppire-syntax-window.c \ - src/ui/gui/psppire-syntax-window.h + src/ui/gui/widgets.c \ + src/ui/gui/widgets.h nodist_src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-marshal.c \ @@ -237,22 +261,26 @@ yelp-check: echo ' Yelp is available from the GNOME project. ftp://ftp.gnome.org/pub/gnome/sources/yelp' ; \ echo ; \ fi + PHONY += yelp-check AM_CPPFLAGS += -Isrc src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list - glib-genmarshal --body --prefix=psppire_marshal $< > $@ + echo '#include ' > $@ + $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list - glib-genmarshal --header --prefix=psppire_marshal $< > $@ + $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@ -.glade.ui: - gtk-builder-convert $< $@ - -EXTRA_DIST += src/ui/gui/OChangeLog\ - src/ui/gui/marshaller-list +desktopdir = $(datadir)/applications +desktop_DATA = src/ui/gui/pspp.desktop 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