Mercurial > hg > octave-max
changeset 15251:87f337783d95
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.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 29 Aug 2012 10:17:36 -0700 |
parents | 7880fa9d676f |
children | 50156b22f87c |
files | doc/Makefile.am doc/faq/Makefile.am doc/interpreter/Makefile.am doc/liboctave/Makefile.am m4/acinclude.m4 |
diffstat | 5 files changed, 13 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -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 = \
--- a/doc/faq/Makefile.am +++ b/doc/faq/Makefile.am @@ -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 +
--- a/doc/interpreter/Makefile.am +++ b/doc/interpreter/Makefile.am @@ -263,6 +263,9 @@ $(LOGOS) \ $(TXI_SRC) +clean-local: + rm -rf t2d_cache + DISTCLEANFILES = $(BUILT_TEXINFOS) doc-cache MAINTAINERCLEANFILES = $(IMAGES)
--- a/doc/liboctave/Makefile.am +++ b/doc/liboctave/Makefile.am @@ -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 +
--- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -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