27 Apr
2009
27 Apr
'09
5:47 p.m.
* doc/examples/examples.mk,
* doc/figures/figures.mk,
* doc/outputs/outputs.mk,
* doc/generate_dist_files.sh: do not add distributed files in
EXTRA_DIST.
* doc/examples/samples.mk: remove since useless now.
---
milena/ChangeLog | 12 +++++
milena/doc/examples/examples.mk | 89 +------------------------------------
milena/doc/examples/samples.mk | 55 -----------------------
milena/doc/figures/figures.mk | 3 +-
milena/doc/generate_dist_files.sh | 8 ++-
milena/doc/outputs/outputs.mk | 4 +-
6 files changed, 23 insertions(+), 148 deletions(-)
delete mode 100644 milena/doc/examples/samples.mk
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 03a2bdb..10a5cc4 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,17 @@
2009-04-27 Guillaume Lazzara <lazzara(a)lrde.epita.fr>
+ Fix documentation distributed files.
+
+ * doc/examples/examples.mk,
+ * doc/figures/figures.mk,
+ * doc/outputs/outputs.mk,
+ * doc/generate_dist_files.sh: do not add distributed files in
+ EXTRA_DIST.
+
+ * doc/examples/samples.mk: remove since useless now.
+
+2009-04-27 Guillaume Lazzara <lazzara(a)lrde.epita.fr>
+
Fix seeds2tiling_roundness test.
* mln/geom/chamfer.hh: Fix a too restrictive test (true == 1 but not >
diff --git a/milena/doc/examples/examples.mk b/milena/doc/examples/examples.mk
index 4449d52..3ae418c 100644
--- a/milena/doc/examples/examples.mk
+++ b/milena/doc/examples/examples.mk
@@ -1,96 +1,9 @@
## Generated by ../generate_dist_files, do not modify.
EXTRA_DIST += \
-examples/paste-call-1.cc \
-examples/dpoint-1.cc \
-examples/parray-append.cc \
-examples/trash \
-examples/trash/cpp_issue.cc \
-examples/trash/sub_image.cc \
-examples/trash/sub_image_if.cc \
-examples/trash/graph.cc \
-examples/trash/p_vaccess.cc \
-examples/trash/tuto_one.cc \
-examples/trash/win_multiple.cc \
-examples/trash/image2d.cc \
-examples/trash/image_plain.cc \
-examples/trash/p_run.cc \
-examples/trash/proxy.cc \
-examples/trash/p_array.2.cc \
-examples/trash/labeling_algo.cc \
-examples/trash/for_Z.cc \
-examples/trash/image_if.cc \
-examples/trash/p_key.cc \
-examples/trash/p_mutable_array_of.cc \
-examples/trash/p_queue.cc \
-examples/trash/image_flat.cc \
-examples/trash/p_image.cc \
-examples/trash/mk_graph.cc \
-examples/trash/box.cc \
-examples/trash/p_line2d.cc \
-examples/trash/p_array.cc \
-examples/trash/accu.cc \
-examples/trash/p_key.2.cc \
-examples/trash/window.cc \
-examples/trash/tuto_bis.cc \
-examples/trash/image_safe.cc \
-examples/trash/erosion.cc \
-examples/trash/vec.cc \
examples/fill-proto.cc.raw \
examples/ima2d-restricted-1.cc.raw \
-examples/graph-iter.cc \
-examples/labeling-compute.cc \
-examples/ima2d-7.cc \
examples/ima2d-restricted-2.cc.raw \
-examples/fill-subimage-cfun.cc \
-examples/ima-save.cc \
-examples/point-1.cc \
-examples/box2d-bbox.cc \
-examples/forall-piter.cc \
-examples/ima-size.cc \
-examples/tuto2 \
-examples/examples.mk \
-examples/tuto4 \
-examples/borderthickness.cc \
-examples/Makefile.in \
-examples/ima-load.cc \
-examples/ima-has.cc \
-examples/win-create-1.cc \
-examples/samples.mk \
-examples/tuto3 \
examples/tuto3/fill_non_generic.cc.raw \
-examples/tuto3/colorize.cc \
-examples/tuto3/println.cc \
-examples/tuto3/trace.cc \
-examples/tuto3/first_routine.cc \
examples/accu-wrong-instanciation.cc.raw \
-examples/accu-right-instanciation.cc \
-examples/ima2d-5.cc \
-examples/fill-subdomain.cc \
-examples/fill-subdomain-shorter.cc \
-examples/tuto3_rw_image.cc \
-examples/ima2d-2.cc \
-examples/extension-ignore.cc \
-examples/extend.cc \
-examples/Makefile.am \
-examples/parray-bbox.cc \
-examples/graph-data.cc \
-examples/mln_var.cc \
-examples/ima2d-4.cc \
-examples/predicate-1.cc \
-examples/ima2d-3.cc \
-examples/tuto2_first_image.cc \
-examples/ima2d-1.cc \
-examples/estim-sites.cc \
-examples/ima2d-6-clone.cc \
-examples/ima2d-restricted-3.cc.raw \
-examples/logical-not.cc \
-examples/fun-p2v-1.cc \
-examples/ima2d-rot.cc \
-examples/fill-part-image.cc \
-examples/domain-display.cc \
-examples/tuto4_genericity_and_algorithms.cc \
-examples/paste.cc \
-examples/fill.cc \
-examples/fill-call-1.cc \
-examples/win-create-2.cc
+examples/ima2d-restricted-3.cc.raw
diff --git a/milena/doc/examples/samples.mk b/milena/doc/examples/samples.mk
deleted file mode 100644
index e0e3f5d..0000000
--- a/milena/doc/examples/samples.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-## Generated by ../generate_dist_files, do not modify.
-
-EXTRA_DIST += \
-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/extend.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
diff --git a/milena/doc/figures/figures.mk b/milena/doc/figures/figures.mk
index 42d8724..2602b31 100644
--- a/milena/doc/figures/figures.mk
+++ b/milena/doc/figures/figures.mk
@@ -16,14 +16,15 @@ figures/tuto4_genericity_and_algorithms-9.ppm \
figures/logical-not-1.pbm \
figures/ima_save.pbm \
figures/tuto2_first_image-1.pbm \
-figures/figures.mk \
figures/fill-subimage-cfun-1.ppm \
figures/extend-3.ppm \
figures/fill-subdomain-4.ppm \
+figures/colorize-1.pgm \
figures/tuto4_genericity_and_algorithms-7.ppm \
figures/tuto4_genericity_and_algorithms-6.ppm \
figures/extend-5.ppm \
figures/logical-not-3.pbm \
+figures/colorize-2.ppm \
figures/tuto4_genericity_and_algorithms-3.pbm \
figures/tuto4_genericity_and_algorithms-1.ppm \
figures/extend-4.ppm \
diff --git a/milena/doc/generate_dist_files.sh b/milena/doc/generate_dist_files.sh
index df2daad..e7c3b38 100755
--- a/milena/doc/generate_dist_files.sh
+++ b/milena/doc/generate_dist_files.sh
@@ -13,9 +13,11 @@ for dir in figures outputs examples; do
echo "## Generated by ../generate_dist_files, do not modify." > $OUT
echo >>$OUT
$ECHO_N "EXTRA_DIST += " >> $OUT
- for file in `find $dir -mindepth 1`; do
- echo " \\" >> $OUT
- $ECHO_N $file >> $OUT
+ for ftype in cc.raw p*m txt; do
+ for file in `find $dir -mindepth 1 -name *.$ftype`; do
+ echo " \\" >> $OUT
+ $ECHO_N $file >> $OUT
+ done
done
echo "" >> $OUT
done
diff --git a/milena/doc/outputs/outputs.mk b/milena/doc/outputs/outputs.mk
index bb57832..ac10062 100644
--- a/milena/doc/outputs/outputs.mk
+++ b/milena/doc/outputs/outputs.mk
@@ -2,6 +2,7 @@
EXTRA_DIST += \
outputs/win-create-1-display.txt \
+outputs/trace.txt \
outputs/win-create-2.txt \
outputs/accu-right-instanciation.txt \
outputs/extend.txt \
@@ -29,12 +30,13 @@ outputs/fill-subdomain.txt \
outputs/ima-size.txt \
outputs/tuto2_first_image.txt \
outputs/logical-not.txt \
+outputs/colorize.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/println.txt \
outputs/tuto3_rw_image.txt \
outputs/parray-bbox.txt \
outputs/domain-display.txt \
--
1.5.6.5