* Makefile.am: fix list of distributed images. * doc/tutorial/Makefile.am: include new mk files. * doc/tutorial/generate_dist_files.sh: new script to generate the following list of files. * doc/tutorial/examples/examples.mk, * doc/tutorial/figures/figures.mk, * doc/tutorial/outputs/outputs.mk, * doc/tutorial/samples/samples.mk: generated files. --- milena/ChangeLog | 16 +++ milena/Makefile.am | 49 +++++----- milena/doc/tutorial/Makefile.am | 142 +--------------------------- milena/doc/tutorial/examples/examples.mk | 29 ++++++ milena/doc/tutorial/figures/figures.mk | 33 +++++++ milena/doc/tutorial/generate_dist_files.sh | 12 +++ milena/doc/tutorial/outputs/outputs.mk | 55 +++++++++++ milena/doc/tutorial/samples/samples.mk | 54 +++++++++++ 8 files changed, 229 insertions(+), 161 deletions(-) create mode 100644 milena/doc/tutorial/examples/examples.mk create mode 100644 milena/doc/tutorial/figures/figures.mk create mode 100755 milena/doc/tutorial/generate_dist_files.sh create mode 100644 milena/doc/tutorial/outputs/outputs.mk create mode 100644 milena/doc/tutorial/samples/samples.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index 3986d4f..2ccdce1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,19 @@ +2009-01-26 Guillaume Lazzara <z@lrde.epita.fr> + + Fix list of distributed files. + + * Makefile.am: fix list of distributed images. + + * doc/tutorial/Makefile.am: include new mk files. + + * doc/tutorial/generate_dist_files.sh: new script to generate the following + list of files. + + * doc/tutorial/examples/examples.mk, + * doc/tutorial/figures/figures.mk, + * doc/tutorial/outputs/outputs.mk, + * doc/tutorial/samples/samples.mk: generated files. + 2009-01-24 Thierry Geraud <thierry.geraud@lrde.epita.fr> Fix consistency of make::box3d arguments. diff --git a/milena/Makefile.am b/milena/Makefile.am index c400ae7..cb295b9 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -17,29 +17,32 @@ tutorial: include $(top_srcdir)/milena/headers.mk -EXTRA_DIST = \ -img/lena.pbm \ -img/fly.pbm \ -img/squares-lc.pgm \ -img/lena_16.ppm \ -img/squares.pgm \ -img/fly.pgm \ -img/toto.pbm \ -img/README \ -img/quite-small.pgm \ -img/test.fits \ -img/lena.pgm \ -img/tiny.pbm \ -img/tiny.pgm \ -img/picasso.pbm \ -img/space_debris.pgm \ -img/picasso.pgm \ -img/small.pbm \ -img/small-enlarged.png \ -img/small.png \ -img/small.ppm \ -img/lena.ppm \ -img/small.pgm +EXTRA_DIST = \ +img/README \ +img/fly.pbm \ +img/fly.pgm \ +img/fly.ppm \ +img/lena.pbm \ +img/lena.pgm \ +img/lena.ppm \ +img/lena_16.ppm \ +img/medium.pgm \ +img/medium.ppm \ +img/picasso.pbm \ +img/picasso.pgm \ +img/quite-small.pgm \ +img/small-enlarged.png \ +img/small.pbm \ +img/small.pgm \ +img/small.png \ +img/small.ppm \ +img/squares-lc.pgm \ +img/squares.pgm \ +img/test.fits \ +img/tiny.pbm \ +img/tiny.pgm \ +img/tiny.ppm \ +img/toto.pbm EXTRA_DIST += \ generate_dist_headers.sh diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index ba26fe4..88be83d 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -40,145 +40,11 @@ EXTRA_DIST = \ tutorial.tex \ tutorial.pdf -EXTRA_DIST += \ -examples/cpp_issue.cc \ -examples/sub_image.cc \ -examples/sub_image_if.cc \ -examples/p_vaccess.cc \ -examples/win_multiple.cc \ -examples/image2d.cc \ -examples/image_plain.cc \ -examples/p_run.cc \ -examples/proxy.cc \ -examples/p_array.2.cc \ -examples/for_Z.cc \ -examples/image_if.cc \ -examples/p_key.cc \ -examples/p_mutable_array_of.cc \ -examples/p_queue.cc \ -examples/image_flat.cc \ -examples/p_image.cc \ -examples/box.cc \ -examples/p_line2d.cc \ -examples/p_array.cc \ -examples/accu.cc \ -examples/p_key.2.cc \ -examples/window.cc \ -examples/image_safe.cc \ -examples/vec.cc -EXTRA_DIST += \ -figures/ima2d-rot-2.ppm \ -figures/logical-not-2.pbm \ -figures/fill-subdomain-2.ppm \ -figures/labeling-compute-2.ppm \ -figures/ima2d-rot-1.ppm \ -figures/fill-subdomain-3.ppm \ -figures/logical-not-1.pbm \ -figures/ima_save.pbm \ -figures/fill-subimage-cfun-1.ppm \ -figures/fill-subdomain-4.ppm \ -figures/logical-not-3.pbm \ -figures/labeling-compute-1.pbm \ -figures/fill-subdomain-1.pbm - -EXTRA_DIST += \ -outputs/win-create-1-display.txt \ -outputs/win-create-2.txt \ -outputs/accu-right-instanciation.txt \ -outputs/ima2d-1.txt \ -outputs/borderthickness.txt \ -outputs/ima-save.txt \ -outputs/fill-subimage-cfun.txt \ -outputs/labeling-compute.txt \ -outputs/parray-display-1.txt \ -outputs/fill-subdomain-shorter.txt \ -outputs/dpoint-1.txt \ -outputs/forall-piter.txt \ -outputs/predicate-1.txt \ -outputs/box2d-bbox.txt \ -outputs/graph-iter.txt \ -outputs/graph-output-1.txt \ -outputs/fill-call-1.txt \ -outputs/ima2d-rot.txt \ -outputs/paste-call-1.txt \ -outputs/fun-p2v-1.txt \ -outputs/estim-sites.txt \ -outputs/parray-append.txt \ -outputs/fill-subdomain.txt \ -outputs/ima-size.txt \ -outputs/logical-not.txt \ -outputs/ima2d-display-output-2.txt \ -outputs/ima2d-decl-2.txt \ -outputs/paste.txt \ -outputs/ima2d-6-clone.txt \ -outputs/ima2d-7.txt \ -outputs/parray-bbox.txt \ -outputs/domain-display.txt \ -outputs/ima2d-display-1.txt \ -outputs/win-create-1.txt \ -outputs/ima2d-display-2.txt \ -outputs/ima2d-display-output-1.txt \ -outputs/fill-part-image.txt \ -outputs/ima2d-3-output.txt \ -outputs/ima-has.txt \ -outputs/ima2d-5.txt \ -outputs/ima2d-4.txt \ -outputs/mln_var.txt \ -outputs/fill.txt \ -outputs/point-1.txt \ -outputs/extension-ignore.txt \ -outputs/graph-data.txt \ -outputs/ima2d-2.txt \ -outputs/ima2d-3.txt - -EXTRA_DIST += \ -samples/paste-call-1.cc \ -samples/dpoint-1.cc \ -samples/parray-append.cc \ -samples/ima-load.cc.raw \ -samples/ima2d-restricted-1.cc.raw \ -samples/graph-iter.cc \ -samples/labeling-compute.cc \ -samples/ima2d-7.cc \ -samples/ima2d-restricted-2.cc.raw \ -samples/fill-subimage-cfun.cc \ -samples/ima-save.cc \ -samples/point-1.cc \ -samples/box2d-bbox.cc \ -samples/forall-piter.cc \ -samples/ima-size.cc \ -samples/borderthickness.cc \ -samples/Makefile.in \ -samples/ima-has.cc \ -samples/win-create-1.cc \ -samples/accu-wrong-instanciation.cc.raw \ -samples/accu-right-instanciation.cc \ -samples/ima2d-5.cc \ -samples/fill-subdomain.cc \ -samples/fill-subdomain-shorter.cc \ -samples/ima2d-2.cc \ -samples/extension-ignore.cc \ -samples/Makefile.am \ -samples/parray-bbox.cc \ -samples/graph-data.cc \ -samples/mln_var.cc \ -samples/ima2d-4.cc \ -samples/predicate-1.cc \ -samples/ima2d-3.cc \ -samples/ima2d-1.cc \ -samples/estim-sites.cc \ -samples/ima2d-6-clone.cc \ -samples/ima2d-restricted-3.cc.raw \ -samples/logical-not.cc \ -samples/fun-p2v-1.cc \ -samples/ima2d-rot.cc \ -samples/fill-part-image.cc \ -samples/domain-display.cc \ -samples/paste.cc \ -samples/fill.cc \ -samples/fill-call-1.cc \ -samples/win-create-2.cc +include $(top_srcdir)/milena/doc/tutorial/examples/examples.mk +include $(top_srcdir)/milena/doc/tutorial/figures/figures.mk +include $(top_srcdir)/milena/doc/tutorial/outputs/outputs.mk +include $(top_srcdir)/milena/doc/tutorial/samples/samples.mk EXTRA_DIST += \ tools/sample_utils.hh \ diff --git a/milena/doc/tutorial/examples/examples.mk b/milena/doc/tutorial/examples/examples.mk new file mode 100644 index 0000000..146f068 --- /dev/null +++ b/milena/doc/tutorial/examples/examples.mk @@ -0,0 +1,29 @@ +## Generated by ../generate_dist_files, do not modify ## +EXTRA_DIST += \ +examples \ +examples/cpp_issue.cc \ +examples/sub_image.cc \ +examples/sub_image_if.cc \ +examples/p_vaccess.cc \ +examples/win_multiple.cc \ +examples/image2d.cc \ +examples/image_plain.cc \ +examples/p_run.cc \ +examples/proxy.cc \ +examples/p_array.2.cc \ +examples/examples.mk \ +examples/for_Z.cc \ +examples/image_if.cc \ +examples/p_key.cc \ +examples/p_mutable_array_of.cc \ +examples/p_queue.cc \ +examples/image_flat.cc \ +examples/p_image.cc \ +examples/box.cc \ +examples/p_line2d.cc \ +examples/p_array.cc \ +examples/accu.cc \ +examples/p_key.2.cc \ +examples/window.cc \ +examples/image_safe.cc \ +examples/vec.cc diff --git a/milena/doc/tutorial/figures/figures.mk b/milena/doc/tutorial/figures/figures.mk new file mode 100644 index 0000000..3d11a2b --- /dev/null +++ b/milena/doc/tutorial/figures/figures.mk @@ -0,0 +1,33 @@ +## Generated by ../generate_dist_files, do not modify ## +EXTRA_DIST += \ +figures \ +figures/ima2d-rot-2.ppm \ +figures/tuto3_rw_image-1.ppm \ +figures/logical-not-2.pbm \ +figures/fill-subdomain-2.ppm \ +figures/tuto4_genericity_and_algorithms-9.pgm \ +figures/labeling-compute-2.ppm \ +figures/tuto4_genericity_and_algorithms-7.pgm \ +figures/tuto4_genericity_and_algorithms-5.ppm \ +figures/ima2d-rot-1.ppm \ +figures/fill-subdomain-3.ppm \ +figures/tuto4_genericity_and_algorithms-9.ppm \ +figures/logical-not-1.pbm \ +figures/ima_save.pbm \ +figures/figures.mk \ +figures/fill-subimage-cfun-1.ppm \ +figures/fill-subdomain-4.ppm \ +figures/tuto4_genericity_and_algorithms-7.ppm \ +figures/tuto4_genericity_and_algorithms-6.ppm \ +figures/logical-not-3.pbm \ +figures/tuto4_genericity_and_algorithms-3.pbm \ +figures/tuto1_first_image-1.pbm \ +figures/tuto4_genericity_and_algorithms-1.ppm \ +figures/tuto4_genericity_and_algorithms-8.ppm \ +figures/labeling-compute-1.pbm \ +figures/tuto3_rw_image-3.ppm \ +figures/tuto4_genericity_and_algorithms-4.ppm \ +figures/tuto4_genericity_and_algorithms-8.pgm \ +figures/tuto4_genericity_and_algorithms-2.ppm \ +figures/fill-subdomain-1.pbm \ +figures/tuto3_rw_image-2.ppm diff --git a/milena/doc/tutorial/generate_dist_files.sh b/milena/doc/tutorial/generate_dist_files.sh new file mode 100755 index 0000000..5864bff --- /dev/null +++ b/milena/doc/tutorial/generate_dist_files.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +for dir in samples figures outputs examples; do + OUT="$dir/$dir.mk" + echo "## Generated by ../generate_dist_files, do not modify ##" > $OUT + echo -n "EXTRA_DIST += " >> $OUT + for file in `find $dir`; do + echo " \\" >> $OUT + echo -n $file >> $OUT + done + echo "" >> $OUT +done diff --git a/milena/doc/tutorial/outputs/outputs.mk b/milena/doc/tutorial/outputs/outputs.mk new file mode 100644 index 0000000..7d7596d --- /dev/null +++ b/milena/doc/tutorial/outputs/outputs.mk @@ -0,0 +1,55 @@ +## Generated by ../generate_dist_files, do not modify ## +EXTRA_DIST += \ +outputs \ +outputs/win-create-1-display.txt \ +outputs/win-create-2.txt \ +outputs/accu-right-instanciation.txt \ +outputs/ima2d-1.txt \ +outputs/borderthickness.txt \ +outputs/ima-save.txt \ +outputs/fill-subimage-cfun.txt \ +outputs/labeling-compute.txt \ +outputs/parray-display-1.txt \ +outputs/fill-subdomain-shorter.txt \ +outputs/dpoint-1.txt \ +outputs/forall-piter.txt \ +outputs/predicate-1.txt \ +outputs/box2d-bbox.txt \ +outputs/graph-iter.txt \ +outputs/graph-output-1.txt \ +outputs/fill-call-1.txt \ +outputs/ima2d-rot.txt \ +outputs/paste-call-1.txt \ +outputs/fun-p2v-1.txt \ +outputs/estim-sites.txt \ +outputs/parray-append.txt \ +outputs/fill-subdomain.txt \ +outputs/ima-size.txt \ +outputs/tuto2_first_image.txt \ +outputs/logical-not.txt \ +outputs/ima2d-display-output-2.txt \ +outputs/ima2d-decl-2.txt \ +outputs/paste.txt \ +outputs/outputs.mk \ +outputs/ima2d-6-clone.txt \ +outputs/ima2d-7.txt \ +outputs/tuto3_rw_image.txt \ +outputs/parray-bbox.txt \ +outputs/domain-display.txt \ +outputs/ima2d-display-1.txt \ +outputs/win-create-1.txt \ +outputs/ima2d-display-2.txt \ +outputs/ima2d-display-output-1.txt \ +outputs/fill-part-image.txt \ +outputs/tuto4_genericity_and_algorithms.txt \ +outputs/ima-has.txt \ +outputs/ima2d-5.txt \ +outputs/ima2d-4.txt \ +outputs/mln_var.txt \ +outputs/fill.txt \ +outputs/point-1.txt \ +outputs/extension-ignore.txt \ +outputs/graph-data.txt \ +outputs/tuto1_first_image.txt \ +outputs/ima2d-2.txt \ +outputs/ima2d-3.txt diff --git a/milena/doc/tutorial/samples/samples.mk b/milena/doc/tutorial/samples/samples.mk new file mode 100644 index 0000000..7213ed1 --- /dev/null +++ b/milena/doc/tutorial/samples/samples.mk @@ -0,0 +1,54 @@ +## Generated by ../generate_dist_files, do not modify ## +EXTRA_DIST += \ +samples \ +samples/paste-call-1.cc \ +samples/dpoint-1.cc \ +samples/parray-append.cc \ +samples/fill-proto.cc.raw \ +samples/ima2d-restricted-1.cc.raw \ +samples/graph-iter.cc \ +samples/labeling-compute.cc \ +samples/ima2d-7.cc \ +samples/ima2d-restricted-2.cc.raw \ +samples/fill-subimage-cfun.cc \ +samples/ima-save.cc \ +samples/point-1.cc \ +samples/box2d-bbox.cc \ +samples/forall-piter.cc \ +samples/ima-size.cc \ +samples/borderthickness.cc \ +samples/Makefile.in \ +samples/ima-load.cc \ +samples/ima-has.cc \ +samples/win-create-1.cc \ +samples/samples.mk \ +samples/accu-wrong-instanciation.cc.raw \ +samples/accu-right-instanciation.cc \ +samples/ima2d-5.cc \ +samples/fill-subdomain.cc \ +samples/fill-subdomain-shorter.cc \ +samples/tuto3_rw_image.cc \ +samples/ima2d-2.cc \ +samples/extension-ignore.cc \ +samples/Makefile.am \ +samples/parray-bbox.cc \ +samples/graph-data.cc \ +samples/mln_var.cc \ +samples/ima2d-4.cc \ +samples/predicate-1.cc \ +samples/ima2d-3.cc \ +samples/tuto2_first_image.cc \ +samples/ima2d-1.cc \ +samples/estim-sites.cc \ +samples/ima2d-6-clone.cc \ +samples/ima2d-restricted-3.cc.raw \ +samples/logical-not.cc \ +samples/fun-p2v-1.cc \ +samples/ima2d-rot.cc \ +samples/fill-part-image.cc \ +samples/domain-display.cc \ +samples/tuto4_genericity_and_algorithms.cc \ +samples/paste.cc \ +samples/fill.cc \ +samples/fill-call-1.cc \ +samples/win-create-2.cc -- 1.5.6.5