Mercurial > hg > octave-max
changeset 15267:219dcb37bdf9
Restore ability to build HTML version of documentation.
* doc/interpreter/Makefile.am: New HTMLDIR_IMAGES target using an ordered rule
to copy images to octave.html directory after directory is created.
* doc/interpreter/images.awk: Remove HTMLDIR_IMAGES variable from images.mk.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 30 Aug 2012 16:47:36 -0700 |
| parents | f463154f1c1b |
| children | df3939195fbb |
| files | doc/interpreter/Makefile.am doc/interpreter/images.awk |
| diffstat | 2 files changed, 11 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/Makefile.am +++ b/doc/interpreter/Makefile.am @@ -87,8 +87,9 @@ $(IMAGES_EPS) \ $(IMAGES_PDF) \ $(IMAGES_PNG) \ - $(IMAGES_TXT) \ - $(HTMLDIR_IMAGES) + $(IMAGES_TXT) + +HTMLDIR_IMAGES = $(addprefix octave.html/, $(IMAGES_PNG)) LOGOS = \ octave_logo.eps \ @@ -147,12 +148,12 @@ var.texi \ vectorize.texi +TXI_SRC = $(MUNGED_TEXI_SRC:.texi=.txi) + BUILT_TEXINFOS = \ contributors.texi \ $(MUNGED_TEXI_SRC) -TXI_SRC = $(MUNGED_TEXI_SRC:.texi=.txi) - info_TEXINFOS = octave.texi octave_TEXINFOS = \ @@ -162,10 +163,12 @@ $(LOGOS) \ $(srcdir)/images.mk -octave.html: - if [ -d octave.html ]; then true; else mkdir octave.html; fi +all-local: dvi html pdf ps doc-cache -all-local: dvi html pdf ps doc-cache $(HTMLDIR_IMAGES) +html: $(HTMLDIR_IMAGES) + +$(HTMLDIR_IMAGES): $(IMAGES_PNG) | octave.html + cp $(@F) octave.html # Prevent packaging of distribution unless all libraries # necessary to create documentation are present @@ -214,12 +217,12 @@ --no-validate --no-headers --no-split --output INSTALL $< mv INSTALL ../../INSTALL.OCTAVE + undocumented_list: rm -f $@ -$(PERL) $(srcdir)/doccheck/mk_undocumented_list > $@ .PHONY: undocumented_list - SPELLCHECK_FILES = $(MUNGED_TEXI_SRC:.texi=.scheck) %.scheck: %.texi
--- a/doc/interpreter/images.awk +++ b/doc/interpreter/images.awk @@ -4,7 +4,6 @@ exts[3] = "png"; exts[4] = "txt"; printf ("IMAGES_SRC =\n"); - printf ("HTMLDIR_IMAGES =\n"); for (i = 1; i <= 4; i++) { printf ("IMAGES_%s =\n", toupper (exts[i])); } @@ -25,18 +24,7 @@ printf ("IMAGES_%s += $(%s_%s)\n", uext, ubasename, uext); - if (ext == "png") { - printf ("HTMLDIR_IMAGES += "); - for (j = 2; j <= NF; j++) - printf (" octave.html/%s.png", $j); - printf ("\n"); - } - for (j = 2; j <= NF; j++) { - if (ext == "png") { - printf ("octave.html/%s.png: %s.png octave.html\n", $j, $j); - printf ("\tcp $< $@\n"); - } printf ("%s.%s: %s\n", $j, ext, script); printf ("\t$(top_builddir)/run-octave -f -q -H -p $(srcdir) --eval \"%s ('%s', '%s');\"\n", basename, $j, ext);