X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=7e3c5d49372d9974da9b87b075e1f887547889ee;hb=8b85e5c61350e0cee32236ecacc4c7c665188396;hp=9c73d344bffbeef2489fd3eb4ea166e3c6fd4ecb;hpb=a9acce47d67e0ab35ce1690e4f1b1ac0121c2d78;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index 9c73d344bf..7e3c5d4937 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -1,16 +1,16 @@
 ## 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 \
 	doc/command-index.texi \
 	doc/concept-index.texi \
-	doc/configuring.texi \
 	doc/data-io.texi \
 	doc/data-selection.texi \
 	doc/expressions.texi \
 	doc/files.texi \
+	doc/combining.texi \
 	doc/flow-control.texi \
 	doc/function-index.texi \
 	doc/installing.texi \
@@ -18,10 +18,14 @@ 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 \
 	doc/transformation.texi \
+	doc/tutorial.texi \
+	doc/tut.texi \
 	doc/regression.texi \
 	doc/utilities.texi \
 	doc/variables.texi \
@@ -32,14 +36,43 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 	doc/dev/concepts.texi \
 	doc/dev/syntax.texi \
 	doc/dev/data.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
 
-doc/ni.texi: $(top_srcdir)/src/language/command.def 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
+	$(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
+if BROKEN_DOCBOOK_XML
+	touch $@
+else
 	@$(MKDIR_P)  doc
-	@PERL@ $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
+	$(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
+		$< -o $@
+endif
+
+docbookdir = $(docdir)
+dist_docbook_DATA = doc/pspp.xml
+
+
+CLEANFILES += pspp-dev.dvi $(docbook_DATA)
+
+doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
+.PHONY: doc