X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=28866ca2e9196eb46143842cb7b1d3a95ba24483;hb=refs%2Fheads%2Fspv2;hp=a5255e03fe2ddc2ba27bd8f985b2d8eef1bd2b70;hpb=63c7521729b947ace9e192dff9330813ecfb5812;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index a5255e03fe..28866ca2e9 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -19,6 +19,7 @@ doc_pspp_TEXINFOS = doc/version.texi \
 	doc/language.texi \
 	doc/license.texi \
 	doc/pspp-convert.texi \
+	doc/pspp-dump-sav.texi \
 	doc/ni.texi \
 	doc/not-implemented.texi \
 	doc/statistics.texi \
@@ -40,12 +41,28 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 	doc/dev/system-file-format.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
 
+if HAVE_DOT
+$(PDFS): doc/dev/spv-structure.pdf
+$(srcdir)/doc/dev/spv-structure.pdf: doc/dev/spv-structure.gv
+	dot -Tpdf < $< > $@
+
+$(DVIS): doc/dev/spv-structure.eps
+$(srcdir)/doc/dev/spv-structure.eps: doc/dev/spv-structure.gv
+	dot -Teps < $< > $@
+endif
+EXTRA_DIST += \
+	doc/dev/spv-structure.gv \
+	doc/dev/spv-structure.pdf \
+	doc/dev/spv-structure.eps
+
 dist_man_MANS += doc/pspp.1 \
                  doc/psppire.1
 
-EXTRA_DIST += doc/get-commands.pl
+EXTRA_DIST += doc/get-commands.pl doc/help-pages-list
 
 $(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
 	@$(MKDIR_P)  doc
@@ -56,9 +73,10 @@ $(srcdir)/doc/tut.texi:
 	$(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@
 
 
-# The SED and AWK filters in this rule, are to work-around some nasty bugs in makeinfo version 4.13, which produces
-# broken docbook xml.  These workarounds are rather horrible and must be removed asap.
-$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS)
+# The SED and AWK filters in this rule, are to work-around some nasty bugs in 
+# makeinfo version 4.13, which produces broken docbook xml.  These workarounds 
+# are rather horrible and must be removed asap.
+$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) $(top_srcdir)/doc/help-pages-list
 	@$(MKDIR_P)  doc
 	$(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
 		$(top_srcdir)/doc/pspp.texi -o - \
@@ -77,12 +95,17 @@ $(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS)
 		-e 's/&period;/./g' \
 		-e 's%\(<figure [^>]*\)>%\1/>%g' \
 	 | $(AWK) '/<para>.*<table.*>.*<\/para>/{x=sub("</para>",""); print; s=1;next}/<\/table>/{print; if (s==1) print "</para>"; s=0; next}1' \
-	> $@
-	$(AM_V_at)$(XMLLINT) --output /dev/null $@ || ( $(RM) $@ ; false)
+	> $@,tmp
+	$(AM_V_at)$(XMLLINT) --output /dev/null $@,tmp
+	$(AM_V_at)cat $(top_srcdir)/doc/help-pages-list | while read node ; do \
+	 $(XMLLINT) --xpath "$$node" $@,tmp > /dev/null; \
+	 if test $$? -ne 0 ; then  echo "$$node does not appear in $@" ; exit 1; fi ; \
+	 done 
+	mv $@,tmp $@
 
 docbookdir = $(docdir)
 dist_docbook_DATA = doc/pspp.xml
- 
+
 
 CLEANFILES += pspp-dev.dvi $(docbook_DATA)