X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=801f278ce653a1fb8956a6c362b227befdd9d390;hb=08e7ac5d6dee8626969223b055fdf44ab1fc964c;hp=61a35f9fe339abd0b666e75fadbc716d86aed51a;hpb=f1141d27ca616a8c8edc2a1f18067085ceaaf448;p=pspp
diff --git a/doc/automake.mk b/doc/automake.mk
index 61a35f9fe3..801f278ce6 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -70,19 +70,16 @@ EXTRA_DIST += doc/get-commands.pl \
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/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 $@
endif
@@ -91,13 +88,13 @@ 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)
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
@@ -127,42 +124,84 @@ EXAMPLE_SYNTAX = \
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_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)
+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_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
-.sps.html:
- $(MKDIR_P) $(@D)
- where=$$PWD ; \
- (cd $(top_srcdir)/examples; ${abs_builddir}/src/ui/terminal/pspp $(abs_srcdir)/doc/examples/$(