[Emacs-diffs] /srv/bzr/emacs/trunk r111850: Parallelize documentation builds.

[Paul Eggert]

------------------------------------------------------------
revno: 111850
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-02-21 14:42:56 -0800
message:
  Parallelize documentation builds.
  
  This speeds up building of documentation on multiprocessor
  platforms, and is motivated by Texinfo 5.0, which is much slower.
  Add a toplevel rule 'make docs' to make all the documentation.
  * .bzrignore: Add .dvi, .html, .ps.
  * Makefile.in (DVIS, HTMLS, INFOS, PSS, DOCS): New macros.
  ($(DOCS), docs, vi, html, pdf, ps): New rules.
  (info-real): Depend on $(INFOS) rather than doing it sequentially.
  (dvi): Depend on $(DVIS) rather than doing it sequentially.
  * doc/misc/Makefile.in (html): New rule.
modified:
  .bzrignore
  ChangeLog
  Makefile.in
  doc/misc/ChangeLog
  doc/misc/Makefile.in

=== modified file '.bzrignore'
--- a/.bzrignore        2013-02-11 23:37:18 +0000
+++ b/.bzrignore        2013-02-21 22:42:56 +0000
@@ -62,7 +62,10 @@
 doc/**/*.tps
 doc/**/*.vr
 doc/**/*.vrs
+doc/**/*.dvi
+doc/**/*.html
 doc/**/*.pdf
+doc/**/*.ps
 !doc/lispintro/cons-*.pdf
 !doc/lispintro/drawers.pdf
 !doc/lispintro/lambda-*.pdf

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-02-18 18:27:51 +0000
+++ b/ChangeLog 2013-02-21 22:42:56 +0000
@@ -1,3 +1,15 @@
+2013-02-21  Paul Eggert  <address@hidden>
+
+       Parallelize documentation builds.
+       This speeds up building of documentation on multiprocessor
+       platforms, and is motivated by Texinfo 5.0, which is much slower.
+       Add a toplevel rule 'make docs' to make all the documentation.
+       * .bzrignore: Add .dvi, .html, .ps.
+       * Makefile.in (DVIS, HTMLS, INFOS, PSS, DOCS): New macros.
+       ($(DOCS), docs, vi, html, pdf, ps): New rules.
+       (info-real): Depend on $(INFOS) rather than doing it sequentially.
+       (dvi): Depend on $(DVIS) rather than doing it sequentially.
+
 2013-02-18  Aidan Gauland  <address@hidden>
 
        * doc/misc/eshell.texi: Added documentation for Eshell insert

=== modified file 'Makefile.in'
--- a/Makefile.in       2013-01-19 20:38:13 +0000
+++ b/Makefile.in       2013-02-21 22:42:56 +0000
@@ -54,6 +54,9 @@
 # make bootstrap
 #      Removes all the compiled files to force a new bootstrap from a
 #      clean slate, and then build in the normal way.
+#
+# make docs
+#      Make Emacs documentation files from their sources; requires makeinfo.
 
 SHELL = /bin/sh
 
@@ -859,13 +862,25 @@
 dist:
        cd ${srcdir}; ./make-dist
 
+DVIS  = lispref-dvi  lispintro-dvi  emacs-dvi  misc-dvi
+HTMLS = lispref-html lispintro-html emacs-html misc-html
+INFOS = lispref-info lispintro-info emacs-info misc-info
+PDFS  = lispref-pdf  lispintro-pdf  emacs-pdf  misc-pdf
+PSS   = lispref-ps   lispintro-ps   emacs-ps # no misc-ps
+
+DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
+$(DOCS):
+       t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2
+
+.PHONY: $(DOCS) docs pdf ps
 .PHONY: info dvi dist check html info-real force-info check-info-dir
 
-info-real:
-       (cd doc/emacs; $(MAKE) $(MFLAGS) info)
-       (cd doc/misc; $(MAKE) $(MFLAGS) info)
-       (cd doc/lispref; $(MAKE) $(MFLAGS) info)
-       (cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+docs: $(DOCS)
+dvi: $(DVIS)
+html: $(HTMLS)
+info-real: $(INFOS)
+pdf: $(PDFS)
+ps: $(PSS)
 
 force-info:
 # Note that man/Makefile knows how to put the info files in $(srcdir),
@@ -904,12 +919,6 @@
        fi ; \
        echo "info/dir is OK"
 
-dvi:
-       (cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
-       (cd doc/misc; $(MAKE) $(MFLAGS) dvi)
-       (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi)
-       (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
-
 #### Bootstrapping.
 
 ### This first cleans the lisp subdirectory, removing all compiled

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-02-20 14:49:52 +0000
+++ b/doc/misc/ChangeLog        2013-02-21 22:42:56 +0000
@@ -1,3 +1,7 @@
+2013-02-21  Paul Eggert  <address@hidden>
+
+       * Makefile.in (html): New rule.
+
 2013-02-20  Michael Albinus  <address@hidden>
 
        * tramp.texi (Android shell setup): Improve.  Reported by Thierry

=== modified file 'doc/misc/Makefile.in'
--- a/doc/misc/Makefile.in      2013-01-04 19:22:37 +0000
+++ b/doc/misc/Makefile.in      2013-02-21 22:42:56 +0000
@@ -192,6 +192,8 @@
 
 dvi: $(DVI_TARGETS)
 
+html: $(HTML_TARGETS)
+
 pdf: $(PDF_TARGETS)
 
 # Note that all the Info targets build the Info files in srcdir.