# HG changeset patch
# User Rik <rik@octave.org>
# Date 1346260656 25200
# Node ID 87f337783d95e43f7acc69b2810ea84ec85ee318
# Parent  7880fa9d676fb7ee1b45602931ca54d4a4de4238
Cache texi2XXX intermediate results for faster builds.

* m4/acinclude.m4: Change build-dir for texi2XXX cmds to t2d_cache.

* doc/Makefile.am: Reword comment about keeping .NOTPARALLEL directive.

* faq/Makefile.am, interpreter/Makefile.am, doc/liboctave/Makefile.am:
Remove NOTPARALLEL directive.  Add local rule to clean t2d_cache.

diff -r 7880fa9d676f -r 87f337783d95 doc/Makefile.am
--- a/doc/Makefile.am	Wed Aug 29 09:17:26 2012 -0400
+++ b/doc/Makefile.am	Wed Aug 29 10:17:36 2012 -0700
@@ -20,8 +20,8 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
-## Avoid making multiple subdirs in parallel which can lead 
-## to a confusing error message stream
+## Avoid making multiple subdirs in parallel
+## which can lead to a confusing error message stream.
 .NOTPARALLEL:
 
 EXTRA_DIST = \
diff -r 7880fa9d676f -r 87f337783d95 doc/faq/Makefile.am
--- a/doc/faq/Makefile.am	Wed Aug 29 09:17:26 2012 -0400
+++ b/doc/faq/Makefile.am	Wed Aug 29 10:17:36 2012 -0700
@@ -20,10 +20,6 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
-## Automake generated rules for documentation are not parallel-safe.
-## Restrict current directory to run serially
-.NOTPARALLEL:
-
 TEXINFO_TEX = ../texinfo.tex
 
 info_TEXINFOS = OctaveFAQ.texi
@@ -32,3 +28,6 @@
 
 EXTRA_DIST = OctaveFAQ.dvi OctaveFAQ.html OctaveFAQ.pdf OctaveFAQ.ps
 
+clean-local:
+	rm -rf t2d_cache
+
diff -r 7880fa9d676f -r 87f337783d95 doc/interpreter/Makefile.am
--- a/doc/interpreter/Makefile.am	Wed Aug 29 09:17:26 2012 -0400
+++ b/doc/interpreter/Makefile.am	Wed Aug 29 10:17:36 2012 -0700
@@ -263,6 +263,9 @@
   $(LOGOS) \
   $(TXI_SRC)
 
+clean-local:
+	rm -rf t2d_cache
+
 DISTCLEANFILES = $(BUILT_TEXINFOS) doc-cache
 
 MAINTAINERCLEANFILES = $(IMAGES)
diff -r 7880fa9d676f -r 87f337783d95 doc/liboctave/Makefile.am
--- a/doc/liboctave/Makefile.am	Wed Aug 29 09:17:26 2012 -0400
+++ b/doc/liboctave/Makefile.am	Wed Aug 29 10:17:36 2012 -0700
@@ -21,10 +21,6 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
-## Automake generated rules for documentation are not parallel-safe.
-## Restrict current directory to run serially
-.NOTPARALLEL:
-
 TEXINFO_TEX = ../texinfo.tex
 
 info_TEXINFOS = liboctave.texi
@@ -54,3 +50,6 @@
 
 EXTRA_DIST = liboctave.dvi liboctave.html liboctave.pdf liboctave.ps
 
+clean-local:
+	rm -rf t2d_cache
+
diff -r 7880fa9d676f -r 87f337783d95 m4/acinclude.m4
--- a/m4/acinclude.m4	Wed Aug 29 09:17:26 2012 -0400
+++ b/m4/acinclude.m4	Wed Aug 29 10:17:36 2012 -0700
@@ -1506,7 +1506,7 @@
 "
     OCTAVE_CONFIGURE_WARNING([warn_texi2dvi])
   fi
-  TEXI2DVI="$TEXI2DVI"' --build-dir=texi2dvi-build.$$$$'
+  TEXI2DVI="$TEXI2DVI"' --build-dir=t2d_cache'
   AC_SUBST(TEXI2DVI)
 ])
 dnl
@@ -1533,7 +1533,7 @@
 "
     OCTAVE_CONFIGURE_WARNING([warn_texi2pdf])
   fi
-  TEXI2PDF="$TEXI2PDF"' --build-dir=texi2pdf-build.$$$$'
+  TEXI2PDF="$TEXI2PDF"' --build-dir=t2d_cache'
   AC_SUBST(TEXI2PDF)
 ])
 dnl