X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=504fb8a7bd7522ef1a74335d5392f60087f5c387;hb=1b49116188b31ff17ee1a85e944488a7f254b847;hp=7c19acc01a52c4d5a85b40570b72d9ecf44524ba;hpb=1d2780996f3f615c2ea19ddfc1c9e1592fa64b70;p=pspp-builds.git

diff --git a/doc/automake.mk b/doc/automake.mk
index 7c19acc0..504fb8a7 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -1,17 +1,17 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-info_TEXINFOS = doc/pspp.texinfo 
+info_TEXINFOS = doc/pspp.texinfo doc/pspp-dev.texinfo
 
 doc_pspp_TEXINFOS = doc/version.texi \
 	doc/bugs.texi \
 	doc/command-index.texi \
 	doc/concept-index.texi \
 	doc/configuring.texi \
-	doc/data-file-format.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 \
@@ -19,32 +19,50 @@ doc_pspp_TEXINFOS = doc/version.texi \
 	doc/invoking.texi \
 	doc/language.texi \
 	doc/license.texi \
+	doc/ni.texi \
 	doc/not-implemented.texi \
-	doc/portable-file-format.texi \
-	doc/q2c.texi \
 	doc/statistics.texi \
 	doc/transformation.texi \
+	doc/tutorial.texi \
+	doc/tut.texi \
 	doc/regression.texi \
 	doc/utilities.texi \
 	doc/variables.texi \
 	doc/fdl.texi 
 
-nodist_doc_pspp_TEXINFOS = doc/ni.texi
-
+doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
+	doc/dev/intro.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/portable-file-format.texi \
+	doc/dev/q2c.texi
 
 EXTRA_DIST += doc/pspp.man \
-	doc/get-commands.pl \
-	$(doc_pspp_TEXINFOS)
-
-# Kludge to get around automake deficiency.
-am__TEXINFO_TEX_DIR=./doc
+	doc/get-commands.pl
 
 doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
-	@$(top_srcdir)/mkinstalldirs  doc
-	@PERL@ $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
+	@$(MKDIR_P)  doc
+	$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
+
+doc/tut.texi:
+	@$(MKDIR_P) doc
+	echo "@set example-dir $(examplesdir)" > $@
+
 
+doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
+	@$(MKDIR_P)  doc
+	$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
+		$(top_srcdir)/doc/pspp.texinfo -o - \
+		| $(SED) 's/Time-&-Date/Time-\&-Date/g' > $@
+	$(XMLLINT) --output /dev/null $@ 2>&1 2> /dev/null || ( $(RM) $@ && false )
 
-$(INFO_DEPS): doc/ni.texi
-$(HTML_DEPS): doc/ni.texi
+docbookdir = $(docdir)
+docbook_DATA = doc/pspp.xml
+EXTRA_DIST += doc/pspp.xml
 
-CLEANFILES += doc/ni.texi
+EXTRA_DIST += doc/OChangeLog
+CLEANFILES += pspp-dev.dvi $(docbook_DATA)