- Olena-patches

last-svn-commit-48-g1202981 Fix the regeneration of HTML outputs.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am ($(TECHNICAL_HTML_OUTPUTS)) ($(TUTORIAL_HTML_OUTPUTS)) ($(WHITE_PAPER_HTML_OUTPUTS)) ($(REF_GUIDE_HTML_OUTPUTS)): Fix tests on targets. --- milena/ChangeLog | 11 +++++++++++ milena/doc/Makefile.am | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b0e8778..058fc20 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the regeneration of HTML outputs. + + * doc/Makefile.am + ($(TECHNICAL_HTML_OUTPUTS)) + ($(TUTORIAL_HTML_OUTPUTS)) + ($(WHITE_PAPER_HTML_OUTPUTS)) + ($(REF_GUIDE_HTML_OUTPUTS)): + Fix tests on targets. + 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> Distribute and clean documentation timestamps. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 553a8dd..7f6c1c2 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -340,7 +340,7 @@ $(TECHNICAL_HTML).stamp: $(technical_dir)/technical.tex $(technical_dependencies $(TECHNICAL_HTML_OUTPUTS): $(TECHNICAL_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -443,7 +443,7 @@ $(TUTORIAL_HTML).stamp: $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) $(TUTORIAL_HTML_OUTPUTS): $(TUTORIAL_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -559,7 +559,7 @@ $(WHITE_PAPER_HTML).stamp: $(white_paper_dir)/white_paper.tex $(EPSS) $(WHITE_PAPER_HTML_OUTPUTS): $(WHITE_PAPER_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -646,7 +646,7 @@ $(REF_GUIDE_HTML).stamp: $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies $(REF_GUIDE_HTML_OUTPUTS): $(REF_GUIDE_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -- 1.5.6.5

1 0

last-svn-commit-55-g15b0083 Fix the regeneration of HTML outputs.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am ($(TECHNICAL_HTML_OUTPUTS)) ($(TUTORIAL_HTML_OUTPUTS)) ($(WHITE_PAPER_HTML_OUTPUTS)) ($(REF_GUIDE_HTML_OUTPUTS)): Fix tests on targets. --- milena/ChangeLog | 11 +++++++++++ milena/doc/Makefile.am | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bde2cc3..d06de1a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the regeneration of HTML outputs. + + * doc/Makefile.am + ($(TECHNICAL_HTML_OUTPUTS)) + ($(TUTORIAL_HTML_OUTPUTS)) + ($(WHITE_PAPER_HTML_OUTPUTS)) + ($(REF_GUIDE_HTML_OUTPUTS)): + Fix tests on targets. + 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> Distribute and clean documentation timestamps. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 553a8dd..7f6c1c2 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -340,7 +340,7 @@ $(TECHNICAL_HTML).stamp: $(technical_dir)/technical.tex $(technical_dependencies $(TECHNICAL_HTML_OUTPUTS): $(TECHNICAL_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -443,7 +443,7 @@ $(TUTORIAL_HTML).stamp: $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) $(TUTORIAL_HTML_OUTPUTS): $(TUTORIAL_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -559,7 +559,7 @@ $(WHITE_PAPER_HTML).stamp: $(white_paper_dir)/white_paper.tex $(EPSS) $(WHITE_PAPER_HTML_OUTPUTS): $(WHITE_PAPER_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -646,7 +646,7 @@ $(REF_GUIDE_HTML).stamp: $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies $(REF_GUIDE_HTML_OUTPUTS): $(REF_GUIDE_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -- 1.5.6.5

1 0

last-svn-commit-80-gb6d23f2 Fix dependencies in doc/.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (refman_dependencies): Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). (technical_dependencies): Add $(TECHNICAL_EXAMPLES). (tutorial_dependencies, ref_guide_dependencies): Add $(EXAMPLES) and $(OUTPUTS). --- milena/ChangeLog | 10 ++++++++++ milena/doc/Makefile.am | 26 ++++++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cafa0d4..41a6f7d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Fix dependencies in doc/. + + * doc/Makefile.am (refman_dependencies): + Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). + (technical_dependencies): Add $(TECHNICAL_EXAMPLES). + (tutorial_dependencies, ref_guide_dependencies): + Add $(EXAMPLES) and $(OUTPUTS). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated figures in the documentation. * doc/Makefile.am (MORE_FIGURES): New variable. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 63f3ea8..9bd9512 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -267,13 +267,7 @@ regen-split-examples-mk: ## Doxygen documentation. ## ## ----------------------- ## -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. refman_dependencies = \ - $(SPLIT_EXAMPLES) \ - $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ $(srcdir)/ref_guide/ref_guide.hh @@ -454,10 +448,10 @@ technical: technical-html technical-pdf technical_dir = $(doc_dir)/technical -# FIXME: Check these dependencies. And it'd be better to depend on -# actual files rather than timestamps corresponding to a bunch of -# files. -technical_dependencies = $(PNG_FIGURES) $(DOC_PACKAGES) +technical_dependencies = \ + $(TECHNICAL_EXAMPLES) \ + $(PNG_FIGURES) \ + $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -557,12 +551,10 @@ tutorial: tutorial-html tutorial-pdf tutorial_dir = $(doc_dir)/tutorial -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. tutorial_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) @@ -755,12 +747,10 @@ ref-guide: ref-guide-html ref-guide-pdf ref_guide_dir = $(doc_dir)/ref_guide -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. ref_guide_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) -- 1.5.6.5

1 0

last-svn-commit-87-g6c5106c Fix dependencies in doc/.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (refman_dependencies): Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). (technical_dependencies): Add $(TECHNICAL_EXAMPLES). (tutorial_dependencies, ref_guide_dependencies): Add $(EXAMPLES) and $(OUTPUTS). --- milena/ChangeLog | 10 ++++++++++ milena/doc/Makefile.am | 26 ++++++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8eef77a..625a873 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Fix dependencies in doc/. + + * doc/Makefile.am (refman_dependencies): + Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). + (technical_dependencies): Add $(TECHNICAL_EXAMPLES). + (tutorial_dependencies, ref_guide_dependencies): + Add $(EXAMPLES) and $(OUTPUTS). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated figures in the documentation. * doc/Makefile.am (MORE_FIGURES): New variable. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 63f3ea8..9bd9512 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -267,13 +267,7 @@ regen-split-examples-mk: ## Doxygen documentation. ## ## ----------------------- ## -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. refman_dependencies = \ - $(SPLIT_EXAMPLES) \ - $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ $(srcdir)/ref_guide/ref_guide.hh @@ -454,10 +448,10 @@ technical: technical-html technical-pdf technical_dir = $(doc_dir)/technical -# FIXME: Check these dependencies. And it'd be better to depend on -# actual files rather than timestamps corresponding to a bunch of -# files. -technical_dependencies = $(PNG_FIGURES) $(DOC_PACKAGES) +technical_dependencies = \ + $(TECHNICAL_EXAMPLES) \ + $(PNG_FIGURES) \ + $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -557,12 +551,10 @@ tutorial: tutorial-html tutorial-pdf tutorial_dir = $(doc_dir)/tutorial -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. tutorial_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) @@ -755,12 +747,10 @@ ref-guide: ref-guide-html ref-guide-pdf ref_guide_dir = $(doc_dir)/ref_guide -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. ref_guide_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) -- 1.5.6.5

1 0

last-svn-commit-79-g4c961ee Distribute non generated figures in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (MORE_FIGURES): New variable. Add figures/accu_image_morpher_big_picture.pdf. (EXTRA_DIST): Add $(MORE_FIGURES). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c7e2924..cafa0d4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated figures in the documentation. + + * doc/Makefile.am (MORE_FIGURES): New variable. + Add figures/accu_image_morpher_big_picture.pdf. + (EXTRA_DIST): Add $(MORE_FIGURES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated examples in the documentation. * doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8e1a4f0..63f3ea8 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -102,6 +102,10 @@ include $(srcdir)/figures.mk # variables may be removed someday (see FIXME below). MAINTAINERCLEANFILES = $(FIGURES) +# This image seems to be used nowhere. +MORE_FIGURES = figures/accu_image_morpher_big_picture.pdf +EXTRA_DIST += $(MORE_FIGURES) + # ----- # # PBM. # # ----- # -- 1.5.6.5

1 0

last-svn-commit-86-gfca5428 Distribute non generated figures in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (MORE_FIGURES): New variable. Add figures/accu_image_morpher_big_picture.pdf. (EXTRA_DIST): Add $(MORE_FIGURES). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f561db9..8eef77a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated figures in the documentation. + + * doc/Makefile.am (MORE_FIGURES): New variable. + Add figures/accu_image_morpher_big_picture.pdf. + (EXTRA_DIST): Add $(MORE_FIGURES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated examples in the documentation. * doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8e1a4f0..63f3ea8 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -102,6 +102,10 @@ include $(srcdir)/figures.mk # variables may be removed someday (see FIXME below). MAINTAINERCLEANFILES = $(FIGURES) +# This image seems to be used nowhere. +MORE_FIGURES = figures/accu_image_morpher_big_picture.pdf +EXTRA_DIST += $(MORE_FIGURES) + # ----- # # PBM. # # ----- # -- 1.5.6.5

1 0

last-svn-commit-78-gcc8f9ba Distribute non generated examples in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): New variables. (EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index dff8465..c7e2924 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated examples in the documentation. + + * doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): + New variables. + (EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Have ``make maintainer-clean'' remove generated figures in doc/. * doc/figures.mk diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 5d71933..8e1a4f0 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -221,6 +221,23 @@ regen-examples-mk: mv -f $(srcdir)/examples.mk.tmp $(srcdir)/examples.mk chmod -w $(srcdir)/examples.mk +# Examples used in the technical documentation. +TECHNICAL_EXAMPLES = \ + examples/devel/dispatch.cc.raw \ + examples/devel/facade.cc.raw \ + examples/devel/impl.cc.raw +EXTRA_DIST += $(TECHNICAL_EXAMPLES) + +# Non generated examples. +MORE_EXAMPLES = \ + examples/accu-wrong-instanciation.cc.raw \ + examples/fill-proto.cc.raw \ + examples/ima2d-restricted-1.cc.raw \ + examples/ima2d-restricted-2.cc.raw \ + examples/ima2d-restricted-3.cc.raw \ + examples/tuto3/fill_non_generic.cc.raw +EXTRA_DIST += $(MORE_EXAMPLES) + ## ---------------- ## ## Split examples. ## ## ---------------- ## -- 1.5.6.5

1 0

last-svn-commit-85-g55f2622 Distribute non generated examples in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): New variables. (EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 90dc6e6..f561db9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated examples in the documentation. + + * doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): + New variables. + (EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Have ``make maintainer-clean'' remove generated figures in doc/. * doc/figures.mk diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 5d71933..8e1a4f0 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -221,6 +221,23 @@ regen-examples-mk: mv -f $(srcdir)/examples.mk.tmp $(srcdir)/examples.mk chmod -w $(srcdir)/examples.mk +# Examples used in the technical documentation. +TECHNICAL_EXAMPLES = \ + examples/devel/dispatch.cc.raw \ + examples/devel/facade.cc.raw \ + examples/devel/impl.cc.raw +EXTRA_DIST += $(TECHNICAL_EXAMPLES) + +# Non generated examples. +MORE_EXAMPLES = \ + examples/accu-wrong-instanciation.cc.raw \ + examples/fill-proto.cc.raw \ + examples/ima2d-restricted-1.cc.raw \ + examples/ima2d-restricted-2.cc.raw \ + examples/ima2d-restricted-3.cc.raw \ + examples/tuto3/fill_non_generic.cc.raw +EXTRA_DIST += $(MORE_EXAMPLES) + ## ---------------- ## ## Split examples. ## ## ---------------- ## -- 1.5.6.5

1 0

last-svn-commit-77-gf86b1e7 Have ``make maintainer-clean'' remove generated figures in doc/.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/figures.mk (EXTEND_FIGURES) (FILL_FIGURES) (FILL_SUBDOMAIN_FIGURES) (FILL_IMAGEIF_CFUN_FIGURES) (IMA2D_ROT_FIGURES) (IMA_SAVE_FIGURES) (LABELING_COMPUTE_FIGURES) (LOGICAL_NOT_FIGURES) (TUTO2_FIRST_IMAGE_FIGURES) (TUTO3_COLORIZE_FIGURES) (TUTO3_RW_IMAGE_FIGURES) (TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): New variables. Use them to simplify rules. (FIGURES): New variable. * doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES). --- milena/ChangeLog | 22 +++++++++++++ milena/doc/Makefile.am | 12 +++++-- milena/doc/figures.mk | 79 ++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 98 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1518c1a..dff8465 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,27 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Have ``make maintainer-clean'' remove generated figures in doc/. + + * doc/figures.mk + (EXTEND_FIGURES) + (FILL_FIGURES) + (FILL_SUBDOMAIN_FIGURES) + (FILL_IMAGEIF_CFUN_FIGURES) + (IMA2D_ROT_FIGURES) + (IMA_SAVE_FIGURES) + (LABELING_COMPUTE_FIGURES) + (LOGICAL_NOT_FIGURES) + (TUTO2_FIRST_IMAGE_FIGURES) + (TUTO3_COLORIZE_FIGURES) + (TUTO3_RW_IMAGE_FIGURES) + (TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): + New variables. + Use them to simplify rules. + (FIGURES): New variable. + * doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Generate the list of split outputs in the documentation. * doc/Makefile.am ($(srcdir)/split-outputs.mk): New rule. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index d2b6300..5d71933 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -94,6 +94,14 @@ DOC_PACKAGES = doxyfuns.sty milena.sty ## Figures. ## ## --------- ## +# Generated figures. +include $(srcdir)/figures.mk +# FIXME: $(FIGURES) is not added to EXTRA_DIST (though it is added to +# MAINTAINERCLEANFILES), because its contents is already in EXTRA_DIST +# thanks to PBM_FIGURES, PGM_FIGURES and PPM_FIGURES. However, these +# variables may be removed someday (see FIXME below). +MAINTAINERCLEANFILES = $(FIGURES) + # ----- # # PBM. # # ----- # @@ -185,7 +193,7 @@ PNG_FIGURES = \ $(PGM_FIGURES:.pgm=.png) \ $(PPM_FIGURES:.ppm=.png) EXTRA_DIST += $(PNG_FIGURES) -MAINTAINERCLEANFILES = $(PNG_FIGURES) +MAINTAINERCLEANFILES += $(PNG_FIGURES) ## ---------- ## @@ -903,8 +911,6 @@ regen-examples-outputs-mk: mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk chmod -w $(srcdir)/examples-outputs.mk -include $(srcdir)/figures.mk - ## --------------- ## ## Split outputs. ## ## --------------- ## diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index 3519e3f..d4a9263 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -25,86 +25,141 @@ ## outputs (as a side effect) or at least if the extraction of this ## list from the source file was straightforward. -$(srcdir)/figures/extend-1.ppm $(srcdir)/figures/extend-2.ppm $(srcdir)/figures/extend-3.ppm $(srcdir)/figures/extend-4.ppm $(srcdir)/figures/extend-5.ppm: $(srcdir)/examples/extend.stamp +EXTEND_FIGURES = \ + $(srcdir)/figures/extend-1.ppm \ + $(srcdir)/figures/extend-2.ppm \ + $(srcdir)/figures/extend-3.ppm \ + $(srcdir)/figures/extend-4.ppm \ + $(srcdir)/figures/extend-5.ppm +$(EXTEND_FIGURES): $(srcdir)/examples/extend.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-1.ppm $(srcdir)/figures/fill-2.ppm: $(srcdir)/examples/fill.stamp +FILL_FIGURES = \ + $(srcdir)/figures/fill-1.ppm \ + $(srcdir)/figures/fill-2.ppm +$(FILL_FIGURES): $(srcdir)/examples/fill.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-subdomain-1.pbm $(srcdir)/figures/fill-subdomain-2.ppm $(srcdir)/figures/fill-subdomain-3.ppm $(srcdir)/figures/fill-subdomain-4.ppm: $(srcdir)/examples/fill-subdomain.stamp +FILL_SUBDOMAIN_FIGURES = \ + $(srcdir)/figures/fill-subdomain-1.pbm \ + $(srcdir)/figures/fill-subdomain-2.ppm \ + $(srcdir)/figures/fill-subdomain-3.ppm \ + $(srcdir)/figures/fill-subdomain-4.ppm +$(FILL_SUBDOMAIN_FIGURES): $(srcdir)/examples/fill-subdomain.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-imageif-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp +FILL_IMAGEIF_CFUN_FIGURES = $(srcdir)/figures/fill-imageif-cfun-1.ppm +$(FILL_IMAGEIF_CFUN_FIGURES): $(srcdir)/examples/fill-imageif-cfun.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/ima2d-rot-1.ppm $(srcdir)/figures/ima2d-rot-2.ppm: $(srcdir)/examples/ima2d-rot.stamp +IMA2D_ROT_FIGURES = \ + $(srcdir)/figures/ima2d-rot-1.ppm \ + $(srcdir)/figures/ima2d-rot-2.ppm +$(IMA2D_ROT_FIGURES): $(srcdir)/examples/ima2d-rot.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/ima_save.pbm: $(srcdir)/examples/ima-save.stamp +IMA_SAVE_FIGURES = $(srcdir)/figures/ima_save.pbm +$(IMA_SAVE_FIGURES): $(srcdir)/examples/ima-save.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/labeling-compute-1.pbm $(srcdir)/figures/labeling-compute-2.ppm: $(srcdir)/examples/labeling-compute.stamp +LABELING_COMPUTE_FIGURES = \ + $(srcdir)/figures/labeling-compute-1.pbm \ + $(srcdir)/figures/labeling-compute-2.ppm +$(LABELING_COMPUTE_FIGURES): $(srcdir)/examples/labeling-compute.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/logical-not-1.pbm $(srcdir)/figures/logical-not-2.pbm $(srcdir)/figures/logical-not-3.pbm: $(srcdir)/examples/logical-not.stamp +LOGICAL_NOT_FIGURES = \ + $(srcdir)/figures/logical-not-1.pbm \ + $(srcdir)/figures/logical-not-2.pbm \ + $(srcdir)/figures/logical-not-3.pbm +$(LOGICAL_NOT_FIGURES): $(srcdir)/examples/logical-not.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto2_first_image-1.pbm: $(srcdir)/examples/tuto2_first_image.stamp +TUTO2_FIRST_IMAGE_FIGURES = $(srcdir)/figures/tuto2_first_image-1.pbm +$(TUTO2_FIRST_IMAGE_FIGURES): $(srcdir)/examples/tuto2_first_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto3_colorize-1.pgm $(srcdir)/figures/tuto3_colorize-2.ppm: $(srcdir)/examples/tuto3/colorize.stamp +TUTO3_COLORIZE_FIGURES = \ + $(srcdir)/figures/tuto3_colorize-1.pgm \ + $(srcdir)/figures/tuto3_colorize-2.ppm +$(TUTO3_COLORIZE_FIGURES): $(srcdir)/examples/tuto3/colorize.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto3_rw_image-1.ppm $(srcdir)/figures/tuto3_rw_image-3.ppm: $(srcdir)/examples/tuto3_rw_image.stamp +TUTO3_RW_IMAGE_FIGURES = \ + $(srcdir)/figures/tuto3_rw_image-1.ppm \ + $(srcdir)/figures/tuto3_rw_image-3.ppm +$(TUTO3_RW_IMAGE_FIGURES): $(srcdir)/examples/tuto3_rw_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm: $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp +TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES = \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm +$(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi + +# The list of all generated figures. +FIGURES = \ + $(EXTEND_FIGURES) \ + $(FILL_FIGURES) \ + $(FILL_SUBDOMAIN_FIGURES) \ + $(FILL_IMAGEIF_CFUN_FIGURES) \ + $(IMA2D_ROT_FIGURES) \ + $(IMA_SAVE_FIGURES) \ + $(LABELING_COMPUTE_FIGURES) \ + $(LOGICAL_NOT_FIGURES) \ + $(TUTO2_FIRST_IMAGE_FIGURES) \ + $(TUTO3_COLORIZE_FIGURES) \ + $(TUTO3_RW_IMAGE_FIGURES) \ + $(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES) -- 1.5.6.5

1 0

last-svn-commit-84-g2152dd0 Have ``make maintainer-clean'' remove generated figures in doc/.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/figures.mk (EXTEND_FIGURES) (FILL_FIGURES) (FILL_SUBDOMAIN_FIGURES) (FILL_IMAGEIF_CFUN_FIGURES) (IMA2D_ROT_FIGURES) (IMA_SAVE_FIGURES) (LABELING_COMPUTE_FIGURES) (LOGICAL_NOT_FIGURES) (TUTO2_FIRST_IMAGE_FIGURES) (TUTO3_COLORIZE_FIGURES) (TUTO3_RW_IMAGE_FIGURES) (TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): New variables. Use them to simplify rules. (FIGURES): New variable. * doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES). --- milena/ChangeLog | 22 +++++++++++++ milena/doc/Makefile.am | 12 +++++-- milena/doc/figures.mk | 79 ++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 98 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7b7982d..90dc6e6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,27 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Have ``make maintainer-clean'' remove generated figures in doc/. + + * doc/figures.mk + (EXTEND_FIGURES) + (FILL_FIGURES) + (FILL_SUBDOMAIN_FIGURES) + (FILL_IMAGEIF_CFUN_FIGURES) + (IMA2D_ROT_FIGURES) + (IMA_SAVE_FIGURES) + (LABELING_COMPUTE_FIGURES) + (LOGICAL_NOT_FIGURES) + (TUTO2_FIRST_IMAGE_FIGURES) + (TUTO3_COLORIZE_FIGURES) + (TUTO3_RW_IMAGE_FIGURES) + (TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): + New variables. + Use them to simplify rules. + (FIGURES): New variable. + * doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Generate the list of split outputs in the documentation. * doc/Makefile.am ($(srcdir)/split-outputs.mk): New rule. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index d2b6300..5d71933 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -94,6 +94,14 @@ DOC_PACKAGES = doxyfuns.sty milena.sty ## Figures. ## ## --------- ## +# Generated figures. +include $(srcdir)/figures.mk +# FIXME: $(FIGURES) is not added to EXTRA_DIST (though it is added to +# MAINTAINERCLEANFILES), because its contents is already in EXTRA_DIST +# thanks to PBM_FIGURES, PGM_FIGURES and PPM_FIGURES. However, these +# variables may be removed someday (see FIXME below). +MAINTAINERCLEANFILES = $(FIGURES) + # ----- # # PBM. # # ----- # @@ -185,7 +193,7 @@ PNG_FIGURES = \ $(PGM_FIGURES:.pgm=.png) \ $(PPM_FIGURES:.ppm=.png) EXTRA_DIST += $(PNG_FIGURES) -MAINTAINERCLEANFILES = $(PNG_FIGURES) +MAINTAINERCLEANFILES += $(PNG_FIGURES) ## ---------- ## @@ -903,8 +911,6 @@ regen-examples-outputs-mk: mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk chmod -w $(srcdir)/examples-outputs.mk -include $(srcdir)/figures.mk - ## --------------- ## ## Split outputs. ## ## --------------- ## diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index 3519e3f..d4a9263 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -25,86 +25,141 @@ ## outputs (as a side effect) or at least if the extraction of this ## list from the source file was straightforward. -$(srcdir)/figures/extend-1.ppm $(srcdir)/figures/extend-2.ppm $(srcdir)/figures/extend-3.ppm $(srcdir)/figures/extend-4.ppm $(srcdir)/figures/extend-5.ppm: $(srcdir)/examples/extend.stamp +EXTEND_FIGURES = \ + $(srcdir)/figures/extend-1.ppm \ + $(srcdir)/figures/extend-2.ppm \ + $(srcdir)/figures/extend-3.ppm \ + $(srcdir)/figures/extend-4.ppm \ + $(srcdir)/figures/extend-5.ppm +$(EXTEND_FIGURES): $(srcdir)/examples/extend.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-1.ppm $(srcdir)/figures/fill-2.ppm: $(srcdir)/examples/fill.stamp +FILL_FIGURES = \ + $(srcdir)/figures/fill-1.ppm \ + $(srcdir)/figures/fill-2.ppm +$(FILL_FIGURES): $(srcdir)/examples/fill.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-subdomain-1.pbm $(srcdir)/figures/fill-subdomain-2.ppm $(srcdir)/figures/fill-subdomain-3.ppm $(srcdir)/figures/fill-subdomain-4.ppm: $(srcdir)/examples/fill-subdomain.stamp +FILL_SUBDOMAIN_FIGURES = \ + $(srcdir)/figures/fill-subdomain-1.pbm \ + $(srcdir)/figures/fill-subdomain-2.ppm \ + $(srcdir)/figures/fill-subdomain-3.ppm \ + $(srcdir)/figures/fill-subdomain-4.ppm +$(FILL_SUBDOMAIN_FIGURES): $(srcdir)/examples/fill-subdomain.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-imageif-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp +FILL_IMAGEIF_CFUN_FIGURES = $(srcdir)/figures/fill-imageif-cfun-1.ppm +$(FILL_IMAGEIF_CFUN_FIGURES): $(srcdir)/examples/fill-imageif-cfun.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/ima2d-rot-1.ppm $(srcdir)/figures/ima2d-rot-2.ppm: $(srcdir)/examples/ima2d-rot.stamp +IMA2D_ROT_FIGURES = \ + $(srcdir)/figures/ima2d-rot-1.ppm \ + $(srcdir)/figures/ima2d-rot-2.ppm +$(IMA2D_ROT_FIGURES): $(srcdir)/examples/ima2d-rot.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/ima_save.pbm: $(srcdir)/examples/ima-save.stamp +IMA_SAVE_FIGURES = $(srcdir)/figures/ima_save.pbm +$(IMA_SAVE_FIGURES): $(srcdir)/examples/ima-save.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/labeling-compute-1.pbm $(srcdir)/figures/labeling-compute-2.ppm: $(srcdir)/examples/labeling-compute.stamp +LABELING_COMPUTE_FIGURES = \ + $(srcdir)/figures/labeling-compute-1.pbm \ + $(srcdir)/figures/labeling-compute-2.ppm +$(LABELING_COMPUTE_FIGURES): $(srcdir)/examples/labeling-compute.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/logical-not-1.pbm $(srcdir)/figures/logical-not-2.pbm $(srcdir)/figures/logical-not-3.pbm: $(srcdir)/examples/logical-not.stamp +LOGICAL_NOT_FIGURES = \ + $(srcdir)/figures/logical-not-1.pbm \ + $(srcdir)/figures/logical-not-2.pbm \ + $(srcdir)/figures/logical-not-3.pbm +$(LOGICAL_NOT_FIGURES): $(srcdir)/examples/logical-not.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto2_first_image-1.pbm: $(srcdir)/examples/tuto2_first_image.stamp +TUTO2_FIRST_IMAGE_FIGURES = $(srcdir)/figures/tuto2_first_image-1.pbm +$(TUTO2_FIRST_IMAGE_FIGURES): $(srcdir)/examples/tuto2_first_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto3_colorize-1.pgm $(srcdir)/figures/tuto3_colorize-2.ppm: $(srcdir)/examples/tuto3/colorize.stamp +TUTO3_COLORIZE_FIGURES = \ + $(srcdir)/figures/tuto3_colorize-1.pgm \ + $(srcdir)/figures/tuto3_colorize-2.ppm +$(TUTO3_COLORIZE_FIGURES): $(srcdir)/examples/tuto3/colorize.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto3_rw_image-1.ppm $(srcdir)/figures/tuto3_rw_image-3.ppm: $(srcdir)/examples/tuto3_rw_image.stamp +TUTO3_RW_IMAGE_FIGURES = \ + $(srcdir)/figures/tuto3_rw_image-1.ppm \ + $(srcdir)/figures/tuto3_rw_image-3.ppm +$(TUTO3_RW_IMAGE_FIGURES): $(srcdir)/examples/tuto3_rw_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm: $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp +TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES = \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm +$(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi + +# The list of all generated figures. +FIGURES = \ + $(EXTEND_FIGURES) \ + $(FILL_FIGURES) \ + $(FILL_SUBDOMAIN_FIGURES) \ + $(FILL_IMAGEIF_CFUN_FIGURES) \ + $(IMA2D_ROT_FIGURES) \ + $(IMA_SAVE_FIGURES) \ + $(LABELING_COMPUTE_FIGURES) \ + $(LOGICAL_NOT_FIGURES) \ + $(TUTO2_FIRST_IMAGE_FIGURES) \ + $(TUTO3_COLORIZE_FIGURES) \ + $(TUTO3_RW_IMAGE_FIGURES) \ + $(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES) -- 1.5.6.5

1 0