X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=d51fdc3964bb17e262fd5b92444286f508977b57;hb=refs%2Fheads%2Fctables7;hp=066b229e1534a239dddecc7c7e459ccd0cd60d1f;hpb=e298b626d78aab4d891e5e561ab1e04322cfe9cd;p=pspp diff --git a/doc/automake.mk b/doc/automake.mk index 066b229e15..d51fdc3964 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -46,11 +46,13 @@ doc_pspp_TEXINFOS = doc/version.texi \ doc/regression.texi \ doc/utilities.texi \ doc/variables.texi \ + doc/matrices.texi \ doc/fdl.texi doc_pspp_dev_TEXINFOS = doc/version-dev.texi \ doc/dev/intro.texi \ doc/dev/concepts.texi \ + doc/dev/gui.texi \ doc/dev/syntax.texi \ doc/dev/data.texi \ doc/dev/i18n.texi \ @@ -60,18 +62,17 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \ doc/dev/portable-file-format.texi \ doc/dev/spv-file-format.texi \ doc/dev/tlo-file-format.texi \ - doc/dev/encrypted-file-wrappers.texi \ - doc/dev/q2c.texi + doc/dev/encrypted-file-wrappers.texi dist_man_MANS += doc/pspp.1 \ doc/psppire.1 -EXTRA_DIST += doc/get-commands.pl \ +EXTRA_DIST += doc/get-commands.py \ doc/help-pages-list \ doc/prepdoc.sh -$(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl - $(AM_V_GEN)$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@ +$(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.py + $(AM_V_GEN)$(PYTHON3) $(top_srcdir)/doc/get-commands.py $(top_srcdir)/src/language/command.def > $@ $(srcdir)/doc/tut.texi: $(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@ @@ -92,7 +93,7 @@ dist_docbook_DATA = doc/pspp.xml CLEANFILES += pspp-dev.dvi $(docbook_DATA) doc/pspp.info* doc/pspp.xml -doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA) +doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PNGS) $(HTMLS) $(dist_docbook_DATA) PHONY += doc doc/help-pages-list: $(UI_FILES) @@ -116,9 +117,23 @@ FIGURE_SYNTAX = \ doc/pspp-figures/chisquare.sps \ doc/pspp-figures/compute.sps \ doc/pspp-figures/count.sps \ + doc/pspp-figures/ctables1.sps \ + doc/pspp-figures/ctables2.sps \ + doc/pspp-figures/ctables3.sps \ + doc/pspp-figures/ctables4.sps \ + doc/pspp-figures/ctables5.sps \ + doc/pspp-figures/ctables6.sps \ + doc/pspp-figures/ctables7.sps \ + doc/pspp-figures/ctables8.sps \ + doc/pspp-figures/ctables9.sps \ + doc/pspp-figures/ctables10.sps \ + doc/pspp-figures/ctables11.sps \ + doc/pspp-figures/ctables12.sps \ + doc/pspp-figures/crosstabs.sps \ doc/pspp-figures/descriptives.sps \ doc/pspp-figures/flip.sps \ doc/pspp-figures/frequencies.sps \ + doc/pspp-figures/matrix-print.sps \ doc/pspp-figures/means.sps \ doc/pspp-figures/one-sample-t.sps \ doc/pspp-figures/independent-samples-t.sps \ @@ -150,23 +165,36 @@ FIGURE_TXTS = $(FIGURE_SPVS:.spv=.txt) FIGURE_TEXIS = $(FIGURE_TXTS:.txt=.texi) FIGURE_HTMLS = $(FIGURE_SPVS:.spv=.html) FIGURE_PDFS = $(FIGURE_SPVS:.spv=.pdf) +FIGURE_PNGS = $(FIGURE_SPVS:.spv=.png) figure-spvs: $(FIGURE_SPVS) figure-txts: $(FIGURE_TXTS) figure-texis: $(FIGURE_TEXIS) figure-htmls: $(FIGURE_HTMLS) figure-pdfs: $(FIGURE_PDFS) -PHONY += figure-spv figure-txts figure-texis figure-htmls figure-pdfs - -$(top_builddir)/doc/pspp.info: $(FIGURE_TEXIS) +figure-pngs: $(FIGURE_PNGS) +PHONY += \ + figure-spv \ + figure-txts \ + figure-texis \ + figure-htmls \ + figure-pdfs \ + figure-pngs + +$(top_builddir)/doc/pspp.info: $(FIGURE_PNGS) $(top_builddir)/doc/pspp.ps: $(FIGURE_TEXIS) $(top_builddir)/doc/pspp.dvi: $(FIGURE_TEXIS) $(top_builddir)/doc/pspp.html: $(FIGURE_HTMLS) $(top_builddir)/doc/pspp.pdf: $(FIGURE_TEXIS) $(top_builddir)/doc/pspp.xml: $(FIGURE_TEXIS) -CLEANFILES += $(FIGURE_TXTS) $(FIGURE_SPVS) $(FIGURE_TEXIS) $(FIGURE_HTMLS) -SUFFIXES += .sps .spv .txt .html .texi .pdf +CLEANFILES += \ + $(FIGURE_TXTS) \ + $(FIGURE_SPVS) \ + $(FIGURE_TEXIS) \ + $(FIGURE_HTMLS) \ + $(FIGURE_PNGS) +SUFFIXES += .sps .spv .txt .html .texi .pdf .png # Use pspp to process a syntax file into an output file. if cross_compiling @@ -175,7 +203,7 @@ pspp_output = native/utilities/pspp-output native/Makefile: $(MKDIR_P) native - (cd native && $(top_srcdir)/configure --without-gui) + (cd native && $(abs_top_srcdir)/configure --host=$(build) --without-gui) native/gl/libgl.la: native/Makefile (cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) gl/libgl.la) @@ -192,12 +220,12 @@ endif $(FIGURE_SPVS): $(pspp) .sps.spv: - $(AM_V_GEN)(cd $(top_srcdir)/examples \ - && $(abs_top_builddir)/$(pspp) ../doc/pspp-figures/$( $@.tmp + $(AM_V_GEN)(cd "$(top_srcdir)/examples" \ + && "$(abs_top_builddir)/$(pspp)" ../doc/pspp-figures/$( $@.tmp $(AM_V_at)mv $@.tmp $@ # In some cases, the tutorial only wants some parts of the output. -convert = $(AM_V_GEN)$(pspp_output) convert $< $@ +convert = $(AM_V_GEN)LSAN_OPTIONS="suppressions=$(abs_top_srcdir)/tests/lsan.supp:print_suppressions=0:$$LSAN_OPTIONS" $(pspp_output) convert $< $@ doc/pspp-figures/tutorial2a.spv: doc/pspp-figures/tutorial2.spv $(pspp_output) $(convert) --command='Descriptives' doc/pspp-figures/tutorial2b.spv: doc/pspp-figures/tutorial2.spv $(pspp_output) @@ -211,12 +239,21 @@ doc/pspp-figures/tutorial7a.spv: doc/pspp-figures/tutorial7.spv $(pspp_output) doc/pspp-figures/tutorial7b.spv: doc/pspp-figures/tutorial7.spv $(pspp_output) $(convert) --commands=regression --nth-command=2 --subtypes=coefficients + +$(FIGURE_PNGS): $(pspp_output) +$(FIGURE_TXTS): $(pspp_output) +$(FIGURE_HTMLS): $(pspp_output) +$(FIGURE_PDFS): $(pspp_output) + # Convert an output file into a text file or HTML file. $(FIGURE_TXTS) $(FIGURE_HTMLS): $(pspp_output) .spv.txt: $(convert) .spv.pdf: - $(convert) -O left-margin=0pt -O right-margin=0pt -O top-margin=0pt -O bottom-margin=0pt -O paper-size=6x20in -O font-size=12000 --table-look=$(HOME)/pspp/spss15/Looks/report.tlo + $(convert) -O trim=true -O left-margin=0in -O right-margin=0in -O top-margin=0in -O bottom-margin=0in -O paper-size=7.5x99in --table-look=$(srcdir)/doc/tutorial.stt +.spv.png: + $(convert) -O trim=true -O left-margin=0in -O right-margin=0in -O top-margin=0in -O bottom-margin=0in -O paper-size=7.5x99in --table-look=$(srcdir)/doc/tutorial.stt +EXTRA_DIST += doc/tutorial.stt .spv.html: $(convert) -O format=html -O bare=true @@ -272,6 +309,7 @@ $(top_srcdir)/doc/screenshots/chisquare.grab \ $(top_srcdir)/doc/screenshots/count.grab \ $(top_srcdir)/doc/screenshots/count-define.grab \ $(top_srcdir)/doc/screenshots/compute.grab \ +$(top_srcdir)/doc/screenshots/crosstabs.grab \ $(top_srcdir)/doc/screenshots/descriptives.grab \ $(top_srcdir)/doc/screenshots/one-sample-t.grab \ $(top_srcdir)/doc/screenshots/independent-samples-t.grab \ @@ -299,17 +337,25 @@ doc-make: doc/doc-make.in Makefile # Install all the PNG files so that info readers can recognise them -install-info-local: +install-info-local: $(FIGURE_PNGS) $(MKDIR_P) $(DESTDIR)$(infodir)/screenshots for p in $(INFO_SCREENSHOTS); do \ $(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/screenshots ;\ done + $(INSTALL) -d $(DESTDIR)$(infodir)/pspp-figures + for p in $(FIGURE_PNGS); do \ + $(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/pspp-figures ;\ + done uninstall-local: for p in $(INFO_SCREENSHOTS); do \ f=`basename $$p ` ; \ rm -f $(DESTDIR)$(infodir)/screenshots/$$f ; \ done + for p in $(FIGURE_PNGS); do \ + f=`basename $$p ` ; \ + rm -f $(DESTDIR)$(infodir)/pspp-figures/$$f ; \ + done EXTRA_DIST+= $(SCREENSHOTS) doc/doc-make.in doc/screengrab