Mercurial > octave-nkf
changeset 20380:10f67e9d1e70
keep list of built images separate from other images
* Makefile.am, doc/module.mk, doc/interpreter/images.awk:
Create separate lists of built images and all images.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 14 Jul 2015 11:34:55 -0400 |
| parents | ff56b738854c |
| children | 86299d2fbf87 |
| files | Makefile.am doc/interpreter/images.awk doc/module.mk |
| diffstat | 3 files changed, 17 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Tue Jul 14 11:04:26 2015 -0400 +++ b/Makefile.am Tue Jul 14 11:34:55 2015 -0400 @@ -68,8 +68,13 @@ BUILT_SOURCES = TEST_FILES = +DOC_IMAGES_SRC = +BUILT_DOC_IMAGES = +BUILT_DOC_IMAGES_EPS = +BUILT_DOC_IMAGES_PDF = +BUILT_DOC_IMAGES_PNG = +BUILT_DOC_IMAGES_TXT = DOC_IMAGES = -DOC_IMAGES_SRC = DOC_IMAGES_EPS = DOC_IMAGES_PDF = DOC_IMAGES_PNG =
--- a/doc/interpreter/images.awk Tue Jul 14 11:04:26 2015 -0400 +++ b/doc/interpreter/images.awk Tue Jul 14 11:34:55 2015 -0400 @@ -25,7 +25,7 @@ printf (" %s%s.%s", dir, $j, ext); printf ("\n"); - printf ("DOC_IMAGES_%s += $(%s_%s)\n", uext, ubasename, uext); + printf ("BUILT_DOC_IMAGES_%s += $(%s_%s)\n", uext, ubasename, uext); for (j = 2; j <= NF; j++) { printf ("%s%s.%s: %s%s\n", dir, $j, ext, dir, script);
--- a/doc/module.mk Tue Jul 14 11:04:26 2015 -0400 +++ b/doc/module.mk Tue Jul 14 11:34:55 2015 -0400 @@ -103,11 +103,16 @@ doc/interpreter/java-images/image008.png \ doc/interpreter/java-images/image009.png -BUILT_DOC_IMAGES = \ - $(DOC_IMAGES_EPS) \ - $(DOC_IMAGES_PDF) \ - $(DOC_IMAGES_PNG) \ - $(DOC_IMAGES_TXT) +BUILT_DOC_IMAGES += \ + $(BUILT_DOC_IMAGES_EPS) \ + $(BUILT_DOC_IMAGES_PDF) \ + $(BUILT_DOC_IMAGES_PNG) \ + $(BUILT_DOC_IMAGES_TXT) + +DOC_IMAGES_EPS += $(BUILT_DOC_IMAGES_EPS) +DOC_IMAGES_PDF += $(BUILT_DOC_IMAGES_PDF) +DOC_IMAGES_PNG += $(BUILT_DOC_IMAGES_PNG) +DOC_IMAGES_TXT += $(BUILT_DOC_IMAGES_TXT) DOC_IMAGES += \ $(BUILT_DOC_IMAGES) \