X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=8cba97018bd166cfb06f6dc6fcaa7ec3f6ace615;hb=6f3865480503c571963d8a2d1af858a4d72d4e88;hp=0dcd519ce775b14638dfe5cca921bdd80c376cb6;hpb=8a8f2ec2ef0054d16a76a752c79b7968c590c166;p=pspp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 0dcd519ce7..8cba97018b 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 \ @@ -18,9 +17,13 @@ UI_FILES = \ src/ui/gui/factor.ui \ src/ui/gui/find.ui \ src/ui/gui/frequencies.ui \ + src/ui/gui/indep-samples.ui \ 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 \ src/ui/gui/paired-samples.ui \ src/ui/gui/psppire.ui \ @@ -36,16 +39,19 @@ UI_FILES = \ 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/val-labs-dialog.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 + src/ui/gui/syntax-editor.ui \ + src/ui/gui/var-sheet.ui \ + src/ui/gui/var-type-dialog.ui EXTRA_DIST += \ src/ui/gui/OChangeLog \ src/ui/gui/marshaller-list \ - src/ui/gui/pspp.desktop + src/ui/gui/gen-dot-desktop.sh + if HAVE_GUI bin_PROGRAMS += src/ui/gui/psppire @@ -66,12 +72,12 @@ 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 \ $(GTK_LIBS) \ + $(GTHREAD_LIBS) \ $(GTKSOURCEVIEW_LIBS) \ $(CAIRO_LIBS) \ $(LIBINTL) \ @@ -94,7 +100,9 @@ install-icons: $(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-lang @@ -125,10 +133,23 @@ 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 \ + $(top_srcdir)/src/ui/gui/psppire.gtkrc 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-button-editable.c \ + src/ui/gui/psppire-button-editable.h \ + src/ui/gui/psppire-cell-renderer-button.c \ + src/ui/gui/psppire-cell-renderer-button.h \ src/ui/gui/psppire-dialog.c \ src/ui/gui/psppire-keypad.c \ src/ui/gui/psppire-selector.c \ @@ -142,8 +163,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 \ @@ -156,26 +175,16 @@ 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/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 \ 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 \ @@ -201,6 +210,8 @@ src_ui_gui_psppire_SOURCES = \ 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 \ @@ -208,26 +219,56 @@ 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-var-info.c \ - src/ui/gui/psppire-dialog-action-var-info.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 \ + src/ui/gui/psppire-dialog-action-rank.h \ + src/ui/gui/psppire-dialog-action-regression.c \ + src/ui/gui/psppire-dialog-action-regression.h \ + src/ui/gui/psppire-dialog-action-reliability.c \ + 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-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-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 \ @@ -239,39 +280,31 @@ src_ui_gui_psppire_SOURCES = \ 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 \ 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-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 \ - 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/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/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-independent-samples-dialog.c \ - src/ui/gui/t-test-independent-samples-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 \ @@ -313,6 +346,11 @@ 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 $? >> $@ @@ -348,3 +386,4 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h mv $@-t $@ CLEANFILES += src/ui/gui/include/gtk/gtk.h EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h +