X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=e99b82c6ee518e5b3aa4d645d164c84e775eac53;hb=484653b70e9ddc0100c8eb1cccccb2ad1ccd7824;hp=61a35f9fe339abd0b666e75fadbc716d86aed51a;hpb=f1141d27ca616a8c8edc2a1f18067085ceaaf448;p=pspp
diff --git a/doc/automake.mk b/doc/automake.mk
index 61a35f9fe3..e99b82c6ee 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 \
@@ -59,45 +61,42 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
doc/dev/pc+-file-format.texi \
doc/dev/portable-file-format.texi \
doc/dev/spv-file-format.texi \
- doc/dev/encrypted-file-wrappers.texi \
- doc/dev/q2c.texi
+ doc/dev/tlo-file-format.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
- @$(MKDIR_P) doc
- $(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:
- @$(MKDIR_P) doc
$(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@
-$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) $(top_srcdir)/doc/help-pages-list
+doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) doc/help-pages-list
if BROKEN_DOCBOOK_XML
touch $@
else
- @$(MKDIR_P) doc
- $(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)
dist_docbook_DATA = doc/pspp.xml
-CLEANFILES += pspp-dev.dvi $(docbook_DATA) doc/pspp.info*
+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
-$(top_srcdir)/doc/help-pages-list: $(UI_FILES)
+doc/help-pages-list: $(UI_FILES)
$(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
$(SED) -e 's% *\([^<]*\)%//*[@id='"'"'\1'"'"']%' \
-e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp
@@ -108,71 +107,274 @@ 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/weight.sps
-
-
-EXTRA_DIST += $(EXAMPLE_SYNTAX)
-
-EXAMPLE_OUTPUTS = $(EXAMPLE_SYNTAX:.sps=.out)
-EXAMPLE_HTML = $(EXAMPLE_SYNTAX:.sps=.html)
-
-$(top_builddir)/doc/pspp.info: $(EXAMPLE_OUTPUTS)
-$(top_builddir)/doc/pspp.ps: $(EXAMPLE_OUTPUTS)
-$(top_builddir)/doc/pspp.dvi: $(EXAMPLE_OUTPUTS)
-$(top_builddir)/doc/pspp.html: $(EXAMPLE_HTML)
-$(top_builddir)/doc/pspp.pdf: $(EXAMPLE_OUTPUTS)
-
-# The examples cannot be built until the binary has been built
-$(EXAMPLE_OUTPUTS): $(top_builddir)/src/ui/terminal/pspp
-$(EXAMPLE_HTML): $(top_builddir)/src/ui/terminal/pspp
-
-CLEANFILES += $(EXAMPLE_OUTPUTS)
-
-SUFFIXES: .sps
-
-# use pspp to process a syntax file and reap the output into a text file
-.sps.out:
- $(MKDIR_P) $(@D)
- where=$$PWD ; \
- (cd $(top_srcdir)/examples; ${abs_builddir}/src/ui/terminal/pspp $(abs_srcdir)/doc/examples/$( and
-# everything after and including