X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=47a3215835e7bb47716eabd0fb4666ea2a7562ac;hb=e339b2ca72d77a076566856e9357781d49cd983c;hp=87795d8dd388d1211fd2de416a49b1521500f933;hpb=b6493cbb201307a2a5d1ff840a8347d75548cb85;p=pspp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 87795d8dd3..47a3215835 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -21,6 +21,7 @@ UI_FILES = \ src/ui/gui/k-means.ui \ src/ui/gui/k-related.ui \ src/ui/gui/ks-one-sample.ui \ + src/ui/gui/logistic.ui \ src/ui/gui/means.ui \ src/ui/gui/missing-val-dialog.ui \ src/ui/gui/oneway.ui \ @@ -54,8 +55,10 @@ EXTRA_DIST += \ if HAVE_GUI bin_PROGRAMS += src/ui/gui/psppire +noinst_PROGRAMS += src/ui/gui/spreadsheet-test src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 +src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 src_ui_gui_psppire_LDFLAGS = \ @@ -82,57 +85,27 @@ src_ui_gui_psppire_LDADD = \ $(LIBINTL) \ $(GSL_LIBS) -src_ui_gui_psppiredir = $(pkgdatadir) +src_ui_gui_spreadsheet_test_LDADD = \ + src/libpspp-core.la \ + $(GTK_LIBS) \ + $(GTHREAD_LIBS) -themedir = $(DESTDIR)$(datadir)/icons/hicolor -context = pspp +src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/psppire-spreadsheet-model.c -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_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 - if test -z "$(DESTDIR)" ; then \ - gtk-update-icon-cache --ignore-theme-index $(themedir); \ - fi +src_ui_gui_psppiredir = $(pkgdatadir) -INSTALL_DATA_HOOKS += install-icons install-lang -uninstall-icons: - for size in 16x16 ; do \ - rm -r -f $(themedir)/$$size/$(context); \ - rm -f $(themedir)/$$size/apps/pspp.png; \ - done - gtk-update-icon-cache --ignore-theme-index $(themedir) +install-lang: + $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir) -UNINSTALL_DATA_HOOKS += uninstall-icons +INSTALL_DATA_HOOKS += install-lang 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\ - $(top_srcdir)/src/ui/gui/icons/insert-case.png \ - $(top_srcdir)/src/ui/gui/icons/insert-variable.png \ - $(top_srcdir)/src/ui/gui/icons/recent-dialogs.png \ - $(top_srcdir)/src/ui/gui/icons/split-file.png \ - $(top_srcdir)/src/ui/gui/icons/select-cases.png \ - $(top_srcdir)/src/ui/gui/icons/weight-cases.png \ - $(top_srcdir)/src/ui/gui/icons/16x16/nominal.png \ - $(top_srcdir)/src/ui/gui/icons/16x16/ordinal.png \ - $(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/psppire.gtkrc src_ui_gui_psppire_SOURCES = \ @@ -162,8 +135,6 @@ src_ui_gui_psppire_SOURCES = \ 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 \ @@ -176,8 +147,6 @@ src_ui_gui_psppire_SOURCES = \ 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/dialog-common.c \ src/ui/gui/dialog-common.h \ src/ui/gui/dict-display.h \ @@ -188,8 +157,6 @@ 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/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 \ @@ -224,18 +191,26 @@ src_ui_gui_psppire_SOURCES = \ 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-binomial.c \ + src/ui/gui/psppire-dialog-action-binomial.h \ src/ui/gui/psppire-dialog-action-correlation.c \ src/ui/gui/psppire-dialog-action-correlation.h \ + src/ui/gui/psppire-dialog-action-crosstabs.c \ + src/ui/gui/psppire-dialog-action-crosstabs.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-factor.c \ src/ui/gui/psppire-dialog-action-factor.h \ + src/ui/gui/psppire-dialog-action-frequencies.c \ + src/ui/gui/psppire-dialog-action-frequencies.h \ src/ui/gui/psppire-dialog-action-indep-samps.c \ src/ui/gui/psppire-dialog-action-indep-samps.h \ src/ui/gui/psppire-dialog-action-kmeans.c \ src/ui/gui/psppire-dialog-action-kmeans.h \ + src/ui/gui/psppire-dialog-action-logistic.c \ + src/ui/gui/psppire-dialog-action-logistic.h \ src/ui/gui/psppire-dialog-action-means.c \ src/ui/gui/psppire-dialog-action-means.h \ src/ui/gui/psppire-dialog-action-rank.c \ @@ -270,6 +245,8 @@ src_ui_gui_psppire_SOURCES = \ 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-spreadsheet-model.c \ + src/ui/gui/psppire-spreadsheet-model.h \ src/ui/gui/psppire-selector.h \ src/ui/gui/psppire-select-dest.c \ src/ui/gui/psppire-select-dest.h \ @@ -298,6 +275,18 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/select-cases-dialog.h \ src/ui/gui/split-file-dialog.c \ src/ui/gui/split-file-dialog.h \ + src/ui/gui/page-assistant.c \ + src/ui/gui/page-intro.c \ + src/ui/gui/page-intro.h \ + src/ui/gui/page-file.c \ + src/ui/gui/page-first-line.c \ + src/ui/gui/page-first-line.h \ + src/ui/gui/page-formats.c \ + src/ui/gui/page-formats.h \ + src/ui/gui/page-separators.c \ + src/ui/gui/page-separators.h \ + src/ui/gui/page-sheet-spec.c \ + src/ui/gui/page-sheet-spec.h \ src/ui/gui/text-data-import-dialog.c \ src/ui/gui/text-data-import-dialog.h \ src/ui/gui/transpose-dialog.c \ @@ -384,3 +373,8 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h CLEANFILES += src/ui/gui/include/gtk/gtk.h EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h +include $(top_srcdir)/src/ui/gui/icons/automake.mk + +UNINSTALL_DATA_HOOKS += update-icon-cache +INSTALL_DATA_HOOKS += update-icon-cache +