X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=7cbb819db364361a9bd5fa954093760e706deeed;hb=3aaf55988637cd30d00acd14d188ed5716c0eb74;hp=9be58a12a9185869919e64901bbc493b8be7178d;hpb=c04cd41a646f3e85f86208278bf52f8078e0780a;p=pspp diff --git a/doc/automake.mk b/doc/automake.mk index 9be58a12a9..7cbb819db3 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -81,8 +81,8 @@ doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) doc/help-pages-list if BROKEN_DOCBOOK_XML touch $@ else - $(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \ - $< -o $@ + $(AM_V_GEN)$(MAKEINFO) --docbook $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ + -I doc -I $(srcdir)/doc $< -o $@ endif docbookdir = $(docdir) @@ -106,94 +106,99 @@ EXTRA_DIST += \ doc/help-pages-list \ doc/pspp-manual.css - -AM_MAKEINFOFLAGS=-I $(top_srcdir)/doc/examples -I $(top_builddir)/doc/examples -am__TEXINFO_TEX_DIR=:$(top_srcdir)/doc/examples:$(top_builddir)/doc/examples +am__TEXINFO_TEX_DIR=:$(top_srcdir)/doc:$(top_builddir)/doc ################# Example programs ############################## -EXAMPLE_SYNTAX = \ - doc/examples/autorecode.sps \ - doc/examples/chisquare.sps \ - doc/examples/compute.sps \ - doc/examples/count.sps \ - doc/examples/descriptives.sps \ - doc/examples/flip.sps \ - doc/examples/frequencies.sps \ - doc/examples/means.sps \ - doc/examples/one-sample-t.sps \ - doc/examples/independent-samples-t.sps \ - doc/examples/reliability.sps \ - doc/examples/split.sps \ - doc/examples/tutorial1.sps \ - doc/examples/tutorial2.sps \ - doc/examples/tutorial3.sps \ - doc/examples/tutorial4.sps \ - doc/examples/tutorial5.sps \ - doc/examples/tutorial6.sps \ - doc/examples/tutorial7.sps \ - doc/examples/weight.sps - - -EXTRA_DIST += $(EXAMPLE_SYNTAX) - -EXAMPLE_SPVS = $(EXAMPLE_SYNTAX:.sps=.spv) \ - doc/examples/tutorial2a.spv \ - doc/examples/tutorial2b.spv \ - doc/examples/tutorial5a.spv \ - doc/examples/tutorial5b.spv \ - doc/examples/tutorial7a.spv \ - doc/examples/tutorial7b.spv -EXAMPLE_TXTS = $(EXAMPLE_SPVS:.spv=.txt) -EXAMPLE_TEXIS = $(EXAMPLE_TXTS:.txt=.texi) -EXAMPLE_HTML = $(EXAMPLE_SPVS:.spv=.html) - -example-spv: $(EXAMPLE_SPVS) -example-txts: $(EXAMPLE_TXTS) -example-texis: $(EXAMPLE_TEXIS) -example-html: $(EXAMPLE_HTML) -PHONY += example-spv example-txts example-texis example-html - -$(top_builddir)/doc/pspp.info: $(EXAMPLE_TEXIS) -$(top_builddir)/doc/pspp.ps: $(EXAMPLE_TEXIS) -$(top_builddir)/doc/pspp.dvi: $(EXAMPLE_TEXIS) -$(top_builddir)/doc/pspp.html: $(EXAMPLE_HTML) -$(top_builddir)/doc/pspp.pdf: $(EXAMPLE_TEXIS) -$(top_builddir)/doc/pspp.xml: $(EXAMPLE_TEXIS) - -CLEANFILES += $(EXAMPLE_TXTS) $(EXAMPLE_SPVS) $(EXAMPLE_TEXIS) $(EXAMPLE_HTML) -SUFFIXES += .sps .spv .txt .html .texi +FIGURE_SYNTAX = \ + doc/pspp-figures/aggregate.sps \ +doc/pspp-figures/autorecode.sps \ + doc/pspp-figures/chisquare.sps \ + doc/pspp-figures/compute.sps \ + doc/pspp-figures/count.sps \ + doc/pspp-figures/descriptives.sps \ + doc/pspp-figures/flip.sps \ + doc/pspp-figures/frequencies.sps \ + doc/pspp-figures/means.sps \ + doc/pspp-figures/one-sample-t.sps \ + doc/pspp-figures/independent-samples-t.sps \ + doc/pspp-figures/reliability.sps \ + doc/pspp-figures/select-if.sps \ + doc/pspp-figures/split.sps \ + doc/pspp-figures/temporary.sps \ + doc/pspp-figures/tutorial1.sps \ + doc/pspp-figures/tutorial2.sps \ + doc/pspp-figures/tutorial3.sps \ + doc/pspp-figures/tutorial4.sps \ + doc/pspp-figures/tutorial5.sps \ + doc/pspp-figures/tutorial6.sps \ + doc/pspp-figures/tutorial7.sps \ + doc/pspp-figures/weight.sps + + +EXTRA_DIST += $(FIGURE_SYNTAX) + +FIGURE_SPVS = $(FIGURE_SYNTAX:.sps=.spv) \ + doc/pspp-figures/tutorial2a.spv \ + doc/pspp-figures/tutorial2b.spv \ + doc/pspp-figures/tutorial5a.spv \ + doc/pspp-figures/tutorial5b.spv \ + doc/pspp-figures/tutorial7a.spv \ + doc/pspp-figures/tutorial7b.spv +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-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) +$(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 # Use pspp to process a syntax file into an output file. -pspp = src/ui/terminal/pspp$(EXEEXT) -$(EXAMPLE_SPVS): $(pspp) +pspp = src/ui/terminal/pspp +$(FIGURE_SPVS): $(pspp)$(EXEEXT) .sps.spv: $(AM_V_GEN)(cd $(top_srcdir)/examples \ - && $(abs_top_builddir)/$(pspp) ../doc/examples/$( $@.tmp + && $(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. pspp_output = utilities/pspp-output convert = $(AM_V_GEN)$(pspp_output) convert $< $@ -doc/examples/tutorial2a.spv: doc/examples/tutorial2.spv $(pspp_output) +doc/pspp-figures/tutorial2a.spv: doc/pspp-figures/tutorial2.spv $(pspp_output) $(convert) --command='Descriptives' -doc/examples/tutorial2b.spv: doc/examples/tutorial2.spv $(pspp_output) +doc/pspp-figures/tutorial2b.spv: doc/pspp-figures/tutorial2.spv $(pspp_output) $(convert) --label='Extreme Values' -doc/examples/tutorial5a.spv: doc/examples/tutorial5.spv $(pspp_output) +doc/pspp-figures/tutorial5a.spv: doc/pspp-figures/tutorial5.spv $(pspp_output) $(convert) --commands=examine --nth-command=1 --labels=descriptives -doc/examples/tutorial5b.spv: doc/examples/tutorial5.spv $(pspp_output) +doc/pspp-figures/tutorial5b.spv: doc/pspp-figures/tutorial5.spv $(pspp_output) $(convert) --commands=examine --nth-command=2 --labels=descriptives -doc/examples/tutorial7a.spv: doc/examples/tutorial7.spv $(pspp_output) +doc/pspp-figures/tutorial7a.spv: doc/pspp-figures/tutorial7.spv $(pspp_output) $(convert) --commands=regression --nth-command=1 --subtypes=coefficients -doc/examples/tutorial7b.spv: doc/examples/tutorial7.spv $(pspp_output) +doc/pspp-figures/tutorial7b.spv: doc/pspp-figures/tutorial7.spv $(pspp_output) $(convert) --commands=regression --nth-command=2 --subtypes=coefficients # Convert an output file into a text file or HTML file. -$(EXAMPLE_TXTS) $(EXAMPLE_HTML): $(pspp_output) +$(FIGURE_TXTS) $(FIGURE_HTMLS): $(pspp_output) .spv.txt: - $(AM_V_GEN)utilities/pspp-output convert $< $@ + $(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 .spv.html: - $(AM_V_GEN)utilities/pspp-output convert $< $@ -O format=html -O bare=true + $(convert) -O format=html -O bare=true # Convert a text file into a Texinfo file. .txt.texi: