- Olena-patches

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-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-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

last-svn-commit-51-g0176b4b Revamp the conversion of images in the documentation.
by Roland Levillain 16 Mar '10

16 Mar '10

* gen-make-variable: New script. * doc/Makefile.am: Include $(srcdir)/pbm-figures.mk, ($(srcdir)/pgm-figures.mk and $(srcdir)/ppm-figures.mk. ($(srcdir)/pbm-figures.mk) ($(srcdir)/pgm-figures.mk) ($(srcdir)/ppm-figures.mk): New targets. (EXTRA_DIST): Add $(PBM_FIGURES), $(PGM_FIGURES), $(PPM_FIGURES). (regen-pbm-figures-mk) (regen-pgm-figures-mk) (regen-ppm-figures-mk): New (phony target). (regen-am): Remake regen-pbm-figures-mk, regen-pgm-figures-mk and regen-ppm-figures-mk instead of calling generate_dist_files.sh to convert figures. ($(srcdir)/headers.stamp): No longer call generate_dist_files.sh to convert figures. (convert_to_png): New variable. (SUFFIXES): Add .pbm, .pgm, .ppm and .png. (.pbm.png, .pgm.png, .ppm.png): New suffix rules. (PNG_FIGURES): New variable. (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(PNG_FIGURES). (refman_dependencies): Remove $(srcdir)/figures.stamp. Add $(PNG_FIGURES). (technical_dependencies) (tutorial_dependencies) (ref_guide_dependencies): Likewise. No longer include $(srcdir)/figures/figures.mk. ($(srcdir)/figures/figures.mk, $(srcdir)/figures.stamp): Remove rules. (EXTRA_DIST, MAINTAINERCLEANFILES): Remove $(srcdir)/figures.stamp. (EXTRA_DIST): Add gen-make-variable. * pbm-figures.mk, pgm-figures.mk, ppm-figures.mk: New (generated) Make helpers. * figures/figures.mk: Remove. --- milena/ChangeLog | 43 ++++++ milena/doc/Makefile.am | 140 +++++++++++++++----- milena/doc/figures/figures.mk | 41 ------ .../{gen-examples-outputs-mk => gen-make-variable} | 41 ++++-- milena/doc/pbm-figures.mk | 11 ++ milena/doc/pgm-figures.mk | 7 + milena/doc/ppm-figures.mk | 30 ++++ 7 files changed, 227 insertions(+), 86 deletions(-) delete mode 100644 milena/doc/figures/figures.mk copy milena/doc/{gen-examples-outputs-mk => gen-make-variable} (54%) create mode 100644 milena/doc/pbm-figures.mk create mode 100644 milena/doc/pgm-figures.mk create mode 100644 milena/doc/ppm-figures.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index ab828ac..f49830e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,46 @@ +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp the conversion of images in the documentation. + + * gen-make-variable: New script. + * doc/Makefile.am: Include $(srcdir)/pbm-figures.mk, + ($(srcdir)/pgm-figures.mk and $(srcdir)/ppm-figures.mk. + ($(srcdir)/pbm-figures.mk) + ($(srcdir)/pgm-figures.mk) + ($(srcdir)/ppm-figures.mk): + New targets. + (EXTRA_DIST): Add $(PBM_FIGURES), $(PGM_FIGURES), $(PPM_FIGURES). + (regen-pbm-figures-mk) + (regen-pgm-figures-mk) + (regen-ppm-figures-mk): + New (phony target). + (regen-am): Remake regen-pbm-figures-mk, regen-pgm-figures-mk and + regen-ppm-figures-mk instead of calling generate_dist_files.sh to + convert figures. + ($(srcdir)/headers.stamp): No longer call generate_dist_files.sh to + convert figures. + (convert_to_png): New variable. + (SUFFIXES): Add .pbm, .pgm, .ppm and .png. + (.pbm.png, .pgm.png, .ppm.png): New suffix rules. + (PNG_FIGURES): New variable. + (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(PNG_FIGURES). + (refman_dependencies): + Remove $(srcdir)/figures.stamp. + Add $(PNG_FIGURES). + (technical_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies): + Likewise. + No longer include $(srcdir)/figures/figures.mk. + ($(srcdir)/figures/figures.mk, $(srcdir)/figures.stamp): + Remove rules. + (EXTRA_DIST, MAINTAINERCLEANFILES): + Remove $(srcdir)/figures.stamp. + (EXTRA_DIST): Add gen-make-variable. + * pbm-figures.mk, pgm-figures.mk, ppm-figures.mk: + New (generated) Make helpers. + * figures/figures.mk: Remove. + 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> Add a rule to forcefully regen doc/examples-outputs.mk. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index e31ddc8..8f312a3 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -93,6 +93,104 @@ TEXI2DVI_FLAGS += -I $(DOC_SRCDIR)/white_paper DOC_PACKAGES = $(srcdir)/doxyfuns.sty $(srcdir)/milena.sty +## --------- ## +## Figures. ## +## --------- ## + +# ----- # +# PBM. # +# ----- # + +$(srcdir)/pbm-figures.mk: $(srcdir)/gen-make-variable + rm -f $@.tmp + $(srcdir)/gen-make-variable PBM_FIGURES \ + `find $(srcdir)/figures/*.pbm | sed 's,^$(srcdir),\$$(srcdir),'` \ + >$@.tmp + mv -f $@.tmp $@ + chmod -w $@ +include $(srcdir)/pbm-figures.mk +EXTRA_DIST += $(PBM_FIGURES) + +.PHONY: regen-pbm-figures-mk +regen-pbm-figures-mk: + rm -f $(srcdir)/pbm-figures.mk.tmp + $(srcdir)/gen-make-variable PBM_FIGURES \ + `find $(srcdir)/figures/*.pbm | sed 's,^$(srcdir),\$$(srcdir),'` \ + >$(srcdir)/pbm-figures.mk.tmp + mv -f $(srcdir)/pbm-figures.mk.tmp $(srcdir)/pbm-figures.mk + chmod -w $(srcdir)/pbm-figures.mk + +# ----- # +# PGM. # +# ----- # + +$(srcdir)/pgm-figures.mk: $(srcdir)/gen-make-variable + rm -f $@.tmp + $(srcdir)/gen-make-variable PGM_FIGURES \ + `find $(srcdir)/figures/*.pgm | sed 's,^$(srcdir),\$$(srcdir),'` \ + >$@.tmp + mv -f $@.tmp $@ + chmod -w $@ +include $(srcdir)/pgm-figures.mk +EXTRA_DIST += $(PGM_FIGURES) + +.PHONY: regen-pgm-figures-mk +regen-pgm-figures-mk: + rm -f $(srcdir)/pgm-figures.mk.tmp + $(srcdir)/gen-make-variable PGM_FIGURES \ + `find $(srcdir)/figures/*.pgm | sed 's,^$(srcdir),\$$(srcdir),'` \ + >$(srcdir)/pgm-figures.mk.tmp + mv -f $(srcdir)/pgm-figures.mk.tmp $(srcdir)/pgm-figures.mk + chmod -w $(srcdir)/pgm-figures.mk + +# ----- # +# PPM. # +# ----- # + +$(srcdir)/ppm-figures.mk: $(srcdir)/gen-make-variable + rm -f $@.tmp + $(srcdir)/gen-make-variable PPM_FIGURES \ + `find $(srcdir)/figures/*.ppm | sed 's,^$(srcdir),\$$(srcdir),'` \ + >$@.tmp + mv -f $@.tmp $@ + chmod -w $@ +include $(srcdir)/ppm-figures.mk +EXTRA_DIST += $(PPM_FIGURES) + +.PHONY: regen-ppm-figures-mk +regen-ppm-figures-mk: + rm -f $(srcdir)/ppm-figures.mk.tmp + $(srcdir)/gen-make-variable PPM_FIGURES \ + `find $(srcdir)/figures/*.ppm | sed 's,^$(srcdir),\$$(srcdir),'` \ + >$(srcdir)/ppm-figures.mk.tmp + mv -f $(srcdir)/ppm-figures.mk.tmp $(srcdir)/ppm-figures.mk + chmod -w $(srcdir)/ppm-figures.mk + +# ----- # +# PNG. # +# ----- # + +convert_to_png = convert -scale 250 -bordercolor black -border 2x2 + +SUFFIXES += .pbm .pgm .ppm .png + +.pbm.png: + $(convert_to_png) $< $@ + +.pgm.png: + $(convert_to_png) $< $@ + +.ppm.png: + $(convert_to_png) $< $@ + +PNG_FIGURES = \ + $(PBM_FIGURES:.pbm=.png) \ + $(PGM_FIGURES:.pgm=.png) \ + $(PPM_FIGURES:.ppm=.png) +EXTRA_DIST += $(PNG_FIGURES) +MAINTAINERCLEANFILES = $(PNG_FIGURES) + + ## ----------------------- ## ## Doxygen documentation. ## ## ----------------------- ## @@ -104,7 +202,7 @@ DOC_PACKAGES = $(srcdir)/doxyfuns.sty $(srcdir)/milena.sty refman_dependencies = \ $(srcdir)/split-examples.stamp \ $(srcdir)/split-outputs.stamp \ - $(srcdir)/figures.stamp \ + $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ $(srcdir)/ref_guide/ref_guide.hh @@ -140,7 +238,7 @@ $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \ | sed -e 's/\\\$$//g'`; \ $(edit) $< >$@ -MAINTAINERCLEANFILES = $(DOXYFILE_USER) +MAINTAINERCLEANFILES += $(DOXYFILE_USER) ## FIXME: Rename USER_REFMAN_PDF to something else? USER_REFMAN_PDF = user-refman.pdf @@ -293,7 +391,7 @@ technical_dir = $(doc_dir)/technical # FIXME: Check these dependencies. And it'd be better to depend on # actual files rather than timestamps corresponding to a bunch of # files. -technical_dependencies = $(doc_dir)/figures.stamp +technical_dependencies = $(PNG_FIGURES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -400,7 +498,7 @@ tutorial_dir = $(doc_dir)/tutorial tutorial_dependencies = \ $(doc_dir)/split-examples.stamp \ $(doc_dir)/split-outputs.stamp \ - $(doc_dir)/figures.stamp + $(PNG_FIGURES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -600,7 +698,7 @@ ref_guide_dir = $(doc_dir)/ref_guide ref_guide_dependencies = \ $(doc_dir)/split-examples.stamp \ $(doc_dir)/split-outputs.stamp \ - $(doc_dir)/figures.stamp + $(PNG_FIGURES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -690,30 +788,6 @@ EXTRA_DIST += \ MAINTAINERCLEANFILES += $(REF_GUIDE_HH) -## --------- ## -## Figures. ## -## --------- ## - -$(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp -include $(srcdir)/figures/figures.mk - -EXTRA_DIST += $(srcdir)/figures.stamp -MAINTAINERCLEANFILES += $(srcdir)/figures.stamp -$(srcdir)/figures.stamp: $(FIGURES_SRCDIR)/*.p*m - rm -f $@.tmp - touch $@.tmp - failcom='exit 1'; \ - list="$(FIGURES_SRCDIR)/*.p*m"; for img in $$list; do \ - echo "Converting $$img to PNG"; \ - name=`basename $$img` \ - ext=`echo $$name | cut -d '.' -f 2`; \ - convert -scale 250 -bordercolor black -border 2x2 $$img \ - $(FIGURES_SRCDIR)/`basename $$img $$ext`png \ - || eval $$failcom; \ - done - mv -f $@.tmp $@ - - ## ---------- ## ## Examples. ## ## ---------- ## @@ -1065,9 +1139,11 @@ include $(top_srcdir)/build-aux/regen-recursive.mk 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-outputs-mk @cd $(srcdir) && \ - ./generate_dist_files.sh figures 'p*m' && \ ./generate_dist_files.sh outputs txt && \ ./generate_dist_files.sh examples cc.raw @mv -f $(srcdir)/headers.stamp.tmp $(srcdir)/headers.stamp @@ -1080,7 +1156,6 @@ $(srcdir)/headers.stamp: $(srcdir)/generate_dist_files.sh @rm -f $@.tmp @touch $@.tmp @cd $(srcdir) && \ - ./generate_dist_files.sh figures 'p*m' && \ ./generate_dist_files.sh outputs txt && \ ./generate_dist_files.sh examples cc.raw @mv -f $@.tmp $@ @@ -1141,4 +1216,7 @@ EXTRA_DIST += \ tools/split_sample.sh \ tools/todoxygen.sh +# Generate a Makefile helper containing a variable assignment. +EXTRA_DIST += gen-make-variable +# FIXME: Can't we implement this using `gen-make-variable'? EXTRA_DIST += gen-examples-outputs-mk diff --git a/milena/doc/figures/figures.mk b/milena/doc/figures/figures.mk deleted file mode 100644 index 38fc1d1..0000000 --- a/milena/doc/figures/figures.mk +++ /dev/null @@ -1,41 +0,0 @@ -## Generated by ../generate_dist_files, do not modify. - -EXTRA_DIST += \ -figures/extend-1.ppm \ -figures/extend-2.ppm \ -figures/extend-3.ppm \ -figures/extend-4.ppm \ -figures/extend-5.ppm \ -figures/fill-1.ppm \ -figures/fill-2.ppm \ -figures/fill-imageif-cfun-1.ppm \ -figures/fill-subdomain-1.pbm \ -figures/fill-subdomain-2.ppm \ -figures/fill-subdomain-3.ppm \ -figures/fill-subdomain-4.ppm \ -figures/ima2d-rot-1.ppm \ -figures/ima2d-rot-2.ppm \ -figures/ima_save.pbm \ -figures/labeling-compute-1.pbm \ -figures/labeling-compute-2.ppm \ -figures/logical-not-1.pbm \ -figures/logical-not-2.pbm \ -figures/logical-not-3.pbm \ -figures/tuto2_first_image-1.pbm \ -figures/tuto3_colorize-1.pgm \ -figures/tuto3_colorize-2.ppm \ -figures/tuto3_rw_image-1.ppm \ -figures/tuto3_rw_image-2.ppm \ -figures/tuto3_rw_image-3.ppm \ -figures/tuto4_genericity_and_algorithms-1.ppm \ -figures/tuto4_genericity_and_algorithms-2.ppm \ -figures/tuto4_genericity_and_algorithms-3.pbm \ -figures/tuto4_genericity_and_algorithms-4.ppm \ -figures/tuto4_genericity_and_algorithms-5.ppm \ -figures/tuto4_genericity_and_algorithms-6.ppm \ -figures/tuto4_genericity_and_algorithms-7.pgm \ -figures/tuto4_genericity_and_algorithms-7.ppm \ -figures/tuto4_genericity_and_algorithms-8.pgm \ -figures/tuto4_genericity_and_algorithms-8.ppm \ -figures/tuto4_genericity_and_algorithms-9.pgm \ -figures/tuto4_genericity_and_algorithms-9.ppm diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-make-variable similarity index 54% copy from milena/doc/gen-examples-outputs-mk copy to milena/doc/gen-make-variable index 10692a1..91403ae 100755 --- a/milena/doc/gen-examples-outputs-mk +++ b/milena/doc/gen-make-variable @@ -16,24 +16,37 @@ # 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` -test $# -ne 0 || { echo "usage: $me PROGRAMS..."; exit 1; } +# Use the C locale to have a deterministic sort. +export LC_ALL=C + +test $# -gt 1 || { echo "usage: $me VARIABLE FILES..."; 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" +} cat<<EOF ## Generated by $me. Do not edit by hand. EOF - -for program; do -cat<<EOF -\$(srcdir)/outputs/$program.txt: $program\$(EXEEXT) - rm -f \$@.tmp - ./\$< >\$@.tmp - cp -f \$@.tmp \$@ - rm -f \$@.tmp - -EOF -done +{ + echo "$1 =" + shift + for var; do + echo "$var" + shift + done | sort | sed 's/$.*$/ \1/' +} | backslashify diff --git a/milena/doc/pbm-figures.mk b/milena/doc/pbm-figures.mk new file mode 100644 index 0000000..dd061a5 --- /dev/null +++ b/milena/doc/pbm-figures.mk @@ -0,0 +1,11 @@ +## Generated by gen-make-variable. Do not edit by hand. + +PBM_FIGURES = \ + $(srcdir)/figures/fill-subdomain-1.pbm \ + $(srcdir)/figures/ima_save.pbm \ + $(srcdir)/figures/labeling-compute-1.pbm \ + $(srcdir)/figures/logical-not-1.pbm \ + $(srcdir)/figures/logical-not-2.pbm \ + $(srcdir)/figures/logical-not-3.pbm \ + $(srcdir)/figures/tuto2_first_image-1.pbm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm diff --git a/milena/doc/pgm-figures.mk b/milena/doc/pgm-figures.mk new file mode 100644 index 0000000..b65d78f --- /dev/null +++ b/milena/doc/pgm-figures.mk @@ -0,0 +1,7 @@ +## Generated by gen-make-variable. Do not edit by hand. + +PGM_FIGURES = \ + $(srcdir)/figures/tuto3_colorize-1.pgm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-7.pgm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-8.pgm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-9.pgm diff --git a/milena/doc/ppm-figures.mk b/milena/doc/ppm-figures.mk new file mode 100644 index 0000000..835a32e --- /dev/null +++ b/milena/doc/ppm-figures.mk @@ -0,0 +1,30 @@ +## Generated by gen-make-variable. Do not edit by hand. + +PPM_FIGURES = \ + $(srcdir)/figures/extend-1.ppm \ + $(srcdir)/figures/extend-2.ppm \ + $(srcdir)/figures/extend-3.ppm \ + $(srcdir)/figures/extend-4.ppm \ + $(srcdir)/figures/extend-5.ppm \ + $(srcdir)/figures/fill-1.ppm \ + $(srcdir)/figures/fill-2.ppm \ + $(srcdir)/figures/fill-imageif-cfun-1.ppm \ + $(srcdir)/figures/fill-subdomain-2.ppm \ + $(srcdir)/figures/fill-subdomain-3.ppm \ + $(srcdir)/figures/fill-subdomain-4.ppm \ + $(srcdir)/figures/fill-subimage-cfun-1.ppm \ + $(srcdir)/figures/ima2d-rot-1.ppm \ + $(srcdir)/figures/ima2d-rot-2.ppm \ + $(srcdir)/figures/labeling-compute-2.ppm \ + $(srcdir)/figures/tuto3_colorize-2.ppm \ + $(srcdir)/figures/tuto3_rw_image-1.ppm \ + $(srcdir)/figures/tuto3_rw_image-2.ppm \ + $(srcdir)/figures/tuto3_rw_image-3.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-7.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-8.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-9.ppm -- 1.5.6.5

1 0

branch next updated: last-svn-commit-8-gfbe0b7f
by git＠lrde.epita.fr 15 Mar '10

15 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via fbe0b7f5ec449ab79dfad0b4d285a745f625e41e (commit) via 851beeb4d1256b38ff6d57b2c0f2944fd0479db2 (commit) via 77004f3748794e5990deca22ecbafb173fd44eef (commit) via 08a77f75484a3b12fcee2cf1f1970aefad936362 (commit) via 501c45e68c71fc00982b8b21a629d7b6757272cc (commit) from f9ac5d4d841e31df0aa208435d302202852a9a6b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- fbe0b7f gluit/gluit.mk: Help Emacs find out the nature of this file. 851beeb Clean up external/trimesh/ChangeLog. 77004f3 Aesthetic changes. 08a77f7 Aesthetic changes. 501c45e AUTHORS: Update. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 24 +++++++++++++++------- ChangeLog | 13 ++++++++++++ build-aux/extra-recursive-targets.mk | 23 +++++++++++---------- build-aux/regen-recursive.mk | 27 +++++++++++++------------ external/trimesh/ChangeLog | 6 ++++- external/trimesh/gluit/gluit.mk | 2 +- milena/ChangeLog | 9 ++++++++ milena/tests/tests-recursive.mk | 36 +++++++++++++++++----------------- milena/tests/tests.mk | 36 ++++++++++++++++++--------------- 9 files changed, 108 insertions(+), 68 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0