X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=c571a236d2fc240d8bd841a2ade937ae2791158d;hb=eb182278adbaa6f7dd9cdeaf18b26c2885b32f41;hp=6db82bfb7e72d43f21c90784b5709ea086db4966;hpb=dba18c7c05778b92388aebc4a991a448790794e5;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index 6db82bfb7e..c571a236d2 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-info_TEXINFOS = doc/pspp.texinfo doc/pspp-dev.texinfo
+info_TEXINFOS = doc/pspp.texi doc/pspp-dev.texi
 
 doc_pspp_TEXINFOS = doc/version.texi \
 	doc/bugs.texi \
@@ -18,6 +18,8 @@ doc_pspp_TEXINFOS = doc/version.texi \
 	doc/invoking.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 \
@@ -37,27 +39,33 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 	doc/dev/i18n.texi \
 	doc/dev/output.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
 
-EXTRA_DIST += doc/pspp.man \
-	doc/get-commands.pl
+dist_man_MANS += doc/pspp.1 \
+                 doc/psppire.1
+
+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
-	$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
+	$(AM_V_GEN)$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
 
 $(srcdir)/doc/tut.texi:
 	@$(MKDIR_P) doc
-	echo "@set example-dir $(examplesdir)" > $@
+	$(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.texinfo $(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
-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
-		$(top_srcdir)/doc/pspp.texinfo -o - \
+	$(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
+		$(top_srcdir)/doc/pspp.texi -o - \
 		| $(SED) -e 's/Time-&-Date/Time-\&-Date/g' \
 		-e 's/“/\“/g' \
 		-e 's/”/\”/g' \
@@ -73,13 +81,19 @@ $(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
 		-e 's/././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' \
-	> $@
-	$(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
- 
 
-EXTRA_DIST += doc/OChangeLog
+
 CLEANFILES += pspp-dev.dvi $(docbook_DATA)
 
+doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
+.PHONY: doc