March 2010 - Olena-patches

last-svn-commit-65-g3b9b30f Generate doc/examples-outputs.mk using sources in lieu of programs.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/gen-examples-outputs-mk: Take sources as input instead of programs. * doc/examples-outputs.mk: Regen. * doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk): Adjust caller. Use `find' to get inputs instead of relying on $(PROGRAMS_examples). Rename target as... ($(srcdir)/examples-outputs.mk): ...this. Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on $(srcdir)/Makefile.am. (regen-examples-outputs-mk): Adjust as well. * doc/programs-examples.mk: Adjust comments. --- milena/ChangeLog | 18 ++++ milena/doc/Makefile.am | 25 ++++-- milena/doc/examples-outputs.mk | 161 +++++++++++++++++++++++++----------- milena/doc/gen-examples-outputs-mk | 14 ++- milena/doc/programs-examples.mk | 4 +- 5 files changed, 158 insertions(+), 64 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7d50a30..2f4606f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Generate doc/examples-outputs.mk using sources in lieu of programs. + + * doc/gen-examples-outputs-mk: Take sources as input instead of + programs. + * doc/examples-outputs.mk: Regen. + * doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk): + Adjust caller. + Use `find' to get inputs instead of relying on + $(PROGRAMS_examples). + Rename target as... + ($(srcdir)/examples-outputs.mk): ...this. + Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on + $(srcdir)/Makefile.am. + (regen-examples-outputs-mk): Adjust as well. + * doc/programs-examples.mk: Adjust comments. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Move bits about programs out of doc/Makefile.am to improve readability. * doc/Makefile.am (PROGRAMS_examples) diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 303b97f..6e2822f 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -909,19 +909,28 @@ MORE_OUTPUTS = \ $(srcdir)/outputs/parray-display-1.txt \ $(srcdir)/outputs/win-create-1-display.txt -$(DOC_SRCDIR)/examples-outputs.mk: $(DOC_SRCDIR)/gen-examples-outputs-mk $(srcdir)/Makefile.am - $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) >$@.tmp +$(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk + rm -f $@.tmp +# Ignore sources in examples/trash/. + cd $(srcdir) && \ + ./gen-examples-outputs-mk \ + `find examples -name \*.cc -a \! -path examples/trash/\* \ + | env LC_ALL=C sort` \ + >examples-outputs.mk.tmp mv -f $@.tmp $@ chmod -w $@ -include $(DOC_SRCDIR)/examples-outputs.mk +include $(srcdir)/examples-outputs.mk .PHONY: regen-examples-outputs-mk regen-examples-outputs-mk: - $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) \ - >$(DOC_SRCDIR)/examples-outputs.mk.tmp - mv -f $(DOC_SRCDIR)/examples-outputs.mk.tmp \ - $(DOC_SRCDIR)/examples-outputs.mk - chmod -w $(DOC_SRCDIR)/examples-outputs.mk + rm -f $(srcdir)/examples-outputs.mk.tmp + cd $(srcdir) && \ + ./gen-examples-outputs-mk \ + `find examples -name \*.cc -a \! -path examples/trash/\* \ + | env LC_ALL=C sort` \ + >examples-outputs.mk.tmp + mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk + chmod -w $(srcdir)/examples-outputs.mk MAINTAINERCLEANFILES += $(OUTPUTS) diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk index 6fdb543..f70feca 100644 --- a/milena/doc/examples-outputs.mk +++ b/milena/doc/examples-outputs.mk @@ -1,295 +1,358 @@ ## Generated by gen-examples-outputs-mk. Do not edit by hand. -$(srcdir)/outputs/accu-right-instanciation.txt: accu-right-instanciation$(EXEEXT) +$(srcdir)/outputs/accu-right-instanciation.txt: examples/accu-right-instanciation.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/borderthickness.txt: borderthickness$(EXEEXT) +$(srcdir)/outputs/borderthickness.txt: examples/borderthickness.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) borderthickness$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/box2d-bbox.txt: box2d-bbox$(EXEEXT) +$(srcdir)/outputs/box2d-bbox.txt: examples/box2d-bbox.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) box2d-bbox$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/domain-display.txt: domain-display$(EXEEXT) +$(srcdir)/outputs/domain-display.txt: examples/domain-display.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) domain-display$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/dpoint-1.txt: dpoint-1$(EXEEXT) +$(srcdir)/outputs/dpoint-1.txt: examples/dpoint-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) dpoint-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/estim-sites.txt: estim-sites$(EXEEXT) +$(srcdir)/outputs/estim-sites.txt: examples/estim-sites.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) estim-sites$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/extend.txt: extend$(EXEEXT) +$(srcdir)/outputs/extend.txt: examples/extend.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) extend$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/extension-ignore.txt: extension-ignore$(EXEEXT) +$(srcdir)/outputs/extension-ignore.txt: examples/extension-ignore.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) extension-ignore$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill.txt: fill$(EXEEXT) +$(srcdir)/outputs/fill-call-1.txt: examples/fill-call-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-call-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-call-1.txt: fill-call-1$(EXEEXT) +$(srcdir)/outputs/fill-imageif-cfun.txt: examples/fill-imageif-cfun.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-imageif-cfun$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-imageif-cfun.txt: fill-imageif-cfun$(EXEEXT) +$(srcdir)/outputs/fill-part-image.txt: examples/fill-part-image.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-part-image$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-part-image.txt: fill-part-image$(EXEEXT) +$(srcdir)/outputs/fill-subdomain-shorter.txt: examples/fill-subdomain-shorter.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-subdomain-shorter$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-subdomain.txt: fill-subdomain$(EXEEXT) +$(srcdir)/outputs/fill-subdomain.txt: examples/fill-subdomain.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-subdomain$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-subdomain-shorter.txt: fill-subdomain-shorter$(EXEEXT) +$(srcdir)/outputs/fill.txt: examples/fill.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/first_routine.txt: first_routine$(EXEEXT) +$(srcdir)/outputs/forall-piter.txt: examples/forall-piter.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) forall-piter$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/forall-piter.txt: forall-piter$(EXEEXT) +$(srcdir)/outputs/fun-p2v-1.txt: examples/fun-p2v-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fun-p2v-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fun-p2v-1.txt: fun-p2v-1$(EXEEXT) +$(srcdir)/outputs/graph-data.txt: examples/graph-data.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) graph-data$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/graph-data.txt: graph-data$(EXEEXT) +$(srcdir)/outputs/graph-iter.txt: examples/graph-iter.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) graph-iter$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/graph-iter.txt: graph-iter$(EXEEXT) +$(srcdir)/outputs/ima-has.txt: examples/ima-has.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima-has$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima-has.txt: ima-has$(EXEEXT) +$(srcdir)/outputs/ima-load.txt: examples/ima-load.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima-load$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima-save.txt: ima-save$(EXEEXT) +$(srcdir)/outputs/ima-save.txt: examples/ima-save.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima-save$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima-size.txt: ima-size$(EXEEXT) +$(srcdir)/outputs/ima-size.txt: examples/ima-size.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima-size$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-1.txt: ima2d-1$(EXEEXT) +$(srcdir)/outputs/ima2d-1.txt: examples/ima2d-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-2.txt: ima2d-2$(EXEEXT) +$(srcdir)/outputs/ima2d-2.txt: examples/ima2d-2.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-2$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-3.txt: ima2d-3$(EXEEXT) +$(srcdir)/outputs/ima2d-3.txt: examples/ima2d-3.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-3$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-4.txt: ima2d-4$(EXEEXT) +$(srcdir)/outputs/ima2d-4.txt: examples/ima2d-4.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-4$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-5.txt: ima2d-5$(EXEEXT) +$(srcdir)/outputs/ima2d-5.txt: examples/ima2d-5.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-5$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-6-clone.txt: ima2d-6-clone$(EXEEXT) +$(srcdir)/outputs/ima2d-6-clone.txt: examples/ima2d-6-clone.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-6-clone$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-7.txt: ima2d-7$(EXEEXT) +$(srcdir)/outputs/ima2d-7.txt: examples/ima2d-7.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-7$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-rot.txt: ima2d-rot$(EXEEXT) +$(srcdir)/outputs/ima2d-rot.txt: examples/ima2d-rot.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-rot$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/labeling-compute.txt: labeling-compute$(EXEEXT) +$(srcdir)/outputs/labeling-compute.txt: examples/labeling-compute.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) labeling-compute$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/logical-not.txt: logical-not$(EXEEXT) +$(srcdir)/outputs/logical-not.txt: examples/logical-not.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) logical-not$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/mln_var.txt: mln_var$(EXEEXT) +$(srcdir)/outputs/mln_var.txt: examples/mln_var.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) mln_var$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/parray-append.txt: parray-append$(EXEEXT) +$(srcdir)/outputs/parray-append.txt: examples/parray-append.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) parray-append$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/parray-bbox.txt: parray-bbox$(EXEEXT) +$(srcdir)/outputs/parray-bbox.txt: examples/parray-bbox.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) parray-bbox$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/paste.txt: paste$(EXEEXT) +$(srcdir)/outputs/paste-call-1.txt: examples/paste-call-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) paste-call-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/paste-call-1.txt: paste-call-1$(EXEEXT) +$(srcdir)/outputs/paste.txt: examples/paste.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) paste$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/point-1.txt: point-1$(EXEEXT) +$(srcdir)/outputs/point-1.txt: examples/point-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) point-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/predicate-1.txt: predicate-1$(EXEEXT) +$(srcdir)/outputs/predicate-1.txt: examples/predicate-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) predicate-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/win-create-1.txt: win-create-1$(EXEEXT) +$(srcdir)/outputs/tuto2_first_image.txt: examples/tuto2_first_image.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) tuto2_first_image$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/win-create-2.txt: win-create-2$(EXEEXT) +$(srcdir)/outputs/colorize.txt: examples/tuto3/colorize.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) colorize$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto2_first_image.txt: tuto2_first_image$(EXEEXT) +$(srcdir)/outputs/first_routine.txt: examples/tuto3/first_routine.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) first_routine$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto3_rw_image.txt: tuto3_rw_image$(EXEEXT) +$(srcdir)/outputs/println.txt: examples/tuto3/println.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) println$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: tuto4_genericity_and_algorithms$(EXEEXT) +$(srcdir)/outputs/trace.txt: examples/tuto3/trace.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) trace$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto3_colorize.txt: tuto3_colorize$(EXEEXT) +$(srcdir)/outputs/tuto3_rw_image.txt: examples/tuto3_rw_image.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) tuto3_rw_image$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto3_println.txt: tuto3_println$(EXEEXT) +$(srcdir)/outputs/image.txt: examples/tuto4/image.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) image$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto3_trace.txt: tuto3_trace$(EXEEXT) +$(srcdir)/outputs/point2d.txt: examples/tuto4/point2d.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) point2d$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto4_point2d.txt: tuto4_point2d$(EXEEXT) +$(srcdir)/outputs/site_set_create.txt: examples/tuto4/site_set_create.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) site_set_create$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto4_site_set_create.txt: tuto4_site_set_create$(EXEEXT) +$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: examples/tuto4_genericity_and_algorithms.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) tuto4_genericity_and_algorithms$(EXEEXT) + ./$< >$@.tmp + cp -f $@.tmp $@ + rm -f $@.tmp + +$(srcdir)/outputs/win-create-1.txt: examples/win-create-1.cc + rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) win-create-1$(EXEEXT) + ./$< >$@.tmp + cp -f $@.tmp $@ + rm -f $@.tmp + +$(srcdir)/outputs/win-create-2.txt: examples/win-create-2.cc + rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) win-create-2$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk index 10692a1..2580072 100755 --- a/milena/doc/gen-examples-outputs-mk +++ b/milena/doc/gen-examples-outputs-mk @@ -20,17 +20,23 @@ me=`basename $0` -test $# -ne 0 || { echo "usage: $me PROGRAMS..."; exit 1; } +test $# -ne 0 || { echo "usage: $me SOURCES..."; exit 1; } cat<<EOF ## Generated by $me. Do not edit by hand. EOF -for program; do -cat<<EOF -\$(srcdir)/outputs/$program.txt: $program\$(EXEEXT) +for source; do + program=`basename "$source" .cc` + # Have outputs depend on sources rather than programs, and recompile + # the latter to regen the former only when needed. This way, we can + # ship generated outputs without forcing the user of the + # distribution to recompile the programs. + cat<<EOF +\$(srcdir)/outputs/$program.txt: $source rm -f \$@.tmp + \$(MAKE) \$(AM_MAKEFLAGS) $program\$(EXEEXT) ./\$< >\$@.tmp cp -f \$@.tmp \$@ rm -f \$@.tmp diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk index b75152b..4a38dd3 100644 --- a/milena/doc/programs-examples.mk +++ b/milena/doc/programs-examples.mk @@ -20,9 +20,7 @@ ## generation of examples-outputs.mk depends only on this file, instead ## of Makefile.am. -## FIXME: Generate this file? Probably a good idea. If so, we -## probably won't need to have examples-outputs.mk depend on it (which -## will simplify the regen calling sequence in bootstrap as well). +## FIXME: Generate this file? Probably a good idea. ## ## If generated, merge examples-outputs.mk and outputs.mk? -- 1.5.6.5

1 0

last-svn-commit-58-gef57579 Generate doc/examples-outputs.mk using sources in lieu of programs.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/gen-examples-outputs-mk: Take sources as input instead of programs. * doc/examples-outputs.mk: Regen. * doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk): Adjust caller. Use `find' to get inputs instead of relying on $(PROGRAMS_examples). Rename target as... ($(srcdir)/examples-outputs.mk): ...this. Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on $(srcdir)/Makefile.am. (regen-examples-outputs-mk): Adjust as well. * doc/programs-examples.mk: Adjust comments. --- milena/ChangeLog | 18 ++++ milena/doc/Makefile.am | 25 ++++-- milena/doc/examples-outputs.mk | 161 +++++++++++++++++++++++++----------- milena/doc/gen-examples-outputs-mk | 14 ++- milena/doc/programs-examples.mk | 4 +- 5 files changed, 158 insertions(+), 64 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0e52376..9f7f28b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Generate doc/examples-outputs.mk using sources in lieu of programs. + + * doc/gen-examples-outputs-mk: Take sources as input instead of + programs. + * doc/examples-outputs.mk: Regen. + * doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk): + Adjust caller. + Use `find' to get inputs instead of relying on + $(PROGRAMS_examples). + Rename target as... + ($(srcdir)/examples-outputs.mk): ...this. + Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on + $(srcdir)/Makefile.am. + (regen-examples-outputs-mk): Adjust as well. + * doc/programs-examples.mk: Adjust comments. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Move bits about programs out of doc/Makefile.am to improve readability. * doc/Makefile.am (PROGRAMS_examples) diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 303b97f..6e2822f 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -909,19 +909,28 @@ MORE_OUTPUTS = \ $(srcdir)/outputs/parray-display-1.txt \ $(srcdir)/outputs/win-create-1-display.txt -$(DOC_SRCDIR)/examples-outputs.mk: $(DOC_SRCDIR)/gen-examples-outputs-mk $(srcdir)/Makefile.am - $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) >$@.tmp +$(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk + rm -f $@.tmp +# Ignore sources in examples/trash/. + cd $(srcdir) && \ + ./gen-examples-outputs-mk \ + `find examples -name \*.cc -a \! -path examples/trash/\* \ + | env LC_ALL=C sort` \ + >examples-outputs.mk.tmp mv -f $@.tmp $@ chmod -w $@ -include $(DOC_SRCDIR)/examples-outputs.mk +include $(srcdir)/examples-outputs.mk .PHONY: regen-examples-outputs-mk regen-examples-outputs-mk: - $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) \ - >$(DOC_SRCDIR)/examples-outputs.mk.tmp - mv -f $(DOC_SRCDIR)/examples-outputs.mk.tmp \ - $(DOC_SRCDIR)/examples-outputs.mk - chmod -w $(DOC_SRCDIR)/examples-outputs.mk + rm -f $(srcdir)/examples-outputs.mk.tmp + cd $(srcdir) && \ + ./gen-examples-outputs-mk \ + `find examples -name \*.cc -a \! -path examples/trash/\* \ + | env LC_ALL=C sort` \ + >examples-outputs.mk.tmp + mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk + chmod -w $(srcdir)/examples-outputs.mk MAINTAINERCLEANFILES += $(OUTPUTS) diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk index 6fdb543..f70feca 100644 --- a/milena/doc/examples-outputs.mk +++ b/milena/doc/examples-outputs.mk @@ -1,295 +1,358 @@ ## Generated by gen-examples-outputs-mk. Do not edit by hand. -$(srcdir)/outputs/accu-right-instanciation.txt: accu-right-instanciation$(EXEEXT) +$(srcdir)/outputs/accu-right-instanciation.txt: examples/accu-right-instanciation.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/borderthickness.txt: borderthickness$(EXEEXT) +$(srcdir)/outputs/borderthickness.txt: examples/borderthickness.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) borderthickness$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/box2d-bbox.txt: box2d-bbox$(EXEEXT) +$(srcdir)/outputs/box2d-bbox.txt: examples/box2d-bbox.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) box2d-bbox$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/domain-display.txt: domain-display$(EXEEXT) +$(srcdir)/outputs/domain-display.txt: examples/domain-display.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) domain-display$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/dpoint-1.txt: dpoint-1$(EXEEXT) +$(srcdir)/outputs/dpoint-1.txt: examples/dpoint-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) dpoint-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/estim-sites.txt: estim-sites$(EXEEXT) +$(srcdir)/outputs/estim-sites.txt: examples/estim-sites.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) estim-sites$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/extend.txt: extend$(EXEEXT) +$(srcdir)/outputs/extend.txt: examples/extend.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) extend$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/extension-ignore.txt: extension-ignore$(EXEEXT) +$(srcdir)/outputs/extension-ignore.txt: examples/extension-ignore.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) extension-ignore$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill.txt: fill$(EXEEXT) +$(srcdir)/outputs/fill-call-1.txt: examples/fill-call-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-call-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-call-1.txt: fill-call-1$(EXEEXT) +$(srcdir)/outputs/fill-imageif-cfun.txt: examples/fill-imageif-cfun.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-imageif-cfun$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-imageif-cfun.txt: fill-imageif-cfun$(EXEEXT) +$(srcdir)/outputs/fill-part-image.txt: examples/fill-part-image.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-part-image$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-part-image.txt: fill-part-image$(EXEEXT) +$(srcdir)/outputs/fill-subdomain-shorter.txt: examples/fill-subdomain-shorter.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-subdomain-shorter$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-subdomain.txt: fill-subdomain$(EXEEXT) +$(srcdir)/outputs/fill-subdomain.txt: examples/fill-subdomain.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill-subdomain$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fill-subdomain-shorter.txt: fill-subdomain-shorter$(EXEEXT) +$(srcdir)/outputs/fill.txt: examples/fill.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fill$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/first_routine.txt: first_routine$(EXEEXT) +$(srcdir)/outputs/forall-piter.txt: examples/forall-piter.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) forall-piter$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/forall-piter.txt: forall-piter$(EXEEXT) +$(srcdir)/outputs/fun-p2v-1.txt: examples/fun-p2v-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) fun-p2v-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/fun-p2v-1.txt: fun-p2v-1$(EXEEXT) +$(srcdir)/outputs/graph-data.txt: examples/graph-data.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) graph-data$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/graph-data.txt: graph-data$(EXEEXT) +$(srcdir)/outputs/graph-iter.txt: examples/graph-iter.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) graph-iter$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/graph-iter.txt: graph-iter$(EXEEXT) +$(srcdir)/outputs/ima-has.txt: examples/ima-has.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima-has$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima-has.txt: ima-has$(EXEEXT) +$(srcdir)/outputs/ima-load.txt: examples/ima-load.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima-load$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima-save.txt: ima-save$(EXEEXT) +$(srcdir)/outputs/ima-save.txt: examples/ima-save.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima-save$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima-size.txt: ima-size$(EXEEXT) +$(srcdir)/outputs/ima-size.txt: examples/ima-size.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima-size$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-1.txt: ima2d-1$(EXEEXT) +$(srcdir)/outputs/ima2d-1.txt: examples/ima2d-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-2.txt: ima2d-2$(EXEEXT) +$(srcdir)/outputs/ima2d-2.txt: examples/ima2d-2.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-2$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-3.txt: ima2d-3$(EXEEXT) +$(srcdir)/outputs/ima2d-3.txt: examples/ima2d-3.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-3$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-4.txt: ima2d-4$(EXEEXT) +$(srcdir)/outputs/ima2d-4.txt: examples/ima2d-4.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-4$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-5.txt: ima2d-5$(EXEEXT) +$(srcdir)/outputs/ima2d-5.txt: examples/ima2d-5.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-5$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-6-clone.txt: ima2d-6-clone$(EXEEXT) +$(srcdir)/outputs/ima2d-6-clone.txt: examples/ima2d-6-clone.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-6-clone$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-7.txt: ima2d-7$(EXEEXT) +$(srcdir)/outputs/ima2d-7.txt: examples/ima2d-7.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-7$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/ima2d-rot.txt: ima2d-rot$(EXEEXT) +$(srcdir)/outputs/ima2d-rot.txt: examples/ima2d-rot.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) ima2d-rot$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/labeling-compute.txt: labeling-compute$(EXEEXT) +$(srcdir)/outputs/labeling-compute.txt: examples/labeling-compute.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) labeling-compute$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/logical-not.txt: logical-not$(EXEEXT) +$(srcdir)/outputs/logical-not.txt: examples/logical-not.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) logical-not$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/mln_var.txt: mln_var$(EXEEXT) +$(srcdir)/outputs/mln_var.txt: examples/mln_var.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) mln_var$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/parray-append.txt: parray-append$(EXEEXT) +$(srcdir)/outputs/parray-append.txt: examples/parray-append.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) parray-append$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/parray-bbox.txt: parray-bbox$(EXEEXT) +$(srcdir)/outputs/parray-bbox.txt: examples/parray-bbox.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) parray-bbox$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/paste.txt: paste$(EXEEXT) +$(srcdir)/outputs/paste-call-1.txt: examples/paste-call-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) paste-call-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/paste-call-1.txt: paste-call-1$(EXEEXT) +$(srcdir)/outputs/paste.txt: examples/paste.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) paste$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/point-1.txt: point-1$(EXEEXT) +$(srcdir)/outputs/point-1.txt: examples/point-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) point-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/predicate-1.txt: predicate-1$(EXEEXT) +$(srcdir)/outputs/predicate-1.txt: examples/predicate-1.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) predicate-1$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/win-create-1.txt: win-create-1$(EXEEXT) +$(srcdir)/outputs/tuto2_first_image.txt: examples/tuto2_first_image.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) tuto2_first_image$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/win-create-2.txt: win-create-2$(EXEEXT) +$(srcdir)/outputs/colorize.txt: examples/tuto3/colorize.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) colorize$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto2_first_image.txt: tuto2_first_image$(EXEEXT) +$(srcdir)/outputs/first_routine.txt: examples/tuto3/first_routine.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) first_routine$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto3_rw_image.txt: tuto3_rw_image$(EXEEXT) +$(srcdir)/outputs/println.txt: examples/tuto3/println.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) println$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: tuto4_genericity_and_algorithms$(EXEEXT) +$(srcdir)/outputs/trace.txt: examples/tuto3/trace.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) trace$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto3_colorize.txt: tuto3_colorize$(EXEEXT) +$(srcdir)/outputs/tuto3_rw_image.txt: examples/tuto3_rw_image.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) tuto3_rw_image$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto3_println.txt: tuto3_println$(EXEEXT) +$(srcdir)/outputs/image.txt: examples/tuto4/image.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) image$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto3_trace.txt: tuto3_trace$(EXEEXT) +$(srcdir)/outputs/point2d.txt: examples/tuto4/point2d.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) point2d$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto4_point2d.txt: tuto4_point2d$(EXEEXT) +$(srcdir)/outputs/site_set_create.txt: examples/tuto4/site_set_create.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) site_set_create$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp -$(srcdir)/outputs/tuto4_site_set_create.txt: tuto4_site_set_create$(EXEEXT) +$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: examples/tuto4_genericity_and_algorithms.cc rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) tuto4_genericity_and_algorithms$(EXEEXT) + ./$< >$@.tmp + cp -f $@.tmp $@ + rm -f $@.tmp + +$(srcdir)/outputs/win-create-1.txt: examples/win-create-1.cc + rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) win-create-1$(EXEEXT) + ./$< >$@.tmp + cp -f $@.tmp $@ + rm -f $@.tmp + +$(srcdir)/outputs/win-create-2.txt: examples/win-create-2.cc + rm -f $@.tmp + $(MAKE) $(AM_MAKEFLAGS) win-create-2$(EXEEXT) ./$< >$@.tmp cp -f $@.tmp $@ rm -f $@.tmp diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk index 10692a1..2580072 100755 --- a/milena/doc/gen-examples-outputs-mk +++ b/milena/doc/gen-examples-outputs-mk @@ -20,17 +20,23 @@ me=`basename $0` -test $# -ne 0 || { echo "usage: $me PROGRAMS..."; exit 1; } +test $# -ne 0 || { echo "usage: $me SOURCES..."; exit 1; } cat<<EOF ## Generated by $me. Do not edit by hand. EOF -for program; do -cat<<EOF -\$(srcdir)/outputs/$program.txt: $program\$(EXEEXT) +for source; do + program=`basename "$source" .cc` + # Have outputs depend on sources rather than programs, and recompile + # the latter to regen the former only when needed. This way, we can + # ship generated outputs without forcing the user of the + # distribution to recompile the programs. + cat<<EOF +\$(srcdir)/outputs/$program.txt: $source rm -f \$@.tmp + \$(MAKE) \$(AM_MAKEFLAGS) $program\$(EXEEXT) ./\$< >\$@.tmp cp -f \$@.tmp \$@ rm -f \$@.tmp diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk index b75152b..4a38dd3 100644 --- a/milena/doc/programs-examples.mk +++ b/milena/doc/programs-examples.mk @@ -20,9 +20,7 @@ ## generation of examples-outputs.mk depends only on this file, instead ## of Makefile.am. -## FIXME: Generate this file? Probably a good idea. If so, we -## probably won't need to have examples-outputs.mk depend on it (which -## will simplify the regen calling sequence in bootstrap as well). +## FIXME: Generate this file? Probably a good idea. ## ## If generated, merge examples-outputs.mk and outputs.mk? -- 1.5.6.5

1 0

last-svn-commit-64-gc16f093 Move bits about programs out of doc/Makefile.am to improve readability.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (PROGRAMS_examples) (accu_right_instanciation_SOURCES) (borderthickness_SOURCES) (box2d_bbox_SOURCES) (domain_display_SOURCES) (dpoint_1_SOURCES) (estim_sites_SOURCES) (extend_SOURCES) (extension_ignore_SOURCES) (fill_SOURCES) (fill_call_1_SOURCES) (fill_imageif_cfun_SOURCES) (fill_part_image_SOURCES) (fill_subdomain_SOURCES) (fill_subdomain_shorter_SOURCES) (first_routine_SOURCES) (forall_piter_SOURCES) (fun_p2v_1_SOURCES) (graph_data_SOURCES) (graph_iter_SOURCES) (ima2d_1_SOURCES) (ima2d_2_SOURCES) (ima2d_3_SOURCES) (ima2d_4_SOURCES) (ima2d_5_SOURCES) (ima2d_6_clone_SOURCES) (ima2d_7_SOURCES) (ima2d_rot_SOURCES) (ima_has_SOURCES) (ima_save_SOURCES) (ima_size_SOURCES) (labeling_compute_SOURCES) (logical_not_SOURCES) (mln_var_SOURCES) (parray_append_SOURCES) (parray_bbox_SOURCES) (paste_SOURCES) (paste_call_1_SOURCES) (point_1_SOURCES) (predicate_1_SOURCES) (tuto2_first_image_SOURCES) (tuto3_colorize_SOURCES) (tuto3_println_SOURCES) (tuto3_rw_image_SOURCES) (tuto3_trace_SOURCES) (tuto4_genericity_and_algorithms_SOURCES) (tuto4_point2d_SOURCES) (tuto4_site_set_create_SOURCES) (win_create_1_SOURCES) (win_create_2_SOURCES): Move variables... * doc/programs-examples.mk: ...here (new file). (PROGRAMS_examples): Rename first_routine as tuto3_first_routine. Add ima-load and tuto4_image. (first_routine_SOURCES): Remove this variable. Superseded by... (tuto3_first_routine_SOURCES): ...this (new) variable. (ima_load_SOURCES, tuto4_image_SOURCES): New variables. * doc/Makefile.am: Include $(srcdir)/programs-examples.mk. --- milena/ChangeLog | 64 +++++++++++++++++ milena/doc/Makefile.am | 120 +------------------------------- milena/doc/programs-examples.mk | 149 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+), 119 deletions(-) create mode 100644 milena/doc/programs-examples.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index 04b7ab2..7d50a30 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,67 @@ +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Move bits about programs out of doc/Makefile.am to improve readability. + + * doc/Makefile.am (PROGRAMS_examples) + (accu_right_instanciation_SOURCES) + (borderthickness_SOURCES) + (box2d_bbox_SOURCES) + (domain_display_SOURCES) + (dpoint_1_SOURCES) + (estim_sites_SOURCES) + (extend_SOURCES) + (extension_ignore_SOURCES) + (fill_SOURCES) + (fill_call_1_SOURCES) + (fill_imageif_cfun_SOURCES) + (fill_part_image_SOURCES) + (fill_subdomain_SOURCES) + (fill_subdomain_shorter_SOURCES) + (first_routine_SOURCES) + (forall_piter_SOURCES) + (fun_p2v_1_SOURCES) + (graph_data_SOURCES) + (graph_iter_SOURCES) + (ima2d_1_SOURCES) + (ima2d_2_SOURCES) + (ima2d_3_SOURCES) + (ima2d_4_SOURCES) + (ima2d_5_SOURCES) + (ima2d_6_clone_SOURCES) + (ima2d_7_SOURCES) + (ima2d_rot_SOURCES) + (ima_has_SOURCES) + (ima_save_SOURCES) + (ima_size_SOURCES) + (labeling_compute_SOURCES) + (logical_not_SOURCES) + (mln_var_SOURCES) + (parray_append_SOURCES) + (parray_bbox_SOURCES) + (paste_SOURCES) + (paste_call_1_SOURCES) + (point_1_SOURCES) + (predicate_1_SOURCES) + (tuto2_first_image_SOURCES) + (tuto3_colorize_SOURCES) + (tuto3_println_SOURCES) + (tuto3_rw_image_SOURCES) + (tuto3_trace_SOURCES) + (tuto4_genericity_and_algorithms_SOURCES) + (tuto4_point2d_SOURCES) + (tuto4_site_set_create_SOURCES) + (win_create_1_SOURCES) + (win_create_2_SOURCES): + Move variables... + * doc/programs-examples.mk: ...here (new file). + (PROGRAMS_examples): Rename first_routine as tuto3_first_routine. + Add ima-load and tuto4_image. + (first_routine_SOURCES): Remove this variable. + Superseded by... + (tuto3_first_routine_SOURCES): ...this (new) variable. + (ima_load_SOURCES, tuto4_image_SOURCES): New variables. + * doc/Makefile.am: Include $(srcdir)/programs-examples.mk. + 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> Generate the list of split examples in the documentation. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 230d8c3..303b97f 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -838,128 +838,10 @@ MAINTAINERCLEANFILES += $(REF_GUIDE_HH) ## Programs. ## ## ---------- ## -PROGRAMS_examples = \ - accu-right-instanciation \ - borderthickness \ - box2d-bbox \ - domain-display \ - dpoint-1 \ - estim-sites \ - extend \ - extension-ignore \ - fill \ - fill-call-1 \ - fill-imageif-cfun \ - fill-part-image \ - fill-subdomain \ - fill-subdomain-shorter \ - first_routine \ - forall-piter \ - fun-p2v-1 \ - graph-data \ - graph-iter \ - ima-has \ - ima-save \ - ima-size \ - ima2d-1 \ - ima2d-2 \ - ima2d-3 \ - ima2d-4 \ - ima2d-5 \ - ima2d-6-clone \ - ima2d-7 \ - ima2d-rot \ - labeling-compute \ - logical-not \ - mln_var \ - parray-append \ - parray-bbox \ - paste \ - paste-call-1 \ - point-1 \ - predicate-1 \ - win-create-1 \ - win-create-2 - -PROGRAMS_examples += \ - tuto2_first_image \ - tuto3_rw_image \ - tuto4_genericity_and_algorithms - -# Tuto3 -PROGRAMS_examples += \ - tuto3_colorize \ - tuto3_println \ - tuto3_trace - -# Tuto4 -PROGRAMS_examples += \ - tuto4_point2d \ - tuto4_site_set_create - +include $(srcdir)/programs-examples.mk EXTRA_PROGRAMS = $(PROGRAMS_examples) CLEANFILES = $(PROGRAMS_examples) -# FIXME: Careful, this will only work if this file is included by -# `milena/doc/Makefile.am', since `examples/' is a subdirectory of -# `milena/doc/'. Anyway, this file is to be eventually inlined in -# `milena/doc/Makefile.am', so this is not a big deal. -accu_right_instanciation_SOURCES = examples/accu-right-instanciation.cc -borderthickness_SOURCES = examples/borderthickness.cc -box2d_bbox_SOURCES = examples/box2d-bbox.cc -domain_display_SOURCES = examples/domain-display.cc -dpoint_1_SOURCES = examples/dpoint-1.cc -estim_sites_SOURCES = examples/estim-sites.cc -extend_SOURCES = examples/extend.cc -extension_ignore_SOURCES = examples/extension-ignore.cc -fill_SOURCES = examples/fill.cc -fill_call_1_SOURCES = examples/fill-call-1.cc -fill_imageif_cfun_SOURCES = examples/fill-imageif-cfun.cc -fill_part_image_SOURCES = examples/fill-part-image.cc -fill_subdomain_SOURCES = examples/fill-subdomain.cc -fill_subdomain_shorter_SOURCES = examples/fill-subdomain-shorter.cc -first_routine_SOURCES = examples/tuto3/first_routine.cc -forall_piter_SOURCES = examples/forall-piter.cc -fun_p2v_1_SOURCES = examples/fun-p2v-1.cc -graph_data_SOURCES = examples/graph-data.cc -graph_iter_SOURCES = examples/graph-iter.cc -ima2d_1_SOURCES = examples/ima2d-1.cc -ima2d_2_SOURCES = examples/ima2d-2.cc -ima2d_3_SOURCES = examples/ima2d-3.cc -ima2d_4_SOURCES = examples/ima2d-4.cc -ima2d_5_SOURCES = examples/ima2d-5.cc -ima2d_6_clone_SOURCES = examples/ima2d-6-clone.cc -ima2d_7_SOURCES = examples/ima2d-7.cc -ima2d_rot_SOURCES = examples/ima2d-rot.cc -ima_has_SOURCES = examples/ima-has.cc -ima_save_SOURCES = examples/ima-save.cc -ima_size_SOURCES = examples/ima-size.cc -labeling_compute_SOURCES = examples/labeling-compute.cc -logical_not_SOURCES = examples/logical-not.cc -mln_var_SOURCES = examples/mln_var.cc -parray_append_SOURCES = examples/parray-append.cc -parray_bbox_SOURCES = examples/parray-bbox.cc -paste_SOURCES = examples/paste.cc -paste_call_1_SOURCES = examples/paste-call-1.cc -point_1_SOURCES = examples/point-1.cc -predicate_1_SOURCES = examples/predicate-1.cc -win_create_1_SOURCES = examples/win-create-1.cc -win_create_2_SOURCES = examples/win-create-2.cc - -tuto2_first_image_SOURCES = examples/tuto2_first_image.cc -tuto3_rw_image_SOURCES = examples/tuto3_rw_image.cc -tuto4_genericity_and_algorithms_SOURCES = examples/tuto4_genericity_and_algorithms.cc - -# Tuto 3 -tuto3_colorize_SOURCES = examples/tuto3/colorize.cc -tuto3_println_SOURCES = examples/tuto3/println.cc -tuto3_trace_SOURCES = examples/tuto3/trace.cc - -# Tuto 4 -tuto4_point2d_SOURCES = examples/tuto4/point2d.cc -tuto4_site_set_create_SOURCES = examples/tuto4/site_set_create.cc - - # FIXME: Try to avoid the use an extensive list: either use Make's # substitution rules or generate it. Actually this list is already # generated (see outputs/outputs.mk). diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk new file mode 100644 index 0000000..b75152b --- /dev/null +++ b/milena/doc/programs-examples.mk @@ -0,0 +1,149 @@ +## Program as examples, generating images & outputs. -*- Makefile-Automake -*- + +## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +## +## This file is part of Olena. +## +## Olena is free software: you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free +## Software Foundation, version 2 of the License. +## +## Olena is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Olena. If not, see <http://www.gnu.org/licenses/>. + +## These variable are set aside in their own file, so that the +## generation of examples-outputs.mk depends only on this file, instead +## of Makefile.am. + +## FIXME: Generate this file? Probably a good idea. If so, we +## probably won't need to have examples-outputs.mk depend on it (which +## will simplify the regen calling sequence in bootstrap as well). +## +## If generated, merge examples-outputs.mk and outputs.mk? + +PROGRAMS_examples = \ + accu-right-instanciation \ + borderthickness \ + box2d-bbox \ + domain-display \ + dpoint-1 \ + estim-sites \ + extend \ + extension-ignore \ + fill \ + fill-call-1 \ + fill-imageif-cfun \ + fill-part-image \ + fill-subdomain \ + fill-subdomain-shorter \ + forall-piter \ + fun-p2v-1 \ + graph-data \ + graph-iter \ + ima-has \ + ima-load \ + ima-save \ + ima-size \ + ima2d-1 \ + ima2d-2 \ + ima2d-3 \ + ima2d-4 \ + ima2d-5 \ + ima2d-6-clone \ + ima2d-7 \ + ima2d-rot \ + labeling-compute \ + logical-not \ + mln_var \ + parray-append \ + parray-bbox \ + paste \ + paste-call-1 \ + point-1 \ + predicate-1 \ + win-create-1 \ + win-create-2 + +PROGRAMS_examples += \ + tuto2_first_image \ + tuto3_rw_image \ + tuto4_genericity_and_algorithms + +# Tuto3 +PROGRAMS_examples += \ + tuto3_colorize \ + tuto3_first_routine \ + tuto3_println \ + tuto3_trace + +# Tuto4 +PROGRAMS_examples += \ + tuto4_image \ + tuto4_point2d \ + tuto4_site_set_create + +# FIXME: Careful, this will only work if this file is included by +# `milena/doc/Makefile.am', since `examples/' is a subdirectory of +# `milena/doc/'. Anyway, this file is to be eventually inlined in +# `milena/doc/Makefile.am', so this is not a big deal. +accu_right_instanciation_SOURCES = examples/accu-right-instanciation.cc +borderthickness_SOURCES = examples/borderthickness.cc +box2d_bbox_SOURCES = examples/box2d-bbox.cc +domain_display_SOURCES = examples/domain-display.cc +dpoint_1_SOURCES = examples/dpoint-1.cc +estim_sites_SOURCES = examples/estim-sites.cc +extend_SOURCES = examples/extend.cc +extension_ignore_SOURCES = examples/extension-ignore.cc +fill_SOURCES = examples/fill.cc +fill_call_1_SOURCES = examples/fill-call-1.cc +fill_imageif_cfun_SOURCES = examples/fill-imageif-cfun.cc +fill_part_image_SOURCES = examples/fill-part-image.cc +fill_subdomain_SOURCES = examples/fill-subdomain.cc +fill_subdomain_shorter_SOURCES = examples/fill-subdomain-shorter.cc +forall_piter_SOURCES = examples/forall-piter.cc +fun_p2v_1_SOURCES = examples/fun-p2v-1.cc +graph_data_SOURCES = examples/graph-data.cc +graph_iter_SOURCES = examples/graph-iter.cc +ima2d_1_SOURCES = examples/ima2d-1.cc +ima2d_2_SOURCES = examples/ima2d-2.cc +ima2d_3_SOURCES = examples/ima2d-3.cc +ima2d_4_SOURCES = examples/ima2d-4.cc +ima2d_5_SOURCES = examples/ima2d-5.cc +ima2d_6_clone_SOURCES = examples/ima2d-6-clone.cc +ima2d_7_SOURCES = examples/ima2d-7.cc +ima2d_rot_SOURCES = examples/ima2d-rot.cc +ima_has_SOURCES = examples/ima-has.cc +ima_load_SOURCES = examples/ima-load.cc +ima_save_SOURCES = examples/ima-save.cc +ima_size_SOURCES = examples/ima-size.cc +labeling_compute_SOURCES = examples/labeling-compute.cc +logical_not_SOURCES = examples/logical-not.cc +mln_var_SOURCES = examples/mln_var.cc +parray_append_SOURCES = examples/parray-append.cc +parray_bbox_SOURCES = examples/parray-bbox.cc +paste_SOURCES = examples/paste.cc +paste_call_1_SOURCES = examples/paste-call-1.cc +point_1_SOURCES = examples/point-1.cc +predicate_1_SOURCES = examples/predicate-1.cc +win_create_1_SOURCES = examples/win-create-1.cc +win_create_2_SOURCES = examples/win-create-2.cc + +tuto2_first_image_SOURCES = examples/tuto2_first_image.cc +tuto3_rw_image_SOURCES = examples/tuto3_rw_image.cc +tuto4_genericity_and_algorithms_SOURCES = examples/tuto4_genericity_and_algorithms.cc + +# Tuto 3 +tuto3_colorize_SOURCES = examples/tuto3/colorize.cc +tuto3_first_routine_SOURCES = examples/tuto3/first_routine.cc +tuto3_println_SOURCES = examples/tuto3/println.cc +tuto3_trace_SOURCES = examples/tuto3/trace.cc + +# Tuto 4 +tuto4_image_SOURCES = examples/tuto4/image.cc +tuto4_point2d_SOURCES = examples/tuto4/point2d.cc +tuto4_site_set_create_SOURCES = examples/tuto4/site_set_create.cc -- 1.5.6.5

1 0

last-svn-commit-57-gf31fd99 Move bits about programs out of doc/Makefile.am to improve readability.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (PROGRAMS_examples) (accu_right_instanciation_SOURCES) (borderthickness_SOURCES) (box2d_bbox_SOURCES) (domain_display_SOURCES) (dpoint_1_SOURCES) (estim_sites_SOURCES) (extend_SOURCES) (extension_ignore_SOURCES) (fill_SOURCES) (fill_call_1_SOURCES) (fill_imageif_cfun_SOURCES) (fill_part_image_SOURCES) (fill_subdomain_SOURCES) (fill_subdomain_shorter_SOURCES) (first_routine_SOURCES) (forall_piter_SOURCES) (fun_p2v_1_SOURCES) (graph_data_SOURCES) (graph_iter_SOURCES) (ima2d_1_SOURCES) (ima2d_2_SOURCES) (ima2d_3_SOURCES) (ima2d_4_SOURCES) (ima2d_5_SOURCES) (ima2d_6_clone_SOURCES) (ima2d_7_SOURCES) (ima2d_rot_SOURCES) (ima_has_SOURCES) (ima_save_SOURCES) (ima_size_SOURCES) (labeling_compute_SOURCES) (logical_not_SOURCES) (mln_var_SOURCES) (parray_append_SOURCES) (parray_bbox_SOURCES) (paste_SOURCES) (paste_call_1_SOURCES) (point_1_SOURCES) (predicate_1_SOURCES) (tuto2_first_image_SOURCES) (tuto3_colorize_SOURCES) (tuto3_println_SOURCES) (tuto3_rw_image_SOURCES) (tuto3_trace_SOURCES) (tuto4_genericity_and_algorithms_SOURCES) (tuto4_point2d_SOURCES) (tuto4_site_set_create_SOURCES) (win_create_1_SOURCES) (win_create_2_SOURCES): Move variables... * doc/programs-examples.mk: ...here (new file). (PROGRAMS_examples): Rename first_routine as tuto3_first_routine. Add ima-load and tuto4_image. (first_routine_SOURCES): Remove this variable. Superseded by... (tuto3_first_routine_SOURCES): ...this (new) variable. (ima_load_SOURCES, tuto4_image_SOURCES): New variables. * doc/Makefile.am: Include $(srcdir)/programs-examples.mk. --- milena/ChangeLog | 64 +++++++++++++++++ milena/doc/Makefile.am | 120 +------------------------------- milena/doc/programs-examples.mk | 149 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+), 119 deletions(-) create mode 100644 milena/doc/programs-examples.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index 6f638ca..0e52376 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,67 @@ +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Move bits about programs out of doc/Makefile.am to improve readability. + + * doc/Makefile.am (PROGRAMS_examples) + (accu_right_instanciation_SOURCES) + (borderthickness_SOURCES) + (box2d_bbox_SOURCES) + (domain_display_SOURCES) + (dpoint_1_SOURCES) + (estim_sites_SOURCES) + (extend_SOURCES) + (extension_ignore_SOURCES) + (fill_SOURCES) + (fill_call_1_SOURCES) + (fill_imageif_cfun_SOURCES) + (fill_part_image_SOURCES) + (fill_subdomain_SOURCES) + (fill_subdomain_shorter_SOURCES) + (first_routine_SOURCES) + (forall_piter_SOURCES) + (fun_p2v_1_SOURCES) + (graph_data_SOURCES) + (graph_iter_SOURCES) + (ima2d_1_SOURCES) + (ima2d_2_SOURCES) + (ima2d_3_SOURCES) + (ima2d_4_SOURCES) + (ima2d_5_SOURCES) + (ima2d_6_clone_SOURCES) + (ima2d_7_SOURCES) + (ima2d_rot_SOURCES) + (ima_has_SOURCES) + (ima_save_SOURCES) + (ima_size_SOURCES) + (labeling_compute_SOURCES) + (logical_not_SOURCES) + (mln_var_SOURCES) + (parray_append_SOURCES) + (parray_bbox_SOURCES) + (paste_SOURCES) + (paste_call_1_SOURCES) + (point_1_SOURCES) + (predicate_1_SOURCES) + (tuto2_first_image_SOURCES) + (tuto3_colorize_SOURCES) + (tuto3_println_SOURCES) + (tuto3_rw_image_SOURCES) + (tuto3_trace_SOURCES) + (tuto4_genericity_and_algorithms_SOURCES) + (tuto4_point2d_SOURCES) + (tuto4_site_set_create_SOURCES) + (win_create_1_SOURCES) + (win_create_2_SOURCES): + Move variables... + * doc/programs-examples.mk: ...here (new file). + (PROGRAMS_examples): Rename first_routine as tuto3_first_routine. + Add ima-load and tuto4_image. + (first_routine_SOURCES): Remove this variable. + Superseded by... + (tuto3_first_routine_SOURCES): ...this (new) variable. + (ima_load_SOURCES, tuto4_image_SOURCES): New variables. + * doc/Makefile.am: Include $(srcdir)/programs-examples.mk. + 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> Generate the list of split examples in the documentation. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 230d8c3..303b97f 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -838,128 +838,10 @@ MAINTAINERCLEANFILES += $(REF_GUIDE_HH) ## Programs. ## ## ---------- ## -PROGRAMS_examples = \ - accu-right-instanciation \ - borderthickness \ - box2d-bbox \ - domain-display \ - dpoint-1 \ - estim-sites \ - extend \ - extension-ignore \ - fill \ - fill-call-1 \ - fill-imageif-cfun \ - fill-part-image \ - fill-subdomain \ - fill-subdomain-shorter \ - first_routine \ - forall-piter \ - fun-p2v-1 \ - graph-data \ - graph-iter \ - ima-has \ - ima-save \ - ima-size \ - ima2d-1 \ - ima2d-2 \ - ima2d-3 \ - ima2d-4 \ - ima2d-5 \ - ima2d-6-clone \ - ima2d-7 \ - ima2d-rot \ - labeling-compute \ - logical-not \ - mln_var \ - parray-append \ - parray-bbox \ - paste \ - paste-call-1 \ - point-1 \ - predicate-1 \ - win-create-1 \ - win-create-2 - -PROGRAMS_examples += \ - tuto2_first_image \ - tuto3_rw_image \ - tuto4_genericity_and_algorithms - -# Tuto3 -PROGRAMS_examples += \ - tuto3_colorize \ - tuto3_println \ - tuto3_trace - -# Tuto4 -PROGRAMS_examples += \ - tuto4_point2d \ - tuto4_site_set_create - +include $(srcdir)/programs-examples.mk EXTRA_PROGRAMS = $(PROGRAMS_examples) CLEANFILES = $(PROGRAMS_examples) -# FIXME: Careful, this will only work if this file is included by -# `milena/doc/Makefile.am', since `examples/' is a subdirectory of -# `milena/doc/'. Anyway, this file is to be eventually inlined in -# `milena/doc/Makefile.am', so this is not a big deal. -accu_right_instanciation_SOURCES = examples/accu-right-instanciation.cc -borderthickness_SOURCES = examples/borderthickness.cc -box2d_bbox_SOURCES = examples/box2d-bbox.cc -domain_display_SOURCES = examples/domain-display.cc -dpoint_1_SOURCES = examples/dpoint-1.cc -estim_sites_SOURCES = examples/estim-sites.cc -extend_SOURCES = examples/extend.cc -extension_ignore_SOURCES = examples/extension-ignore.cc -fill_SOURCES = examples/fill.cc -fill_call_1_SOURCES = examples/fill-call-1.cc -fill_imageif_cfun_SOURCES = examples/fill-imageif-cfun.cc -fill_part_image_SOURCES = examples/fill-part-image.cc -fill_subdomain_SOURCES = examples/fill-subdomain.cc -fill_subdomain_shorter_SOURCES = examples/fill-subdomain-shorter.cc -first_routine_SOURCES = examples/tuto3/first_routine.cc -forall_piter_SOURCES = examples/forall-piter.cc -fun_p2v_1_SOURCES = examples/fun-p2v-1.cc -graph_data_SOURCES = examples/graph-data.cc -graph_iter_SOURCES = examples/graph-iter.cc -ima2d_1_SOURCES = examples/ima2d-1.cc -ima2d_2_SOURCES = examples/ima2d-2.cc -ima2d_3_SOURCES = examples/ima2d-3.cc -ima2d_4_SOURCES = examples/ima2d-4.cc -ima2d_5_SOURCES = examples/ima2d-5.cc -ima2d_6_clone_SOURCES = examples/ima2d-6-clone.cc -ima2d_7_SOURCES = examples/ima2d-7.cc -ima2d_rot_SOURCES = examples/ima2d-rot.cc -ima_has_SOURCES = examples/ima-has.cc -ima_save_SOURCES = examples/ima-save.cc -ima_size_SOURCES = examples/ima-size.cc -labeling_compute_SOURCES = examples/labeling-compute.cc -logical_not_SOURCES = examples/logical-not.cc -mln_var_SOURCES = examples/mln_var.cc -parray_append_SOURCES = examples/parray-append.cc -parray_bbox_SOURCES = examples/parray-bbox.cc -paste_SOURCES = examples/paste.cc -paste_call_1_SOURCES = examples/paste-call-1.cc -point_1_SOURCES = examples/point-1.cc -predicate_1_SOURCES = examples/predicate-1.cc -win_create_1_SOURCES = examples/win-create-1.cc -win_create_2_SOURCES = examples/win-create-2.cc - -tuto2_first_image_SOURCES = examples/tuto2_first_image.cc -tuto3_rw_image_SOURCES = examples/tuto3_rw_image.cc -tuto4_genericity_and_algorithms_SOURCES = examples/tuto4_genericity_and_algorithms.cc - -# Tuto 3 -tuto3_colorize_SOURCES = examples/tuto3/colorize.cc -tuto3_println_SOURCES = examples/tuto3/println.cc -tuto3_trace_SOURCES = examples/tuto3/trace.cc - -# Tuto 4 -tuto4_point2d_SOURCES = examples/tuto4/point2d.cc -tuto4_site_set_create_SOURCES = examples/tuto4/site_set_create.cc - - # FIXME: Try to avoid the use an extensive list: either use Make's # substitution rules or generate it. Actually this list is already # generated (see outputs/outputs.mk). diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk new file mode 100644 index 0000000..b75152b --- /dev/null +++ b/milena/doc/programs-examples.mk @@ -0,0 +1,149 @@ +## Program as examples, generating images & outputs. -*- Makefile-Automake -*- + +## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +## +## This file is part of Olena. +## +## Olena is free software: you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free +## Software Foundation, version 2 of the License. +## +## Olena is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Olena. If not, see <http://www.gnu.org/licenses/>. + +## These variable are set aside in their own file, so that the +## generation of examples-outputs.mk depends only on this file, instead +## of Makefile.am. + +## FIXME: Generate this file? Probably a good idea. If so, we +## probably won't need to have examples-outputs.mk depend on it (which +## will simplify the regen calling sequence in bootstrap as well). +## +## If generated, merge examples-outputs.mk and outputs.mk? + +PROGRAMS_examples = \ + accu-right-instanciation \ + borderthickness \ + box2d-bbox \ + domain-display \ + dpoint-1 \ + estim-sites \ + extend \ + extension-ignore \ + fill \ + fill-call-1 \ + fill-imageif-cfun \ + fill-part-image \ + fill-subdomain \ + fill-subdomain-shorter \ + forall-piter \ + fun-p2v-1 \ + graph-data \ + graph-iter \ + ima-has \ + ima-load \ + ima-save \ + ima-size \ + ima2d-1 \ + ima2d-2 \ + ima2d-3 \ + ima2d-4 \ + ima2d-5 \ + ima2d-6-clone \ + ima2d-7 \ + ima2d-rot \ + labeling-compute \ + logical-not \ + mln_var \ + parray-append \ + parray-bbox \ + paste \ + paste-call-1 \ + point-1 \ + predicate-1 \ + win-create-1 \ + win-create-2 + +PROGRAMS_examples += \ + tuto2_first_image \ + tuto3_rw_image \ + tuto4_genericity_and_algorithms + +# Tuto3 +PROGRAMS_examples += \ + tuto3_colorize \ + tuto3_first_routine \ + tuto3_println \ + tuto3_trace + +# Tuto4 +PROGRAMS_examples += \ + tuto4_image \ + tuto4_point2d \ + tuto4_site_set_create + +# FIXME: Careful, this will only work if this file is included by +# `milena/doc/Makefile.am', since `examples/' is a subdirectory of +# `milena/doc/'. Anyway, this file is to be eventually inlined in +# `milena/doc/Makefile.am', so this is not a big deal. +accu_right_instanciation_SOURCES = examples/accu-right-instanciation.cc +borderthickness_SOURCES = examples/borderthickness.cc +box2d_bbox_SOURCES = examples/box2d-bbox.cc +domain_display_SOURCES = examples/domain-display.cc +dpoint_1_SOURCES = examples/dpoint-1.cc +estim_sites_SOURCES = examples/estim-sites.cc +extend_SOURCES = examples/extend.cc +extension_ignore_SOURCES = examples/extension-ignore.cc +fill_SOURCES = examples/fill.cc +fill_call_1_SOURCES = examples/fill-call-1.cc +fill_imageif_cfun_SOURCES = examples/fill-imageif-cfun.cc +fill_part_image_SOURCES = examples/fill-part-image.cc +fill_subdomain_SOURCES = examples/fill-subdomain.cc +fill_subdomain_shorter_SOURCES = examples/fill-subdomain-shorter.cc +forall_piter_SOURCES = examples/forall-piter.cc +fun_p2v_1_SOURCES = examples/fun-p2v-1.cc +graph_data_SOURCES = examples/graph-data.cc +graph_iter_SOURCES = examples/graph-iter.cc +ima2d_1_SOURCES = examples/ima2d-1.cc +ima2d_2_SOURCES = examples/ima2d-2.cc +ima2d_3_SOURCES = examples/ima2d-3.cc +ima2d_4_SOURCES = examples/ima2d-4.cc +ima2d_5_SOURCES = examples/ima2d-5.cc +ima2d_6_clone_SOURCES = examples/ima2d-6-clone.cc +ima2d_7_SOURCES = examples/ima2d-7.cc +ima2d_rot_SOURCES = examples/ima2d-rot.cc +ima_has_SOURCES = examples/ima-has.cc +ima_load_SOURCES = examples/ima-load.cc +ima_save_SOURCES = examples/ima-save.cc +ima_size_SOURCES = examples/ima-size.cc +labeling_compute_SOURCES = examples/labeling-compute.cc +logical_not_SOURCES = examples/logical-not.cc +mln_var_SOURCES = examples/mln_var.cc +parray_append_SOURCES = examples/parray-append.cc +parray_bbox_SOURCES = examples/parray-bbox.cc +paste_SOURCES = examples/paste.cc +paste_call_1_SOURCES = examples/paste-call-1.cc +point_1_SOURCES = examples/point-1.cc +predicate_1_SOURCES = examples/predicate-1.cc +win_create_1_SOURCES = examples/win-create-1.cc +win_create_2_SOURCES = examples/win-create-2.cc + +tuto2_first_image_SOURCES = examples/tuto2_first_image.cc +tuto3_rw_image_SOURCES = examples/tuto3_rw_image.cc +tuto4_genericity_and_algorithms_SOURCES = examples/tuto4_genericity_and_algorithms.cc + +# Tuto 3 +tuto3_colorize_SOURCES = examples/tuto3/colorize.cc +tuto3_first_routine_SOURCES = examples/tuto3/first_routine.cc +tuto3_println_SOURCES = examples/tuto3/println.cc +tuto3_trace_SOURCES = examples/tuto3/trace.cc + +# Tuto 4 +tuto4_image_SOURCES = examples/tuto4/image.cc +tuto4_point2d_SOURCES = examples/tuto4/point2d.cc +tuto4_site_set_create_SOURCES = examples/tuto4/site_set_create.cc -- 1.5.6.5

1 0

last-svn-commit-49-gb7fc1e7 Ship doc/gen-examples-outputs-mk.
by Roland Levillain 16 Mar '10

16 Mar '10

* doc/Makefile.am (EXTRA_DIST): Add gen-examples-outputs-mk. --- milena/ChangeLog | 6 ++++++ milena/doc/Makefile.am | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 058fc20..d48cb6c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + + Ship doc/gen-examples-outputs-mk. + + * doc/Makefile.am (EXTRA_DIST): Add gen-examples-outputs-mk. + 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> Fix the regeneration of HTML outputs. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 7f6c1c2..9ba03c0 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -1128,3 +1128,5 @@ EXTRA_DIST += \ tools/sample_utils.hh \ tools/split_sample.sh \ tools/todoxygen.sh + +EXTRA_DIST += gen-examples-outputs-mk -- 1.5.6.5

1 0

last-svn-commit-56-ge5d6ed0 bootstrap: Regen the list of split examples of the documentation.
by Roland Levillain 16 Mar '10

16 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4fe239..e3166c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Regen the list of split examples of the documentation. + +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Regen the list of examples of the documentation. 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 9cafeff..9dada3f 100755 --- a/bootstrap +++ b/bootstrap @@ -177,7 +177,8 @@ run milena/doc/ ./generate_dist_files.sh outputs txt milena/doc/gen-make-variable EXAMPLES \ `find milena/doc/examples -name '*.cc' | sed 's,^milena/doc,\$(srcdir),'` \ >milena/doc/examples.mk -run milena/doc/ ./generate_dist_files.sh examples cc.raw +# * Split examples. +cd milena/doc && ./gen-split-examples-mk >split-examples.mk # Generate unit test files. run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests -- 1.5.6.5

1 0

last-svn-commit-55-g16b19b7 Generate the list of split examples in the documentation.
by Roland Levillain 16 Mar '10

16 Mar '10

* doc/gen-split-examples-mk: New script. * doc/Makefile.am: Include ($(srcdir)/split-examples.mk). ($(srcdir)/split-examples.mk): New target. (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(SPLIT_EXAMPLES). (refman_dependencies) (tutorial_dependencies) (ref_guide_dependencies): Remove $(doc_dir)/split-examples.stamp. Add $(SPLIT_EXAMPLES). (regen-split-examples-mk): New (phony) target. (regen-am): Remake regen-split-examples-mk instead of using generate_dist_files.sh. ($(srcdir)/headers.stamp): No longer call generate_dist_files.sh to regen doc/examples/examples.mk. No longer include $(srcdir)/examples/examples.mk. ($(srcdir)/examples/examples.mk, $(srcdir)/split-examples.stamp): Remove rules. (EXTRA_DIST, MAINTAINERCLEANFILES): Remove $(srcdir)/split-examples.stamp. (EXTRA_DIST): Add gen-split-examples-mk. * doc/split-examples.mk: New (generated) Make helper. * doc/examples/examples.mk: Remove. --- milena/ChangeLog | 27 ++ milena/doc/Makefile.am | 62 ++-- milena/doc/examples/examples.mk | 125 ------ milena/doc/gen-split-examples-mk | 127 ++++++ milena/doc/split-examples.mk | 916 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 1100 insertions(+), 157 deletions(-) delete mode 100644 milena/doc/examples/examples.mk create mode 100755 milena/doc/gen-split-examples-mk create mode 100644 milena/doc/split-examples.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index 028e7a8..6f638ca 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,32 @@ 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + Generate the list of split examples in the documentation. + + * doc/gen-split-examples-mk: New script. + * doc/Makefile.am: Include ($(srcdir)/split-examples.mk). + ($(srcdir)/split-examples.mk): New target. + (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(SPLIT_EXAMPLES). + (refman_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies): + Remove $(doc_dir)/split-examples.stamp. + Add $(SPLIT_EXAMPLES). + (regen-split-examples-mk): New (phony) target. + (regen-am): Remake regen-split-examples-mk instead of using + generate_dist_files.sh. + ($(srcdir)/headers.stamp): No longer call generate_dist_files.sh + to regen doc/examples/examples.mk. + No longer include $(srcdir)/examples/examples.mk. + ($(srcdir)/examples/examples.mk, $(srcdir)/split-examples.stamp): + Remove rules. + (EXTRA_DIST, MAINTAINERCLEANFILES): + Remove $(srcdir)/split-examples.stamp. + (EXTRA_DIST): Add gen-split-examples-mk. + * doc/split-examples.mk: New (generated) Make helper. + * doc/examples/examples.mk: Remove. + +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + Generate the list of examples in the documentation. * doc/Makefile.am (EXAMPLES): Remove this variable that used to be diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 0174fc7..230d8c3 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -216,6 +216,27 @@ regen-examples-mk: mv -f $(srcdir)/examples.mk.tmp $(srcdir)/examples.mk chmod -w $(srcdir)/examples.mk +## ---------------- ## +## Split examples. ## +## ---------------- ## + +$(srcdir)/split-examples.mk: $(srcdir)/gen-split-examples-mk + rm -f $@.tmp + cd $(srcdir) && ./gen-split-examples-mk >split-examples.mk.tmp + mv -f $@.tmp $@ + chmod -w $@ +include $(srcdir)/split-examples.mk +EXTRA_DIST += $(SPLIT_EXAMPLES) +MAINTAINERCLEANFILES += $(SPLIT_EXAMPLES) + +.PHONY: regen-split-examples-mk +regen-split-examples-mk: + rm -f $(srcdir)/split-examples.mk.tmp + cd $(srcdir) && ./gen-split-examples-mk >split-examples.mk.tmp + mv -f $(srcdir)/split-examples.mk.tmp $(srcdir)/split-examples.mk + chmod -w $(srcdir)/split-examples.mk + + ## ----------------------- ## ## Doxygen documentation. ## ## ----------------------- ## @@ -225,7 +246,7 @@ regen-examples-mk: # 2. It'd be better to depend on actual files rather than timestamps # corresponding to a bunch of files. refman_dependencies = \ - $(srcdir)/split-examples.stamp \ + $(SPLIT_EXAMPLES) \ $(srcdir)/split-outputs.stamp \ $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ @@ -521,7 +542,7 @@ tutorial_dir = $(doc_dir)/tutorial # 2. It'd be better to depend on actual files rather than timestamps # corresponding to a bunch of files. tutorial_dependencies = \ - $(doc_dir)/split-examples.stamp \ + $(SPLIT_EXAMPLES) \ $(doc_dir)/split-outputs.stamp \ $(PNG_FIGURES) @@ -721,7 +742,7 @@ ref_guide_dir = $(doc_dir)/ref_guide # 2. It'd be better to depend on actual files rather than timestamps # corresponding to a bunch of files. ref_guide_dependencies = \ - $(doc_dir)/split-examples.stamp \ + $(SPLIT_EXAMPLES) \ $(doc_dir)/split-outputs.stamp \ $(PNG_FIGURES) @@ -1022,31 +1043,9 @@ regen-examples-outputs-mk: MAINTAINERCLEANFILES += $(OUTPUTS) -# FIXME: Warning: $(SPLIT_EXAMPLES_SRCDIR) might not exist. Ensure it -# exists. - -# FIXME: Place split files in their own directory, e.g.: split -# `examples/foo.cc' into `examples/split/foo.dir/foo-1.cc', -# `examples/split/foo.dir/foo-2.cc', etc. It makes removal of these -# files easier. We probably also nee a stamp file to keep track of -# dependencies. - -EXTRA_DIST += $(srcdir)/split-examples.stamp -MAINTAINERCLEANFILES += $(srcdir)/split-examples.stamp -# FIXME: Loops are bad, as they prevent parallelism. And we prefer -# data-driven actions anyway. This would imply that we know in -# advance the list out outputs (here, split examples). Maybe we can -# infer it from the LaTeX document. -$(srcdir)/split-examples.stamp: $(EXAMPLES) - @rm -f $@.tmp - @touch $@.tmp - failcom='exit 1'; \ - for file in $(EXAMPLES); do \ - $(DOC_SRCDIR)/tools/split_sample.sh \ - $$file cc raw $(SPLIT_EXAMPLES_SRCDIR) \ - || eval $$failcom; \ - done - @mv -f $@.tmp $@ +## --------------- ## +## Split outputs. ## +## --------------- ## EXTRA_DIST += $(srcdir)/split-outputs.stamp MAINTAINERCLEANFILES += $(srcdir)/split-outputs.stamp @@ -1082,13 +1081,12 @@ regen-am: $(MAKE) $(AM_MAKEFLAGS) regen-pgm-figures-mk $(MAKE) $(AM_MAKEFLAGS) regen-ppm-figures-mk $(MAKE) $(AM_MAKEFLAGS) regen-examples-mk + $(MAKE) $(AM_MAKEFLAGS) regen-split-examples-mk $(MAKE) $(AM_MAKEFLAGS) regen-examples-outputs-mk @cd $(srcdir) && \ ./generate_dist_files.sh outputs txt && \ - ./generate_dist_files.sh examples cc.raw @mv -f $(srcdir)/headers.stamp.tmp $(srcdir)/headers.stamp -$(srcdir)/examples/examples.mk: $(srcdir)/headers.stamp $(srcdir)/outputs/outputs.mk: $(srcdir)/headers.stamp @@ -1097,11 +1095,9 @@ $(srcdir)/headers.stamp: $(srcdir)/generate_dist_files.sh @touch $@.tmp @cd $(srcdir) && \ ./generate_dist_files.sh outputs txt && \ - ./generate_dist_files.sh examples cc.raw @mv -f $@.tmp $@ -include $(srcdir)/examples/examples.mk include $(srcdir)/outputs/outputs.mk @@ -1160,3 +1156,5 @@ EXTRA_DIST += \ EXTRA_DIST += gen-make-variable # FIXME: Can't we implement this using `gen-make-variable'? EXTRA_DIST += gen-examples-outputs-mk +# Generate a Makefile handling the generation of split examples. +EXTRA_DIST += gen-split-examples-mk diff --git a/milena/doc/examples/examples.mk b/milena/doc/examples/examples.mk deleted file mode 100644 index 1feed0f..0000000 --- a/milena/doc/examples/examples.mk +++ /dev/null @@ -1,125 +0,0 @@ -## Generated by ../generate_dist_files, do not modify. - -EXTRA_DIST += \ -examples/accu-wrong-instanciation.cc.raw \ -examples/devel/dispatch.cc.raw \ -examples/devel/facade.cc.raw \ -examples/devel/impl.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/split/accu-right-instanciation-1.cc.raw \ -examples/split/borderthickness-1.cc.raw \ -examples/split/box2d-bbox-1.cc.raw \ -examples/split/domain-display-1.cc.raw \ -examples/split/dpoint-1-1.cc.raw \ -examples/split/estim-sites-1.cc.raw \ -examples/split/extend-1.cc.raw \ -examples/split/extend-2.cc.raw \ -examples/split/extend-3.cc.raw \ -examples/split/extend-4.cc.raw \ -examples/split/extend-5.cc.raw \ -examples/split/extension-ignore-1.cc.raw \ -examples/split/fill-1.cc.raw \ -examples/split/fill-2.cc.raw \ -examples/split/fill-3.cc.raw \ -examples/split/fill-call-1-1.cc.raw \ -examples/split/fill-call-1-2.cc.raw \ -examples/split/fill-call-1-3.cc.raw \ -examples/split/fill-imageif-cfun-1.cc.raw \ -examples/split/fill-imageif-cfun-2.cc.raw \ -examples/split/fill-imageif-cfun-3.cc.raw \ -examples/split/fill-part-image-1.cc.raw \ -examples/split/fill-part-image-2.cc.raw \ -examples/split/fill-subdomain-1.cc.raw \ -examples/split/fill-subdomain-2.cc.raw \ -examples/split/fill-subdomain-3.cc.raw \ -examples/split/fill-subdomain-4.cc.raw \ -examples/split/fill-subdomain-shorter-1.cc.raw \ -examples/split/fill-subdomain-shorter-2.cc.raw \ -examples/split/forall-piter-1.cc.raw \ -examples/split/fun-p2v-1-1.cc.raw \ -examples/split/graph-data-1.cc.raw \ -examples/split/graph-data-2.cc.raw \ -examples/split/graph-data-3.cc.raw \ -examples/split/graph-data-4.cc.raw \ -examples/split/graph-data-5.cc.raw \ -examples/split/graph-data-6.cc.raw \ -examples/split/graph-iter-1.cc.raw \ -examples/split/graph-iter-2.cc.raw \ -examples/split/graph-iter-3.cc.raw \ -examples/split/graph-iter-4.cc.raw \ -examples/split/ima-has-1.cc.raw \ -examples/split/ima-load-1.cc.raw \ -examples/split/ima-save-1.cc.raw \ -examples/split/ima-size-1.cc.raw \ -examples/split/ima2d-1-1.cc.raw \ -examples/split/ima2d-2-1.cc.raw \ -examples/split/ima2d-3-1.cc.raw \ -examples/split/ima2d-4-1.cc.raw \ -examples/split/ima2d-5-1.cc.raw \ -examples/split/ima2d-6-clone-1.cc.raw \ -examples/split/ima2d-7-1.cc.raw \ -examples/split/ima2d-rot-1.cc.raw \ -examples/split/labeling-compute-1.cc.raw \ -examples/split/labeling-compute-2.cc.raw \ -examples/split/labeling-compute-3.cc.raw \ -examples/split/labeling-compute-4.cc.raw \ -examples/split/logical-not-1.cc.raw \ -examples/split/logical-not-2.cc.raw \ -examples/split/logical-not-3.cc.raw \ -examples/split/mln_var-1.cc.raw \ -examples/split/mln_var-2.cc.raw \ -examples/split/mln_var-3.cc.raw \ -examples/split/parray-append-1.cc.raw \ -examples/split/parray-bbox-1.cc.raw \ -examples/split/paste-1.cc.raw \ -examples/split/paste-call-1-1.cc.raw \ -examples/split/point-1-1.cc.raw \ -examples/split/predicate-1-1.cc.raw \ -examples/split/tuto2_first_image-1.cc.raw \ -examples/split/tuto2_first_image-2.cc.raw \ -examples/split/tuto2_first_image-3.cc.raw \ -examples/split/tuto2_first_image-4.cc.raw \ -examples/split/tuto3_colorize-1.cc.raw \ -examples/split/tuto3_first_routine-1.cc.raw \ -examples/split/tuto3_first_routine-2.cc.raw \ -examples/split/tuto3_first_routine-3.cc.raw \ -examples/split/tuto3_first_routine-4.cc.raw \ -examples/split/tuto3_first_routine-5.cc.raw \ -examples/split/tuto3_first_routine-6.cc.raw \ -examples/split/tuto3_first_routine-7.cc.raw \ -examples/split/tuto3_first_routine-8.cc.raw \ -examples/split/tuto3_println-1.cc.raw \ -examples/split/tuto3_println-2.cc.raw \ -examples/split/tuto3_rw_image-1.cc.raw \ -examples/split/tuto3_rw_image-2.cc.raw \ -examples/split/tuto3_rw_image-3.cc.raw \ -examples/split/tuto3_rw_image-4.cc.raw \ -examples/split/tuto3_rw_image-5.cc.raw \ -examples/split/tuto3_rw_image-6.cc.raw \ -examples/split/tuto3_rw_image-7.cc.raw \ -examples/split/tuto3_trace-1.cc.raw \ -examples/split/tuto3_trace-2.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-1.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-10.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-11.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-12.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-2.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-3.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-4.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-5.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-6.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-7.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-8.cc.raw \ -examples/split/tuto4_genericity_and_algorithms-9.cc.raw \ -examples/split/tuto4_point2d-1.cc.raw \ -examples/split/tuto4_site_set_create-1.cc.raw \ -examples/split/tuto4_site_set_create-2.cc.raw \ -examples/split/tuto4_site_set_create-3.cc.raw \ -examples/split/tuto4_site_set_create-4.cc.raw \ -examples/split/tuto4_site_set_create-5.cc.raw \ -examples/split/win-create-1-1.cc.raw \ -examples/split/win-create-2-1.cc.raw \ -examples/tuto3/fill_non_generic.cc.raw diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk new file mode 100755 index 0000000..fb29a02 --- /dev/null +++ b/milena/doc/gen-split-examples-mk @@ -0,0 +1,127 @@ +#! /bin/sh + +# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Olena. If not, see <http://www.gnu.org/licenses/>. + +# To be used from milena/doc/'s source directory. + +me=`basename $0` + +die () +{ + echo >&2 "$me: $@" + exit 1 +} + +# backslashify +# ------------ +# Read lines from the standard input and write them on the standard +# output with an extra trailing backslash, except for the last line. +backslashify() +{ + # Set IFS to nothing to prevent `read' from trimming spaces or tabs. + IFS= read last_line + while IFS= read line; do + echo "$last_line \\" + last_line=$line + done + echo "$last_line" +} + +# Get this list as argument? +inputs() +{ + find examples -name \*.cc +} + +output_dir=examples/split + +# Use a temporary file to dump rules at the end of the output. +tempfile=`mktemp` +# Set up automatic cleanup. +cleanup() { rm -f "$tempfile"; exit; } +trap cleanup 0 1 2 3 6 15 + +# Header. +cat <<EOF +## Generated by $me. Do not edit by hand. + +EOF + +# Output target names in a variable. +{ + echo "SPLIT_EXAMPLES =" + inputs | while read file; do + # Count the number of opening and closing marks. + nopening=`grep -c '// *\\\{' "$file"` + nclosing=`grep -c '// *\\\}' "$file"` + test "$nopening" -eq "$nclosing" \ + || die "Unbalanced marks in $file ($nopening vs $nclosing)" + + # If there is no mark, skip this file. + test "$nopening" -eq 0 && continue + + # FIXME: Programs of which sources are located in a subdirectory of + # examples/ take the path as prefix of their name. This is a pain. + # It'd be much simpler to have all sources in the same directory. + canonical_name=`echo "$file" \ + | sed -e 's,examples/,,' \ + -e 'y,/,_,' \ + -e 's,\.cc$,,'` + # Timestamp split examples (outputs) depend on. + timestamp="\$(srcdir)/$output_dir/$canonical_name.cc.stamp" + # List of targets associated to FILE. + targets= + { + i=1 + while test "$i" -le "$nopening"; do + # i-th part of the split file. + part="\$(srcdir)/$output_dir/$canonical_name-$i.cc.raw" + + if test -z "$targets"; then + targets="$part" + else + targets="$targets $part" + fi + echo " $part" + i=`expr $i + 1` + done + + # Collect rules in a temporary file... + cat >>"$tempfile" <<EOF + + +$timestamp: \$(srcdir)/$file + @rm -f \$@.tmp + @touch \$@.tmp + \$(srcdir)/tools/split_sample.sh \$< cc raw \$(srcdir)/$output_dir + @mv -f \$@.tmp \$@ +EXTRA_DIST += $timestamp +MAINTAINERCLEANFILES += $timestamp + +$targets: $timestamp +## Recover from the removal of \$@ + @if test -f \$@; then :; else \\ + rm -f \$<; \\ + \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ + fi +EOF + } + done +} | backslashify + +# ...and output them at the end. +cat "$tempfile" diff --git a/milena/doc/split-examples.mk b/milena/doc/split-examples.mk new file mode 100644 index 0000000..ee61d74 --- /dev/null +++ b/milena/doc/split-examples.mk @@ -0,0 +1,916 @@ +## Generated by gen-split-examples-mk. Do not edit by hand. + +SPLIT_EXAMPLES = \ + $(srcdir)/examples/split/ima-save-1.cc.raw \ + $(srcdir)/examples/split/accu-right-instanciation-1.cc.raw \ + $(srcdir)/examples/split/borderthickness-1.cc.raw \ + $(srcdir)/examples/split/box2d-bbox-1.cc.raw \ + $(srcdir)/examples/split/domain-display-1.cc.raw \ + $(srcdir)/examples/split/dpoint-1-1.cc.raw \ + $(srcdir)/examples/split/estim-sites-1.cc.raw \ + $(srcdir)/examples/split/extend-1.cc.raw \ + $(srcdir)/examples/split/extend-2.cc.raw \ + $(srcdir)/examples/split/extend-3.cc.raw \ + $(srcdir)/examples/split/extend-4.cc.raw \ + $(srcdir)/examples/split/extend-5.cc.raw \ + $(srcdir)/examples/split/extension-ignore-1.cc.raw \ + $(srcdir)/examples/split/fill-call-1-1.cc.raw \ + $(srcdir)/examples/split/fill-call-1-2.cc.raw \ + $(srcdir)/examples/split/fill-call-1-3.cc.raw \ + $(srcdir)/examples/split/fill-imageif-cfun-1.cc.raw \ + $(srcdir)/examples/split/fill-imageif-cfun-2.cc.raw \ + $(srcdir)/examples/split/fill-imageif-cfun-3.cc.raw \ + $(srcdir)/examples/split/fill-part-image-1.cc.raw \ + $(srcdir)/examples/split/fill-part-image-2.cc.raw \ + $(srcdir)/examples/split/fill-subdomain-shorter-1.cc.raw \ + $(srcdir)/examples/split/fill-subdomain-shorter-2.cc.raw \ + $(srcdir)/examples/split/fill-subdomain-1.cc.raw \ + $(srcdir)/examples/split/fill-subdomain-2.cc.raw \ + $(srcdir)/examples/split/fill-subdomain-3.cc.raw \ + $(srcdir)/examples/split/fill-subdomain-4.cc.raw \ + $(srcdir)/examples/split/fill-1.cc.raw \ + $(srcdir)/examples/split/fill-2.cc.raw \ + $(srcdir)/examples/split/fill-3.cc.raw \ + $(srcdir)/examples/split/forall-piter-1.cc.raw \ + $(srcdir)/examples/split/fun-p2v-1-1.cc.raw \ + $(srcdir)/examples/split/graph-data-1.cc.raw \ + $(srcdir)/examples/split/graph-data-2.cc.raw \ + $(srcdir)/examples/split/graph-data-3.cc.raw \ + $(srcdir)/examples/split/graph-data-4.cc.raw \ + $(srcdir)/examples/split/graph-data-5.cc.raw \ + $(srcdir)/examples/split/graph-data-6.cc.raw \ + $(srcdir)/examples/split/graph-iter-1.cc.raw \ + $(srcdir)/examples/split/graph-iter-2.cc.raw \ + $(srcdir)/examples/split/graph-iter-3.cc.raw \ + $(srcdir)/examples/split/graph-iter-4.cc.raw \ + $(srcdir)/examples/split/ima-has-1.cc.raw \ + $(srcdir)/examples/split/ima-load-1.cc.raw \ + $(srcdir)/examples/split/ima-size-1.cc.raw \ + $(srcdir)/examples/split/ima2d-1-1.cc.raw \ + $(srcdir)/examples/split/ima2d-2-1.cc.raw \ + $(srcdir)/examples/split/ima2d-3-1.cc.raw \ + $(srcdir)/examples/split/ima2d-4-1.cc.raw \ + $(srcdir)/examples/split/ima2d-5-1.cc.raw \ + $(srcdir)/examples/split/ima2d-6-clone-1.cc.raw \ + $(srcdir)/examples/split/ima2d-7-1.cc.raw \ + $(srcdir)/examples/split/ima2d-rot-1.cc.raw \ + $(srcdir)/examples/split/labeling-compute-1.cc.raw \ + $(srcdir)/examples/split/labeling-compute-2.cc.raw \ + $(srcdir)/examples/split/labeling-compute-3.cc.raw \ + $(srcdir)/examples/split/labeling-compute-4.cc.raw \ + $(srcdir)/examples/split/logical-not-1.cc.raw \ + $(srcdir)/examples/split/logical-not-2.cc.raw \ + $(srcdir)/examples/split/logical-not-3.cc.raw \ + $(srcdir)/examples/split/mln_var-1.cc.raw \ + $(srcdir)/examples/split/mln_var-2.cc.raw \ + $(srcdir)/examples/split/mln_var-3.cc.raw \ + $(srcdir)/examples/split/parray-append-1.cc.raw \ + $(srcdir)/examples/split/parray-bbox-1.cc.raw \ + $(srcdir)/examples/split/paste-call-1-1.cc.raw \ + $(srcdir)/examples/split/paste-1.cc.raw \ + $(srcdir)/examples/split/point-1-1.cc.raw \ + $(srcdir)/examples/split/predicate-1-1.cc.raw \ + $(srcdir)/examples/split/tuto2_first_image-1.cc.raw \ + $(srcdir)/examples/split/tuto2_first_image-2.cc.raw \ + $(srcdir)/examples/split/tuto2_first_image-3.cc.raw \ + $(srcdir)/examples/split/tuto2_first_image-4.cc.raw \ + $(srcdir)/examples/split/tuto3_colorize-1.cc.raw \ + $(srcdir)/examples/split/tuto3_first_routine-1.cc.raw \ + $(srcdir)/examples/split/tuto3_first_routine-2.cc.raw \ + $(srcdir)/examples/split/tuto3_first_routine-3.cc.raw \ + $(srcdir)/examples/split/tuto3_first_routine-4.cc.raw \ + $(srcdir)/examples/split/tuto3_first_routine-5.cc.raw \ + $(srcdir)/examples/split/tuto3_first_routine-6.cc.raw \ + $(srcdir)/examples/split/tuto3_first_routine-7.cc.raw \ + $(srcdir)/examples/split/tuto3_first_routine-8.cc.raw \ + $(srcdir)/examples/split/tuto3_println-1.cc.raw \ + $(srcdir)/examples/split/tuto3_println-2.cc.raw \ + $(srcdir)/examples/split/tuto3_trace-1.cc.raw \ + $(srcdir)/examples/split/tuto3_trace-2.cc.raw \ + $(srcdir)/examples/split/tuto3_rw_image-1.cc.raw \ + $(srcdir)/examples/split/tuto3_rw_image-2.cc.raw \ + $(srcdir)/examples/split/tuto3_rw_image-3.cc.raw \ + $(srcdir)/examples/split/tuto3_rw_image-4.cc.raw \ + $(srcdir)/examples/split/tuto3_rw_image-5.cc.raw \ + $(srcdir)/examples/split/tuto3_rw_image-6.cc.raw \ + $(srcdir)/examples/split/tuto3_rw_image-7.cc.raw \ + $(srcdir)/examples/split/tuto4_point2d-1.cc.raw \ + $(srcdir)/examples/split/tuto4_site_set_create-1.cc.raw \ + $(srcdir)/examples/split/tuto4_site_set_create-2.cc.raw \ + $(srcdir)/examples/split/tuto4_site_set_create-3.cc.raw \ + $(srcdir)/examples/split/tuto4_site_set_create-4.cc.raw \ + $(srcdir)/examples/split/tuto4_site_set_create-5.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-1.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-2.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-3.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-4.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-5.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-6.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-7.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-8.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-9.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-10.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-11.cc.raw \ + $(srcdir)/examples/split/tuto4_genericity_and_algorithms-12.cc.raw \ + $(srcdir)/examples/split/win-create-1-1.cc.raw \ + $(srcdir)/examples/split/win-create-2-1.cc.raw + + +$(srcdir)/examples/split/ima-save.cc.stamp: $(srcdir)/examples/ima-save.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima-save.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-save.cc.stamp + +$(srcdir)/examples/split/ima-save-1.cc.raw: $(srcdir)/examples/split/ima-save.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/accu-right-instanciation.cc.stamp: $(srcdir)/examples/accu-right-instanciation.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/accu-right-instanciation.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/accu-right-instanciation.cc.stamp + +$(srcdir)/examples/split/accu-right-instanciation-1.cc.raw: $(srcdir)/examples/split/accu-right-instanciation.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/borderthickness.cc.stamp: $(srcdir)/examples/borderthickness.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/borderthickness.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/borderthickness.cc.stamp + +$(srcdir)/examples/split/borderthickness-1.cc.raw: $(srcdir)/examples/split/borderthickness.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/box2d-bbox.cc.stamp: $(srcdir)/examples/box2d-bbox.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/box2d-bbox.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/box2d-bbox.cc.stamp + +$(srcdir)/examples/split/box2d-bbox-1.cc.raw: $(srcdir)/examples/split/box2d-bbox.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/domain-display.cc.stamp: $(srcdir)/examples/domain-display.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/domain-display.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/domain-display.cc.stamp + +$(srcdir)/examples/split/domain-display-1.cc.raw: $(srcdir)/examples/split/domain-display.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/dpoint-1.cc.stamp: $(srcdir)/examples/dpoint-1.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/dpoint-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/dpoint-1.cc.stamp + +$(srcdir)/examples/split/dpoint-1-1.cc.raw: $(srcdir)/examples/split/dpoint-1.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/estim-sites.cc.stamp: $(srcdir)/examples/estim-sites.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/estim-sites.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/estim-sites.cc.stamp + +$(srcdir)/examples/split/estim-sites-1.cc.raw: $(srcdir)/examples/split/estim-sites.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/extend.cc.stamp: $(srcdir)/examples/extend.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/extend.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/extend.cc.stamp + +$(srcdir)/examples/split/extend-1.cc.raw $(srcdir)/examples/split/extend-2.cc.raw $(srcdir)/examples/split/extend-3.cc.raw $(srcdir)/examples/split/extend-4.cc.raw $(srcdir)/examples/split/extend-5.cc.raw: $(srcdir)/examples/split/extend.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/extension-ignore.cc.stamp: $(srcdir)/examples/extension-ignore.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/extension-ignore.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/extension-ignore.cc.stamp + +$(srcdir)/examples/split/extension-ignore-1.cc.raw: $(srcdir)/examples/split/extension-ignore.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/fill-call-1.cc.stamp: $(srcdir)/examples/fill-call-1.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/fill-call-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-call-1.cc.stamp + +$(srcdir)/examples/split/fill-call-1-1.cc.raw $(srcdir)/examples/split/fill-call-1-2.cc.raw $(srcdir)/examples/split/fill-call-1-3.cc.raw: $(srcdir)/examples/split/fill-call-1.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/fill-imageif-cfun.cc.stamp: $(srcdir)/examples/fill-imageif-cfun.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp + +$(srcdir)/examples/split/fill-imageif-cfun-1.cc.raw $(srcdir)/examples/split/fill-imageif-cfun-2.cc.raw $(srcdir)/examples/split/fill-imageif-cfun-3.cc.raw: $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/fill-part-image.cc.stamp: $(srcdir)/examples/fill-part-image.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/fill-part-image.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-part-image.cc.stamp + +$(srcdir)/examples/split/fill-part-image-1.cc.raw $(srcdir)/examples/split/fill-part-image-2.cc.raw: $(srcdir)/examples/split/fill-part-image.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp: $(srcdir)/examples/fill-subdomain-shorter.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp + +$(srcdir)/examples/split/fill-subdomain-shorter-1.cc.raw $(srcdir)/examples/split/fill-subdomain-shorter-2.cc.raw: $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/fill-subdomain.cc.stamp: $(srcdir)/examples/fill-subdomain.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/fill-subdomain.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-subdomain.cc.stamp + +$(srcdir)/examples/split/fill-subdomain-1.cc.raw $(srcdir)/examples/split/fill-subdomain-2.cc.raw $(srcdir)/examples/split/fill-subdomain-3.cc.raw $(srcdir)/examples/split/fill-subdomain-4.cc.raw: $(srcdir)/examples/split/fill-subdomain.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/fill.cc.stamp: $(srcdir)/examples/fill.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/fill.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill.cc.stamp + +$(srcdir)/examples/split/fill-1.cc.raw $(srcdir)/examples/split/fill-2.cc.raw $(srcdir)/examples/split/fill-3.cc.raw: $(srcdir)/examples/split/fill.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/forall-piter.cc.stamp: $(srcdir)/examples/forall-piter.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/forall-piter.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/forall-piter.cc.stamp + +$(srcdir)/examples/split/forall-piter-1.cc.raw: $(srcdir)/examples/split/forall-piter.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/fun-p2v-1.cc.stamp: $(srcdir)/examples/fun-p2v-1.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/fun-p2v-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fun-p2v-1.cc.stamp + +$(srcdir)/examples/split/fun-p2v-1-1.cc.raw: $(srcdir)/examples/split/fun-p2v-1.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/graph-data.cc.stamp: $(srcdir)/examples/graph-data.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/graph-data.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/graph-data.cc.stamp + +$(srcdir)/examples/split/graph-data-1.cc.raw $(srcdir)/examples/split/graph-data-2.cc.raw $(srcdir)/examples/split/graph-data-3.cc.raw $(srcdir)/examples/split/graph-data-4.cc.raw $(srcdir)/examples/split/graph-data-5.cc.raw $(srcdir)/examples/split/graph-data-6.cc.raw: $(srcdir)/examples/split/graph-data.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/graph-iter.cc.stamp: $(srcdir)/examples/graph-iter.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/graph-iter.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/graph-iter.cc.stamp + +$(srcdir)/examples/split/graph-iter-1.cc.raw $(srcdir)/examples/split/graph-iter-2.cc.raw $(srcdir)/examples/split/graph-iter-3.cc.raw $(srcdir)/examples/split/graph-iter-4.cc.raw: $(srcdir)/examples/split/graph-iter.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima-has.cc.stamp: $(srcdir)/examples/ima-has.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima-has.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-has.cc.stamp + +$(srcdir)/examples/split/ima-has-1.cc.raw: $(srcdir)/examples/split/ima-has.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima-load.cc.stamp: $(srcdir)/examples/ima-load.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima-load.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-load.cc.stamp + +$(srcdir)/examples/split/ima-load-1.cc.raw: $(srcdir)/examples/split/ima-load.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima-size.cc.stamp: $(srcdir)/examples/ima-size.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima-size.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-size.cc.stamp + +$(srcdir)/examples/split/ima-size-1.cc.raw: $(srcdir)/examples/split/ima-size.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima2d-1.cc.stamp: $(srcdir)/examples/ima2d-1.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima2d-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-1.cc.stamp + +$(srcdir)/examples/split/ima2d-1-1.cc.raw: $(srcdir)/examples/split/ima2d-1.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima2d-2.cc.stamp: $(srcdir)/examples/ima2d-2.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima2d-2.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-2.cc.stamp + +$(srcdir)/examples/split/ima2d-2-1.cc.raw: $(srcdir)/examples/split/ima2d-2.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima2d-3.cc.stamp: $(srcdir)/examples/ima2d-3.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima2d-3.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-3.cc.stamp + +$(srcdir)/examples/split/ima2d-3-1.cc.raw: $(srcdir)/examples/split/ima2d-3.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima2d-4.cc.stamp: $(srcdir)/examples/ima2d-4.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima2d-4.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-4.cc.stamp + +$(srcdir)/examples/split/ima2d-4-1.cc.raw: $(srcdir)/examples/split/ima2d-4.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima2d-5.cc.stamp: $(srcdir)/examples/ima2d-5.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima2d-5.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-5.cc.stamp + +$(srcdir)/examples/split/ima2d-5-1.cc.raw: $(srcdir)/examples/split/ima2d-5.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima2d-6-clone.cc.stamp: $(srcdir)/examples/ima2d-6-clone.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima2d-6-clone.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-6-clone.cc.stamp + +$(srcdir)/examples/split/ima2d-6-clone-1.cc.raw: $(srcdir)/examples/split/ima2d-6-clone.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima2d-7.cc.stamp: $(srcdir)/examples/ima2d-7.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima2d-7.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-7.cc.stamp + +$(srcdir)/examples/split/ima2d-7-1.cc.raw: $(srcdir)/examples/split/ima2d-7.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/ima2d-rot.cc.stamp: $(srcdir)/examples/ima2d-rot.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima2d-rot.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-rot.cc.stamp + +$(srcdir)/examples/split/ima2d-rot-1.cc.raw: $(srcdir)/examples/split/ima2d-rot.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/labeling-compute.cc.stamp: $(srcdir)/examples/labeling-compute.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/labeling-compute.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/labeling-compute.cc.stamp + +$(srcdir)/examples/split/labeling-compute-1.cc.raw $(srcdir)/examples/split/labeling-compute-2.cc.raw $(srcdir)/examples/split/labeling-compute-3.cc.raw $(srcdir)/examples/split/labeling-compute-4.cc.raw: $(srcdir)/examples/split/labeling-compute.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/logical-not.cc.stamp: $(srcdir)/examples/logical-not.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/logical-not.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/logical-not.cc.stamp + +$(srcdir)/examples/split/logical-not-1.cc.raw $(srcdir)/examples/split/logical-not-2.cc.raw $(srcdir)/examples/split/logical-not-3.cc.raw: $(srcdir)/examples/split/logical-not.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/mln_var.cc.stamp: $(srcdir)/examples/mln_var.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/mln_var.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/mln_var.cc.stamp + +$(srcdir)/examples/split/mln_var-1.cc.raw $(srcdir)/examples/split/mln_var-2.cc.raw $(srcdir)/examples/split/mln_var-3.cc.raw: $(srcdir)/examples/split/mln_var.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/parray-append.cc.stamp: $(srcdir)/examples/parray-append.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/parray-append.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/parray-append.cc.stamp + +$(srcdir)/examples/split/parray-append-1.cc.raw: $(srcdir)/examples/split/parray-append.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/parray-bbox.cc.stamp: $(srcdir)/examples/parray-bbox.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/parray-bbox.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/parray-bbox.cc.stamp + +$(srcdir)/examples/split/parray-bbox-1.cc.raw: $(srcdir)/examples/split/parray-bbox.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/paste-call-1.cc.stamp: $(srcdir)/examples/paste-call-1.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/paste-call-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste-call-1.cc.stamp + +$(srcdir)/examples/split/paste-call-1-1.cc.raw: $(srcdir)/examples/split/paste-call-1.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/paste.cc.stamp: $(srcdir)/examples/paste.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/paste.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste.cc.stamp + +$(srcdir)/examples/split/paste-1.cc.raw: $(srcdir)/examples/split/paste.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/point-1.cc.stamp: $(srcdir)/examples/point-1.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/point-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/point-1.cc.stamp + +$(srcdir)/examples/split/point-1-1.cc.raw: $(srcdir)/examples/split/point-1.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/predicate-1.cc.stamp: $(srcdir)/examples/predicate-1.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/predicate-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/predicate-1.cc.stamp + +$(srcdir)/examples/split/predicate-1-1.cc.raw: $(srcdir)/examples/split/predicate-1.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/tuto2_first_image.cc.stamp: $(srcdir)/examples/tuto2_first_image.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/tuto2_first_image.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto2_first_image.cc.stamp + +$(srcdir)/examples/split/tuto2_first_image-1.cc.raw $(srcdir)/examples/split/tuto2_first_image-2.cc.raw $(srcdir)/examples/split/tuto2_first_image-3.cc.raw $(srcdir)/examples/split/tuto2_first_image-4.cc.raw: $(srcdir)/examples/split/tuto2_first_image.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/tuto3_colorize.cc.stamp: $(srcdir)/examples/tuto3/colorize.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/tuto3_colorize.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_colorize.cc.stamp + +$(srcdir)/examples/split/tuto3_colorize-1.cc.raw: $(srcdir)/examples/split/tuto3_colorize.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/tuto3_first_routine.cc.stamp: $(srcdir)/examples/tuto3/first_routine.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/tuto3_first_routine.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_first_routine.cc.stamp + +$(srcdir)/examples/split/tuto3_first_routine-1.cc.raw $(srcdir)/examples/split/tuto3_first_routine-2.cc.raw $(srcdir)/examples/split/tuto3_first_routine-3.cc.raw $(srcdir)/examples/split/tuto3_first_routine-4.cc.raw $(srcdir)/examples/split/tuto3_first_routine-5.cc.raw $(srcdir)/examples/split/tuto3_first_routine-6.cc.raw $(srcdir)/examples/split/tuto3_first_routine-7.cc.raw $(srcdir)/examples/split/tuto3_first_routine-8.cc.raw: $(srcdir)/examples/split/tuto3_first_routine.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/tuto3_println.cc.stamp: $(srcdir)/examples/tuto3/println.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/tuto3_println.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_println.cc.stamp + +$(srcdir)/examples/split/tuto3_println-1.cc.raw $(srcdir)/examples/split/tuto3_println-2.cc.raw: $(srcdir)/examples/split/tuto3_println.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/tuto3_trace.cc.stamp: $(srcdir)/examples/tuto3/trace.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/tuto3_trace.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_trace.cc.stamp + +$(srcdir)/examples/split/tuto3_trace-1.cc.raw $(srcdir)/examples/split/tuto3_trace-2.cc.raw: $(srcdir)/examples/split/tuto3_trace.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/tuto3_rw_image.cc.stamp: $(srcdir)/examples/tuto3_rw_image.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/tuto3_rw_image.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_rw_image.cc.stamp + +$(srcdir)/examples/split/tuto3_rw_image-1.cc.raw $(srcdir)/examples/split/tuto3_rw_image-2.cc.raw $(srcdir)/examples/split/tuto3_rw_image-3.cc.raw $(srcdir)/examples/split/tuto3_rw_image-4.cc.raw $(srcdir)/examples/split/tuto3_rw_image-5.cc.raw $(srcdir)/examples/split/tuto3_rw_image-6.cc.raw $(srcdir)/examples/split/tuto3_rw_image-7.cc.raw: $(srcdir)/examples/split/tuto3_rw_image.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/tuto4_point2d.cc.stamp: $(srcdir)/examples/tuto4/point2d.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/tuto4_point2d.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto4_point2d.cc.stamp + +$(srcdir)/examples/split/tuto4_point2d-1.cc.raw: $(srcdir)/examples/split/tuto4_point2d.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/tuto4_site_set_create.cc.stamp: $(srcdir)/examples/tuto4/site_set_create.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp + +$(srcdir)/examples/split/tuto4_site_set_create-1.cc.raw $(srcdir)/examples/split/tuto4_site_set_create-2.cc.raw $(srcdir)/examples/split/tuto4_site_set_create-3.cc.raw $(srcdir)/examples/split/tuto4_site_set_create-4.cc.raw $(srcdir)/examples/split/tuto4_site_set_create-5.cc.raw: $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp: $(srcdir)/examples/tuto4_genericity_and_algorithms.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp + +$(srcdir)/examples/split/tuto4_genericity_and_algorithms-1.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-2.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-3.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-4.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-5.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-6.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-7.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-8.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-9.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-10.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-11.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-12.cc.raw: $(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/win-create-1.cc.stamp: $(srcdir)/examples/win-create-1.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/win-create-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/win-create-1.cc.stamp + +$(srcdir)/examples/split/win-create-1-1.cc.raw: $(srcdir)/examples/split/win-create-1.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/examples/split/win-create-2.cc.stamp: $(srcdir)/examples/win-create-2.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/win-create-2.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/win-create-2.cc.stamp + +$(srcdir)/examples/split/win-create-2-1.cc.raw: $(srcdir)/examples/split/win-create-2.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi -- 1.5.6.5

1 0

last-svn-commit-54-g5787162 bootstrap: Regen the list of examples of the documentation.
by Roland Levillain 16 Mar '10

16 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b9feae..c4fe239 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Regen the list of examples of the documentation. + +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + Catch up with milena/doc figure generators. * bootstrap: Here. diff --git a/bootstrap b/bootstrap index 9c03711..9cafeff 100755 --- a/bootstrap +++ b/bootstrap @@ -173,6 +173,10 @@ gen_doc_figures PBM_FIGURES pbm gen_doc_figures PGM_FIGURES pgm gen_doc_figures PPM_FIGURES ppm run milena/doc/ ./generate_dist_files.sh outputs txt +# * Examples. +milena/doc/gen-make-variable EXAMPLES \ + `find milena/doc/examples -name '*.cc' | sed 's,^milena/doc,\$(srcdir),'` \ + >milena/doc/examples.mk run milena/doc/ ./generate_dist_files.sh examples cc.raw # Generate unit test files. -- 1.5.6.5

1 0

last-svn-commit-53-g1168f52 Generate the list of examples in the documentation.
by Roland Levillain 16 Mar '10

16 Mar '10

* doc/Makefile.am (EXAMPLES): Remove this variable that used to be populated by hand. Include ($(srcdir)/examples.mk). ($(srcdir)/examples.mk): New target. (EXTRA_DIST): Add $(EXAMPLES). (regen-examples-mk): New (phony) target. (regen-am): Remake regen-examples-mk. * doc/examples.mk: New (generated) Make helper. --- milena/ChangeLog | 13 +++++ milena/doc/Makefile.am | 118 ++++++++++++------------------------------------ milena/doc/examples.mk | 85 ++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 89 deletions(-) create mode 100644 milena/doc/examples.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index f49830e..028e7a8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + Generate the list of examples in the documentation. + + * doc/Makefile.am (EXAMPLES): Remove this variable that used to be + populated by hand. + Include ($(srcdir)/examples.mk). + ($(srcdir)/examples.mk): New target. + (EXTRA_DIST): Add $(EXAMPLES). + (regen-examples-mk): New (phony) target. + (regen-am): Remake regen-examples-mk. + * doc/examples.mk: New (generated) Make helper. + +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + Revamp the conversion of images in the documentation. * gen-make-variable: New script. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8f312a3..0174fc7 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -191,6 +191,31 @@ EXTRA_DIST += $(PNG_FIGURES) MAINTAINERCLEANFILES = $(PNG_FIGURES) +## ---------- ## +## Examples. ## +## ---------- ## + +$(srcdir)/examples.mk: $(srcdir)/gen-make-variable + rm -f $@.tmp + $(srcdir)/gen-make-variable EXAMPLES \ + `find $(srcdir)/examples -name '*.cc' \ + | sed 's,^$(srcdir),\$$(srcdir),'` \ + >$@.tmp + mv -f $@.tmp $@ + chmod -w $@ +include $(srcdir)/examples.mk +EXTRA_DIST += $(EXAMPLES) + +.PHONY: regen-examples-mk +regen-examples-mk: + rm -f $(srcdir)/examples.mk.tmp + $(srcdir)/gen-make-variable EXAMPLES \ + `find $(srcdir)/examples -name '*.cc' \ + | sed 's,^$(srcdir),\$$(srcdir),'` \ + >$(srcdir)/examples.mk.tmp + mv -f $(srcdir)/examples.mk.tmp $(srcdir)/examples.mk + chmod -w $(srcdir)/examples.mk + ## ----------------------- ## ## Doxygen documentation. ## ## ----------------------- ## @@ -789,7 +814,7 @@ MAINTAINERCLEANFILES += $(REF_GUIDE_HH) ## ---------- ## -## Examples. ## +## Programs. ## ## ---------- ## PROGRAMS_examples = \ @@ -1000,92 +1025,6 @@ MAINTAINERCLEANFILES += $(OUTPUTS) # FIXME: Warning: $(SPLIT_EXAMPLES_SRCDIR) might not exist. Ensure it # exists. -# FIXME: Try to avoid the use an extensive list: either use Make's -# substitution rules or generate it. -EXAMPLES = \ - $(srcdir)/examples/accu-right-instanciation.cc \ - $(srcdir)/examples/borderthickness.cc \ - $(srcdir)/examples/box2d-bbox.cc \ - $(srcdir)/examples/domain-display.cc \ - $(srcdir)/examples/dpoint-1.cc \ - $(srcdir)/examples/estim-sites.cc \ - $(srcdir)/examples/extend.cc \ - $(srcdir)/examples/extension-ignore.cc \ - $(srcdir)/examples/fill-call-1.cc \ - $(srcdir)/examples/fill-imageif-cfun.cc \ - $(srcdir)/examples/fill-part-image.cc \ - $(srcdir)/examples/fill-subdomain-shorter.cc \ - $(srcdir)/examples/fill-subdomain.cc \ - $(srcdir)/examples/fill.cc \ - $(srcdir)/examples/forall-piter.cc \ - $(srcdir)/examples/fun-p2v-1.cc \ - $(srcdir)/examples/graph-data.cc \ - $(srcdir)/examples/graph-iter.cc \ - $(srcdir)/examples/ima-has.cc \ - $(srcdir)/examples/ima-load.cc \ - $(srcdir)/examples/ima-save.cc \ - $(srcdir)/examples/ima-size.cc \ - $(srcdir)/examples/ima2d-1.cc \ - $(srcdir)/examples/ima2d-2.cc \ - $(srcdir)/examples/ima2d-3.cc \ - $(srcdir)/examples/ima2d-4.cc \ - $(srcdir)/examples/ima2d-5.cc \ - $(srcdir)/examples/ima2d-6-clone.cc \ - $(srcdir)/examples/ima2d-7.cc \ - $(srcdir)/examples/ima2d-rot.cc \ - $(srcdir)/examples/labeling-compute.cc \ - $(srcdir)/examples/logical-not.cc \ - $(srcdir)/examples/mln_var.cc \ - $(srcdir)/examples/parray-append.cc \ - $(srcdir)/examples/parray-bbox.cc \ - $(srcdir)/examples/paste-call-1.cc \ - $(srcdir)/examples/paste.cc \ - $(srcdir)/examples/point-1.cc \ - $(srcdir)/examples/predicate-1.cc \ - $(srcdir)/examples/trash/accu.cc \ - $(srcdir)/examples/trash/box.cc \ - $(srcdir)/examples/trash/cpp_issue.cc \ - $(srcdir)/examples/trash/erosion.cc \ - $(srcdir)/examples/trash/for_Z.cc \ - $(srcdir)/examples/trash/graph.cc \ - $(srcdir)/examples/trash/image2d.cc \ - $(srcdir)/examples/trash/image_flat.cc \ - $(srcdir)/examples/trash/image_if.cc \ - $(srcdir)/examples/trash/image_plain.cc \ - $(srcdir)/examples/trash/image_safe.cc \ - $(srcdir)/examples/trash/labeling_algo.cc \ - $(srcdir)/examples/trash/mk_graph.cc \ - $(srcdir)/examples/trash/p_array.2.cc \ - $(srcdir)/examples/trash/p_array.cc \ - $(srcdir)/examples/trash/p_image.cc \ - $(srcdir)/examples/trash/p_key.2.cc \ - $(srcdir)/examples/trash/p_key.cc \ - $(srcdir)/examples/trash/p_line2d.cc \ - $(srcdir)/examples/trash/p_mutable_array_of.cc \ - $(srcdir)/examples/trash/p_queue.cc \ - $(srcdir)/examples/trash/p_run.cc \ - $(srcdir)/examples/trash/p_vaccess.cc \ - $(srcdir)/examples/trash/proxy.cc \ - $(srcdir)/examples/trash/sub_image.cc \ - $(srcdir)/examples/trash/sub_image_if.cc \ - $(srcdir)/examples/trash/tuto_bis.cc \ - $(srcdir)/examples/trash/tuto_one.cc \ - $(srcdir)/examples/trash/vec.cc \ - $(srcdir)/examples/trash/win_multiple.cc \ - $(srcdir)/examples/trash/window.cc \ - $(srcdir)/examples/tuto2_first_image.cc \ - $(srcdir)/examples/tuto3/colorize.cc \ - $(srcdir)/examples/tuto3/first_routine.cc \ - $(srcdir)/examples/tuto3/println.cc \ - $(srcdir)/examples/tuto3/trace.cc \ - $(srcdir)/examples/tuto3_rw_image.cc \ - $(srcdir)/examples/tuto4/image.cc \ - $(srcdir)/examples/tuto4/point2d.cc \ - $(srcdir)/examples/tuto4/site_set_create.cc \ - $(srcdir)/examples/tuto4_genericity_and_algorithms.cc \ - $(srcdir)/examples/win-create-1.cc \ - $(srcdir)/examples/win-create-2.cc - # FIXME: Place split files in their own directory, e.g.: split # `examples/foo.cc' into `examples/split/foo.dir/foo-1.cc', # `examples/split/foo.dir/foo-2.cc', etc. It makes removal of these @@ -1134,14 +1073,15 @@ $(srcdir)/split-outputs.stamp: $(OUTPUTS) # Regen Make helpers. EXTRA_DIST += generate_dist_files.sh headers.stamp include $(top_srcdir)/build-aux/regen-recursive.mk -## FIXME: It'd probably be better to separate the rules generating -## examples/examples.mk, outputs/outputs.mk and figures/figures.mk. +## FIXME: Get rid of headers.stamp, which is (was) used by two many +## generators. regen-am: @rm -f $(srcdir)/headers.stamp.tmp @touch $(srcdir)/headers.stamp.tmp $(MAKE) $(AM_MAKEFLAGS) regen-pbm-figures-mk $(MAKE) $(AM_MAKEFLAGS) regen-pgm-figures-mk $(MAKE) $(AM_MAKEFLAGS) regen-ppm-figures-mk + $(MAKE) $(AM_MAKEFLAGS) regen-examples-mk $(MAKE) $(AM_MAKEFLAGS) regen-examples-outputs-mk @cd $(srcdir) && \ ./generate_dist_files.sh outputs txt && \ diff --git a/milena/doc/examples.mk b/milena/doc/examples.mk new file mode 100644 index 0000000..c30f111 --- /dev/null +++ b/milena/doc/examples.mk @@ -0,0 +1,85 @@ +## Generated by gen-make-variable. Do not edit by hand. + +EXAMPLES = \ + $(srcdir)/examples/accu-right-instanciation.cc \ + $(srcdir)/examples/borderthickness.cc \ + $(srcdir)/examples/box2d-bbox.cc \ + $(srcdir)/examples/domain-display.cc \ + $(srcdir)/examples/dpoint-1.cc \ + $(srcdir)/examples/estim-sites.cc \ + $(srcdir)/examples/extend.cc \ + $(srcdir)/examples/extension-ignore.cc \ + $(srcdir)/examples/fill-call-1.cc \ + $(srcdir)/examples/fill-imageif-cfun.cc \ + $(srcdir)/examples/fill-part-image.cc \ + $(srcdir)/examples/fill-subdomain-shorter.cc \ + $(srcdir)/examples/fill-subdomain.cc \ + $(srcdir)/examples/fill.cc \ + $(srcdir)/examples/forall-piter.cc \ + $(srcdir)/examples/fun-p2v-1.cc \ + $(srcdir)/examples/graph-data.cc \ + $(srcdir)/examples/graph-iter.cc \ + $(srcdir)/examples/ima-has.cc \ + $(srcdir)/examples/ima-load.cc \ + $(srcdir)/examples/ima-save.cc \ + $(srcdir)/examples/ima-size.cc \ + $(srcdir)/examples/ima2d-1.cc \ + $(srcdir)/examples/ima2d-2.cc \ + $(srcdir)/examples/ima2d-3.cc \ + $(srcdir)/examples/ima2d-4.cc \ + $(srcdir)/examples/ima2d-5.cc \ + $(srcdir)/examples/ima2d-6-clone.cc \ + $(srcdir)/examples/ima2d-7.cc \ + $(srcdir)/examples/ima2d-rot.cc \ + $(srcdir)/examples/labeling-compute.cc \ + $(srcdir)/examples/logical-not.cc \ + $(srcdir)/examples/mln_var.cc \ + $(srcdir)/examples/parray-append.cc \ + $(srcdir)/examples/parray-bbox.cc \ + $(srcdir)/examples/paste-call-1.cc \ + $(srcdir)/examples/paste.cc \ + $(srcdir)/examples/point-1.cc \ + $(srcdir)/examples/predicate-1.cc \ + $(srcdir)/examples/trash/accu.cc \ + $(srcdir)/examples/trash/box.cc \ + $(srcdir)/examples/trash/cpp_issue.cc \ + $(srcdir)/examples/trash/erosion.cc \ + $(srcdir)/examples/trash/for_Z.cc \ + $(srcdir)/examples/trash/graph.cc \ + $(srcdir)/examples/trash/image2d.cc \ + $(srcdir)/examples/trash/image_flat.cc \ + $(srcdir)/examples/trash/image_if.cc \ + $(srcdir)/examples/trash/image_plain.cc \ + $(srcdir)/examples/trash/image_safe.cc \ + $(srcdir)/examples/trash/labeling_algo.cc \ + $(srcdir)/examples/trash/mk_graph.cc \ + $(srcdir)/examples/trash/p_array.2.cc \ + $(srcdir)/examples/trash/p_array.cc \ + $(srcdir)/examples/trash/p_image.cc \ + $(srcdir)/examples/trash/p_key.2.cc \ + $(srcdir)/examples/trash/p_key.cc \ + $(srcdir)/examples/trash/p_line2d.cc \ + $(srcdir)/examples/trash/p_mutable_array_of.cc \ + $(srcdir)/examples/trash/p_queue.cc \ + $(srcdir)/examples/trash/p_run.cc \ + $(srcdir)/examples/trash/p_vaccess.cc \ + $(srcdir)/examples/trash/proxy.cc \ + $(srcdir)/examples/trash/sub_image.cc \ + $(srcdir)/examples/trash/sub_image_if.cc \ + $(srcdir)/examples/trash/tuto_bis.cc \ + $(srcdir)/examples/trash/tuto_one.cc \ + $(srcdir)/examples/trash/vec.cc \ + $(srcdir)/examples/trash/win_multiple.cc \ + $(srcdir)/examples/trash/window.cc \ + $(srcdir)/examples/tuto2_first_image.cc \ + $(srcdir)/examples/tuto3/colorize.cc \ + $(srcdir)/examples/tuto3/first_routine.cc \ + $(srcdir)/examples/tuto3/println.cc \ + $(srcdir)/examples/tuto3/trace.cc \ + $(srcdir)/examples/tuto3_rw_image.cc \ + $(srcdir)/examples/tuto4/image.cc \ + $(srcdir)/examples/tuto4/point2d.cc \ + $(srcdir)/examples/tuto4/site_set_create.cc \ + $(srcdir)/examples/tuto4_genericity_and_algorithms.cc \ + $(srcdir)/examples/win-create-1.cc \ + $(srcdir)/examples/win-create-2.cc -- 1.5.6.5

1 0

last-svn-commit-52-gdb2104b Catch up with milena/doc generators.
by Roland Levillain 16 Mar '10

16 Mar '10

* bootstrap: Here. --- ChangeLog | 6 ++++++ bootstrap | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6195210..5b9feae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + + Catch up with milena/doc figure generators. + + * bootstrap: Here. + 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> Disable the implicit generation of HTML from LaTeX. diff --git a/bootstrap b/bootstrap index 18a65b1..9c03711 100755 --- a/bootstrap +++ b/bootstrap @@ -161,7 +161,17 @@ run scribo `pwd`/build-aux/generate_dist_headers.sh . headers.mk nodist-headers # Generate lists of files to be part of the distribution # for the tutorial. -run milena/doc/ ./generate_dist_files.sh figures 'p*m' +# * Figures. +gen_doc_figures() +{ + milena/doc/gen-make-variable "$1" \ + `find milena/doc/figures/*.$2 | sed 's,^milena/doc,\$(srcdir),'` \ + >"milena/doc/$2-figures.mk" \ + || fatal "unexpected failure: $@" +} +gen_doc_figures PBM_FIGURES pbm +gen_doc_figures PGM_FIGURES pgm +gen_doc_figures PPM_FIGURES ppm run milena/doc/ ./generate_dist_files.sh outputs txt run milena/doc/ ./generate_dist_files.sh examples cc.raw -- 1.5.6.5

1 0