X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=06825dd568855c095aa29cbe6ceb19d604a400ee;hb=5b246c776e802ed91e8cac6ab19dcab7e4bd9921;hp=941a7fea1c2690b36840188c13d19f3933ee7ed7;hpb=920ccda5e43b81b2118caf37784f6edaa568e246;p=pspp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 941a7fea1c..06825dd568 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -include $(top_srcdir)/src/ui/gui/sheet/automake.mk - UI_FILES = \ src/ui/gui/aggregate.ui \ src/ui/gui/autorecode.ui \ @@ -11,6 +9,7 @@ UI_FILES = \ src/ui/gui/count.ui \ src/ui/gui/crosstabs.ui \ src/ui/gui/chi-square.ui \ + src/ui/gui/data-sheet.ui \ src/ui/gui/descriptives.ui \ src/ui/gui/entry-dialog.ui \ src/ui/gui/examine.ui \ @@ -45,6 +44,7 @@ UI_FILES = \ src/ui/gui/data-editor.ui \ src/ui/gui/output-viewer.ui \ src/ui/gui/syntax-editor.ui \ + src/ui/gui/var-sheet.ui \ src/ui/gui/var-type-dialog.ui EXTRA_DIST += \ @@ -74,8 +74,7 @@ endif src_ui_gui_psppire_LDADD = \ - src/ui/gui/sheet/libsheet.la \ - lib/gtk-contrib/libgtksheet.a \ + lib/gtk-contrib/libxpaned.a \ src/ui/libuicommon.la \ src/libpspp.la \ src/libpspp-core.la \ @@ -99,54 +98,14 @@ src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/p src_ui_gui_psppiredir = $(pkgdatadir) -themedir = $(DESTDIR)$(datadir)/icons/hicolor -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_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 - -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) - -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 = \ @@ -178,18 +137,12 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/aggregate-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/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/customentry.c \ - src/ui/gui/customentry.h \ src/ui/gui/dialog-common.c \ src/ui/gui/dialog-common.h \ src/ui/gui/dict-display.h \ @@ -221,10 +174,14 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire.h \ src/ui/gui/psppire-acr.h \ src/ui/gui/psppire-buttonbox.h \ + src/ui/gui/psppire-checkbox-treeview.c \ + src/ui/gui/psppire-checkbox-treeview.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-sheet.c \ + src/ui/gui/psppire-data-sheet.h \ src/ui/gui/psppire-data-store.c \ src/ui/gui/psppire-data-store.h \ src/ui/gui/psppire-data-window.c \ @@ -234,6 +191,8 @@ src_ui_gui_psppire_SOURCES = \ 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-chisquare.c \ + src/ui/gui/psppire-dialog-action-chisquare.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 \ @@ -244,6 +203,8 @@ src_ui_gui_psppire_SOURCES = \ 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-flip.c \ + src/ui/gui/psppire-dialog-action-flip.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 \ @@ -262,6 +223,8 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-dialog-action-reliability.h \ src/ui/gui/psppire-dialog-action-roc.c \ src/ui/gui/psppire-dialog-action-roc.h \ + src/ui/gui/psppire-dialog-action-runs.c \ + src/ui/gui/psppire-dialog-action-runs.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 \ @@ -301,8 +264,6 @@ src_ui_gui_psppire_SOURCES = \ 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 \ @@ -312,8 +273,6 @@ src_ui_gui_psppire_SOURCES = \ src/ui/gui/psppire-window-register.h \ src/ui/gui/recode-dialog.c \ src/ui/gui/recode-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/split-file-dialog.c \ @@ -332,8 +291,6 @@ src_ui_gui_psppire_SOURCES = \ 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 \ - src/ui/gui/transpose-dialog.h \ src/ui/gui/t-test-one-sample.c \ src/ui/gui/t-test-one-sample.h \ src/ui/gui/t-test-options.c \ @@ -416,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 +