Mercurial > hg > octave-lojdl
changeset 9997:8561ecc44317
Use automake syntax to build munge-texi
author | Rik <rdrider0-list@yahoo.com> |
---|---|
date | Thu, 17 Dec 2009 13:28:29 -0800 |
parents | 929e53107f09 |
children | 46493feaab7f |
files | doc/ChangeLog doc/interpreter/Makefile.am |
diffstat | 2 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2009-12-17 Rik <octave@nomad.inbox5.com> + + * interpreter/Makefile.am: use automake syntax to build munge-texi. + 2009-12-11 Rik <octave@nomad.inbox5.com> * interpreter/Makefile.am: remove install-local target and use automake
--- a/doc/interpreter/Makefile.am +++ b/doc/interpreter/Makefile.am @@ -33,6 +33,10 @@ TEXMFCNF := "..$(PATH_SEPARATOR)$(srcdir)/..$(PATH_SEPARATOR)$(TEXMFCNF)$(PATH_SEPARATOR)" export TEXMFCNF +## Automake generated rules for documentation are not parallel-safe. +## Restrict current directory to run serially +.NOTPARALLEL: + dist_man1_MANS = \ mkoctfile.1 \ octave-bug.1 \ @@ -171,10 +175,12 @@ doc-cache: $(DOCSTRING_FILES) mk_doc_cache.m $(TOPDIR)/run-octave -f -q -H $(srcdir)/mk_doc_cache.m doc-cache $(DOCSTRING_FILES) || { rm -f doc-cache; exit 1; } -$(MUNGED_TEXI_SRC): $(DOCSTRING_FILES) munge-texi.cc +## Program compiled only to help build documentation. No need to install +noinst_PROGRAMS = munge-texi -munge-texi$(BUILD_EXEEXT): munge-texi.cc - $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS) +munge_texi_SOURCES = munge-texi.cc + +$(MUNGED_TEXI_SRC): $(DOCSTRING_FILES) $(munge_texi_SOURCES) .txi.texi: @$(MAKE) $(AM_MAKEFLAGS) munge-texi$(BUILD_EXEEXT) @@ -205,7 +211,6 @@ images.mk \ mk_doc_cache.m \ mkcontrib.awk \ - munge-texi.cc \ octave.dvi \ octave.html \ octave.pdf \ @@ -214,10 +219,7 @@ $(IMAGES_SRC) \ $(TXI_SRC) -DISTCLEANFILES = $(octave_TEXINFOS) doc-cache munge-texi$(BUILD_EXEEXT) +DISTCLEANFILES = $(octave_TEXINFOS) doc-cache MAINTAINERCLEANFILES = $(IMAGES) -## Automake generated rules for documentation are not parallel-safe. -## Restrict current directory to run serially -.NOTPARALLEL: