Mercurial > octave-nkf
changeset 20451:44a1281e6e76
build: Adopt Automake's calling conventions for texi2dvi and texi2pdf rules
* doc/module.mk (doc/interpreter/octave.dvi, doc/interpreter/octave.pdf):
Add target-specific --build-dir options as done in Automake version 1.13.
(doc-interpreter-clean, doc-liboctave-clean): Delete obsolete targets.
(doc-clean): Delete the build-dir directory names.
* m4/acinclude.m4 (OCTAVE_PROG_TEXI2DVI, OCTAVE_PROG_TEXI2PDF): Don't add
--build-dir options here.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Sun, 02 Aug 2015 09:50:43 -0400 |
| parents | 57a3e21e131b |
| children | 095e42d7a0bb |
| files | doc/module.mk m4/acinclude.m4 |
| diffstat | 2 files changed, 7 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/module.mk Sat Aug 01 19:05:00 2015 -0400 +++ b/doc/module.mk Sun Aug 02 09:50:43 2015 -0400 @@ -248,13 +248,13 @@ doc/interpreter/octave.dvi: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi | doc/interpreter/$(am__dirstamp) $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc/interpreter -I $(abs_top_srcdir)/doc/interpreter' \ - $(TEXI2DVI) $(AM_V_texinfo) -o $@ $(AM_V_texidevnull) \ + $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \ `test -f 'doc/interpreter/octave.texi' || echo '$(abs_top_srcdir)/'`doc/interpreter/octave.texi doc/interpreter/octave.pdf: doc/interpreter/octave.texi $(srcdir)/doc/interpreter/version-octave.texi | doc/interpreter/$(am__dirstamp) $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc/interpreter -I $(abs_top_srcdir)/doc/interpreter' \ - $(TEXI2PDF) $(AM_V_texinfo) -o $@ $(AM_V_texidevnull) \ + $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \ `test -f 'doc/interpreter/octave.texi' || echo '$(abs_top_srcdir)/'`doc/interpreter/octave.texi doc/interpreter/octave.html: $(OCTAVE_HTML_STAMP) @@ -362,9 +362,6 @@ $(LOGOS) \ $(TXI_SRC) -doc-interpreter-clean: - rm -rf t2d_cache - doc_DISTCLEANFILES += \ $(OCTAVE_HTML_STAMP) @@ -441,9 +438,6 @@ ## the DVI and PDF builds are forced to run serially through a Makefile rule. #doc/liboctave/liboctave.pdf: doc/liboctave/liboctave.dvi -doc-liboctave-clean: - rm -rf doc/liboctave/t2d_cache - DIRSTAMP_FILES += doc/liboctave/$(octave_dirstamp) refcard_TEX_SRC = \ @@ -551,8 +545,11 @@ doc-clean: rm -f $(doc_CLEANFILES) - rm -rf $(top_builddir)/.t2d.cache - rm -rf $(top_builddir)/.t2p.cache + rm -rf doc/interpreter/octave.t2d + rm -rf doc/interpreter/octave.t2p + rm -rf doc/liboctave/liboctave.t2d + rm -rf doc/liboctave/liboctave.t2p + doc-distclean: doc-clean rm -f $(doc_DISTCLEANFILES)
--- a/m4/acinclude.m4 Sat Aug 01 19:05:00 2015 -0400 +++ b/m4/acinclude.m4 Sun Aug 02 09:50:43 2015 -0400 @@ -2274,11 +2274,6 @@ " OCTAVE_CONFIGURE_WARNING([warn_texi2dvi]) fi -dnl FIXME: texi2pdf and texi2dvi can not be run simultaneously as they both -dnl attempt to create a temporary build directory of the same name. -dnl A workaround is to define separate build directories for each -dnl command as is done here. - TEXI2DVI="$TEXI2DVI"' --build-dir=.t2d.cache' AC_SUBST(TEXI2DVI) ]) dnl @@ -2305,11 +2300,6 @@ " OCTAVE_CONFIGURE_WARNING([warn_texi2pdf]) fi -dnl FIXME: texi2pdf and texi2dvi can not be run simultaneously as they both -dnl attempt to create a temporary build directory of the same name. -dnl A workaround is to define separate build directories for each -dnl command as is done here. - TEXI2PDF="$TEXI2PDF"' --build-dir=.t2p.cache' AC_SUBST(TEXI2PDF) ]) dnl