* configure.ac: New.
* Makefile.am (ACLOCAL_AMFLAGS): New.
(SUBDIRS): Add build-aux.
(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES): New.
(dist-hook): New target.
* AUTHORS: New.
* NEWS: New (imported from Olena and updated).
* COPYING: New (imported from Olena).
* INSTALL: New (generated by Automake).
* README: New.
* m4/autotroll.m4,
* m4/boost.m4,
* m4/oln-with-lib.m4,
* m4/pkg.m4:
New (imported from Olena).
* build-aux/autotroll.mk,
* build-aux/build_unit_test.sh,
* build-aux/extra-recursive-targets.mk,
* build-aux/generate_dist_headers.sh,
* build-aux/regen-recursive.mk,
* build-aux/tex.mk,
* build-aux/texi2dvi:
New (imported from Olena).
* build-aux/Makefile.am: New.
* apps/constrained-connectivity/Makefile.am,
* apps/graph-morpho/Makefile.am,
* apps/mesh-segm-skel/Makefile.am,
* apps/papers/levillain.09.ismm/Makefile.am,
* doc/Makefile.am,
* mesh/Makefile.am,
* tests/Makefile.am,
* tests/accu/Makefile.am,
* tests/accu/image/Makefile.am,
* tests/accu/math/Makefile.am,
* tests/accu/shape/Makefile.am,
* tests/accu/site_set/Makefile.am,
* tests/accu/stat/Makefile.am,
* tests/algebra/Makefile.am,
* tests/arith/Makefile.am,
* tests/binarization/Makefile.am,
* tests/border/Makefile.am,
* tests/canvas/Makefile.am,
* tests/canvas/browsing/Makefile.am,
* tests/canvas/morpho/Makefile.am,
* tests/convert/Makefile.am,
* tests/convert/impl/Makefile.am,
* tests/core/Makefile.am,
* tests/core/alias/Makefile.am,
* tests/core/image/Makefile.am,
* tests/core/image/dmorph/Makefile.am,
* tests/core/image/imorph/Makefile.am,
* tests/core/image/vmorph/Makefile.am,
* tests/core/other/Makefile.am,
* tests/core/routine/Makefile.am,
* tests/core/site_set/Makefile.am,
* tests/data/Makefile.am,
* tests/data/approx/Makefile.am,
* tests/data/naive/Makefile.am,
* tests/debug/Makefile.am,
* tests/display/Makefile.am,
* tests/draw/Makefile.am,
* tests/estim/Makefile.am,
* tests/extension/Makefile.am,
* tests/extract/Makefile.am,
* tests/fun/Makefile.am,
* tests/fun/i2v/Makefile.am,
* tests/fun/p2b/Makefile.am,
* tests/fun/p2p/Makefile.am,
* tests/fun/p2v/Makefile.am,
* tests/fun/stat/Makefile.am,
* tests/fun/v2i/Makefile.am,
* tests/fun/v2v/Makefile.am,
* tests/fun/vv2v/Makefile.am,
* tests/fun/x2x/Makefile.am,
* tests/geom/Makefile.am,
* tests/graph/Makefile.am,
* tests/graph/attribute/Makefile.am,
* tests/histo/Makefile.am,
* tests/io/Makefile.am,
* tests/io/dicom/Makefile.am,
* tests/io/dump/Makefile.am,
* tests/io/fits/Makefile.am,
* tests/io/fld/Makefile.am,
* tests/io/magick/Makefile.am,
* tests/io/off/Makefile.am,
* tests/io/pbm/Makefile.am,
* tests/io/pbms/Makefile.am,
* tests/io/pfm/Makefile.am,
* tests/io/pgm/Makefile.am,
* tests/io/pgms/Makefile.am,
* tests/io/pnm/Makefile.am,
* tests/io/ppm/Makefile.am,
* tests/io/ppms/Makefile.am,
* tests/io/tiff/Makefile.am,
* tests/labeling/Makefile.am,
* tests/linear/Makefile.am,
* tests/linear/gaussian/Makefile.am,
* tests/linear/local/Makefile.am,
* tests/literal/Makefile.am,
* tests/logical/Makefile.am,
* tests/make/Makefile.am,
* tests/math/Makefile.am,
* tests/metal/Makefile.am,
* tests/metal/make/Makefile.am,
* tests/metal/math/Makefile.am,
* tests/morpho/Makefile.am,
* tests/morpho/approx/Makefile.am,
* tests/morpho/attribute/Makefile.am,
* tests/morpho/closing/Makefile.am,
* tests/morpho/closing/approx/Makefile.am,
* tests/morpho/elementary/Makefile.am,
* tests/morpho/opening/Makefile.am,
* tests/morpho/opening/approx/Makefile.am,
* tests/morpho/reconstruction/Makefile.am,
* tests/morpho/reconstruction/by_dilation/Makefile.am,
* tests/morpho/reconstruction/by_erosion/Makefile.am,
* tests/morpho/tree/Makefile.am,
* tests/morpho/tree/filter/Makefile.am,
* tests/morpho/watershed/Makefile.am,
* tests/norm/Makefile.am,
* tests/opt/Makefile.am,
* tests/pw/Makefile.am,
* tests/registration/Makefile.am,
* tests/set/Makefile.am,
* tests/subsampling/Makefile.am,
* tests/tag/Makefile.am,
* tests/test/Makefile.am,
* tests/topo/Makefile.am,
* tests/topo/skeleton/Makefile.am,
* tests/trace/Makefile.am,
* tests/trait/Makefile.am,
* tests/trait/image/Makefile.am,
* tests/trait/op/Makefile.am,
* tests/trait/value/Makefile.am,
* tests/transform/Makefile.am,
* tests/unit_test/Makefile.am,
* tests/upscaling/Makefile.am,
* tests/upscaling/art/Makefile.am,
* tests/util/Makefile.am,
* tests/value/Makefile.am,
* tests/value/builtin/Makefile.am,
* tests/value/concept/Makefile.am,
* tests/win/Makefile.am,
* tests/world/Makefile.am,
* tests/world/binary_2d/Makefile.am,
* tests/world/inter_pixel/Makefile.am,
* tests/world/inter_pixel/dim2/Makefile.am,
* tools/Makefile.am:
Adjust paths.
* tests/tests.mk,
* tools/tools.mk:
Likewise.
* apps/data.hh.in,
* doc/tools/data.hh.in,
* tests/data.hh.in:
Likewise.
* apps/constrained-connectivity/test-constrained-connectivity.in,
* apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in,
* apps/mesh-segm-skel/test-mesh-complex-max-curv.in,
* apps/mesh-segm-skel/test-mesh-complex-segm.in,
* apps/mesh-segm-skel/test-mesh-complex-skel.in,
* apps/mesh-segm-skel/test-mesh-max-curv.in,
* apps/mesh-segm-skel/test-mesh-segm.in:
Likewise.
* doc/Doxyfile.in,
* doc/gen-examples-outputs-mk,
* doc/gen-split-examples-mk,
* doc/programs-examples.mk,
* doc/tutorial.tex:
Likewise.
---
milena/.gitignore | 22 ++
milena/AUTHORS | 1 +
{scribo => milena}/COPYING | 0
milena/ChangeLog | 175 ++++++++++
INSTALL => milena/INSTALL | 0
milena/Makefile.am | 96 +++++
{scribo => milena}/NEWS | 6 +-
README => milena/README | 303 ++++-------------
milena/apps/constrained-connectivity/Makefile.am | 4 +-
.../test-constrained-connectivity.in | 2 +-
milena/apps/data.hh.in | 6 +-
milena/apps/graph-morpho/Makefile.am | 2 +-
milena/apps/mesh-segm-skel/Makefile.am | 10 +-
.../test-mesh-complex-max-curv-segm.in | 5 +-
.../mesh-segm-skel/test-mesh-complex-max-curv.in | 5 +-
.../apps/mesh-segm-skel/test-mesh-complex-segm.in | 5 +-
.../apps/mesh-segm-skel/test-mesh-complex-skel.in | 4 +-
milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 5 +-
milena/apps/mesh-segm-skel/test-mesh-segm.in | 5 +-
milena/apps/papers/levillain.09.ismm/Makefile.am | 7 +-
{build-aux => milena/build-aux}/Makefile.am | 0
{scribo => milena}/build-aux/autotroll.mk | 0
{scribo => milena}/build-aux/build_unit_test.sh | 0
milena/build-aux/extra-recursive-targets.mk | 1 +
.../build-aux/generate_dist_headers.sh | 0
{scribo => milena}/build-aux/regen-recursive.mk | 0
milena/build-aux/strip-lrde | 1 +
{build-aux => milena/build-aux}/tex.mk | 0
{build-aux => milena/build-aux}/texi2dvi | 0
configure.ac => milena/configure.ac | 364 +++++++++-----------
milena/doc/Doxyfile.in | 32 +-
milena/doc/Makefile.am | 6 +-
milena/doc/gen-examples-outputs-mk | 2 +-
milena/doc/gen-split-examples-mk | 2 +-
milena/doc/programs-examples.mk | 6 +-
milena/doc/tools/data.hh.in | 2 +-
milena/doc/tutorial.tex | 17 +-
{scribo => milena}/m4/autotroll.m4 | 0
milena/m4/boost.m4 | 1 +
{scribo => milena}/m4/oln-with-lib.m4 | 0
{scribo => milena}/m4/pkg.m4 | 0
milena/mesh/Makefile.am | 15 +-
milena/tests/Makefile.am | 6 +-
milena/tests/accu/Makefile.am | 2 +-
milena/tests/accu/image/Makefile.am | 4 +-
milena/tests/accu/math/Makefile.am | 4 +-
milena/tests/accu/shape/Makefile.am | 4 +-
milena/tests/accu/site_set/Makefile.am | 4 +-
milena/tests/accu/stat/Makefile.am | 4 +-
milena/tests/algebra/Makefile.am | 5 +-
milena/tests/arith/Makefile.am | 4 +-
milena/tests/binarization/Makefile.am | 4 +-
milena/tests/border/Makefile.am | 4 +-
milena/tests/canvas/Makefile.am | 4 +-
milena/tests/canvas/browsing/Makefile.am | 4 +-
milena/tests/canvas/morpho/Makefile.am | 5 +-
milena/tests/convert/Makefile.am | 2 +-
milena/tests/convert/impl/Makefile.am | 4 +-
milena/tests/core/Makefile.am | 4 +-
milena/tests/core/alias/Makefile.am | 5 +-
milena/tests/core/image/Makefile.am | 4 +-
milena/tests/core/image/dmorph/Makefile.am | 4 +-
milena/tests/core/image/imorph/Makefile.am | 4 +-
milena/tests/core/image/vmorph/Makefile.am | 4 +-
milena/tests/core/other/Makefile.am | 5 +-
milena/tests/core/routine/Makefile.am | 5 +-
milena/tests/core/site_set/Makefile.am | 5 +-
milena/tests/data.hh.in | 8 +-
milena/tests/data/Makefile.am | 5 +-
milena/tests/data/approx/Makefile.am | 4 +-
milena/tests/data/naive/Makefile.am | 4 +-
milena/tests/debug/Makefile.am | 5 +-
milena/tests/display/Makefile.am | 4 +-
milena/tests/draw/Makefile.am | 4 +-
milena/tests/estim/Makefile.am | 4 +-
milena/tests/extension/Makefile.am | 5 +-
milena/tests/extract/Makefile.am | 4 +-
milena/tests/fun/Makefile.am | 4 +-
milena/tests/fun/i2v/Makefile.am | 5 +-
milena/tests/fun/p2b/Makefile.am | 5 +-
milena/tests/fun/p2p/Makefile.am | 4 +-
milena/tests/fun/p2v/Makefile.am | 5 +-
milena/tests/fun/stat/Makefile.am | 4 +-
milena/tests/fun/v2i/Makefile.am | 4 +-
milena/tests/fun/v2v/Makefile.am | 4 +-
milena/tests/fun/vv2v/Makefile.am | 5 +-
milena/tests/fun/x2x/Makefile.am | 4 +-
milena/tests/geom/Makefile.am | 2 +-
milena/tests/graph/Makefile.am | 4 +-
milena/tests/graph/attribute/Makefile.am | 4 +-
milena/tests/histo/Makefile.am | 4 +-
milena/tests/io/Makefile.am | 4 +-
milena/tests/io/dicom/Makefile.am | 4 +-
milena/tests/io/dump/Makefile.am | 2 +-
milena/tests/io/fits/Makefile.am | 2 +-
milena/tests/io/fld/Makefile.am | 5 +-
milena/tests/io/magick/Makefile.am | 2 +-
milena/tests/io/off/Makefile.am | 2 +-
milena/tests/io/pbm/Makefile.am | 2 +-
milena/tests/io/pbms/Makefile.am | 2 +-
milena/tests/io/pfm/Makefile.am | 5 +-
milena/tests/io/pgm/Makefile.am | 2 +-
milena/tests/io/pgms/Makefile.am | 2 +-
milena/tests/io/pnm/Makefile.am | 5 +-
milena/tests/io/ppm/Makefile.am | 2 +-
milena/tests/io/ppms/Makefile.am | 2 +-
milena/tests/io/tiff/Makefile.am | 4 +-
milena/tests/labeling/Makefile.am | 2 +-
milena/tests/linear/Makefile.am | 4 +-
milena/tests/linear/gaussian/Makefile.am | 2 +-
milena/tests/linear/local/Makefile.am | 4 +-
milena/tests/literal/Makefile.am | 4 +-
milena/tests/logical/Makefile.am | 4 +-
milena/tests/make/Makefile.am | 4 +-
milena/tests/math/Makefile.am | 5 +-
milena/tests/metal/Makefile.am | 4 +-
milena/tests/metal/make/Makefile.am | 5 +-
milena/tests/metal/math/Makefile.am | 4 +-
milena/tests/morpho/Makefile.am | 2 +-
milena/tests/morpho/approx/Makefile.am | 2 +-
milena/tests/morpho/attribute/Makefile.am | 4 +-
milena/tests/morpho/closing/Makefile.am | 2 +-
milena/tests/morpho/closing/approx/Makefile.am | 2 +-
milena/tests/morpho/elementary/Makefile.am | 5 +-
milena/tests/morpho/opening/Makefile.am | 2 +-
milena/tests/morpho/opening/approx/Makefile.am | 2 +-
milena/tests/morpho/reconstruction/Makefile.am | 4 +-
.../morpho/reconstruction/by_dilation/Makefile.am | 4 +-
.../morpho/reconstruction/by_erosion/Makefile.am | 4 +-
milena/tests/morpho/tree/Makefile.am | 5 +-
milena/tests/morpho/tree/filter/Makefile.am | 4 +-
milena/tests/morpho/watershed/Makefile.am | 2 +-
milena/tests/norm/Makefile.am | 5 +-
milena/tests/opt/Makefile.am | 5 +-
milena/tests/pw/Makefile.am | 4 +-
milena/tests/registration/Makefile.am | 5 +-
milena/tests/set/Makefile.am | 4 +-
milena/tests/subsampling/Makefile.am | 2 +-
milena/tests/tag/Makefile.am | 5 +-
milena/tests/test/Makefile.am | 5 +-
milena/tests/tests.mk | 8 +-
milena/tests/topo/Makefile.am | 5 +-
milena/tests/topo/skeleton/Makefile.am | 4 +-
milena/tests/trace/Makefile.am | 5 +-
milena/tests/trait/Makefile.am | 4 +-
milena/tests/trait/image/Makefile.am | 4 +-
milena/tests/trait/op/Makefile.am | 4 +-
milena/tests/trait/value/Makefile.am | 4 +-
milena/tests/transform/Makefile.am | 5 +-
milena/tests/unit_test/Makefile.am | 4 +-
milena/tests/upscaling/Makefile.am | 4 +-
milena/tests/upscaling/art/Makefile.am | 4 +-
milena/tests/util/Makefile.am | 4 +-
milena/tests/value/Makefile.am | 4 +-
milena/tests/value/builtin/Makefile.am | 2 +-
milena/tests/value/concept/Makefile.am | 5 +-
milena/tests/win/Makefile.am | 4 +-
milena/tests/world/Makefile.am | 4 +-
milena/tests/world/binary_2d/Makefile.am | 4 +-
milena/tests/world/inter_pixel/Makefile.am | 4 +-
milena/tests/world/inter_pixel/dim2/Makefile.am | 4 +-
milena/tools/Makefile.am | 5 +-
milena/tools/tools.mk | 2 +-
163 files changed, 848 insertions(+), 738 deletions(-)
create mode 120000 milena/AUTHORS
copy {scribo => milena}/COPYING (100%)
copy INSTALL => milena/INSTALL (100%)
copy {scribo => milena}/NEWS (99%)
copy README => milena/README (55%)
copy {build-aux => milena/build-aux}/Makefile.am (100%)
copy {scribo => milena}/build-aux/autotroll.mk (100%)
copy {scribo => milena}/build-aux/build_unit_test.sh (100%)
create mode 120000 milena/build-aux/extra-recursive-targets.mk
copy {scribo => milena}/build-aux/generate_dist_headers.sh (100%)
copy {scribo => milena}/build-aux/regen-recursive.mk (100%)
create mode 120000 milena/build-aux/strip-lrde
copy {build-aux => milena/build-aux}/tex.mk (100%)
copy {build-aux => milena/build-aux}/texi2dvi (100%)
copy configure.ac => milena/configure.ac (60%)
copy {scribo => milena}/m4/autotroll.m4 (100%)
create mode 120000 milena/m4/boost.m4
copy {scribo => milena}/m4/oln-with-lib.m4 (100%)
copy {scribo => milena}/m4/pkg.m4 (100%)
diff --git a/milena/.gitignore b/milena/.gitignore
index 8c2049a..7b3a5ed 100644
--- a/milena/.gitignore
+++ b/milena/.gitignore
@@ -1,3 +1,11 @@
+/build-aux/config.guess
+/build-aux/config.sub
+/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/ltmain.sh
+/build-aux/missing
+/build-aux/py-compile
+
/doc/Doxyfile_user
/doc/user-refman
/doc/user-refman.pdf
@@ -16,4 +24,18 @@
/doc/white-paper.pdf
/doc/white-paper/
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+
/tests/unit_test/mln_*.cc
+
+/*aclocal.m4
+/autom4te.cache*
+/config.h
+/config.h?in*
+/config.hin
+/configure
+/configure.scan
diff --git a/milena/AUTHORS b/milena/AUTHORS
new file mode 120000
index 0000000..9eadf71
--- /dev/null
+++ b/milena/AUTHORS
@@ -0,0 +1 @@
+../AUTHORS
\ No newline at end of file
diff --git a/scribo/COPYING b/milena/COPYING
similarity index 100%
copy from scribo/COPYING
copy to milena/COPYING
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 8e94f5d..8e8cf88 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,180 @@
2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+ Autoconfiscate Milena.
+
+ * configure.ac: New.
+ * Makefile.am (ACLOCAL_AMFLAGS): New.
+ (SUBDIRS): Add build-aux.
+ (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES): New.
+ (dist-hook): New target.
+ * AUTHORS: New.
+ * NEWS: New (imported from Olena and updated).
+ * COPYING: New (imported from Olena).
+ * INSTALL: New (generated by Automake).
+ * README: New.
+ * m4/autotroll.m4,
+ * m4/boost.m4,
+ * m4/oln-with-lib.m4,
+ * m4/pkg.m4:
+ New (imported from Olena).
+ * build-aux/autotroll.mk,
+ * build-aux/build_unit_test.sh,
+ * build-aux/extra-recursive-targets.mk,
+ * build-aux/generate_dist_headers.sh,
+ * build-aux/regen-recursive.mk,
+ * build-aux/tex.mk,
+ * build-aux/texi2dvi:
+ New (imported from Olena).
+ * build-aux/Makefile.am: New.
+ * apps/constrained-connectivity/Makefile.am,
+ * apps/graph-morpho/Makefile.am,
+ * apps/mesh-segm-skel/Makefile.am,
+ * apps/papers/levillain.09.ismm/Makefile.am,
+ * doc/Makefile.am,
+ * mesh/Makefile.am,
+ * tests/Makefile.am,
+ * tests/accu/Makefile.am,
+ * tests/accu/image/Makefile.am,
+ * tests/accu/math/Makefile.am,
+ * tests/accu/shape/Makefile.am,
+ * tests/accu/site_set/Makefile.am,
+ * tests/accu/stat/Makefile.am,
+ * tests/algebra/Makefile.am,
+ * tests/arith/Makefile.am,
+ * tests/binarization/Makefile.am,
+ * tests/border/Makefile.am,
+ * tests/canvas/Makefile.am,
+ * tests/canvas/browsing/Makefile.am,
+ * tests/canvas/morpho/Makefile.am,
+ * tests/convert/Makefile.am,
+ * tests/convert/impl/Makefile.am,
+ * tests/core/Makefile.am,
+ * tests/core/alias/Makefile.am,
+ * tests/core/image/Makefile.am,
+ * tests/core/image/dmorph/Makefile.am,
+ * tests/core/image/imorph/Makefile.am,
+ * tests/core/image/vmorph/Makefile.am,
+ * tests/core/other/Makefile.am,
+ * tests/core/routine/Makefile.am,
+ * tests/core/site_set/Makefile.am,
+ * tests/data/Makefile.am,
+ * tests/data/approx/Makefile.am,
+ * tests/data/naive/Makefile.am,
+ * tests/debug/Makefile.am,
+ * tests/display/Makefile.am,
+ * tests/draw/Makefile.am,
+ * tests/estim/Makefile.am,
+ * tests/extension/Makefile.am,
+ * tests/extract/Makefile.am,
+ * tests/fun/Makefile.am,
+ * tests/fun/i2v/Makefile.am,
+ * tests/fun/p2b/Makefile.am,
+ * tests/fun/p2p/Makefile.am,
+ * tests/fun/p2v/Makefile.am,
+ * tests/fun/stat/Makefile.am,
+ * tests/fun/v2i/Makefile.am,
+ * tests/fun/v2v/Makefile.am,
+ * tests/fun/vv2v/Makefile.am,
+ * tests/fun/x2x/Makefile.am,
+ * tests/geom/Makefile.am,
+ * tests/graph/Makefile.am,
+ * tests/graph/attribute/Makefile.am,
+ * tests/histo/Makefile.am,
+ * tests/io/Makefile.am,
+ * tests/io/dicom/Makefile.am,
+ * tests/io/dump/Makefile.am,
+ * tests/io/fits/Makefile.am,
+ * tests/io/fld/Makefile.am,
+ * tests/io/magick/Makefile.am,
+ * tests/io/off/Makefile.am,
+ * tests/io/pbm/Makefile.am,
+ * tests/io/pbms/Makefile.am,
+ * tests/io/pfm/Makefile.am,
+ * tests/io/pgm/Makefile.am,
+ * tests/io/pgms/Makefile.am,
+ * tests/io/pnm/Makefile.am,
+ * tests/io/ppm/Makefile.am,
+ * tests/io/ppms/Makefile.am,
+ * tests/io/tiff/Makefile.am,
+ * tests/labeling/Makefile.am,
+ * tests/linear/Makefile.am,
+ * tests/linear/gaussian/Makefile.am,
+ * tests/linear/local/Makefile.am,
+ * tests/literal/Makefile.am,
+ * tests/logical/Makefile.am,
+ * tests/make/Makefile.am,
+ * tests/math/Makefile.am,
+ * tests/metal/Makefile.am,
+ * tests/metal/make/Makefile.am,
+ * tests/metal/math/Makefile.am,
+ * tests/morpho/Makefile.am,
+ * tests/morpho/approx/Makefile.am,
+ * tests/morpho/attribute/Makefile.am,
+ * tests/morpho/closing/Makefile.am,
+ * tests/morpho/closing/approx/Makefile.am,
+ * tests/morpho/elementary/Makefile.am,
+ * tests/morpho/opening/Makefile.am,
+ * tests/morpho/opening/approx/Makefile.am,
+ * tests/morpho/reconstruction/Makefile.am,
+ * tests/morpho/reconstruction/by_dilation/Makefile.am,
+ * tests/morpho/reconstruction/by_erosion/Makefile.am,
+ * tests/morpho/tree/Makefile.am,
+ * tests/morpho/tree/filter/Makefile.am,
+ * tests/morpho/watershed/Makefile.am,
+ * tests/norm/Makefile.am,
+ * tests/opt/Makefile.am,
+ * tests/pw/Makefile.am,
+ * tests/registration/Makefile.am,
+ * tests/set/Makefile.am,
+ * tests/subsampling/Makefile.am,
+ * tests/tag/Makefile.am,
+ * tests/test/Makefile.am,
+ * tests/topo/Makefile.am,
+ * tests/topo/skeleton/Makefile.am,
+ * tests/trace/Makefile.am,
+ * tests/trait/Makefile.am,
+ * tests/trait/image/Makefile.am,
+ * tests/trait/op/Makefile.am,
+ * tests/trait/value/Makefile.am,
+ * tests/transform/Makefile.am,
+ * tests/unit_test/Makefile.am,
+ * tests/upscaling/Makefile.am,
+ * tests/upscaling/art/Makefile.am,
+ * tests/util/Makefile.am,
+ * tests/value/Makefile.am,
+ * tests/value/builtin/Makefile.am,
+ * tests/value/concept/Makefile.am,
+ * tests/win/Makefile.am,
+ * tests/world/Makefile.am,
+ * tests/world/binary_2d/Makefile.am,
+ * tests/world/inter_pixel/Makefile.am,
+ * tests/world/inter_pixel/dim2/Makefile.am,
+ * tools/Makefile.am:
+ Adjust paths.
+ * tests/tests.mk,
+ * tools/tools.mk:
+ Likewise.
+ * apps/data.hh.in,
+ * doc/tools/data.hh.in,
+ * tests/data.hh.in:
+ Likewise.
+ * apps/constrained-connectivity/test-constrained-connectivity.in,
+ * apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in,
+ * apps/mesh-segm-skel/test-mesh-complex-max-curv.in,
+ * apps/mesh-segm-skel/test-mesh-complex-segm.in,
+ * apps/mesh-segm-skel/test-mesh-complex-skel.in,
+ * apps/mesh-segm-skel/test-mesh-max-curv.in,
+ * apps/mesh-segm-skel/test-mesh-segm.in:
+ Likewise.
+ * doc/Doxyfile.in,
+ * doc/gen-examples-outputs-mk,
+ * doc/gen-split-examples-mk,
+ * doc/programs-examples.mk,
+ * doc/tutorial.tex:
+ Likewise.
+
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
Fix Boost.Tuple handling.
* tests/accu/Makefile.am (tuple_CPPFLAGS): New.
diff --git a/INSTALL b/milena/INSTALL
similarity index 100%
copy from INSTALL
copy to milena/INSTALL
diff --git a/milena/Makefile.am b/milena/Makefile.am
index 769006d..133cbad 100644
--- a/milena/Makefile.am
+++ b/milena/Makefile.am
@@ -15,7 +15,10 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS = \
+ build-aux \
external \
doc \
mesh \
@@ -112,3 +115,96 @@ EXTRA_DIST += \
tests/img/test_rgb8.tif \
tests/img/test_bw.tif \
tests/img/test_gl.tif
+
+
+#<<lrde
+## FIXME: All of this it too much ad hoc. Use Git branches to
+## distinguish distributed files from non distributed ones after the
+## conversion of the repository.
+
+## FIXME: Moreover, this list is partially duplicated in Olena's
+## `Makefile.am', so that pruning also occurs both when rolling an
+## Olena tarball or a (standalone) Milena tarball.
+
+LRDE_STRIPPED_DIST_FILES = \
+ $(distdir)/Makefile.am \
+ $(distdir)/configure.ac \
+ $(distdir)/mln/accu/math/all.hh \
+ $(distdir)/mln/all.hh \
+ $(distdir)/mln/core/image/vmorph/all.hh \
+ $(distdir)/mln/core/image/vmorph/fun_image.hh \
+ $(distdir)/mln/data/all.hh \
+ $(distdir)/mln/essential/routine.hh \
+ $(distdir)/mln/fun/all.hh \
+ $(distdir)/mln/fun/essential.hh \
+ $(distdir)/mln/fun/v2v/all.hh \
+ $(distdir)/mln/fun/v2v/essential.hh \
+ $(distdir)/mln/linear/all.hh \
+ $(distdir)/mln/trait/all.hh \
+ $(distdir)/mln/trait/ch_value.hh \
+ $(distdir)/mln/value/all.hh \
+ $(distdir)/mln/value/essential.hh \
+ $(distdir)/tests/Makefile.am \
+ $(distdir)/tests/convert/Makefile.am \
+ $(distdir)/tests/extract/Makefile.am \
+ $(distdir)/tests/fun/v2v/Makefile.am \
+ $(distdir)/tests/linear/Makefile.am \
+ $(distdir)/tests/linear/gaussian/Makefile.am \
+ $(distdir)/tests/registration/Makefile.am \
+ $(distdir)/tests/trait/ch_value.cc \
+ $(distdir)/tests/value/Makefile.am
+
+LRDE_NODIST_FILES = \
+ $(distdir)/tests/convert/to_hsl.cc \
+ $(distdir)/tests/extract/blue.cc \
+ $(distdir)/tests/extract/green.cc \
+ $(distdir)/tests/extract/hue.cc \
+ $(distdir)/tests/extract/lum.cc \
+ $(distdir)/tests/extract/red.cc \
+ $(distdir)/tests/extract/sat.cc \
+ $(distdir)/tests/fun/v2v/component.cc \
+ $(distdir)/tests/fun/v2v/hsl_to_rgb.cc \
+ $(distdir)/tests/fun/v2v/rgb_to_hsl.cc \
+ $(distdir)/tests/linear/gaussian.cc \
+ $(distdir)/tests/linear/gaussian/filter.cc \
+ $(distdir)/tests/registration/registration.cc \
+ $(distdir)/tests/value/stack.cc
+
+## FIXME: Running `build-aux/build_unit_test.sh' just to update
+## `milena/tests/unit_test/unit-tests.mk' is overkill:
+##
+## 1. It recreates *all* the sources (more than 1200 `.cc' files!).
+## => We should just regen `unit-tests.mk', not the `.cc' files.
+##
+## 2. It visits (almost) all the directories and files under
+## milena/mln/ (which admittedly a smaller issue compared to the
+## previous one)
+## => Prune `unit-tests.mk' instead of regenerating it. The
+## simplest solution is probably to equip `unit-tests.mk' in the
+## first place with `<<lrde'/`>>' tags, then prune it with
+## dist-strip.
+##
+
+# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde).
+# Then, regen files; and if the `distdir' (or `dist' or `distcheck')
+# target was run from Milena's (and not Olena's) source directory,
+# call `autoreconf'.
+dist-hook:
+ for f in $(LRDE_STRIPPED_DIST_FILES); do \
+ $(srcdir)/build-aux/strip-lrde $$f; \
+ done; \
+ rm -rf $(LRDE_NODIST_FILES) \
+ && $(srcdir)/build-aux/build_unit_test.sh \
+ $(distdir)/mln \
+ $(distdir)/tests/unit_test \
+ $(srcdir)/tests/unit_test/disabled_tests \
+ mln \
+ && if test x$(distdir) = x$(top_distdir); then \
+ ( \
+ cd $(distdir); \
+ set -evx; \
+ autoreconf -f -v -i; \
+ find . -name autom4te.cache | xargs rm -rf \
+ ) \
+ fi
+#>>
diff --git a/scribo/NEWS b/milena/NEWS
similarity index 99%
copy from scribo/NEWS
copy to milena/NEWS
index b7abbba..0a303c7 100644
--- a/scribo/NEWS
+++ b/milena/NEWS
@@ -1,11 +1,9 @@
-* Swilena 1.0a
+* Olena 1.0a
- * Starting with Olena 1.1, Scribo is an independent component
+ * Starting with Olena 1.1, Milena is an independent component
of the project, distributed both together with the Olena
package and as a standalone package.
- * Misc fixes and improvements.
-
* Olena 1.0 July 14, 2009
diff --git a/README b/milena/README
similarity index 55%
copy from README
copy to milena/README
index cc49a02..b351d0b 100644
--- a/README
+++ b/milena/README
@@ -19,63 +19,44 @@ The complete GNU General Public License Notice can also be found in
the 'COPYING' file in the root directory.
-=====================
-Introduction to Olena
-=====================
+======================
+Introduction to Milena
+======================
-Olena_, a platform dedicated to image processing.
+Milena is a part of Olena_, a generic and efficient platform
+dedicated to image processing.
.. _Olena: http://olena.lrde.epita.fr
+Milena is a generic C++ library and the core component of the Olena
+project.
---------
-Overview
---------
-
-Olena is a platform dedicated to image processing. At the moment it is
-mainly composed of a C++ library: Milena. This library features many
-tools to easily perform image processing tasks. Its main
-characteristic is its genericity: it allows to write an algorithm once
-and run it over many kinds of images (gray scale, color, 1D, 2D, 3D,
-...).
+Milena is distributed in two ways:
-Olena is a project developed by the `EPITA Research and Development
-Laboratory (LRDE)`__ since 1997. We did numerous prototypes and
-throwaway experiments before settling into the kind of programming
-paradigm which is finally here.
+ * as a component of the Olena package
-__ http://www.lrde.epita.fr
+ * and a standalone package.
-We do our image processing research using this library, but most
-importantly we have gathered (and still do) generic programming
-expertise from the library development.
+If you obtained Milena as an project embedded an Olena package, we
+advise you to read Olena's README, at the top-level directory of the
+package, and not to configure nor compile Milena separately (i.e., do
+not use `milena/configure', use the top-level `configure' instead
+and run `make' from the top-level directory).
-Yet, Olena is an ongoing development project. Few algorithms or
-definitions may change in a near future. A list of potential changes
-is maintained here :
-http://olena.lrde.epita.fr/FeaturesSubjectToChange.
+Otherwise, you are in the case of a standalone package, and you might
+want to read the rest of this file.
-Likewise, the documentation does not cover the whole project yet. In the
-`doc/' directory you will find the first draft of a reference
-manual. It includes a quick reference guide and a tutorial. This is a
-good start. In `milena/tools' and `milena/doc/examples' few sample
-programs are available. Most of them are already used to illustrate
-the tutorial. For the rest, we're afraid you will have to dig the
-code or e-mail us.
-
- Please direct any question or comments to <olena(a)lrde.epita.fr>, or
-<olena-bugs(a)lrde.epita.fr>.
-
- Olena also has a web page, located at
-<http://olena.lrde.epita.fr>.
+==========================================
+Detailed Instructions (Standalone Package)
+==========================================
-----------------
Required Software
-----------------
Here is a non-exhaustive list of required software required to build
-Olena successfully.
+Milena successfully.
* to compile the user examples:
@@ -85,51 +66,6 @@ Olena successfully.
- a `make' utility, like GNU `make'
-Optional:
-
- * to use various image types:
-
- - Magick++
-
- - libtiff
-
- - GDCM
-
-
-==================
-Quick Start Manual
-==================
-
-This section summarizes the installation procedure. For more
-information about building and installing Olena, see the next
-sections.
-
-To install Olena on your system, create a `_build' directory (even
-though it is not mandatory) and type in the classical sequence at the
-command prompt::
-
- mkdir _build
- cd _build
- ../configure
- make
- make install (as root)
-
-Note that an installation is specific to the compiler used to install
-it. Indeed, the call to ``../configure`` enables some workarounds
-and, consequently, users must compile with the same compiler to avoid
-compatibility problems.
-
-Between ``make`` and ``make install``, you may also want to run::
-
- make check
-
- ``make check`` will run the test suite to check the whole library.
-Running the test suite may require up several hours.
-
-
-=====================
-Detailed Instructions
-=====================
-------------
Configuration
@@ -138,10 +74,10 @@ Configuration
In order to prepare the build process, you need to configure the source
tree.
- Assuming your Olena distribution is uncompressed in directory
-`olena-1.0', follow these steps:
+ Assuming your Milena distribution is uncompressed in directory
+`milena-1.1', follow these steps:
- % cd olena-1.0
+ % cd milena-1.1
% mkdir _build
% cd _build
% ../configure
@@ -149,30 +85,11 @@ tree.
The build process can be altered by a number of options you can pass
to the `configure' script. The following sections describe them.
- Additionally, if you are an Olena maintainer (a person who runs
-`make distcheck'), _prefer setting `CXXFLAGS' as an environment
-variable_: the flags given on the command line to `configure' are not
-propagated to recursive runs by `make distcheck'. Or better: use the
-environment CONFIG_SITE to set up a configuration environment (see
-Autoconf's manual).
-
-
-Verbose Display
-===============
-
-A more verbose display can be turned on by passing the
-`--enable-verbose' flag to configure:
-
- % ../configure --enable-verbose
-
-Before configuring files, configure will display a summary of the
-configuration step.
-
Installation Path
=================
-By default, Olena is installed in the standard "local" directory of
+By default, Milena is installed in the standard "local" directory of
your system. This is usually `/usr/local' under Unix.
You can change this path with the following flag:
@@ -216,89 +133,6 @@ C++ flags by giving `configure' your selection of flags:
% ../configure CXXFLAGS="<your-favorite-flags>"
-Additional Components
-=====================
-
-In additional to Milena, several build targets can be enabled. These
-parts are called "components", and you can obtain a list of them by
-running:
-
- % ../configure --help
-
-Swilena
--------
-
-Swilena is an optional component of Olena exposing Milena to other
-languages thanks to the Simplified Wrapper and Interface Generator
-(SWIG_).
-
-.. _SWIG: http://www.swig.org
-
-For the moment, only some Python_ bindings are provided. They are
-disabled by default because they require extra dependencies (SWIG and
-Python).
-
-.. _Python: http://www.python.org
-
-To enable the installation of this module use::
-
- ./configure --enable-swilena
-
-Tools
------
-
-Sample tools are shipped with the tarball. To enable the installation of
-these tools use::
-
- ./configure --enable-tools
-
-Applications
-------------
-Sample applications are shipped with the tarball. To enable the
-installation of these applications use::
-
- ./configure --enable-apps
-
-Trimesh
--------
-
-Trimesh, a third-party library that we have been using to manipulate
-3D meshes, is shipped with Olena. (We will probably drop Trimesh from
-the distribution someday.) To enable it, use::
-
- ./configure --enable-trimesh
-
-Input/output libraries
-----------------------
-
-To read/write TIFF images with Olena, libtiff is required. If
-``configure`` is unable to find libtiff on your system, you can help
-it by specifying the base directory of libtiff, e.g.::
-
- ./configure --with-tiff=/usr/local
-
-To read/write DICOM images with Olena, GDCM is required. Likewise,
-you can tell ``configure`` where to find it by giving its install
-prefix, e.g.::
-
- ./configure --with-gdcm=/usr/local
-
-Olena use Magick++ to read and write images in common formats. As for
-other optional dependencies, you can specify where it is located (if
-needed) at configuration time::
-
- ./configure --with-magickxx=/usr/local/
-
-Other libraries
----------------
-
-The Boost Tuple library is used to implement a tuple accumulator
-class. This project is a part of the Boost libraries; you can help
-configure find these libraries using the `--with-boost flag':
-
- ./configure --with-boost=/usr/local/
-
-
--------
Building
--------
@@ -307,7 +141,7 @@ Once your build directory is `configure'd, you can run
% make
-to recursively build all the selected components.
+to build Milena.
Additionally, you can build and run the test suite with:
@@ -315,14 +149,14 @@ to recursively build all the selected components.
% make check
However, this process is time- and memory- consuming, and you probably
-do not need it except if you are developing/debugging Olena.
+do not need it except if you are developing/debugging Milena.
----------
Installing
----------
-To install the Olena headers and additional files on your system, run:
+To install Milena on your system, run:
% make install
@@ -336,89 +170,72 @@ from the build directory.
* sample images and meshes in `/usr/local/share/olena/images/',
- * the documentation in `/usr/local/share/doc/olena/`
-
-And optionally:
-
- * Swilena's Python bindings in `/usr/local/lib/python2.x/site-packages/',
-
- * Trimesh programs in `/usr/local/bin/',
+ * the documentation in `/usr/local/share/doc/olena/`.
- * Trimesh libraries in `/usr/local/lib/',
- * Trimesh headers in `/usr/local/share/trimesh/',
-
-
- You can later remove Olena from your system by running
+ You can later remove Milena from your system by running
% make uninstall
from the build directory (if you have kept it). We recommend the use
-of GNU Stow (or any similar program) during the installation of Olena,
-to make the uninstallation of Olena easier.
+of GNU Stow (or any similar program) during the installation of Milena,
+to make the uninstallation of Milena easier.
=====================
Layout of the Tarball
=====================
-The Olena project directory layout is as follows:
+The Milena project directory layout is as follows:
+
+apps
+ Application examples.
build-aux
Auxiliary tools used by the GNU Build System during ``configure``
and ``make`` stages.
-external
- Sources of Shipped dependencies.
-
-m4
- Extra Autoconf macros.
+demos
+ Demos of Milena.
-milena
+doc
+ Documentation.
- apps
- Application examples.
-
- mln
- Headers of the Milena library.
-
- tests
- The test suite.
-
- doc
- The documentation.
+external
+ Sources of bundled dependencies.
- tools
- Example tools.
+ trimesh
+ Trimesh2 library.
- mesh
- Some 3D meshes, mostly used for test purpose.
+img
+ Some (2D) images, mostly used for test purpose.
- img
- Some (2D) images, mostly used for test purpose.
+mesh
+ Some 3D meshes, mostly used for test purpose.
- demos
- Demos of Milena.
+mln
+ Headers of the Milena library.
-swilena
+tests
+ The test suite.
- python
- Some Python bindings for Milena.
+tools
+ Example tools.
===================
Supported Platforms
===================
-Olena has been tested on the following configurations:
+Milena has been tested on the following configurations:
=========================== =============================================
System Compiler
=========================== =============================================
-GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 3.4, 4.0, 4.1, 4.2 and 4.3
+GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 4.1, 4.2 and 4.4
GNU/Linux on IA-32 icpc (Intel C/C++ Compiler) 10.1 and 11.0
GNU/Linux on AMD64/Intel 64 g++ (GNU GCC) 4.1
-Mac OS X (10.5) on IA-32 g++ (GNU GCC) 4.0.1
+Mac OS X (10.6) on IA-32 g++ (GNU GCC) 4.2.1
=========================== =============================================
@@ -433,7 +250,7 @@ To enable I/O with GDCM images, `GDCM`_ must be installed.
.. _GDCM: http://sourceforge.net/apps/mediawiki/gdcm/
-To support many image formats in Olena's I/O system, `Magick++`_ must
+To support many image formats in Milena's I/O system, `Magick++`_ must
be installed.
.. _Magick++: http://www.imagemagick.org/Magick++/
@@ -466,7 +283,7 @@ There are other sources of interest in the distribution.
License
=======
-Olena is released under the GNU General Public Licence. See the file
+Milena is released under the GNU General Public Licence. See the file
``COPYING`` (at the root of the source tree) for details.
@@ -487,7 +304,7 @@ mail address follows.
Bibliography
============
-Further information about Olena can be found into the following related
+Further information about Milena can be found into the following related
papers.
About Image Processing Programming:
diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am
index 84a6ed2..f5c563d 100644
--- a/milena/apps/constrained-connectivity/Makefile.am
+++ b/milena/apps/constrained-connectivity/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -15,7 +15,7 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
diff --git a/milena/apps/constrained-connectivity/test-constrained-connectivity.in b/milena/apps/constrained-connectivity/test-constrained-connectivity.in
index a0d6a88..42090b5 100644
--- a/milena/apps/constrained-connectivity/test-constrained-connectivity.in
+++ b/milena/apps/constrained-connectivity/test-constrained-connectivity.in
@@ -18,6 +18,6 @@
set -ex
-srcdir="@top_srcdir@/milena/apps/constrained-connectivity"
+srcdir="@top_srcdir@/apps/constrained-connectivity"
time ./constrained-connectivity "$srcdir/soille.pgm"
diff --git a/milena/apps/data.hh.in b/milena/apps/data.hh.in
index 8adb35f..8a64e47 100644
--- a/milena/apps/data.hh.in
+++ b/milena/apps/data.hh.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
@@ -33,9 +33,9 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the img directory of Milena.
-# define MLN_IMG_DIR "@abs_top_srcdir@/milena/img"
+# define MLN_IMG_DIR "@abs_top_srcdir@/img"
/// The absolute path to the apps directory of Milena.
-# define MLN_APPS_DIR "@abs_top_srcdir@/milena/apps/"
+# define MLN_APPS_DIR "@abs_top_srcdir@/apps"
#endif // ! APPS_DATA_HH
diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am
index 7e3d4db..8f2e551 100644
--- a/milena/apps/graph-morpho/Makefile.am
+++ b/milena/apps/graph-morpho/Makefile.am
@@ -15,7 +15,7 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am
index 78bc7ca..7794c48 100644
--- a/milena/apps/mesh-segm-skel/Makefile.am
+++ b/milena/apps/mesh-segm-skel/Makefile.am
@@ -16,12 +16,12 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Linking with gluit and GLUT/OpenGL.
-gluit_builddir = $(top_builddir)/milena/external/trimesh/gluit
-include $(top_srcdir)/milena/external/trimesh/gluit/gluit.mk
+gluit_builddir = $(top_builddir)/external/trimesh/gluit
+include $(top_srcdir)/external/trimesh/gluit/gluit.mk
# Find Milena and trimesh headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena
-CPPFLAGS_trimesh = -I$(top_srcdir)/milena/external/trimesh/include
+AM_CPPFLAGS = -I$(top_srcdir)
+CPPFLAGS_trimesh = -I$(top_srcdir)/external/trimesh/include
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
@@ -32,7 +32,7 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS)
# LDFLAGS_trimesh instead. Likewise for CPPFLAGS_trimesh and
# LDADD_trimesh, for symmetry reasons.
LDFLAGS_trimesh = $(GLFLAGS)
-LDADD_trimesh = -L$(top_builddir)/milena/external/trimesh/libsrc -ltrimesh $(GLLIBS)
+LDADD_trimesh = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS)
bin_PROGRAMS =
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
index ac5a1e7..09ed25b 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-max-curv-segm $mesh_dir/socket.off 25 socket-complex-max-curv-segm.off
time ./mesh-complex-max-curv-segm $mesh_dir/teapot.off 50 teapot-complex-max-curv-segm.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
index a60eede..dd29cfe 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,6 +19,6 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-max-curv $mesh_dir/teapot.off teapot-complex-max-curv.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
index 58cd47e..8b72ae8 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-segm $mesh_dir/socket-max-curv.off 25 socket-max-curv-segm.off
time ./mesh-complex-segm $mesh_dir/teapot-max-curv.off 50 teapot-max-curv-segm.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
index f6b787b..a4a711f 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +18,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-skel $mesh_dir/three-triangles.off 1 three-triangles-skel.off
time ./mesh-complex-skel $mesh_dir/socket-max-curv.off 10 socket-max-curv-skel.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
index e5eaf96..00c554b 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,6 +19,6 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-max-curv $mesh_dir/teapot.off teapot-max-curv.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-segm.in b/milena/apps/mesh-segm-skel/test-mesh-segm.in
index e70e63a..3038a6c 100755
--- a/milena/apps/mesh-segm-skel/test-mesh-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-segm $mesh_dir/socket.off 25 socket-segm.off
time ./mesh-segm $mesh_dir/teapot.off 50 teapot-segm.off
diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am
index ec5d328..4dd172b 100644
--- a/milena/apps/papers/levillain.09.ismm/Makefile.am
+++ b/milena/apps/papers/levillain.09.ismm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -17,7 +18,7 @@
# Illustrations from the ISMM 2009 paper.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
@@ -37,7 +38,7 @@ dist_noinst_DATA = seeds.pgm m283-c.off
noinst_DATA = lena-s.ppm graph-s.png m283-s.off
MOSTLYCLEANFILES = $(noinst_DATA) graph-s.neato
-lena-s.ppm: $(top_srcdir)/milena/img/lena.pgm image2d$(EXEEXT)
+lena-s.ppm: $(top_srcdir)/img/lena.pgm image2d$(EXEEXT)
./image2d$(EXEEXT) $< 1000 $@
graph-s.png: graph-s.neato
diff --git a/build-aux/Makefile.am b/milena/build-aux/Makefile.am
similarity index 100%
copy from build-aux/Makefile.am
copy to milena/build-aux/Makefile.am
diff --git a/scribo/build-aux/autotroll.mk b/milena/build-aux/autotroll.mk
similarity index 100%
copy from scribo/build-aux/autotroll.mk
copy to milena/build-aux/autotroll.mk
diff --git a/scribo/build-aux/build_unit_test.sh b/milena/build-aux/build_unit_test.sh
similarity index 100%
copy from scribo/build-aux/build_unit_test.sh
copy to milena/build-aux/build_unit_test.sh
diff --git a/milena/build-aux/extra-recursive-targets.mk b/milena/build-aux/extra-recursive-targets.mk
new file mode 120000
index 0000000..dabc25d
--- /dev/null
+++ b/milena/build-aux/extra-recursive-targets.mk
@@ -0,0 +1 @@
+../../build-aux/extra-recursive-targets.mk
\ No newline at end of file
diff --git a/scribo/build-aux/generate_dist_headers.sh b/milena/build-aux/generate_dist_headers.sh
similarity index 100%
copy from scribo/build-aux/generate_dist_headers.sh
copy to milena/build-aux/generate_dist_headers.sh
diff --git a/scribo/build-aux/regen-recursive.mk b/milena/build-aux/regen-recursive.mk
similarity index 100%
copy from scribo/build-aux/regen-recursive.mk
copy to milena/build-aux/regen-recursive.mk
diff --git a/milena/build-aux/strip-lrde b/milena/build-aux/strip-lrde
new file mode 120000
index 0000000..11926a1
--- /dev/null
+++ b/milena/build-aux/strip-lrde
@@ -0,0 +1 @@
+../../build-aux/strip-lrde
\ No newline at end of file
diff --git a/build-aux/tex.mk b/milena/build-aux/tex.mk
similarity index 100%
copy from build-aux/tex.mk
copy to milena/build-aux/tex.mk
diff --git a/build-aux/texi2dvi b/milena/build-aux/texi2dvi
similarity index 100%
copy from build-aux/texi2dvi
copy to milena/build-aux/texi2dvi
diff --git a/configure.ac b/milena/configure.ac
similarity index 60%
copy from configure.ac
copy to milena/configure.ac
index 074672f..8ae6c3e 100644
--- a/configure.ac
+++ b/milena/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.61])
## Package set up. ##
## ---------------- ##
-AC_INIT([Olena], [1.0a], [olena(a)lrde.epita.fr], [olena])
+AC_INIT([Milena], [1.0a], [olena(a)lrde.epita.fr], [milena])
# M4 macros.
AC_CONFIG_MACRO_DIR([m4])
@@ -37,7 +37,7 @@ AC_CONFIG_FILES([build-aux/Makefile])
AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall])
# Package metadata.
-AC_CONFIG_FILES([milena/mln/version.hh])
+AC_CONFIG_FILES([mln/version.hh])
AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"],
[Package Full name.])
AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
@@ -72,8 +72,8 @@ if test "$GXX" = yes; then
# The code generated for mln::data::impl::memcpy__() by g++ 4.2 with
# a high optimization level (`-O3') and without
# `-fno-strict-aliasing' might be wrong, at least with Debian's g++
- # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this
- # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc.
+ # 4.2 on IA-32 (see also mln/memcpy_.hh). We observed this
+ # behavior with e.g. apps/graph-morpho/samples-image2d.cc.
# Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine.
#
# So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS
@@ -154,7 +154,7 @@ fi
## ``Enable Everything'' Switch. ##
## ------------------------------ ##
-# Enable all bundled features (trimesh2, Swilena, apps, tools). This
+# Enable all bundled features (trimesh2, apps, tools). This
# option is useful to maintainers to ensure they do not break optional
# parts while modifying the core of the project. If both
# ``--enable-all'' is set and a given feature is disabled (say,
@@ -164,10 +164,6 @@ AC_ARG_ENABLE([all],
[AS_HELP_STRING([--enable-all], [enable maintainer mode])],
[if test "x$enable_all" != xno; then
enable_trimesh=yes
- enable_swilena=yes
-dnl<<lrde
- enable_scribo=yes
-dnl>>
enable_apps=yes
enable_tools=yes
fi])
@@ -239,39 +235,22 @@ OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm],
[ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8],
[ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]))
-# ---------------------------- #
-# (Bundled) trimesh2 library. #
-# ---------------------------- #
+
+## ---------------------------- ##
+## External, bundled projects. ##
+## ---------------------------- ##
+
+AC_CONFIG_FILES([external/Makefile])
+
+# ------------------ ##
+# Trimesh2 library. ##
+# ------------------ ##
AC_ARG_ENABLE([trimesh],
[AS_HELP_STRING([--enable-trimesh],
[build the (bundled) trimesh2 library])])
AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes])
-AC_CONFIG_SUBDIRS([milena/external/trimesh])
-
-
-## --------- ##
-## Swilena. ##
-## --------- ##
-
-AC_ARG_ENABLE([swilena],
- [AS_HELP_STRING([--enable-swilena],
- [build Swilena Python bindings])])
-AM_CONDITIONAL([ENABLE_SWILENA], [test "x$enable_swilena" = xyes])
-AC_CONFIG_SUBDIRS([swilena])
-
-
-dnl<<lrde
-## -------- ##
-## Scribo. ##
-## -------- ##
-
-AC_ARG_ENABLE([scribo],
- [AS_HELP_STRING([--enable-scribo],
- [enable Scribo])])
-AM_CONDITIONAL([ENABLE_SCRIBO], [test "x$enable_scribo" = xyes])
-AC_CONFIG_SUBDIRS([scribo])
-dnl>>
+AC_CONFIG_SUBDIRS([external/trimesh])
## --------------- ##
@@ -281,17 +260,15 @@ dnl>>
# Ask for config.h creation.
AC_CONFIG_HEADERS([config.h])
-# Ask for the creation of a milena/doc/tool/data.hh, used to access to
+# Ask for the creation of a doc/tool/data.hh, used to access to
# data (images) from the documentation.
-AC_CONFIG_FILES([milena/doc/tools/data.hh])
+AC_CONFIG_FILES([doc/tools/data.hh])
# Ask for the Makefile creations.
AC_CONFIG_FILES([
Makefile
- milena/Makefile
- milena/doc/Makefile
- milena/external/Makefile
- milena/mesh/Makefile
+ doc/Makefile
+ mesh/Makefile
])
@@ -299,132 +276,132 @@ AC_CONFIG_FILES([
## Tests. ##
## ------- ##
-# Ask for the creation of a milena/tests/data.hh, used to access to
+# Ask for the creation of a tests/data.hh, used to access to
# data (images) from tests.
-AC_CONFIG_FILES([milena/tests/data.hh])
+AC_CONFIG_FILES([tests/data.hh])
# Ask for the creation of tests' Makefiles.
AC_CONFIG_FILES([
- milena/tests/Makefile
- milena/tests/accu/Makefile
- milena/tests/accu/image/Makefile
- milena/tests/accu/site_set/Makefile
- milena/tests/accu/stat/Makefile
- milena/tests/accu/math/Makefile
- milena/tests/accu/shape/Makefile
- milena/tests/algebra/Makefile
- milena/tests/arith/Makefile
- milena/tests/binarization/Makefile
- milena/tests/border/Makefile
- milena/tests/canvas/Makefile
- milena/tests/canvas/browsing/Makefile
- milena/tests/canvas/morpho/Makefile
- milena/tests/convert/Makefile
- milena/tests/convert/impl/Makefile
- milena/tests/core/Makefile
- milena/tests/core/alias/Makefile
- milena/tests/core/image/Makefile
- milena/tests/core/image/dmorph/Makefile
- milena/tests/core/image/imorph/Makefile
- milena/tests/core/image/vmorph/Makefile
- milena/tests/core/other/Makefile
- milena/tests/core/routine/Makefile
- milena/tests/core/site_set/Makefile
- milena/tests/data/Makefile
- milena/tests/data/approx/Makefile
- milena/tests/data/naive/Makefile
- milena/tests/debug/Makefile
- milena/tests/display/Makefile
- milena/tests/draw/Makefile
- milena/tests/estim/Makefile
- milena/tests/extension/Makefile
- milena/tests/fun/Makefile
- milena/tests/fun/i2v/Makefile
- milena/tests/fun/p2b/Makefile
- milena/tests/fun/p2p/Makefile
- milena/tests/fun/p2v/Makefile
- milena/tests/fun/stat/Makefile
- milena/tests/fun/v2v/Makefile
- milena/tests/fun/vv2v/Makefile
- milena/tests/fun/x2x/Makefile
- milena/tests/geom/Makefile
- milena/tests/graph/Makefile
- milena/tests/graph/attribute/Makefile
- milena/tests/histo/Makefile
- milena/tests/io/Makefile
- milena/tests/io/dicom/Makefile
- milena/tests/io/dump/Makefile
- milena/tests/io/fits/Makefile
- milena/tests/io/fld/Makefile
- milena/tests/io/magick/Makefile
- milena/tests/io/off/Makefile
- milena/tests/io/pbm/Makefile
- milena/tests/io/pbms/Makefile
- milena/tests/io/pfm/Makefile
- milena/tests/io/pgm/Makefile
- milena/tests/io/pgms/Makefile
- milena/tests/io/pnm/Makefile
- milena/tests/io/ppm/Makefile
- milena/tests/io/ppms/Makefile
- milena/tests/io/tiff/Makefile
- milena/tests/labeling/Makefile
- milena/tests/linear/Makefile
- milena/tests/linear/local/Makefile
- milena/tests/literal/Makefile
- milena/tests/logical/Makefile
- milena/tests/make/Makefile
- milena/tests/math/Makefile
- milena/tests/metal/Makefile
- milena/tests/metal/make/Makefile
- milena/tests/metal/math/Makefile
- milena/tests/morpho/Makefile
- milena/tests/morpho/approx/Makefile
- milena/tests/morpho/attribute/Makefile
- milena/tests/morpho/closing/Makefile
- milena/tests/morpho/closing/approx/Makefile
- milena/tests/morpho/elementary/Makefile
- milena/tests/morpho/opening/Makefile
- milena/tests/morpho/opening/approx/Makefile
- milena/tests/morpho/reconstruction/Makefile
- milena/tests/morpho/reconstruction/by_dilation/Makefile
- milena/tests/morpho/reconstruction/by_erosion/Makefile
- milena/tests/morpho/tree/Makefile
- milena/tests/morpho/tree/filter/Makefile
- milena/tests/morpho/watershed/Makefile
- milena/tests/norm/Makefile
- milena/tests/opt/Makefile
- milena/tests/pw/Makefile
- milena/tests/set/Makefile
- milena/tests/tag/Makefile
- milena/tests/test/Makefile
- milena/tests/topo/Makefile
- milena/tests/topo/skeleton/Makefile
- milena/tests/trace/Makefile
- milena/tests/trait/Makefile
- milena/tests/trait/image/Makefile
- milena/tests/trait/op/Makefile
- milena/tests/trait/value/Makefile
- milena/tests/transform/Makefile
- milena/tests/unit_test/Makefile
- milena/tests/upscaling/Makefile
- milena/tests/upscaling/art/Makefile
- milena/tests/util/Makefile
- milena/tests/value/Makefile
- milena/tests/value/builtin/Makefile
- milena/tests/value/concept/Makefile
- milena/tests/win/Makefile
- milena/tests/world/Makefile
- milena/tests/world/binary_2d/Makefile
- milena/tests/world/inter_pixel/Makefile
- milena/tests/world/inter_pixel/dim2/Makefile
+ tests/Makefile
+ tests/accu/Makefile
+ tests/accu/image/Makefile
+ tests/accu/site_set/Makefile
+ tests/accu/stat/Makefile
+ tests/accu/math/Makefile
+ tests/accu/shape/Makefile
+ tests/algebra/Makefile
+ tests/arith/Makefile
+ tests/binarization/Makefile
+ tests/border/Makefile
+ tests/canvas/Makefile
+ tests/canvas/browsing/Makefile
+ tests/canvas/morpho/Makefile
+ tests/convert/Makefile
+ tests/convert/impl/Makefile
+ tests/core/Makefile
+ tests/core/alias/Makefile
+ tests/core/image/Makefile
+ tests/core/image/dmorph/Makefile
+ tests/core/image/imorph/Makefile
+ tests/core/image/vmorph/Makefile
+ tests/core/other/Makefile
+ tests/core/routine/Makefile
+ tests/core/site_set/Makefile
+ tests/data/Makefile
+ tests/data/approx/Makefile
+ tests/data/naive/Makefile
+ tests/debug/Makefile
+ tests/display/Makefile
+ tests/draw/Makefile
+ tests/estim/Makefile
+ tests/extension/Makefile
+ tests/fun/Makefile
+ tests/fun/i2v/Makefile
+ tests/fun/p2b/Makefile
+ tests/fun/p2p/Makefile
+ tests/fun/p2v/Makefile
+ tests/fun/stat/Makefile
+ tests/fun/v2v/Makefile
+ tests/fun/vv2v/Makefile
+ tests/fun/x2x/Makefile
+ tests/geom/Makefile
+ tests/graph/Makefile
+ tests/graph/attribute/Makefile
+ tests/histo/Makefile
+ tests/io/Makefile
+ tests/io/dicom/Makefile
+ tests/io/dump/Makefile
+ tests/io/fits/Makefile
+ tests/io/fld/Makefile
+ tests/io/magick/Makefile
+ tests/io/off/Makefile
+ tests/io/pbm/Makefile
+ tests/io/pbms/Makefile
+ tests/io/pfm/Makefile
+ tests/io/pgm/Makefile
+ tests/io/pgms/Makefile
+ tests/io/pnm/Makefile
+ tests/io/ppm/Makefile
+ tests/io/ppms/Makefile
+ tests/io/tiff/Makefile
+ tests/labeling/Makefile
+ tests/linear/Makefile
+ tests/linear/local/Makefile
+ tests/literal/Makefile
+ tests/logical/Makefile
+ tests/make/Makefile
+ tests/math/Makefile
+ tests/metal/Makefile
+ tests/metal/make/Makefile
+ tests/metal/math/Makefile
+ tests/morpho/Makefile
+ tests/morpho/approx/Makefile
+ tests/morpho/attribute/Makefile
+ tests/morpho/closing/Makefile
+ tests/morpho/closing/approx/Makefile
+ tests/morpho/elementary/Makefile
+ tests/morpho/opening/Makefile
+ tests/morpho/opening/approx/Makefile
+ tests/morpho/reconstruction/Makefile
+ tests/morpho/reconstruction/by_dilation/Makefile
+ tests/morpho/reconstruction/by_erosion/Makefile
+ tests/morpho/tree/Makefile
+ tests/morpho/tree/filter/Makefile
+ tests/morpho/watershed/Makefile
+ tests/norm/Makefile
+ tests/opt/Makefile
+ tests/pw/Makefile
+ tests/set/Makefile
+ tests/tag/Makefile
+ tests/test/Makefile
+ tests/topo/Makefile
+ tests/topo/skeleton/Makefile
+ tests/trace/Makefile
+ tests/trait/Makefile
+ tests/trait/image/Makefile
+ tests/trait/op/Makefile
+ tests/trait/value/Makefile
+ tests/transform/Makefile
+ tests/unit_test/Makefile
+ tests/upscaling/Makefile
+ tests/upscaling/art/Makefile
+ tests/util/Makefile
+ tests/value/Makefile
+ tests/value/builtin/Makefile
+ tests/value/concept/Makefile
+ tests/win/Makefile
+ tests/world/Makefile
+ tests/world/binary_2d/Makefile
+ tests/world/inter_pixel/Makefile
+ tests/world/inter_pixel/dim2/Makefile
])
dnl<<lrde
AC_CONFIG_FILES([
- milena/tests/extract/Makefile
- milena/tests/linear/gaussian/Makefile
- milena/tests/registration/Makefile
- milena/tests/subsampling/Makefile
+ tests/extract/Makefile
+ tests/linear/gaussian/Makefile
+ tests/registration/Makefile
+ tests/subsampling/Makefile
])
dnl>>
@@ -433,9 +410,9 @@ dnl>>
## Applications. ##
## -------------- ##
-# Ask for the creation of a milena/apps/data.hh, used to access to
+# Ask for the creation of a apps/data.hh, used to access to
# data (images) from apps.
-AC_CONFIG_FILES([milena/apps/data.hh])
+AC_CONFIG_FILES([apps/data.hh])
AC_ARG_ENABLE([apps],
[AS_HELP_STRING([--enable-apps],
@@ -444,32 +421,32 @@ AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"])
# Ask for the creation of applications' Makefiles.
AC_CONFIG_FILES([
- milena/apps/Makefile
- milena/apps/constrained-connectivity/Makefile
- milena/apps/graph-morpho/Makefile
- milena/apps/mesh-segm-skel/Makefile
- milena/apps/papers/Makefile
- milena/apps/papers/levillain.09.ismm/Makefile
+ apps/Makefile
+ apps/constrained-connectivity/Makefile
+ apps/graph-morpho/Makefile
+ apps/mesh-segm-skel/Makefile
+ apps/papers/Makefile
+ apps/papers/levillain.09.ismm/Makefile
])
# Configure tests.
# FIXME: Consider using `sed' instead of `configure' to create these
# tests for the sake of speed.
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-skel],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel])
-
-AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectivity],
- [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-max-curv],
+ [chmod +x apps/mesh-segm-skel/test-mesh-max-curv])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-max-curv],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-max-curv])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-skel],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-skel])
+
+AC_CONFIG_FILES([apps/constrained-connectivity/test-constrained-connectivity],
+ [chmod +x apps/constrained-connectivity/test-constrained-connectivity])
# Flags for apps.
AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications])
@@ -491,7 +468,7 @@ AC_ARG_ENABLE([tools],
AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"])
# Ask for the creation of tools' Makefiles.
-AC_CONFIG_FILES([milena/tools/Makefile])
+AC_CONFIG_FILES([tools/Makefile])
# Flags for tools.
AC_ARG_VAR([TOOLS_CXXFLAGS], [C++ compiler flags for tools])
@@ -536,23 +513,8 @@ CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio
GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm
Magick++ --with-magickxx $oln_have_magickxx
Qt --with-qt $oln_have_qt
-Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract
TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff
-Trimesh --enable-trimesh $enable_trimesh
--------------------------------------------------------------------------------
-
-
-
-
-===========
-| Modules |
-===========
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Scribo --enable-scribo $enable_scribo
-Swilena --enable-swilena $enable_swilena
+Trimesh --enable-trimesh enable_trimesh
-------------------------------------------------------------------------------
diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in
index 5b20a7c..7821071 100644
--- a/milena/doc/Doxyfile.in
+++ b/milena/doc/Doxyfile.in
@@ -31,7 +31,7 @@ ABBREVIATE_BRIEF =
ALWAYS_DETAILED_SEC = YES
INLINE_INHERITED_MEMB = YES
FULL_PATH_NAMES = NO
-STRIP_FROM_PATH = @top_srcdir@/milena
+STRIP_FROM_PATH = @top_srcdir@
STRIP_FROM_INC_PATH =
SHORT_NAMES = YES
JAVADOC_AUTOBRIEF = YES
@@ -91,33 +91,33 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = @top_srcdir@/milena
+INPUT = @top_srcdir@
FILE_PATTERNS = *.cc \
*.hh \
*.hxx \
*.hcc
RECURSIVE = YES
-EXCLUDE = @top_srcdir@/milena/sandbox \
- @top_srcdir@/milena/trash \
- @top_srcdir@/milena/mln/core/concept/proxy.hxx \
- @top_srcdir@/milena/doc/examples/trash \
- @top_srcdir@/milena/doc/user-refman
- @top_srcdir@/milena/doc/devel-refman
- @top_srcdir@/milena/tests/unit_test
+EXCLUDE = @top_srcdir@/sandbox \
+ @top_srcdir@/trash \
+ @top_srcdir@/mln/core/concept/proxy.hxx \
+ @top_srcdir@/doc/examples/trash \
+ @top_srcdir@/doc/user-refman
+ @top_srcdir@/doc/devel-refman
+ @top_srcdir@/tests/unit_test
EXCLUDE_SYMLINKS = YES
EXCLUDE_PATTERNS = *spe.hh
EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::*
-EXAMPLE_PATH = @top_srcdir@/milena/doc/examples \
- @top_srcdir@/milena/doc/outputs \
- @top_srcdir@/milena/doc/examples/split \
- @top_srcdir@/milena/doc/outputs/split
+EXAMPLE_PATH = @top_srcdir@/doc/examples \
+ @top_srcdir@/doc/outputs \
+ @top_srcdir@/doc/examples/split \
+ @top_srcdir@/doc/outputs/split
EXAMPLE_PATTERNS = *.cc \
*.cc.raw \
*.txt
EXAMPLE_RECURSIVE = NO
-IMAGE_PATH = @top_srcdir@/milena/doc/devel/figures \
- @top_srcdir@/milena/doc/img \
- @top_srcdir@/milena/doc/figures
+IMAGE_PATH = @top_srcdir@/doc/devel/figures \
+ @top_srcdir@/doc/img \
+ @top_srcdir@/doc/figures
INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 273b3d8..e2c9acd 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -18,7 +18,7 @@
# Look for Milena headers in srcdir and for (generated) test headers
# (like data.hh) in builddir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
DOXYGEN = doxygen
@@ -215,7 +215,7 @@ edit = sed -e "s|@ID@|$$Id|" \
-e 's,@builddir\@,$(builddir),g'
$(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in
- Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
+ Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog \
| sed -e 's/\\\$$//g'`; \
$(edit) $< >$@
MAINTAINERCLEANFILES += $(DOXYFILE_USER)
@@ -292,7 +292,7 @@ edit_devel = sed \
$(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in
rm -f $@.tmp
- Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
+ Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog \
| sed -e 's/\\\$$//g'`; \
$(edit) $< >$@.tmp
$(edit_devel) $@.tmp >$@
diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk
index 440d960..a1b7691 100755
--- a/milena/doc/gen-examples-outputs-mk
+++ b/milena/doc/gen-examples-outputs-mk
@@ -16,7 +16,7 @@
# 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.
+# To be used from doc/'s source directory.
me=`basename $0`
diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk
index b505370..9300192 100755
--- a/milena/doc/gen-split-examples-mk
+++ b/milena/doc/gen-split-examples-mk
@@ -16,7 +16,7 @@
# 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.
+# To be used from doc/'s source directory.
# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk.
diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk
index 6a81b02..220cb3f 100644
--- a/milena/doc/programs-examples.mk
+++ b/milena/doc/programs-examples.mk
@@ -86,9 +86,9 @@ PROGRAMS_examples += \
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.
+# `doc/Makefile.am', since `examples/' is a subdirectory of
+# `doc/'. Anyway, this file is to be eventually inlined in
+# `doc/Makefile.am', so this is not a big deal.
accu_right_instantiation_SOURCES = examples/accu-right-instantiation.cc
borderthickness_SOURCES = examples/borderthickness.cc
box2d_bbox_SOURCES = examples/box2d-bbox.cc
diff --git a/milena/doc/tools/data.hh.in b/milena/doc/tools/data.hh.in
index c300521..eccbbfa 100644
--- a/milena/doc/tools/data.hh.in
+++ b/milena/doc/tools/data.hh.in
@@ -32,6 +32,6 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the doc directory of Milena.
-# define MLN_DOC_DIR "@abs_top_srcdir@/milena/doc"
+# define MLN_DOC_DIR "@abs_top_srcdir@/doc"
#endif // ! DOC_TOOLS_HH
diff --git a/milena/doc/tutorial.tex b/milena/doc/tutorial.tex
index 5a61461..8d99520 100644
--- a/milena/doc/tutorial.tex
+++ b/milena/doc/tutorial.tex
@@ -138,12 +138,12 @@ It is a more detailed explanations of the library's features.
\textit{Assemblers} and \textit{designers} may be also interested by all the
examples provided with the documentation and the tutorial. The source code is
-available in \hpath{milena/doc/examples} \tofix{ref} and is usually pointed
+available in \hpath{doc/examples} \tofix{ref} and is usually pointed
out and commented by the documentation.
Taking a look at the test suite is also a good idea. The tests usually focus on
a single functionality and handle several use cases which may overlap your needs.
-The test suite is located in \hpath{milena/tests} \tofix{ref?}.
+The test suite is located in \hpath{tests} \tofix{ref?}.
Still not enough information? More information about all the routines is
available in the User HTML documentation \tofix{ref}.
@@ -338,12 +338,12 @@ List of \hpath{milena}'s subdirectories:
test suite. Feel free to use it in your programs.
\item \dir{mesh} --- A set of 3D meshes. They can be used with the full
- example located in \hpath{milena/apps}.
+ example located in \hpath{apps}.
\item \dir{mln} --- The core of the library. Contains all the library headers.
\item \dir{tests} --- The test suite. Is it subdivided in sub directories.
- The directory hierarchy respects \hpath{milena/mln}'s.
+ The directory hierarchy respects \hpath{mln}'s.
\item \dir{tools} --- Small tools written with milena. They can be used as examples.
@@ -405,8 +405,7 @@ List of \hpath{mln}'s subdirectories:
\end{itemize}
-The source code and the material of the documentation is available in \hpath{
-milena/doc}.
+The source code and the material of the documentation is available in \hpath{doc}.
List of \hpath{doc}'s subdirectories:
\begin{itemize}
\item \dir{examples} --- All the source code of the documentation examples.
@@ -723,7 +722,7 @@ compiled if you want to use them.
\doxysubsection{tuto2examples}{Examples}
Examples are part of the documentation. The sources are located in
-\hpath{milena/doc/examples}.
+\hpath{doc/examples}.
To compile the examples simply run:
\begin{verbatim}
@@ -822,7 +821,7 @@ implementation would look like this one:
\doxyrawcode{tuto3/fill_non_generic}
-See milena/doc/examples/tuto3/fill\_non\_generic.cc.
+See doc/examples/tuto3/fill\_non\_generic.cc.
In this example, there are a lot of \B{implicit} assumptions about the input:
@@ -1238,7 +1237,7 @@ This site only contains :
%**************************
\doxysection{tuto4images}{Images}
-In milena, an image is seen as a composition of both a site set and a function
+In Milena, an image is seen as a composition of both a site set and a function
mapping a site to a value.
%--------------------------
diff --git a/scribo/m4/autotroll.m4 b/milena/m4/autotroll.m4
similarity index 100%
copy from scribo/m4/autotroll.m4
copy to milena/m4/autotroll.m4
diff --git a/milena/m4/boost.m4 b/milena/m4/boost.m4
new file mode 120000
index 0000000..247b410
--- /dev/null
+++ b/milena/m4/boost.m4
@@ -0,0 +1 @@
+../../m4/boost.m4
\ No newline at end of file
diff --git a/scribo/m4/oln-with-lib.m4 b/milena/m4/oln-with-lib.m4
similarity index 100%
copy from scribo/m4/oln-with-lib.m4
copy to milena/m4/oln-with-lib.m4
diff --git a/scribo/m4/pkg.m4 b/milena/m4/pkg.m4
similarity index 100%
copy from scribo/m4/pkg.m4
copy to milena/m4/pkg.m4
diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am
index eebfaab..c66b9f0 100644
--- a/milena/mesh/Makefile.am
+++ b/milena/mesh/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -49,9 +50,9 @@ dist_mesh_DATA += $(more_meshes)
## Pseudo-inverse curvature of meshes. ##
## ------------------------------------ ##
-mesh_pinv_curv = $(top_builddir)/milena/apps/mesh-segm-skel/mesh-pinv-curv
-mesh_pinv_curv: $(top_srcdir)/milena/apps/mesh-segm-skel/mesh-pinv-curv.cc
- cd $(top_builddir)/milena/apps/mesh-segm-skel/mesh-pinv-curv && \
+mesh_pinv_curv = $(top_builddir)/apps/mesh-segm-skel/mesh-pinv-curv
+mesh_pinv_curv: $(top_srcdir)/apps/mesh-segm-skel/mesh-pinv-curv.cc
+ cd $(top_builddir)/apps/mesh-segm-skel/mesh-pinv-curv && \
$(MAKE) $(AM_MAKEFLAGS) mesh_pinv_curv
# FIXME: *-pinv-curv.off files should not be regenerated
@@ -67,9 +68,9 @@ dist_mesh_DATA += $(pinv_curv)
## Maximum curvature of meshes. ##
## ----------------------------- ##
-mesh_max_curv = $(top_builddir)/milena/apps/mesh-segm-skel/mesh-max-curv
-mesh_max_curv: $(top_srcdir)/milena/apps/mesh-segm-skel/mesh-max-curv.cc
- cd $(top_builddir)/milena/apps/mesh-segm-skel/mesh-max-curv && \
+mesh_max_curv = $(top_builddir)/apps/mesh-segm-skel/mesh-max-curv
+mesh_max_curv: $(top_srcdir)/apps/mesh-segm-skel/mesh-max-curv.cc
+ cd $(top_builddir)/apps/mesh-segm-skel/mesh-max-curv && \
$(MAKE) $(AM_MAKEFLAGS) mesh_max_curv
# FIXME: *-max-curv.off files should not be regenerated
diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am
index 83f946e..198b355 100644
--- a/milena/tests/Makefile.am
+++ b/milena/tests/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
accu \
@@ -88,7 +88,7 @@ TESTS = $(check_PROGRAMS)
EXTRA_DIST = tools/pretty_check.sh
.PHONY: pretty-check
pretty-check:
- $(top_srcdir)/milena/tests/tools/pretty_check.sh
+ $(top_srcdir)/tests/tools/pretty_check.sh
# Regen files recursively.
include $(top_srcdir)/build-aux/regen-recursive.mk
diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am
index d494d46..201aba6 100644
--- a/milena/tests/accu/Makefile.am
+++ b/milena/tests/accu/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
image \
diff --git a/milena/tests/accu/image/Makefile.am b/milena/tests/accu/image/Makefile.am
index 141300f..a0cfb24 100644
--- a/milena/tests/accu/image/Makefile.am
+++ b/milena/tests/accu/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
init \
diff --git a/milena/tests/accu/math/Makefile.am b/milena/tests/accu/math/Makefile.am
index ca5358b..a9b0a0f 100644
--- a/milena/tests/accu/math/Makefile.am
+++ b/milena/tests/accu/math/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
count
diff --git a/milena/tests/accu/shape/Makefile.am b/milena/tests/accu/shape/Makefile.am
index 374ce89..7ad278d 100644
--- a/milena/tests/accu/shape/Makefile.am
+++ b/milena/tests/accu/shape/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bbox
diff --git a/milena/tests/accu/site_set/Makefile.am b/milena/tests/accu/site_set/Makefile.am
index a44676e..12386d0 100644
--- a/milena/tests/accu/site_set/Makefile.am
+++ b/milena/tests/accu/site_set/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
rectangularity
diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am
index c331db0..f945239 100644
--- a/milena/tests/accu/stat/Makefile.am
+++ b/milena/tests/accu/stat/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
var \
diff --git a/milena/tests/algebra/Makefile.am b/milena/tests/algebra/Makefile.am
index 471389e..b441e4a 100644
--- a/milena/tests/algebra/Makefile.am
+++ b/milena/tests/algebra/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
h_mat \
diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am
index 89dfc9e..5bd2aae 100644
--- a/milena/tests/arith/Makefile.am
+++ b/milena/tests/arith/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff_abs \
diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am
index 601d163..c299519 100644
--- a/milena/tests/binarization/Makefile.am
+++ b/milena/tests/binarization/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Copyright (C) 2008, 2009, 2010, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
threshold
diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am
index 80241ad..b9f1a7b 100644
--- a/milena/tests/border/Makefile.am
+++ b/milena/tests/border/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
adjust \
diff --git a/milena/tests/canvas/Makefile.am b/milena/tests/canvas/Makefile.am
index d8db016..f98d236 100644
--- a/milena/tests/canvas/Makefile.am
+++ b/milena/tests/canvas/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = browsing morpho
diff --git a/milena/tests/canvas/browsing/Makefile.am b/milena/tests/canvas/browsing/Makefile.am
index 66b5b44..2b53f13 100644
--- a/milena/tests/canvas/browsing/Makefile.am
+++ b/milena/tests/canvas/browsing/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fwd \
diff --git a/milena/tests/canvas/morpho/Makefile.am b/milena/tests/canvas/morpho/Makefile.am
index 0504c8e..ef1e9b1 100644
--- a/milena/tests/canvas/morpho/Makefile.am
+++ b/milena/tests/canvas/morpho/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS=attribute_filter
diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am
index e4e3545..66ec621 100644
--- a/milena/tests/convert/Makefile.am
+++ b/milena/tests/convert/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
include $(top_srcdir)/build-aux/autotroll.mk
SUBDIRS = impl
diff --git a/milena/tests/convert/impl/Makefile.am b/milena/tests/convert/impl/Makefile.am
index a7cb10c..8c4c532 100644
--- a/milena/tests/convert/impl/Makefile.am
+++ b/milena/tests/convert/impl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
from_site_set_to_image
diff --git a/milena/tests/core/Makefile.am b/milena/tests/core/Makefile.am
index ba4b041..b942219 100644
--- a/milena/tests/core/Makefile.am
+++ b/milena/tests/core/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
alias \
diff --git a/milena/tests/core/alias/Makefile.am b/milena/tests/core/alias/Makefile.am
index 9c47da2..51c16fd 100644
--- a/milena/tests/core/alias/Makefile.am
+++ b/milena/tests/core/alias/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box1d \
diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am
index 5ac8889..d3bfb4a 100644
--- a/milena/tests/core/image/Makefile.am
+++ b/milena/tests/core/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
# (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
dmorph \
diff --git a/milena/tests/core/image/dmorph/Makefile.am b/milena/tests/core/image/dmorph/Makefile.am
index 3faee32..0d0240f 100644
--- a/milena/tests/core/image/dmorph/Makefile.am
+++ b/milena/tests/core/image/dmorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
hexa \
diff --git a/milena/tests/core/image/imorph/Makefile.am b/milena/tests/core/image/imorph/Makefile.am
index b019f1c..2d986ca 100644
--- a/milena/tests/core/image/imorph/Makefile.am
+++ b/milena/tests/core/image/imorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
decorated_image \
diff --git a/milena/tests/core/image/vmorph/Makefile.am b/milena/tests/core/image/vmorph/Makefile.am
index 5f7eb98..ef55c8a 100644
--- a/milena/tests/core/image/vmorph/Makefile.am
+++ b/milena/tests/core/image/vmorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
cast_image \
diff --git a/milena/tests/core/other/Makefile.am b/milena/tests/core/other/Makefile.am
index 85ce865..c435eed 100644
--- a/milena/tests/core/other/Makefile.am
+++ b/milena/tests/core/other/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box_runstart_piter \
diff --git a/milena/tests/core/routine/Makefile.am b/milena/tests/core/routine/Makefile.am
index 2640c47..07af185 100644
--- a/milena/tests/core/routine/Makefile.am
+++ b/milena/tests/core/routine/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
duplicate \
diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am
index e092e73..5a29e5f 100644
--- a/milena/tests/core/site_set/Makefile.am
+++ b/milena/tests/core/site_set/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box \
diff --git a/milena/tests/data.hh.in b/milena/tests/data.hh.in
index 1953989..ae6f446 100644
--- a/milena/tests/data.hh.in
+++ b/milena/tests/data.hh.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
@@ -33,12 +33,12 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the img directory of Milena.
-# define MLN_IMG_DIR "@abs_top_srcdir@/milena/img"
+# define MLN_IMG_DIR "@abs_top_srcdir@/img"
/// The absolute path to the img directory of Milena.
-# define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/milena/tests/img"
+# define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/tests/img"
/// The absolute path to the mesh directory of Milena.
-# define MLN_MESH_DIR "@abs_top_srcdir@/milena/mesh"
+# define MLN_MESH_DIR "@abs_top_srcdir@/mesh"
#endif // ! TESTS_DATA_HH
diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am
index 205337e..e24b8c9 100644
--- a/milena/tests/data/Makefile.am
+++ b/milena/tests/data/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = approx naive
diff --git a/milena/tests/data/approx/Makefile.am b/milena/tests/data/approx/Makefile.am
index 6f94721..bebdee0 100644
--- a/milena/tests/data/approx/Makefile.am
+++ b/milena/tests/data/approx/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
median
diff --git a/milena/tests/data/naive/Makefile.am b/milena/tests/data/naive/Makefile.am
index d42bcc6..74787ea 100644
--- a/milena/tests/data/naive/Makefile.am
+++ b/milena/tests/data/naive/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
median
diff --git a/milena/tests/debug/Makefile.am b/milena/tests/debug/Makefile.am
index 0346f1a..f6b51c1 100644
--- a/milena/tests/debug/Makefile.am
+++ b/milena/tests/debug/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
println \
diff --git a/milena/tests/display/Makefile.am b/milena/tests/display/Makefile.am
index bdd6d0f..e8d2789 100644
--- a/milena/tests/display/Makefile.am
+++ b/milena/tests/display/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
# Remember not to execute display tests by default. They require a
# running X11 server (as well as a `pkill' binary...). Perform the
diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am
index c823cfb..3a1b771 100644
--- a/milena/tests/draw/Makefile.am
+++ b/milena/tests/draw/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
line \
diff --git a/milena/tests/estim/Makefile.am b/milena/tests/estim/Makefile.am
index 2490ef9..6d422b5 100644
--- a/milena/tests/estim/Makefile.am
+++ b/milena/tests/estim/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
mean \
diff --git a/milena/tests/extension/Makefile.am b/milena/tests/extension/Makefile.am
index 85f9835..aca0fe2 100644
--- a/milena/tests/extension/Makefile.am
+++ b/milena/tests/extension/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fill
diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am
index 2168f8d..7c7f98e 100644
--- a/milena/tests/extract/Makefile.am
+++ b/milena/tests/extract/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet).
diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am
index 82d6e89..a7776ba 100644
--- a/milena/tests/fun/Makefile.am
+++ b/milena/tests/fun/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
i2v \
diff --git a/milena/tests/fun/i2v/Makefile.am b/milena/tests/fun/i2v/Makefile.am
index a3de8f9..74b140d 100644
--- a/milena/tests/fun/i2v/Makefile.am
+++ b/milena/tests/fun/i2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
all_to \
diff --git a/milena/tests/fun/p2b/Makefile.am b/milena/tests/fun/p2b/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/fun/p2b/Makefile.am
+++ b/milena/tests/fun/p2b/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/fun/p2p/Makefile.am b/milena/tests/fun/p2p/Makefile.am
index 862c78b..bd381a1 100644
--- a/milena/tests/fun/p2p/Makefile.am
+++ b/milena/tests/fun/p2p/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fold \
diff --git a/milena/tests/fun/p2v/Makefile.am b/milena/tests/fun/p2v/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/fun/p2v/Makefile.am
+++ b/milena/tests/fun/p2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/fun/stat/Makefile.am b/milena/tests/fun/stat/Makefile.am
index aac5327..c4c8720 100644
--- a/milena/tests/fun/stat/Makefile.am
+++ b/milena/tests/fun/stat/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
mahalanobis
diff --git a/milena/tests/fun/v2i/Makefile.am b/milena/tests/fun/v2i/Makefile.am
index e67e7d0..a1812c7 100644
--- a/milena/tests/fun/v2i/Makefile.am
+++ b/milena/tests/fun/v2i/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
index_of_value
diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am
index ad0f173..343626a 100644
--- a/milena/tests/fun/v2v/Makefile.am
+++ b/milena/tests/fun/v2v/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
norm \
diff --git a/milena/tests/fun/vv2v/Makefile.am b/milena/tests/fun/vv2v/Makefile.am
index d180e3d..4d5a09b 100644
--- a/milena/tests/fun/vv2v/Makefile.am
+++ b/milena/tests/fun/vv2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
max \
diff --git a/milena/tests/fun/x2x/Makefile.am b/milena/tests/fun/x2x/Makefile.am
index 6ac5c22..27e7f20 100644
--- a/milena/tests/fun/x2x/Makefile.am
+++ b/milena/tests/fun/x2x/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
composed \
diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am
index 670561b..d19f37a 100644
--- a/milena/tests/geom/Makefile.am
+++ b/milena/tests/geom/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bbox \
diff --git a/milena/tests/graph/Makefile.am b/milena/tests/graph/Makefile.am
index 608b6d9..aa534e8 100644
--- a/milena/tests/graph/Makefile.am
+++ b/milena/tests/graph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = attribute
diff --git a/milena/tests/graph/attribute/Makefile.am b/milena/tests/graph/attribute/Makefile.am
index cb07318..22b353a 100644
--- a/milena/tests/graph/attribute/Makefile.am
+++ b/milena/tests/graph/attribute/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/histo/Makefile.am b/milena/tests/histo/Makefile.am
index b5f7e7e..62d8fde 100644
--- a/milena/tests/histo/Makefile.am
+++ b/milena/tests/histo/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
compute \
diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am
index bd6c0a4..6dd7ed3 100644
--- a/milena/tests/io/Makefile.am
+++ b/milena/tests/io/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
## ---------------------- ##
## Built-in I/O support. ##
diff --git a/milena/tests/io/dicom/Makefile.am b/milena/tests/io/dicom/Makefile.am
index d8a4ea8..d06e2ce 100644
--- a/milena/tests/io/dicom/Makefile.am
+++ b/milena/tests/io/dicom/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = dicom
diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am
index dedd818..1c88fcb 100644
--- a/milena/tests/io/dump/Makefile.am
+++ b/milena/tests/io/dump/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dump
diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am
index f692f35..614c40e 100644
--- a/milena/tests/io/fits/Makefile.am
+++ b/milena/tests/io/fits/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(CFITSIO_CPPFLAGS)
AM_LDFLAGS = $(CFITSIO_LDFLAGS)
diff --git a/milena/tests/io/fld/Makefile.am b/milena/tests/io/fld/Makefile.am
index 7cbe50b..58dbbcc 100644
--- a/milena/tests/io/fld/Makefile.am
+++ b/milena/tests/io/fld/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fld2d \
diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am
index c04147f..5414ddb 100644
--- a/milena/tests/io/magick/Makefile.am
+++ b/milena/tests/io/magick/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(MAGICKXX_CPPFLAGS)
AM_LDFLAGS = $(MAGICKXX_LDFLAGS)
diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am
index 4029729..5d1f07b 100644
--- a/milena/tests/io/off/Makefile.am
+++ b/milena/tests/io/off/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load_bin \
diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am
index 690c895..488e240 100644
--- a/milena/tests/io/pbm/Makefile.am
+++ b/milena/tests/io/pbm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pbm \
diff --git a/milena/tests/io/pbms/Makefile.am b/milena/tests/io/pbms/Makefile.am
index f6d9770..459964d 100644
--- a/milena/tests/io/pbms/Makefile.am
+++ b/milena/tests/io/pbms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/pfm/Makefile.am b/milena/tests/io/pfm/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/io/pfm/Makefile.am
+++ b/milena/tests/io/pfm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am
index 8fdc560..fd505ee 100644
--- a/milena/tests/io/pgm/Makefile.am
+++ b/milena/tests/io/pgm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pgm16 \
diff --git a/milena/tests/io/pgms/Makefile.am b/milena/tests/io/pgms/Makefile.am
index c5ac784..7a8fb2e 100644
--- a/milena/tests/io/pgms/Makefile.am
+++ b/milena/tests/io/pgms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/pnm/Makefile.am b/milena/tests/io/pnm/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/io/pnm/Makefile.am
+++ b/milena/tests/io/pnm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am
index 695e5d7..61cda9c 100644
--- a/milena/tests/io/ppm/Makefile.am
+++ b/milena/tests/io/ppm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
ppm16 \
diff --git a/milena/tests/io/ppms/Makefile.am b/milena/tests/io/ppms/Makefile.am
index b11b52b..ffabb4b 100644
--- a/milena/tests/io/ppms/Makefile.am
+++ b/milena/tests/io/ppms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/tiff/Makefile.am b/milena/tests/io/tiff/Makefile.am
index 356214b..57f3edc 100644
--- a/milena/tests/io/tiff/Makefile.am
+++ b/milena/tests/io/tiff/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(TIFF_CPPFLAGS)
AM_LDFLAGS = $(TIFF_LDFLAGS)
diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am
index c272da4..0251353 100644
--- a/milena/tests/labeling/Makefile.am
+++ b/milena/tests/labeling/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
background \
diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am
index 8842b8d..25acf9c 100644
--- a/milena/tests/linear/Makefile.am
+++ b/milena/tests/linear/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
local
diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am
index 952a711..c70892c 100644
--- a/milena/tests/linear/gaussian/Makefile.am
+++ b/milena/tests/linear/gaussian/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet).
diff --git a/milena/tests/linear/local/Makefile.am b/milena/tests/linear/local/Makefile.am
index 9f53cfb..04b4f69 100644
--- a/milena/tests/linear/local/Makefile.am
+++ b/milena/tests/linear/local/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
convolve
diff --git a/milena/tests/literal/Makefile.am b/milena/tests/literal/Makefile.am
index ef86851..658c4c9 100644
--- a/milena/tests/literal/Makefile.am
+++ b/milena/tests/literal/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
black \
diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am
index ca59622..8661090 100644
--- a/milena/tests/logical/Makefile.am
+++ b/milena/tests/logical/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
and \
diff --git a/milena/tests/make/Makefile.am b/milena/tests/make/Makefile.am
index 34e0eff..12465e3 100644
--- a/milena/tests/make/Makefile.am
+++ b/milena/tests/make/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dual_neighb \
diff --git a/milena/tests/math/Makefile.am b/milena/tests/math/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/math/Makefile.am
+++ b/milena/tests/math/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/metal/Makefile.am b/milena/tests/metal/Makefile.am
index bc24893..93c0358 100644
--- a/milena/tests/metal/Makefile.am
+++ b/milena/tests/metal/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = make math
diff --git a/milena/tests/metal/make/Makefile.am b/milena/tests/metal/make/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/metal/make/Makefile.am
+++ b/milena/tests/metal/make/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/metal/math/Makefile.am b/milena/tests/metal/math/Makefile.am
index cc48940..9a7762e 100644
--- a/milena/tests/metal/math/Makefile.am
+++ b/milena/tests/metal/math/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pow \
diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am
index a2e460e..cae082a 100644
--- a/milena/tests/morpho/Makefile.am
+++ b/milena/tests/morpho/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx \
diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am
index fcc347e..1a44c1a 100644
--- a/milena/tests/morpho/approx/Makefile.am
+++ b/milena/tests/morpho/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dilation \
diff --git a/milena/tests/morpho/attribute/Makefile.am b/milena/tests/morpho/attribute/Makefile.am
index ae0a5e5..11ad352 100644
--- a/milena/tests/morpho/attribute/Makefile.am
+++ b/milena/tests/morpho/attribute/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am
index 8502e59..3806130 100644
--- a/milena/tests/morpho/closing/Makefile.am
+++ b/milena/tests/morpho/closing/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx
diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am
index 101bbe5..b0e4de5 100644
--- a/milena/tests/morpho/closing/approx/Makefile.am
+++ b/milena/tests/morpho/closing/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
structural
diff --git a/milena/tests/morpho/elementary/Makefile.am b/milena/tests/morpho/elementary/Makefile.am
index 37a726a..dc047eb 100644
--- a/milena/tests/morpho/elementary/Makefile.am
+++ b/milena/tests/morpho/elementary/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
laplacian \
diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am
index 4c06dc4..519353a 100644
--- a/milena/tests/morpho/opening/Makefile.am
+++ b/milena/tests/morpho/opening/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx
diff --git a/milena/tests/morpho/opening/approx/Makefile.am b/milena/tests/morpho/opening/approx/Makefile.am
index 101bbe5..b0e4de5 100644
--- a/milena/tests/morpho/opening/approx/Makefile.am
+++ b/milena/tests/morpho/opening/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
structural
diff --git a/milena/tests/morpho/reconstruction/Makefile.am b/milena/tests/morpho/reconstruction/Makefile.am
index 4ea328e..cae02a5 100644
--- a/milena/tests/morpho/reconstruction/Makefile.am
+++ b/milena/tests/morpho/reconstruction/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
by_dilation \
diff --git a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
index 48f1460..1bf1f7d 100644
--- a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
+++ b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
index 48f1460..1bf1f7d 100644
--- a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
+++ b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/morpho/tree/Makefile.am b/milena/tests/morpho/tree/Makefile.am
index 303bd7c..7721536 100644
--- a/milena/tests/morpho/tree/Makefile.am
+++ b/milena/tests/morpho/tree/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
compute_attribute_image \
diff --git a/milena/tests/morpho/tree/filter/Makefile.am b/milena/tests/morpho/tree/filter/Makefile.am
index 41a0603..65079aa 100644
--- a/milena/tests/morpho/tree/filter/Makefile.am
+++ b/milena/tests/morpho/tree/filter/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
filter
diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am
index 01a28bc..0237863 100644
--- a/milena/tests/morpho/watershed/Makefile.am
+++ b/milena/tests/morpho/watershed/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
flooding \
diff --git a/milena/tests/norm/Makefile.am b/milena/tests/norm/Makefile.am
index 4c335be..2316660 100644
--- a/milena/tests/norm/Makefile.am
+++ b/milena/tests/norm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
l1 \
diff --git a/milena/tests/opt/Makefile.am b/milena/tests/opt/Makefile.am
index 27f0f0d..5b3e806 100644
--- a/milena/tests/opt/Makefile.am
+++ b/milena/tests/opt/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
at
diff --git a/milena/tests/pw/Makefile.am b/milena/tests/pw/Makefile.am
index ae5a829..422b847 100644
--- a/milena/tests/pw/Makefile.am
+++ b/milena/tests/pw/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
image \
diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am
index 2910259..358e7a3 100644
--- a/milena/tests/registration/Makefile.am
+++ b/milena/tests/registration/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet) and currently disabled.
diff --git a/milena/tests/set/Makefile.am b/milena/tests/set/Makefile.am
index ab6e345..7ac5d69 100644
--- a/milena/tests/set/Makefile.am
+++ b/milena/tests/set/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/subsampling/Makefile.am b/milena/tests/subsampling/Makefile.am
index 7e859b4..6264bfb 100644
--- a/milena/tests/subsampling/Makefile.am
+++ b/milena/tests/subsampling/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/tag/Makefile.am b/milena/tests/tag/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/tag/Makefile.am
+++ b/milena/tests/tag/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/test/Makefile.am b/milena/tests/test/Makefile.am
index 6e42c2c..4242e4f 100644
--- a/milena/tests/test/Makefile.am
+++ b/milena/tests/test/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
positive
diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk
index 85ee5d5..da51f6b 100644
--- a/milena/tests/tests.mk
+++ b/milena/tests/tests.mk
@@ -2,7 +2,7 @@
## Shared configuration for tests.
-## Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+## Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
## Laboratory (LRDE)
##
## This file is part of Olena.
@@ -20,11 +20,11 @@
## along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# FIXME: Revamp (see Olena 0.11's test suite).
+# FIXME: Revamp? (See Olena 0.11's test suite).
# Look for Milena header in srcdir and for (generated) test headers
# (like data.hh) in builddir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# FIXME: Add
#
@@ -55,4 +55,4 @@ TIFF_LDFLAGS = @TIFF_LDFLAGS@
# Inject rules to compile tests (recursively), without running them.
-include $(top_srcdir)/milena/tests/tests-recursive.mk
+include $(top_srcdir)/tests/tests-recursive.mk
diff --git a/milena/tests/topo/Makefile.am b/milena/tests/topo/Makefile.am
index b8684bf..e22f880 100644
--- a/milena/tests/topo/Makefile.am
+++ b/milena/tests/topo/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = skeleton
diff --git a/milena/tests/topo/skeleton/Makefile.am b/milena/tests/topo/skeleton/Makefile.am
index 0e60ff6..78b35d9 100644
--- a/milena/tests/topo/skeleton/Makefile.am
+++ b/milena/tests/topo/skeleton/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
crest \
diff --git a/milena/tests/trace/Makefile.am b/milena/tests/trace/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/trace/Makefile.am
+++ b/milena/tests/trace/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/trait/Makefile.am b/milena/tests/trait/Makefile.am
index f3411f9..bdd172c 100644
--- a/milena/tests/trait/Makefile.am
+++ b/milena/tests/trait/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = image op value
diff --git a/milena/tests/trait/image/Makefile.am b/milena/tests/trait/image/Makefile.am
index a428a33..8eda761 100644
--- a/milena/tests/trait/image/Makefile.am
+++ b/milena/tests/trait/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
images
diff --git a/milena/tests/trait/op/Makefile.am b/milena/tests/trait/op/Makefile.am
index 8d83dd2..ca048a3 100644
--- a/milena/tests/trait/op/Makefile.am
+++ b/milena/tests/trait/op/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
plus \
diff --git a/milena/tests/trait/value/Makefile.am b/milena/tests/trait/value/Makefile.am
index 30e6d67..2c653cd 100644
--- a/milena/tests/trait/value/Makefile.am
+++ b/milena/tests/trait/value/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
comp \
diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am
index 933483d..569f5b0 100644
--- a/milena/tests/transform/Makefile.am
+++ b/milena/tests/transform/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bench_closest_point_geodesic \
diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am
index 4ee9885..b324796 100644
--- a/milena/tests/unit_test/Makefile.am
+++ b/milena/tests/unit_test/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
COND_TESTS = cond_tests_boost-tuple \
cond_tests_cfitsio \
@@ -42,7 +42,7 @@ regen-am:
# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@
#
# `$(abs_top_srcdir)' is required because of the change of directory
-# at the beginning og the action.
+# at the beginning of the action.
$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests $(COND_TESTS)
cd $(top_srcdir) \
&& ./build-aux/build_unit_test.sh \
diff --git a/milena/tests/upscaling/Makefile.am b/milena/tests/upscaling/Makefile.am
index 3d0016f..f0c34e2 100644
--- a/milena/tests/upscaling/Makefile.am
+++ b/milena/tests/upscaling/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
art
diff --git a/milena/tests/upscaling/art/Makefile.am b/milena/tests/upscaling/art/Makefile.am
index 01900f4..5f10400 100644
--- a/milena/tests/upscaling/art/Makefile.am
+++ b/milena/tests/upscaling/art/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am
index 0a1119e..bb9b681 100644
--- a/milena/tests/util/Makefile.am
+++ b/milena/tests/util/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am
index 975d471..d932933 100644
--- a/milena/tests/value/Makefile.am
+++ b/milena/tests/value/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
builtin \
diff --git a/milena/tests/value/builtin/Makefile.am b/milena/tests/value/builtin/Makefile.am
index 31ac350..2150e61 100644
--- a/milena/tests/value/builtin/Makefile.am
+++ b/milena/tests/value/builtin/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
builtin \
diff --git a/milena/tests/value/concept/Makefile.am b/milena/tests/value/concept/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/value/concept/Makefile.am
+++ b/milena/tests/value/concept/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/win/Makefile.am b/milena/tests/win/Makefile.am
index 9c58718..39314f8 100644
--- a/milena/tests/win/Makefile.am
+++ b/milena/tests/win/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
backdiag2d \
diff --git a/milena/tests/world/Makefile.am b/milena/tests/world/Makefile.am
index 3bae089..9634ec5 100644
--- a/milena/tests/world/Makefile.am
+++ b/milena/tests/world/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
binary_2d \
diff --git a/milena/tests/world/binary_2d/Makefile.am b/milena/tests/world/binary_2d/Makefile.am
index a52757c..25fd269 100644
--- a/milena/tests/world/binary_2d/Makefile.am
+++ b/milena/tests/world/binary_2d/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
enlarge
diff --git a/milena/tests/world/inter_pixel/Makefile.am b/milena/tests/world/inter_pixel/Makefile.am
index 2d08ba2..8f1386e 100644
--- a/milena/tests/world/inter_pixel/Makefile.am
+++ b/milena/tests/world/inter_pixel/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
dim2
diff --git a/milena/tests/world/inter_pixel/dim2/Makefile.am b/milena/tests/world/inter_pixel/dim2/Makefile.am
index 10ac0fb..6404f7a 100644
--- a/milena/tests/world/inter_pixel/dim2/Makefile.am
+++ b/milena/tests/world/inter_pixel/dim2/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
make_edge_image
diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am
index f7114d0..2f7b3dd 100644
--- a/milena/tools/Makefile.am
+++ b/milena/tools/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tools/tools.mk
+include $(top_srcdir)/tools/tools.mk
bin_PROGRAMS = \
seed2tiling \
diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk
index 9d9a046..97a8082 100644
--- a/milena/tools/tools.mk
+++ b/milena/tools/tools.mk
@@ -18,7 +18,7 @@
## FIXME: Revamp (see Olena 0.11's test suite).
# Look for Milena header in srcdir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena
+AM_CPPFLAGS = -I$(top_srcdir)
# FIXME: Add
#
--
1.5.6.5
* configure.ac: New.
* Makefile.am (ACLOCAL_AMFLAGS): New.
(SUBDIRS): Add build-aux.
(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES): New.
(dist-hook): New target.
* AUTHORS: New.
* NEWS: New (imported from Olena and updated).
* COPYING: New (imported from Olena).
* INSTALL: New (generated by Automake).
* README: New.
* m4/autotroll.m4,
* m4/boost.m4,
* m4/oln-with-lib.m4,
* m4/pkg.m4:
New (imported from Olena).
* build-aux/autotroll.mk,
* build-aux/build_unit_test.sh,
* build-aux/extra-recursive-targets.mk,
* build-aux/generate_dist_headers.sh,
* build-aux/regen-recursive.mk,
* build-aux/tex.mk,
* build-aux/texi2dvi:
New (imported from Olena).
* build-aux/Makefile.am: New.
* apps/constrained-connectivity/Makefile.am,
* apps/graph-morpho/Makefile.am,
* apps/mesh-segm-skel/Makefile.am,
* apps/papers/levillain.09.ismm/Makefile.am,
* doc/Makefile.am,
* mesh/Makefile.am,
* tests/Makefile.am,
* tests/accu/Makefile.am,
* tests/accu/image/Makefile.am,
* tests/accu/math/Makefile.am,
* tests/accu/shape/Makefile.am,
* tests/accu/site_set/Makefile.am,
* tests/accu/stat/Makefile.am,
* tests/algebra/Makefile.am,
* tests/arith/Makefile.am,
* tests/binarization/Makefile.am,
* tests/border/Makefile.am,
* tests/canvas/Makefile.am,
* tests/canvas/browsing/Makefile.am,
* tests/canvas/morpho/Makefile.am,
* tests/convert/Makefile.am,
* tests/convert/impl/Makefile.am,
* tests/core/Makefile.am,
* tests/core/alias/Makefile.am,
* tests/core/image/Makefile.am,
* tests/core/image/dmorph/Makefile.am,
* tests/core/image/imorph/Makefile.am,
* tests/core/image/vmorph/Makefile.am,
* tests/core/other/Makefile.am,
* tests/core/routine/Makefile.am,
* tests/core/site_set/Makefile.am,
* tests/data/Makefile.am,
* tests/data/approx/Makefile.am,
* tests/data/naive/Makefile.am,
* tests/debug/Makefile.am,
* tests/display/Makefile.am,
* tests/draw/Makefile.am,
* tests/estim/Makefile.am,
* tests/extension/Makefile.am,
* tests/extract/Makefile.am,
* tests/fun/Makefile.am,
* tests/fun/i2v/Makefile.am,
* tests/fun/p2b/Makefile.am,
* tests/fun/p2p/Makefile.am,
* tests/fun/p2v/Makefile.am,
* tests/fun/stat/Makefile.am,
* tests/fun/v2i/Makefile.am,
* tests/fun/v2v/Makefile.am,
* tests/fun/vv2v/Makefile.am,
* tests/fun/x2x/Makefile.am,
* tests/geom/Makefile.am,
* tests/graph/Makefile.am,
* tests/graph/attribute/Makefile.am,
* tests/histo/Makefile.am,
* tests/io/Makefile.am,
* tests/io/dicom/Makefile.am,
* tests/io/dump/Makefile.am,
* tests/io/fits/Makefile.am,
* tests/io/fld/Makefile.am,
* tests/io/magick/Makefile.am,
* tests/io/off/Makefile.am,
* tests/io/pbm/Makefile.am,
* tests/io/pbms/Makefile.am,
* tests/io/pfm/Makefile.am,
* tests/io/pgm/Makefile.am,
* tests/io/pgms/Makefile.am,
* tests/io/pnm/Makefile.am,
* tests/io/ppm/Makefile.am,
* tests/io/ppms/Makefile.am,
* tests/io/tiff/Makefile.am,
* tests/labeling/Makefile.am,
* tests/linear/Makefile.am,
* tests/linear/gaussian/Makefile.am,
* tests/linear/local/Makefile.am,
* tests/literal/Makefile.am,
* tests/logical/Makefile.am,
* tests/make/Makefile.am,
* tests/math/Makefile.am,
* tests/metal/Makefile.am,
* tests/metal/make/Makefile.am,
* tests/metal/math/Makefile.am,
* tests/morpho/Makefile.am,
* tests/morpho/approx/Makefile.am,
* tests/morpho/attribute/Makefile.am,
* tests/morpho/closing/Makefile.am,
* tests/morpho/closing/approx/Makefile.am,
* tests/morpho/elementary/Makefile.am,
* tests/morpho/opening/Makefile.am,
* tests/morpho/opening/approx/Makefile.am,
* tests/morpho/reconstruction/Makefile.am,
* tests/morpho/reconstruction/by_dilation/Makefile.am,
* tests/morpho/reconstruction/by_erosion/Makefile.am,
* tests/morpho/tree/Makefile.am,
* tests/morpho/tree/filter/Makefile.am,
* tests/morpho/watershed/Makefile.am,
* tests/norm/Makefile.am,
* tests/opt/Makefile.am,
* tests/pw/Makefile.am,
* tests/registration/Makefile.am,
* tests/set/Makefile.am,
* tests/subsampling/Makefile.am,
* tests/tag/Makefile.am,
* tests/test/Makefile.am,
* tests/topo/Makefile.am,
* tests/topo/skeleton/Makefile.am,
* tests/trace/Makefile.am,
* tests/trait/Makefile.am,
* tests/trait/image/Makefile.am,
* tests/trait/op/Makefile.am,
* tests/trait/value/Makefile.am,
* tests/transform/Makefile.am,
* tests/unit_test/Makefile.am,
* tests/upscaling/Makefile.am,
* tests/upscaling/art/Makefile.am,
* tests/util/Makefile.am,
* tests/value/Makefile.am,
* tests/value/builtin/Makefile.am,
* tests/value/concept/Makefile.am,
* tests/win/Makefile.am,
* tests/world/Makefile.am,
* tests/world/binary_2d/Makefile.am,
* tests/world/inter_pixel/Makefile.am,
* tests/world/inter_pixel/dim2/Makefile.am,
* tools/Makefile.am:
Adjust paths.
* tests/tests.mk,
* tools/tools.mk:
Likewise.
* apps/data.hh.in,
* tests/data.hh.in:
Likewise.
* apps/constrained-connectivity/test-constrained-connectivity.in,
* apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in,
* apps/mesh-segm-skel/test-mesh-complex-max-curv.in,
* apps/mesh-segm-skel/test-mesh-complex-segm.in,
* apps/mesh-segm-skel/test-mesh-complex-skel.in,
* apps/mesh-segm-skel/test-mesh-max-curv.in,
* apps/mesh-segm-skel/test-mesh-segm.in:
Likewise.
---
milena/.gitignore | 22 ++
milena/AUTHORS | 1 +
{scribo => milena}/COPYING | 0
milena/ChangeLog | 168 +++++++++
INSTALL => milena/INSTALL | 0
milena/Makefile.am | 96 +++++
{scribo => milena}/NEWS | 6 +-
README => milena/README | 303 ++++-------------
milena/apps/constrained-connectivity/Makefile.am | 4 +-
.../test-constrained-connectivity.in | 2 +-
milena/apps/data.hh.in | 6 +-
milena/apps/graph-morpho/Makefile.am | 2 +-
milena/apps/mesh-segm-skel/Makefile.am | 10 +-
.../test-mesh-complex-max-curv-segm.in | 5 +-
.../mesh-segm-skel/test-mesh-complex-max-curv.in | 5 +-
.../apps/mesh-segm-skel/test-mesh-complex-segm.in | 5 +-
.../apps/mesh-segm-skel/test-mesh-complex-skel.in | 4 +-
milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 5 +-
milena/apps/mesh-segm-skel/test-mesh-segm.in | 5 +-
milena/apps/papers/levillain.09.ismm/Makefile.am | 7 +-
{build-aux => milena/build-aux}/Makefile.am | 0
{scribo => milena}/build-aux/autotroll.mk | 0
{scribo => milena}/build-aux/build_unit_test.sh | 0
milena/build-aux/extra-recursive-targets.mk | 1 +
.../build-aux/generate_dist_headers.sh | 0
{scribo => milena}/build-aux/regen-recursive.mk | 0
milena/build-aux/strip-lrde | 1 +
{build-aux => milena/build-aux}/tex.mk | 0
{build-aux => milena/build-aux}/texi2dvi | 0
configure.ac => milena/configure.ac | 364 +++++++++-----------
milena/doc/Makefile.am | 6 +-
{scribo => milena}/m4/autotroll.m4 | 0
milena/m4/boost.m4 | 1 +
{scribo => milena}/m4/oln-with-lib.m4 | 0
{scribo => milena}/m4/pkg.m4 | 0
milena/mesh/Makefile.am | 15 +-
milena/tests/Makefile.am | 6 +-
milena/tests/accu/Makefile.am | 2 +-
milena/tests/accu/image/Makefile.am | 4 +-
milena/tests/accu/math/Makefile.am | 4 +-
milena/tests/accu/shape/Makefile.am | 4 +-
milena/tests/accu/site_set/Makefile.am | 4 +-
milena/tests/accu/stat/Makefile.am | 4 +-
milena/tests/algebra/Makefile.am | 5 +-
milena/tests/arith/Makefile.am | 4 +-
milena/tests/binarization/Makefile.am | 4 +-
milena/tests/border/Makefile.am | 4 +-
milena/tests/canvas/Makefile.am | 4 +-
milena/tests/canvas/browsing/Makefile.am | 4 +-
milena/tests/canvas/morpho/Makefile.am | 5 +-
milena/tests/convert/Makefile.am | 2 +-
milena/tests/convert/impl/Makefile.am | 4 +-
milena/tests/core/Makefile.am | 4 +-
milena/tests/core/alias/Makefile.am | 5 +-
milena/tests/core/image/Makefile.am | 4 +-
milena/tests/core/image/dmorph/Makefile.am | 4 +-
milena/tests/core/image/imorph/Makefile.am | 4 +-
milena/tests/core/image/vmorph/Makefile.am | 4 +-
milena/tests/core/other/Makefile.am | 5 +-
milena/tests/core/routine/Makefile.am | 5 +-
milena/tests/core/site_set/Makefile.am | 5 +-
milena/tests/data.hh.in | 8 +-
milena/tests/data/Makefile.am | 5 +-
milena/tests/data/approx/Makefile.am | 4 +-
milena/tests/data/naive/Makefile.am | 4 +-
milena/tests/debug/Makefile.am | 5 +-
milena/tests/display/Makefile.am | 4 +-
milena/tests/draw/Makefile.am | 4 +-
milena/tests/estim/Makefile.am | 4 +-
milena/tests/extension/Makefile.am | 5 +-
milena/tests/extract/Makefile.am | 4 +-
milena/tests/fun/Makefile.am | 4 +-
milena/tests/fun/i2v/Makefile.am | 5 +-
milena/tests/fun/p2b/Makefile.am | 5 +-
milena/tests/fun/p2p/Makefile.am | 4 +-
milena/tests/fun/p2v/Makefile.am | 5 +-
milena/tests/fun/stat/Makefile.am | 4 +-
milena/tests/fun/v2i/Makefile.am | 4 +-
milena/tests/fun/v2v/Makefile.am | 4 +-
milena/tests/fun/vv2v/Makefile.am | 5 +-
milena/tests/fun/x2x/Makefile.am | 4 +-
milena/tests/geom/Makefile.am | 2 +-
milena/tests/graph/Makefile.am | 4 +-
milena/tests/graph/attribute/Makefile.am | 4 +-
milena/tests/histo/Makefile.am | 4 +-
milena/tests/io/Makefile.am | 4 +-
milena/tests/io/dicom/Makefile.am | 4 +-
milena/tests/io/dump/Makefile.am | 2 +-
milena/tests/io/fits/Makefile.am | 2 +-
milena/tests/io/fld/Makefile.am | 5 +-
milena/tests/io/magick/Makefile.am | 2 +-
milena/tests/io/off/Makefile.am | 2 +-
milena/tests/io/pbm/Makefile.am | 2 +-
milena/tests/io/pbms/Makefile.am | 2 +-
milena/tests/io/pfm/Makefile.am | 5 +-
milena/tests/io/pgm/Makefile.am | 2 +-
milena/tests/io/pgms/Makefile.am | 2 +-
milena/tests/io/pnm/Makefile.am | 5 +-
milena/tests/io/ppm/Makefile.am | 2 +-
milena/tests/io/ppms/Makefile.am | 2 +-
milena/tests/io/tiff/Makefile.am | 4 +-
milena/tests/labeling/Makefile.am | 2 +-
milena/tests/linear/Makefile.am | 4 +-
milena/tests/linear/gaussian/Makefile.am | 2 +-
milena/tests/linear/local/Makefile.am | 4 +-
milena/tests/literal/Makefile.am | 4 +-
milena/tests/logical/Makefile.am | 4 +-
milena/tests/make/Makefile.am | 4 +-
milena/tests/math/Makefile.am | 5 +-
milena/tests/metal/Makefile.am | 4 +-
milena/tests/metal/make/Makefile.am | 5 +-
milena/tests/metal/math/Makefile.am | 4 +-
milena/tests/morpho/Makefile.am | 2 +-
milena/tests/morpho/approx/Makefile.am | 2 +-
milena/tests/morpho/attribute/Makefile.am | 4 +-
milena/tests/morpho/closing/Makefile.am | 2 +-
milena/tests/morpho/closing/approx/Makefile.am | 2 +-
milena/tests/morpho/elementary/Makefile.am | 5 +-
milena/tests/morpho/opening/Makefile.am | 2 +-
milena/tests/morpho/opening/approx/Makefile.am | 2 +-
milena/tests/morpho/reconstruction/Makefile.am | 4 +-
.../morpho/reconstruction/by_dilation/Makefile.am | 4 +-
.../morpho/reconstruction/by_erosion/Makefile.am | 4 +-
milena/tests/morpho/tree/Makefile.am | 5 +-
milena/tests/morpho/tree/filter/Makefile.am | 4 +-
milena/tests/morpho/watershed/Makefile.am | 2 +-
milena/tests/norm/Makefile.am | 5 +-
milena/tests/opt/Makefile.am | 5 +-
milena/tests/pw/Makefile.am | 4 +-
milena/tests/registration/Makefile.am | 5 +-
milena/tests/set/Makefile.am | 4 +-
milena/tests/subsampling/Makefile.am | 2 +-
milena/tests/tag/Makefile.am | 5 +-
milena/tests/test/Makefile.am | 5 +-
milena/tests/tests.mk | 8 +-
milena/tests/topo/Makefile.am | 5 +-
milena/tests/topo/skeleton/Makefile.am | 4 +-
milena/tests/trace/Makefile.am | 5 +-
milena/tests/trait/Makefile.am | 4 +-
milena/tests/trait/image/Makefile.am | 4 +-
milena/tests/trait/op/Makefile.am | 4 +-
milena/tests/trait/value/Makefile.am | 4 +-
milena/tests/transform/Makefile.am | 5 +-
milena/tests/unit_test/Makefile.am | 4 +-
milena/tests/upscaling/Makefile.am | 4 +-
milena/tests/upscaling/art/Makefile.am | 4 +-
milena/tests/util/Makefile.am | 4 +-
milena/tests/value/Makefile.am | 4 +-
milena/tests/value/builtin/Makefile.am | 2 +-
milena/tests/value/concept/Makefile.am | 5 +-
milena/tests/win/Makefile.am | 4 +-
milena/tests/world/Makefile.am | 4 +-
milena/tests/world/binary_2d/Makefile.am | 4 +-
milena/tests/world/inter_pixel/Makefile.am | 4 +-
milena/tests/world/inter_pixel/dim2/Makefile.am | 4 +-
milena/tools/Makefile.am | 5 +-
milena/tools/tools.mk | 2 +-
157 files changed, 811 insertions(+), 707 deletions(-)
create mode 120000 milena/AUTHORS
copy {scribo => milena}/COPYING (100%)
copy INSTALL => milena/INSTALL (100%)
copy {scribo => milena}/NEWS (99%)
copy README => milena/README (55%)
copy {build-aux => milena/build-aux}/Makefile.am (100%)
copy {scribo => milena}/build-aux/autotroll.mk (100%)
copy {scribo => milena}/build-aux/build_unit_test.sh (100%)
create mode 120000 milena/build-aux/extra-recursive-targets.mk
copy {scribo => milena}/build-aux/generate_dist_headers.sh (100%)
copy {scribo => milena}/build-aux/regen-recursive.mk (100%)
create mode 120000 milena/build-aux/strip-lrde
copy {build-aux => milena/build-aux}/tex.mk (100%)
copy {build-aux => milena/build-aux}/texi2dvi (100%)
copy configure.ac => milena/configure.ac (60%)
copy {scribo => milena}/m4/autotroll.m4 (100%)
create mode 120000 milena/m4/boost.m4
copy {scribo => milena}/m4/oln-with-lib.m4 (100%)
copy {scribo => milena}/m4/pkg.m4 (100%)
diff --git a/milena/.gitignore b/milena/.gitignore
index 8c2049a..7b3a5ed 100644
--- a/milena/.gitignore
+++ b/milena/.gitignore
@@ -1,3 +1,11 @@
+/build-aux/config.guess
+/build-aux/config.sub
+/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/ltmain.sh
+/build-aux/missing
+/build-aux/py-compile
+
/doc/Doxyfile_user
/doc/user-refman
/doc/user-refman.pdf
@@ -16,4 +24,18 @@
/doc/white-paper.pdf
/doc/white-paper/
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+
/tests/unit_test/mln_*.cc
+
+/*aclocal.m4
+/autom4te.cache*
+/config.h
+/config.h?in*
+/config.hin
+/configure
+/configure.scan
diff --git a/milena/AUTHORS b/milena/AUTHORS
new file mode 120000
index 0000000..9eadf71
--- /dev/null
+++ b/milena/AUTHORS
@@ -0,0 +1 @@
+../AUTHORS
\ No newline at end of file
diff --git a/scribo/COPYING b/milena/COPYING
similarity index 100%
copy from scribo/COPYING
copy to milena/COPYING
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 8e94f5d..3812f84 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,173 @@
2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+ Autoconfiscate Milena.
+
+ * configure.ac: New.
+ * Makefile.am (ACLOCAL_AMFLAGS): New.
+ (SUBDIRS): Add build-aux.
+ (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES): New.
+ (dist-hook): New target.
+ * AUTHORS: New.
+ * NEWS: New (imported from Olena and updated).
+ * COPYING: New (imported from Olena).
+ * INSTALL: New (generated by Automake).
+ * README: New.
+ * m4/autotroll.m4,
+ * m4/boost.m4,
+ * m4/oln-with-lib.m4,
+ * m4/pkg.m4:
+ New (imported from Olena).
+ * build-aux/autotroll.mk,
+ * build-aux/build_unit_test.sh,
+ * build-aux/extra-recursive-targets.mk,
+ * build-aux/generate_dist_headers.sh,
+ * build-aux/regen-recursive.mk,
+ * build-aux/tex.mk,
+ * build-aux/texi2dvi:
+ New (imported from Olena).
+ * build-aux/Makefile.am: New.
+ * apps/constrained-connectivity/Makefile.am,
+ * apps/graph-morpho/Makefile.am,
+ * apps/mesh-segm-skel/Makefile.am,
+ * apps/papers/levillain.09.ismm/Makefile.am,
+ * doc/Makefile.am,
+ * mesh/Makefile.am,
+ * tests/Makefile.am,
+ * tests/accu/Makefile.am,
+ * tests/accu/image/Makefile.am,
+ * tests/accu/math/Makefile.am,
+ * tests/accu/shape/Makefile.am,
+ * tests/accu/site_set/Makefile.am,
+ * tests/accu/stat/Makefile.am,
+ * tests/algebra/Makefile.am,
+ * tests/arith/Makefile.am,
+ * tests/binarization/Makefile.am,
+ * tests/border/Makefile.am,
+ * tests/canvas/Makefile.am,
+ * tests/canvas/browsing/Makefile.am,
+ * tests/canvas/morpho/Makefile.am,
+ * tests/convert/Makefile.am,
+ * tests/convert/impl/Makefile.am,
+ * tests/core/Makefile.am,
+ * tests/core/alias/Makefile.am,
+ * tests/core/image/Makefile.am,
+ * tests/core/image/dmorph/Makefile.am,
+ * tests/core/image/imorph/Makefile.am,
+ * tests/core/image/vmorph/Makefile.am,
+ * tests/core/other/Makefile.am,
+ * tests/core/routine/Makefile.am,
+ * tests/core/site_set/Makefile.am,
+ * tests/data/Makefile.am,
+ * tests/data/approx/Makefile.am,
+ * tests/data/naive/Makefile.am,
+ * tests/debug/Makefile.am,
+ * tests/display/Makefile.am,
+ * tests/draw/Makefile.am,
+ * tests/estim/Makefile.am,
+ * tests/extension/Makefile.am,
+ * tests/extract/Makefile.am,
+ * tests/fun/Makefile.am,
+ * tests/fun/i2v/Makefile.am,
+ * tests/fun/p2b/Makefile.am,
+ * tests/fun/p2p/Makefile.am,
+ * tests/fun/p2v/Makefile.am,
+ * tests/fun/stat/Makefile.am,
+ * tests/fun/v2i/Makefile.am,
+ * tests/fun/v2v/Makefile.am,
+ * tests/fun/vv2v/Makefile.am,
+ * tests/fun/x2x/Makefile.am,
+ * tests/geom/Makefile.am,
+ * tests/graph/Makefile.am,
+ * tests/graph/attribute/Makefile.am,
+ * tests/histo/Makefile.am,
+ * tests/io/Makefile.am,
+ * tests/io/dicom/Makefile.am,
+ * tests/io/dump/Makefile.am,
+ * tests/io/fits/Makefile.am,
+ * tests/io/fld/Makefile.am,
+ * tests/io/magick/Makefile.am,
+ * tests/io/off/Makefile.am,
+ * tests/io/pbm/Makefile.am,
+ * tests/io/pbms/Makefile.am,
+ * tests/io/pfm/Makefile.am,
+ * tests/io/pgm/Makefile.am,
+ * tests/io/pgms/Makefile.am,
+ * tests/io/pnm/Makefile.am,
+ * tests/io/ppm/Makefile.am,
+ * tests/io/ppms/Makefile.am,
+ * tests/io/tiff/Makefile.am,
+ * tests/labeling/Makefile.am,
+ * tests/linear/Makefile.am,
+ * tests/linear/gaussian/Makefile.am,
+ * tests/linear/local/Makefile.am,
+ * tests/literal/Makefile.am,
+ * tests/logical/Makefile.am,
+ * tests/make/Makefile.am,
+ * tests/math/Makefile.am,
+ * tests/metal/Makefile.am,
+ * tests/metal/make/Makefile.am,
+ * tests/metal/math/Makefile.am,
+ * tests/morpho/Makefile.am,
+ * tests/morpho/approx/Makefile.am,
+ * tests/morpho/attribute/Makefile.am,
+ * tests/morpho/closing/Makefile.am,
+ * tests/morpho/closing/approx/Makefile.am,
+ * tests/morpho/elementary/Makefile.am,
+ * tests/morpho/opening/Makefile.am,
+ * tests/morpho/opening/approx/Makefile.am,
+ * tests/morpho/reconstruction/Makefile.am,
+ * tests/morpho/reconstruction/by_dilation/Makefile.am,
+ * tests/morpho/reconstruction/by_erosion/Makefile.am,
+ * tests/morpho/tree/Makefile.am,
+ * tests/morpho/tree/filter/Makefile.am,
+ * tests/morpho/watershed/Makefile.am,
+ * tests/norm/Makefile.am,
+ * tests/opt/Makefile.am,
+ * tests/pw/Makefile.am,
+ * tests/registration/Makefile.am,
+ * tests/set/Makefile.am,
+ * tests/subsampling/Makefile.am,
+ * tests/tag/Makefile.am,
+ * tests/test/Makefile.am,
+ * tests/topo/Makefile.am,
+ * tests/topo/skeleton/Makefile.am,
+ * tests/trace/Makefile.am,
+ * tests/trait/Makefile.am,
+ * tests/trait/image/Makefile.am,
+ * tests/trait/op/Makefile.am,
+ * tests/trait/value/Makefile.am,
+ * tests/transform/Makefile.am,
+ * tests/unit_test/Makefile.am,
+ * tests/upscaling/Makefile.am,
+ * tests/upscaling/art/Makefile.am,
+ * tests/util/Makefile.am,
+ * tests/value/Makefile.am,
+ * tests/value/builtin/Makefile.am,
+ * tests/value/concept/Makefile.am,
+ * tests/win/Makefile.am,
+ * tests/world/Makefile.am,
+ * tests/world/binary_2d/Makefile.am,
+ * tests/world/inter_pixel/Makefile.am,
+ * tests/world/inter_pixel/dim2/Makefile.am,
+ * tools/Makefile.am:
+ Adjust paths.
+ * tests/tests.mk,
+ * tools/tools.mk:
+ Likewise.
+ * apps/data.hh.in,
+ * tests/data.hh.in:
+ Likewise.
+ * apps/constrained-connectivity/test-constrained-connectivity.in,
+ * apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in,
+ * apps/mesh-segm-skel/test-mesh-complex-max-curv.in,
+ * apps/mesh-segm-skel/test-mesh-complex-segm.in,
+ * apps/mesh-segm-skel/test-mesh-complex-skel.in,
+ * apps/mesh-segm-skel/test-mesh-max-curv.in,
+ * apps/mesh-segm-skel/test-mesh-segm.in:
+ Likewise.
+
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
Fix Boost.Tuple handling.
* tests/accu/Makefile.am (tuple_CPPFLAGS): New.
diff --git a/INSTALL b/milena/INSTALL
similarity index 100%
copy from INSTALL
copy to milena/INSTALL
diff --git a/milena/Makefile.am b/milena/Makefile.am
index 769006d..133cbad 100644
--- a/milena/Makefile.am
+++ b/milena/Makefile.am
@@ -15,7 +15,10 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS = \
+ build-aux \
external \
doc \
mesh \
@@ -112,3 +115,96 @@ EXTRA_DIST += \
tests/img/test_rgb8.tif \
tests/img/test_bw.tif \
tests/img/test_gl.tif
+
+
+#<<lrde
+## FIXME: All of this it too much ad hoc. Use Git branches to
+## distinguish distributed files from non distributed ones after the
+## conversion of the repository.
+
+## FIXME: Moreover, this list is partially duplicated in Olena's
+## `Makefile.am', so that pruning also occurs both when rolling an
+## Olena tarball or a (standalone) Milena tarball.
+
+LRDE_STRIPPED_DIST_FILES = \
+ $(distdir)/Makefile.am \
+ $(distdir)/configure.ac \
+ $(distdir)/mln/accu/math/all.hh \
+ $(distdir)/mln/all.hh \
+ $(distdir)/mln/core/image/vmorph/all.hh \
+ $(distdir)/mln/core/image/vmorph/fun_image.hh \
+ $(distdir)/mln/data/all.hh \
+ $(distdir)/mln/essential/routine.hh \
+ $(distdir)/mln/fun/all.hh \
+ $(distdir)/mln/fun/essential.hh \
+ $(distdir)/mln/fun/v2v/all.hh \
+ $(distdir)/mln/fun/v2v/essential.hh \
+ $(distdir)/mln/linear/all.hh \
+ $(distdir)/mln/trait/all.hh \
+ $(distdir)/mln/trait/ch_value.hh \
+ $(distdir)/mln/value/all.hh \
+ $(distdir)/mln/value/essential.hh \
+ $(distdir)/tests/Makefile.am \
+ $(distdir)/tests/convert/Makefile.am \
+ $(distdir)/tests/extract/Makefile.am \
+ $(distdir)/tests/fun/v2v/Makefile.am \
+ $(distdir)/tests/linear/Makefile.am \
+ $(distdir)/tests/linear/gaussian/Makefile.am \
+ $(distdir)/tests/registration/Makefile.am \
+ $(distdir)/tests/trait/ch_value.cc \
+ $(distdir)/tests/value/Makefile.am
+
+LRDE_NODIST_FILES = \
+ $(distdir)/tests/convert/to_hsl.cc \
+ $(distdir)/tests/extract/blue.cc \
+ $(distdir)/tests/extract/green.cc \
+ $(distdir)/tests/extract/hue.cc \
+ $(distdir)/tests/extract/lum.cc \
+ $(distdir)/tests/extract/red.cc \
+ $(distdir)/tests/extract/sat.cc \
+ $(distdir)/tests/fun/v2v/component.cc \
+ $(distdir)/tests/fun/v2v/hsl_to_rgb.cc \
+ $(distdir)/tests/fun/v2v/rgb_to_hsl.cc \
+ $(distdir)/tests/linear/gaussian.cc \
+ $(distdir)/tests/linear/gaussian/filter.cc \
+ $(distdir)/tests/registration/registration.cc \
+ $(distdir)/tests/value/stack.cc
+
+## FIXME: Running `build-aux/build_unit_test.sh' just to update
+## `milena/tests/unit_test/unit-tests.mk' is overkill:
+##
+## 1. It recreates *all* the sources (more than 1200 `.cc' files!).
+## => We should just regen `unit-tests.mk', not the `.cc' files.
+##
+## 2. It visits (almost) all the directories and files under
+## milena/mln/ (which admittedly a smaller issue compared to the
+## previous one)
+## => Prune `unit-tests.mk' instead of regenerating it. The
+## simplest solution is probably to equip `unit-tests.mk' in the
+## first place with `<<lrde'/`>>' tags, then prune it with
+## dist-strip.
+##
+
+# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde).
+# Then, regen files; and if the `distdir' (or `dist' or `distcheck')
+# target was run from Milena's (and not Olena's) source directory,
+# call `autoreconf'.
+dist-hook:
+ for f in $(LRDE_STRIPPED_DIST_FILES); do \
+ $(srcdir)/build-aux/strip-lrde $$f; \
+ done; \
+ rm -rf $(LRDE_NODIST_FILES) \
+ && $(srcdir)/build-aux/build_unit_test.sh \
+ $(distdir)/mln \
+ $(distdir)/tests/unit_test \
+ $(srcdir)/tests/unit_test/disabled_tests \
+ mln \
+ && if test x$(distdir) = x$(top_distdir); then \
+ ( \
+ cd $(distdir); \
+ set -evx; \
+ autoreconf -f -v -i; \
+ find . -name autom4te.cache | xargs rm -rf \
+ ) \
+ fi
+#>>
diff --git a/scribo/NEWS b/milena/NEWS
similarity index 99%
copy from scribo/NEWS
copy to milena/NEWS
index b7abbba..0a303c7 100644
--- a/scribo/NEWS
+++ b/milena/NEWS
@@ -1,11 +1,9 @@
-* Swilena 1.0a
+* Olena 1.0a
- * Starting with Olena 1.1, Scribo is an independent component
+ * Starting with Olena 1.1, Milena is an independent component
of the project, distributed both together with the Olena
package and as a standalone package.
- * Misc fixes and improvements.
-
* Olena 1.0 July 14, 2009
diff --git a/README b/milena/README
similarity index 55%
copy from README
copy to milena/README
index cc49a02..b351d0b 100644
--- a/README
+++ b/milena/README
@@ -19,63 +19,44 @@ The complete GNU General Public License Notice can also be found in
the 'COPYING' file in the root directory.
-=====================
-Introduction to Olena
-=====================
+======================
+Introduction to Milena
+======================
-Olena_, a platform dedicated to image processing.
+Milena is a part of Olena_, a generic and efficient platform
+dedicated to image processing.
.. _Olena: http://olena.lrde.epita.fr
+Milena is a generic C++ library and the core component of the Olena
+project.
---------
-Overview
---------
-
-Olena is a platform dedicated to image processing. At the moment it is
-mainly composed of a C++ library: Milena. This library features many
-tools to easily perform image processing tasks. Its main
-characteristic is its genericity: it allows to write an algorithm once
-and run it over many kinds of images (gray scale, color, 1D, 2D, 3D,
-...).
+Milena is distributed in two ways:
-Olena is a project developed by the `EPITA Research and Development
-Laboratory (LRDE)`__ since 1997. We did numerous prototypes and
-throwaway experiments before settling into the kind of programming
-paradigm which is finally here.
+ * as a component of the Olena package
-__ http://www.lrde.epita.fr
+ * and a standalone package.
-We do our image processing research using this library, but most
-importantly we have gathered (and still do) generic programming
-expertise from the library development.
+If you obtained Milena as an project embedded an Olena package, we
+advise you to read Olena's README, at the top-level directory of the
+package, and not to configure nor compile Milena separately (i.e., do
+not use `milena/configure', use the top-level `configure' instead
+and run `make' from the top-level directory).
-Yet, Olena is an ongoing development project. Few algorithms or
-definitions may change in a near future. A list of potential changes
-is maintained here :
-http://olena.lrde.epita.fr/FeaturesSubjectToChange.
+Otherwise, you are in the case of a standalone package, and you might
+want to read the rest of this file.
-Likewise, the documentation does not cover the whole project yet. In the
-`doc/' directory you will find the first draft of a reference
-manual. It includes a quick reference guide and a tutorial. This is a
-good start. In `milena/tools' and `milena/doc/examples' few sample
-programs are available. Most of them are already used to illustrate
-the tutorial. For the rest, we're afraid you will have to dig the
-code or e-mail us.
-
- Please direct any question or comments to <olena(a)lrde.epita.fr>, or
-<olena-bugs(a)lrde.epita.fr>.
-
- Olena also has a web page, located at
-<http://olena.lrde.epita.fr>.
+==========================================
+Detailed Instructions (Standalone Package)
+==========================================
-----------------
Required Software
-----------------
Here is a non-exhaustive list of required software required to build
-Olena successfully.
+Milena successfully.
* to compile the user examples:
@@ -85,51 +66,6 @@ Olena successfully.
- a `make' utility, like GNU `make'
-Optional:
-
- * to use various image types:
-
- - Magick++
-
- - libtiff
-
- - GDCM
-
-
-==================
-Quick Start Manual
-==================
-
-This section summarizes the installation procedure. For more
-information about building and installing Olena, see the next
-sections.
-
-To install Olena on your system, create a `_build' directory (even
-though it is not mandatory) and type in the classical sequence at the
-command prompt::
-
- mkdir _build
- cd _build
- ../configure
- make
- make install (as root)
-
-Note that an installation is specific to the compiler used to install
-it. Indeed, the call to ``../configure`` enables some workarounds
-and, consequently, users must compile with the same compiler to avoid
-compatibility problems.
-
-Between ``make`` and ``make install``, you may also want to run::
-
- make check
-
- ``make check`` will run the test suite to check the whole library.
-Running the test suite may require up several hours.
-
-
-=====================
-Detailed Instructions
-=====================
-------------
Configuration
@@ -138,10 +74,10 @@ Configuration
In order to prepare the build process, you need to configure the source
tree.
- Assuming your Olena distribution is uncompressed in directory
-`olena-1.0', follow these steps:
+ Assuming your Milena distribution is uncompressed in directory
+`milena-1.1', follow these steps:
- % cd olena-1.0
+ % cd milena-1.1
% mkdir _build
% cd _build
% ../configure
@@ -149,30 +85,11 @@ tree.
The build process can be altered by a number of options you can pass
to the `configure' script. The following sections describe them.
- Additionally, if you are an Olena maintainer (a person who runs
-`make distcheck'), _prefer setting `CXXFLAGS' as an environment
-variable_: the flags given on the command line to `configure' are not
-propagated to recursive runs by `make distcheck'. Or better: use the
-environment CONFIG_SITE to set up a configuration environment (see
-Autoconf's manual).
-
-
-Verbose Display
-===============
-
-A more verbose display can be turned on by passing the
-`--enable-verbose' flag to configure:
-
- % ../configure --enable-verbose
-
-Before configuring files, configure will display a summary of the
-configuration step.
-
Installation Path
=================
-By default, Olena is installed in the standard "local" directory of
+By default, Milena is installed in the standard "local" directory of
your system. This is usually `/usr/local' under Unix.
You can change this path with the following flag:
@@ -216,89 +133,6 @@ C++ flags by giving `configure' your selection of flags:
% ../configure CXXFLAGS="<your-favorite-flags>"
-Additional Components
-=====================
-
-In additional to Milena, several build targets can be enabled. These
-parts are called "components", and you can obtain a list of them by
-running:
-
- % ../configure --help
-
-Swilena
--------
-
-Swilena is an optional component of Olena exposing Milena to other
-languages thanks to the Simplified Wrapper and Interface Generator
-(SWIG_).
-
-.. _SWIG: http://www.swig.org
-
-For the moment, only some Python_ bindings are provided. They are
-disabled by default because they require extra dependencies (SWIG and
-Python).
-
-.. _Python: http://www.python.org
-
-To enable the installation of this module use::
-
- ./configure --enable-swilena
-
-Tools
------
-
-Sample tools are shipped with the tarball. To enable the installation of
-these tools use::
-
- ./configure --enable-tools
-
-Applications
-------------
-Sample applications are shipped with the tarball. To enable the
-installation of these applications use::
-
- ./configure --enable-apps
-
-Trimesh
--------
-
-Trimesh, a third-party library that we have been using to manipulate
-3D meshes, is shipped with Olena. (We will probably drop Trimesh from
-the distribution someday.) To enable it, use::
-
- ./configure --enable-trimesh
-
-Input/output libraries
-----------------------
-
-To read/write TIFF images with Olena, libtiff is required. If
-``configure`` is unable to find libtiff on your system, you can help
-it by specifying the base directory of libtiff, e.g.::
-
- ./configure --with-tiff=/usr/local
-
-To read/write DICOM images with Olena, GDCM is required. Likewise,
-you can tell ``configure`` where to find it by giving its install
-prefix, e.g.::
-
- ./configure --with-gdcm=/usr/local
-
-Olena use Magick++ to read and write images in common formats. As for
-other optional dependencies, you can specify where it is located (if
-needed) at configuration time::
-
- ./configure --with-magickxx=/usr/local/
-
-Other libraries
----------------
-
-The Boost Tuple library is used to implement a tuple accumulator
-class. This project is a part of the Boost libraries; you can help
-configure find these libraries using the `--with-boost flag':
-
- ./configure --with-boost=/usr/local/
-
-
--------
Building
--------
@@ -307,7 +141,7 @@ Once your build directory is `configure'd, you can run
% make
-to recursively build all the selected components.
+to build Milena.
Additionally, you can build and run the test suite with:
@@ -315,14 +149,14 @@ to recursively build all the selected components.
% make check
However, this process is time- and memory- consuming, and you probably
-do not need it except if you are developing/debugging Olena.
+do not need it except if you are developing/debugging Milena.
----------
Installing
----------
-To install the Olena headers and additional files on your system, run:
+To install Milena on your system, run:
% make install
@@ -336,89 +170,72 @@ from the build directory.
* sample images and meshes in `/usr/local/share/olena/images/',
- * the documentation in `/usr/local/share/doc/olena/`
-
-And optionally:
-
- * Swilena's Python bindings in `/usr/local/lib/python2.x/site-packages/',
-
- * Trimesh programs in `/usr/local/bin/',
+ * the documentation in `/usr/local/share/doc/olena/`.
- * Trimesh libraries in `/usr/local/lib/',
- * Trimesh headers in `/usr/local/share/trimesh/',
-
-
- You can later remove Olena from your system by running
+ You can later remove Milena from your system by running
% make uninstall
from the build directory (if you have kept it). We recommend the use
-of GNU Stow (or any similar program) during the installation of Olena,
-to make the uninstallation of Olena easier.
+of GNU Stow (or any similar program) during the installation of Milena,
+to make the uninstallation of Milena easier.
=====================
Layout of the Tarball
=====================
-The Olena project directory layout is as follows:
+The Milena project directory layout is as follows:
+
+apps
+ Application examples.
build-aux
Auxiliary tools used by the GNU Build System during ``configure``
and ``make`` stages.
-external
- Sources of Shipped dependencies.
-
-m4
- Extra Autoconf macros.
+demos
+ Demos of Milena.
-milena
+doc
+ Documentation.
- apps
- Application examples.
-
- mln
- Headers of the Milena library.
-
- tests
- The test suite.
-
- doc
- The documentation.
+external
+ Sources of bundled dependencies.
- tools
- Example tools.
+ trimesh
+ Trimesh2 library.
- mesh
- Some 3D meshes, mostly used for test purpose.
+img
+ Some (2D) images, mostly used for test purpose.
- img
- Some (2D) images, mostly used for test purpose.
+mesh
+ Some 3D meshes, mostly used for test purpose.
- demos
- Demos of Milena.
+mln
+ Headers of the Milena library.
-swilena
+tests
+ The test suite.
- python
- Some Python bindings for Milena.
+tools
+ Example tools.
===================
Supported Platforms
===================
-Olena has been tested on the following configurations:
+Milena has been tested on the following configurations:
=========================== =============================================
System Compiler
=========================== =============================================
-GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 3.4, 4.0, 4.1, 4.2 and 4.3
+GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 4.1, 4.2 and 4.4
GNU/Linux on IA-32 icpc (Intel C/C++ Compiler) 10.1 and 11.0
GNU/Linux on AMD64/Intel 64 g++ (GNU GCC) 4.1
-Mac OS X (10.5) on IA-32 g++ (GNU GCC) 4.0.1
+Mac OS X (10.6) on IA-32 g++ (GNU GCC) 4.2.1
=========================== =============================================
@@ -433,7 +250,7 @@ To enable I/O with GDCM images, `GDCM`_ must be installed.
.. _GDCM: http://sourceforge.net/apps/mediawiki/gdcm/
-To support many image formats in Olena's I/O system, `Magick++`_ must
+To support many image formats in Milena's I/O system, `Magick++`_ must
be installed.
.. _Magick++: http://www.imagemagick.org/Magick++/
@@ -466,7 +283,7 @@ There are other sources of interest in the distribution.
License
=======
-Olena is released under the GNU General Public Licence. See the file
+Milena is released under the GNU General Public Licence. See the file
``COPYING`` (at the root of the source tree) for details.
@@ -487,7 +304,7 @@ mail address follows.
Bibliography
============
-Further information about Olena can be found into the following related
+Further information about Milena can be found into the following related
papers.
About Image Processing Programming:
diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am
index 84a6ed2..f5c563d 100644
--- a/milena/apps/constrained-connectivity/Makefile.am
+++ b/milena/apps/constrained-connectivity/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -15,7 +15,7 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
diff --git a/milena/apps/constrained-connectivity/test-constrained-connectivity.in b/milena/apps/constrained-connectivity/test-constrained-connectivity.in
index a0d6a88..42090b5 100644
--- a/milena/apps/constrained-connectivity/test-constrained-connectivity.in
+++ b/milena/apps/constrained-connectivity/test-constrained-connectivity.in
@@ -18,6 +18,6 @@
set -ex
-srcdir="@top_srcdir@/milena/apps/constrained-connectivity"
+srcdir="@top_srcdir@/apps/constrained-connectivity"
time ./constrained-connectivity "$srcdir/soille.pgm"
diff --git a/milena/apps/data.hh.in b/milena/apps/data.hh.in
index 8adb35f..8a64e47 100644
--- a/milena/apps/data.hh.in
+++ b/milena/apps/data.hh.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
@@ -33,9 +33,9 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the img directory of Milena.
-# define MLN_IMG_DIR "@abs_top_srcdir@/milena/img"
+# define MLN_IMG_DIR "@abs_top_srcdir@/img"
/// The absolute path to the apps directory of Milena.
-# define MLN_APPS_DIR "@abs_top_srcdir@/milena/apps/"
+# define MLN_APPS_DIR "@abs_top_srcdir@/apps"
#endif // ! APPS_DATA_HH
diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am
index 7e3d4db..8f2e551 100644
--- a/milena/apps/graph-morpho/Makefile.am
+++ b/milena/apps/graph-morpho/Makefile.am
@@ -15,7 +15,7 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am
index 78bc7ca..7794c48 100644
--- a/milena/apps/mesh-segm-skel/Makefile.am
+++ b/milena/apps/mesh-segm-skel/Makefile.am
@@ -16,12 +16,12 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Linking with gluit and GLUT/OpenGL.
-gluit_builddir = $(top_builddir)/milena/external/trimesh/gluit
-include $(top_srcdir)/milena/external/trimesh/gluit/gluit.mk
+gluit_builddir = $(top_builddir)/external/trimesh/gluit
+include $(top_srcdir)/external/trimesh/gluit/gluit.mk
# Find Milena and trimesh headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena
-CPPFLAGS_trimesh = -I$(top_srcdir)/milena/external/trimesh/include
+AM_CPPFLAGS = -I$(top_srcdir)
+CPPFLAGS_trimesh = -I$(top_srcdir)/external/trimesh/include
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
@@ -32,7 +32,7 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS)
# LDFLAGS_trimesh instead. Likewise for CPPFLAGS_trimesh and
# LDADD_trimesh, for symmetry reasons.
LDFLAGS_trimesh = $(GLFLAGS)
-LDADD_trimesh = -L$(top_builddir)/milena/external/trimesh/libsrc -ltrimesh $(GLLIBS)
+LDADD_trimesh = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS)
bin_PROGRAMS =
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
index ac5a1e7..09ed25b 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-max-curv-segm $mesh_dir/socket.off 25 socket-complex-max-curv-segm.off
time ./mesh-complex-max-curv-segm $mesh_dir/teapot.off 50 teapot-complex-max-curv-segm.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
index a60eede..dd29cfe 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,6 +19,6 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-max-curv $mesh_dir/teapot.off teapot-complex-max-curv.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
index 58cd47e..8b72ae8 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-segm $mesh_dir/socket-max-curv.off 25 socket-max-curv-segm.off
time ./mesh-complex-segm $mesh_dir/teapot-max-curv.off 50 teapot-max-curv-segm.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
index f6b787b..a4a711f 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +18,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-skel $mesh_dir/three-triangles.off 1 three-triangles-skel.off
time ./mesh-complex-skel $mesh_dir/socket-max-curv.off 10 socket-max-curv-skel.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
index e5eaf96..00c554b 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,6 +19,6 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-max-curv $mesh_dir/teapot.off teapot-max-curv.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-segm.in b/milena/apps/mesh-segm-skel/test-mesh-segm.in
index e70e63a..3038a6c 100755
--- a/milena/apps/mesh-segm-skel/test-mesh-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-segm $mesh_dir/socket.off 25 socket-segm.off
time ./mesh-segm $mesh_dir/teapot.off 50 teapot-segm.off
diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am
index ec5d328..4dd172b 100644
--- a/milena/apps/papers/levillain.09.ismm/Makefile.am
+++ b/milena/apps/papers/levillain.09.ismm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -17,7 +18,7 @@
# Illustrations from the ISMM 2009 paper.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
@@ -37,7 +38,7 @@ dist_noinst_DATA = seeds.pgm m283-c.off
noinst_DATA = lena-s.ppm graph-s.png m283-s.off
MOSTLYCLEANFILES = $(noinst_DATA) graph-s.neato
-lena-s.ppm: $(top_srcdir)/milena/img/lena.pgm image2d$(EXEEXT)
+lena-s.ppm: $(top_srcdir)/img/lena.pgm image2d$(EXEEXT)
./image2d$(EXEEXT) $< 1000 $@
graph-s.png: graph-s.neato
diff --git a/build-aux/Makefile.am b/milena/build-aux/Makefile.am
similarity index 100%
copy from build-aux/Makefile.am
copy to milena/build-aux/Makefile.am
diff --git a/scribo/build-aux/autotroll.mk b/milena/build-aux/autotroll.mk
similarity index 100%
copy from scribo/build-aux/autotroll.mk
copy to milena/build-aux/autotroll.mk
diff --git a/scribo/build-aux/build_unit_test.sh b/milena/build-aux/build_unit_test.sh
similarity index 100%
copy from scribo/build-aux/build_unit_test.sh
copy to milena/build-aux/build_unit_test.sh
diff --git a/milena/build-aux/extra-recursive-targets.mk b/milena/build-aux/extra-recursive-targets.mk
new file mode 120000
index 0000000..dabc25d
--- /dev/null
+++ b/milena/build-aux/extra-recursive-targets.mk
@@ -0,0 +1 @@
+../../build-aux/extra-recursive-targets.mk
\ No newline at end of file
diff --git a/scribo/build-aux/generate_dist_headers.sh b/milena/build-aux/generate_dist_headers.sh
similarity index 100%
copy from scribo/build-aux/generate_dist_headers.sh
copy to milena/build-aux/generate_dist_headers.sh
diff --git a/scribo/build-aux/regen-recursive.mk b/milena/build-aux/regen-recursive.mk
similarity index 100%
copy from scribo/build-aux/regen-recursive.mk
copy to milena/build-aux/regen-recursive.mk
diff --git a/milena/build-aux/strip-lrde b/milena/build-aux/strip-lrde
new file mode 120000
index 0000000..11926a1
--- /dev/null
+++ b/milena/build-aux/strip-lrde
@@ -0,0 +1 @@
+../../build-aux/strip-lrde
\ No newline at end of file
diff --git a/build-aux/tex.mk b/milena/build-aux/tex.mk
similarity index 100%
copy from build-aux/tex.mk
copy to milena/build-aux/tex.mk
diff --git a/build-aux/texi2dvi b/milena/build-aux/texi2dvi
similarity index 100%
copy from build-aux/texi2dvi
copy to milena/build-aux/texi2dvi
diff --git a/configure.ac b/milena/configure.ac
similarity index 60%
copy from configure.ac
copy to milena/configure.ac
index 074672f..8ae6c3e 100644
--- a/configure.ac
+++ b/milena/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.61])
## Package set up. ##
## ---------------- ##
-AC_INIT([Olena], [1.0a], [olena(a)lrde.epita.fr], [olena])
+AC_INIT([Milena], [1.0a], [olena(a)lrde.epita.fr], [milena])
# M4 macros.
AC_CONFIG_MACRO_DIR([m4])
@@ -37,7 +37,7 @@ AC_CONFIG_FILES([build-aux/Makefile])
AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall])
# Package metadata.
-AC_CONFIG_FILES([milena/mln/version.hh])
+AC_CONFIG_FILES([mln/version.hh])
AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"],
[Package Full name.])
AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
@@ -72,8 +72,8 @@ if test "$GXX" = yes; then
# The code generated for mln::data::impl::memcpy__() by g++ 4.2 with
# a high optimization level (`-O3') and without
# `-fno-strict-aliasing' might be wrong, at least with Debian's g++
- # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this
- # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc.
+ # 4.2 on IA-32 (see also mln/memcpy_.hh). We observed this
+ # behavior with e.g. apps/graph-morpho/samples-image2d.cc.
# Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine.
#
# So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS
@@ -154,7 +154,7 @@ fi
## ``Enable Everything'' Switch. ##
## ------------------------------ ##
-# Enable all bundled features (trimesh2, Swilena, apps, tools). This
+# Enable all bundled features (trimesh2, apps, tools). This
# option is useful to maintainers to ensure they do not break optional
# parts while modifying the core of the project. If both
# ``--enable-all'' is set and a given feature is disabled (say,
@@ -164,10 +164,6 @@ AC_ARG_ENABLE([all],
[AS_HELP_STRING([--enable-all], [enable maintainer mode])],
[if test "x$enable_all" != xno; then
enable_trimesh=yes
- enable_swilena=yes
-dnl<<lrde
- enable_scribo=yes
-dnl>>
enable_apps=yes
enable_tools=yes
fi])
@@ -239,39 +235,22 @@ OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm],
[ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8],
[ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]))
-# ---------------------------- #
-# (Bundled) trimesh2 library. #
-# ---------------------------- #
+
+## ---------------------------- ##
+## External, bundled projects. ##
+## ---------------------------- ##
+
+AC_CONFIG_FILES([external/Makefile])
+
+# ------------------ ##
+# Trimesh2 library. ##
+# ------------------ ##
AC_ARG_ENABLE([trimesh],
[AS_HELP_STRING([--enable-trimesh],
[build the (bundled) trimesh2 library])])
AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes])
-AC_CONFIG_SUBDIRS([milena/external/trimesh])
-
-
-## --------- ##
-## Swilena. ##
-## --------- ##
-
-AC_ARG_ENABLE([swilena],
- [AS_HELP_STRING([--enable-swilena],
- [build Swilena Python bindings])])
-AM_CONDITIONAL([ENABLE_SWILENA], [test "x$enable_swilena" = xyes])
-AC_CONFIG_SUBDIRS([swilena])
-
-
-dnl<<lrde
-## -------- ##
-## Scribo. ##
-## -------- ##
-
-AC_ARG_ENABLE([scribo],
- [AS_HELP_STRING([--enable-scribo],
- [enable Scribo])])
-AM_CONDITIONAL([ENABLE_SCRIBO], [test "x$enable_scribo" = xyes])
-AC_CONFIG_SUBDIRS([scribo])
-dnl>>
+AC_CONFIG_SUBDIRS([external/trimesh])
## --------------- ##
@@ -281,17 +260,15 @@ dnl>>
# Ask for config.h creation.
AC_CONFIG_HEADERS([config.h])
-# Ask for the creation of a milena/doc/tool/data.hh, used to access to
+# Ask for the creation of a doc/tool/data.hh, used to access to
# data (images) from the documentation.
-AC_CONFIG_FILES([milena/doc/tools/data.hh])
+AC_CONFIG_FILES([doc/tools/data.hh])
# Ask for the Makefile creations.
AC_CONFIG_FILES([
Makefile
- milena/Makefile
- milena/doc/Makefile
- milena/external/Makefile
- milena/mesh/Makefile
+ doc/Makefile
+ mesh/Makefile
])
@@ -299,132 +276,132 @@ AC_CONFIG_FILES([
## Tests. ##
## ------- ##
-# Ask for the creation of a milena/tests/data.hh, used to access to
+# Ask for the creation of a tests/data.hh, used to access to
# data (images) from tests.
-AC_CONFIG_FILES([milena/tests/data.hh])
+AC_CONFIG_FILES([tests/data.hh])
# Ask for the creation of tests' Makefiles.
AC_CONFIG_FILES([
- milena/tests/Makefile
- milena/tests/accu/Makefile
- milena/tests/accu/image/Makefile
- milena/tests/accu/site_set/Makefile
- milena/tests/accu/stat/Makefile
- milena/tests/accu/math/Makefile
- milena/tests/accu/shape/Makefile
- milena/tests/algebra/Makefile
- milena/tests/arith/Makefile
- milena/tests/binarization/Makefile
- milena/tests/border/Makefile
- milena/tests/canvas/Makefile
- milena/tests/canvas/browsing/Makefile
- milena/tests/canvas/morpho/Makefile
- milena/tests/convert/Makefile
- milena/tests/convert/impl/Makefile
- milena/tests/core/Makefile
- milena/tests/core/alias/Makefile
- milena/tests/core/image/Makefile
- milena/tests/core/image/dmorph/Makefile
- milena/tests/core/image/imorph/Makefile
- milena/tests/core/image/vmorph/Makefile
- milena/tests/core/other/Makefile
- milena/tests/core/routine/Makefile
- milena/tests/core/site_set/Makefile
- milena/tests/data/Makefile
- milena/tests/data/approx/Makefile
- milena/tests/data/naive/Makefile
- milena/tests/debug/Makefile
- milena/tests/display/Makefile
- milena/tests/draw/Makefile
- milena/tests/estim/Makefile
- milena/tests/extension/Makefile
- milena/tests/fun/Makefile
- milena/tests/fun/i2v/Makefile
- milena/tests/fun/p2b/Makefile
- milena/tests/fun/p2p/Makefile
- milena/tests/fun/p2v/Makefile
- milena/tests/fun/stat/Makefile
- milena/tests/fun/v2v/Makefile
- milena/tests/fun/vv2v/Makefile
- milena/tests/fun/x2x/Makefile
- milena/tests/geom/Makefile
- milena/tests/graph/Makefile
- milena/tests/graph/attribute/Makefile
- milena/tests/histo/Makefile
- milena/tests/io/Makefile
- milena/tests/io/dicom/Makefile
- milena/tests/io/dump/Makefile
- milena/tests/io/fits/Makefile
- milena/tests/io/fld/Makefile
- milena/tests/io/magick/Makefile
- milena/tests/io/off/Makefile
- milena/tests/io/pbm/Makefile
- milena/tests/io/pbms/Makefile
- milena/tests/io/pfm/Makefile
- milena/tests/io/pgm/Makefile
- milena/tests/io/pgms/Makefile
- milena/tests/io/pnm/Makefile
- milena/tests/io/ppm/Makefile
- milena/tests/io/ppms/Makefile
- milena/tests/io/tiff/Makefile
- milena/tests/labeling/Makefile
- milena/tests/linear/Makefile
- milena/tests/linear/local/Makefile
- milena/tests/literal/Makefile
- milena/tests/logical/Makefile
- milena/tests/make/Makefile
- milena/tests/math/Makefile
- milena/tests/metal/Makefile
- milena/tests/metal/make/Makefile
- milena/tests/metal/math/Makefile
- milena/tests/morpho/Makefile
- milena/tests/morpho/approx/Makefile
- milena/tests/morpho/attribute/Makefile
- milena/tests/morpho/closing/Makefile
- milena/tests/morpho/closing/approx/Makefile
- milena/tests/morpho/elementary/Makefile
- milena/tests/morpho/opening/Makefile
- milena/tests/morpho/opening/approx/Makefile
- milena/tests/morpho/reconstruction/Makefile
- milena/tests/morpho/reconstruction/by_dilation/Makefile
- milena/tests/morpho/reconstruction/by_erosion/Makefile
- milena/tests/morpho/tree/Makefile
- milena/tests/morpho/tree/filter/Makefile
- milena/tests/morpho/watershed/Makefile
- milena/tests/norm/Makefile
- milena/tests/opt/Makefile
- milena/tests/pw/Makefile
- milena/tests/set/Makefile
- milena/tests/tag/Makefile
- milena/tests/test/Makefile
- milena/tests/topo/Makefile
- milena/tests/topo/skeleton/Makefile
- milena/tests/trace/Makefile
- milena/tests/trait/Makefile
- milena/tests/trait/image/Makefile
- milena/tests/trait/op/Makefile
- milena/tests/trait/value/Makefile
- milena/tests/transform/Makefile
- milena/tests/unit_test/Makefile
- milena/tests/upscaling/Makefile
- milena/tests/upscaling/art/Makefile
- milena/tests/util/Makefile
- milena/tests/value/Makefile
- milena/tests/value/builtin/Makefile
- milena/tests/value/concept/Makefile
- milena/tests/win/Makefile
- milena/tests/world/Makefile
- milena/tests/world/binary_2d/Makefile
- milena/tests/world/inter_pixel/Makefile
- milena/tests/world/inter_pixel/dim2/Makefile
+ tests/Makefile
+ tests/accu/Makefile
+ tests/accu/image/Makefile
+ tests/accu/site_set/Makefile
+ tests/accu/stat/Makefile
+ tests/accu/math/Makefile
+ tests/accu/shape/Makefile
+ tests/algebra/Makefile
+ tests/arith/Makefile
+ tests/binarization/Makefile
+ tests/border/Makefile
+ tests/canvas/Makefile
+ tests/canvas/browsing/Makefile
+ tests/canvas/morpho/Makefile
+ tests/convert/Makefile
+ tests/convert/impl/Makefile
+ tests/core/Makefile
+ tests/core/alias/Makefile
+ tests/core/image/Makefile
+ tests/core/image/dmorph/Makefile
+ tests/core/image/imorph/Makefile
+ tests/core/image/vmorph/Makefile
+ tests/core/other/Makefile
+ tests/core/routine/Makefile
+ tests/core/site_set/Makefile
+ tests/data/Makefile
+ tests/data/approx/Makefile
+ tests/data/naive/Makefile
+ tests/debug/Makefile
+ tests/display/Makefile
+ tests/draw/Makefile
+ tests/estim/Makefile
+ tests/extension/Makefile
+ tests/fun/Makefile
+ tests/fun/i2v/Makefile
+ tests/fun/p2b/Makefile
+ tests/fun/p2p/Makefile
+ tests/fun/p2v/Makefile
+ tests/fun/stat/Makefile
+ tests/fun/v2v/Makefile
+ tests/fun/vv2v/Makefile
+ tests/fun/x2x/Makefile
+ tests/geom/Makefile
+ tests/graph/Makefile
+ tests/graph/attribute/Makefile
+ tests/histo/Makefile
+ tests/io/Makefile
+ tests/io/dicom/Makefile
+ tests/io/dump/Makefile
+ tests/io/fits/Makefile
+ tests/io/fld/Makefile
+ tests/io/magick/Makefile
+ tests/io/off/Makefile
+ tests/io/pbm/Makefile
+ tests/io/pbms/Makefile
+ tests/io/pfm/Makefile
+ tests/io/pgm/Makefile
+ tests/io/pgms/Makefile
+ tests/io/pnm/Makefile
+ tests/io/ppm/Makefile
+ tests/io/ppms/Makefile
+ tests/io/tiff/Makefile
+ tests/labeling/Makefile
+ tests/linear/Makefile
+ tests/linear/local/Makefile
+ tests/literal/Makefile
+ tests/logical/Makefile
+ tests/make/Makefile
+ tests/math/Makefile
+ tests/metal/Makefile
+ tests/metal/make/Makefile
+ tests/metal/math/Makefile
+ tests/morpho/Makefile
+ tests/morpho/approx/Makefile
+ tests/morpho/attribute/Makefile
+ tests/morpho/closing/Makefile
+ tests/morpho/closing/approx/Makefile
+ tests/morpho/elementary/Makefile
+ tests/morpho/opening/Makefile
+ tests/morpho/opening/approx/Makefile
+ tests/morpho/reconstruction/Makefile
+ tests/morpho/reconstruction/by_dilation/Makefile
+ tests/morpho/reconstruction/by_erosion/Makefile
+ tests/morpho/tree/Makefile
+ tests/morpho/tree/filter/Makefile
+ tests/morpho/watershed/Makefile
+ tests/norm/Makefile
+ tests/opt/Makefile
+ tests/pw/Makefile
+ tests/set/Makefile
+ tests/tag/Makefile
+ tests/test/Makefile
+ tests/topo/Makefile
+ tests/topo/skeleton/Makefile
+ tests/trace/Makefile
+ tests/trait/Makefile
+ tests/trait/image/Makefile
+ tests/trait/op/Makefile
+ tests/trait/value/Makefile
+ tests/transform/Makefile
+ tests/unit_test/Makefile
+ tests/upscaling/Makefile
+ tests/upscaling/art/Makefile
+ tests/util/Makefile
+ tests/value/Makefile
+ tests/value/builtin/Makefile
+ tests/value/concept/Makefile
+ tests/win/Makefile
+ tests/world/Makefile
+ tests/world/binary_2d/Makefile
+ tests/world/inter_pixel/Makefile
+ tests/world/inter_pixel/dim2/Makefile
])
dnl<<lrde
AC_CONFIG_FILES([
- milena/tests/extract/Makefile
- milena/tests/linear/gaussian/Makefile
- milena/tests/registration/Makefile
- milena/tests/subsampling/Makefile
+ tests/extract/Makefile
+ tests/linear/gaussian/Makefile
+ tests/registration/Makefile
+ tests/subsampling/Makefile
])
dnl>>
@@ -433,9 +410,9 @@ dnl>>
## Applications. ##
## -------------- ##
-# Ask for the creation of a milena/apps/data.hh, used to access to
+# Ask for the creation of a apps/data.hh, used to access to
# data (images) from apps.
-AC_CONFIG_FILES([milena/apps/data.hh])
+AC_CONFIG_FILES([apps/data.hh])
AC_ARG_ENABLE([apps],
[AS_HELP_STRING([--enable-apps],
@@ -444,32 +421,32 @@ AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"])
# Ask for the creation of applications' Makefiles.
AC_CONFIG_FILES([
- milena/apps/Makefile
- milena/apps/constrained-connectivity/Makefile
- milena/apps/graph-morpho/Makefile
- milena/apps/mesh-segm-skel/Makefile
- milena/apps/papers/Makefile
- milena/apps/papers/levillain.09.ismm/Makefile
+ apps/Makefile
+ apps/constrained-connectivity/Makefile
+ apps/graph-morpho/Makefile
+ apps/mesh-segm-skel/Makefile
+ apps/papers/Makefile
+ apps/papers/levillain.09.ismm/Makefile
])
# Configure tests.
# FIXME: Consider using `sed' instead of `configure' to create these
# tests for the sake of speed.
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-skel],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel])
-
-AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectivity],
- [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-max-curv],
+ [chmod +x apps/mesh-segm-skel/test-mesh-max-curv])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-max-curv],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-max-curv])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-skel],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-skel])
+
+AC_CONFIG_FILES([apps/constrained-connectivity/test-constrained-connectivity],
+ [chmod +x apps/constrained-connectivity/test-constrained-connectivity])
# Flags for apps.
AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications])
@@ -491,7 +468,7 @@ AC_ARG_ENABLE([tools],
AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"])
# Ask for the creation of tools' Makefiles.
-AC_CONFIG_FILES([milena/tools/Makefile])
+AC_CONFIG_FILES([tools/Makefile])
# Flags for tools.
AC_ARG_VAR([TOOLS_CXXFLAGS], [C++ compiler flags for tools])
@@ -536,23 +513,8 @@ CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio
GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm
Magick++ --with-magickxx $oln_have_magickxx
Qt --with-qt $oln_have_qt
-Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract
TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff
-Trimesh --enable-trimesh $enable_trimesh
--------------------------------------------------------------------------------
-
-
-
-
-===========
-| Modules |
-===========
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Scribo --enable-scribo $enable_scribo
-Swilena --enable-swilena $enable_swilena
+Trimesh --enable-trimesh enable_trimesh
-------------------------------------------------------------------------------
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 273b3d8..e2c9acd 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -18,7 +18,7 @@
# Look for Milena headers in srcdir and for (generated) test headers
# (like data.hh) in builddir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
DOXYGEN = doxygen
@@ -215,7 +215,7 @@ edit = sed -e "s|@ID@|$$Id|" \
-e 's,@builddir\@,$(builddir),g'
$(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in
- Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
+ Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog \
| sed -e 's/\\\$$//g'`; \
$(edit) $< >$@
MAINTAINERCLEANFILES += $(DOXYFILE_USER)
@@ -292,7 +292,7 @@ edit_devel = sed \
$(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in
rm -f $@.tmp
- Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
+ Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog \
| sed -e 's/\\\$$//g'`; \
$(edit) $< >$@.tmp
$(edit_devel) $@.tmp >$@
diff --git a/scribo/m4/autotroll.m4 b/milena/m4/autotroll.m4
similarity index 100%
copy from scribo/m4/autotroll.m4
copy to milena/m4/autotroll.m4
diff --git a/milena/m4/boost.m4 b/milena/m4/boost.m4
new file mode 120000
index 0000000..247b410
--- /dev/null
+++ b/milena/m4/boost.m4
@@ -0,0 +1 @@
+../../m4/boost.m4
\ No newline at end of file
diff --git a/scribo/m4/oln-with-lib.m4 b/milena/m4/oln-with-lib.m4
similarity index 100%
copy from scribo/m4/oln-with-lib.m4
copy to milena/m4/oln-with-lib.m4
diff --git a/scribo/m4/pkg.m4 b/milena/m4/pkg.m4
similarity index 100%
copy from scribo/m4/pkg.m4
copy to milena/m4/pkg.m4
diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am
index eebfaab..c66b9f0 100644
--- a/milena/mesh/Makefile.am
+++ b/milena/mesh/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -49,9 +50,9 @@ dist_mesh_DATA += $(more_meshes)
## Pseudo-inverse curvature of meshes. ##
## ------------------------------------ ##
-mesh_pinv_curv = $(top_builddir)/milena/apps/mesh-segm-skel/mesh-pinv-curv
-mesh_pinv_curv: $(top_srcdir)/milena/apps/mesh-segm-skel/mesh-pinv-curv.cc
- cd $(top_builddir)/milena/apps/mesh-segm-skel/mesh-pinv-curv && \
+mesh_pinv_curv = $(top_builddir)/apps/mesh-segm-skel/mesh-pinv-curv
+mesh_pinv_curv: $(top_srcdir)/apps/mesh-segm-skel/mesh-pinv-curv.cc
+ cd $(top_builddir)/apps/mesh-segm-skel/mesh-pinv-curv && \
$(MAKE) $(AM_MAKEFLAGS) mesh_pinv_curv
# FIXME: *-pinv-curv.off files should not be regenerated
@@ -67,9 +68,9 @@ dist_mesh_DATA += $(pinv_curv)
## Maximum curvature of meshes. ##
## ----------------------------- ##
-mesh_max_curv = $(top_builddir)/milena/apps/mesh-segm-skel/mesh-max-curv
-mesh_max_curv: $(top_srcdir)/milena/apps/mesh-segm-skel/mesh-max-curv.cc
- cd $(top_builddir)/milena/apps/mesh-segm-skel/mesh-max-curv && \
+mesh_max_curv = $(top_builddir)/apps/mesh-segm-skel/mesh-max-curv
+mesh_max_curv: $(top_srcdir)/apps/mesh-segm-skel/mesh-max-curv.cc
+ cd $(top_builddir)/apps/mesh-segm-skel/mesh-max-curv && \
$(MAKE) $(AM_MAKEFLAGS) mesh_max_curv
# FIXME: *-max-curv.off files should not be regenerated
diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am
index 83f946e..198b355 100644
--- a/milena/tests/Makefile.am
+++ b/milena/tests/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
accu \
@@ -88,7 +88,7 @@ TESTS = $(check_PROGRAMS)
EXTRA_DIST = tools/pretty_check.sh
.PHONY: pretty-check
pretty-check:
- $(top_srcdir)/milena/tests/tools/pretty_check.sh
+ $(top_srcdir)/tests/tools/pretty_check.sh
# Regen files recursively.
include $(top_srcdir)/build-aux/regen-recursive.mk
diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am
index d494d46..201aba6 100644
--- a/milena/tests/accu/Makefile.am
+++ b/milena/tests/accu/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
image \
diff --git a/milena/tests/accu/image/Makefile.am b/milena/tests/accu/image/Makefile.am
index 141300f..a0cfb24 100644
--- a/milena/tests/accu/image/Makefile.am
+++ b/milena/tests/accu/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
init \
diff --git a/milena/tests/accu/math/Makefile.am b/milena/tests/accu/math/Makefile.am
index ca5358b..a9b0a0f 100644
--- a/milena/tests/accu/math/Makefile.am
+++ b/milena/tests/accu/math/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
count
diff --git a/milena/tests/accu/shape/Makefile.am b/milena/tests/accu/shape/Makefile.am
index 374ce89..7ad278d 100644
--- a/milena/tests/accu/shape/Makefile.am
+++ b/milena/tests/accu/shape/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bbox
diff --git a/milena/tests/accu/site_set/Makefile.am b/milena/tests/accu/site_set/Makefile.am
index a44676e..12386d0 100644
--- a/milena/tests/accu/site_set/Makefile.am
+++ b/milena/tests/accu/site_set/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
rectangularity
diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am
index c331db0..f945239 100644
--- a/milena/tests/accu/stat/Makefile.am
+++ b/milena/tests/accu/stat/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
var \
diff --git a/milena/tests/algebra/Makefile.am b/milena/tests/algebra/Makefile.am
index 471389e..b441e4a 100644
--- a/milena/tests/algebra/Makefile.am
+++ b/milena/tests/algebra/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
h_mat \
diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am
index 89dfc9e..5bd2aae 100644
--- a/milena/tests/arith/Makefile.am
+++ b/milena/tests/arith/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff_abs \
diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am
index 601d163..c299519 100644
--- a/milena/tests/binarization/Makefile.am
+++ b/milena/tests/binarization/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Copyright (C) 2008, 2009, 2010, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
threshold
diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am
index 80241ad..b9f1a7b 100644
--- a/milena/tests/border/Makefile.am
+++ b/milena/tests/border/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
adjust \
diff --git a/milena/tests/canvas/Makefile.am b/milena/tests/canvas/Makefile.am
index d8db016..f98d236 100644
--- a/milena/tests/canvas/Makefile.am
+++ b/milena/tests/canvas/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = browsing morpho
diff --git a/milena/tests/canvas/browsing/Makefile.am b/milena/tests/canvas/browsing/Makefile.am
index 66b5b44..2b53f13 100644
--- a/milena/tests/canvas/browsing/Makefile.am
+++ b/milena/tests/canvas/browsing/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fwd \
diff --git a/milena/tests/canvas/morpho/Makefile.am b/milena/tests/canvas/morpho/Makefile.am
index 0504c8e..ef1e9b1 100644
--- a/milena/tests/canvas/morpho/Makefile.am
+++ b/milena/tests/canvas/morpho/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS=attribute_filter
diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am
index e4e3545..66ec621 100644
--- a/milena/tests/convert/Makefile.am
+++ b/milena/tests/convert/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
include $(top_srcdir)/build-aux/autotroll.mk
SUBDIRS = impl
diff --git a/milena/tests/convert/impl/Makefile.am b/milena/tests/convert/impl/Makefile.am
index a7cb10c..8c4c532 100644
--- a/milena/tests/convert/impl/Makefile.am
+++ b/milena/tests/convert/impl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
from_site_set_to_image
diff --git a/milena/tests/core/Makefile.am b/milena/tests/core/Makefile.am
index ba4b041..b942219 100644
--- a/milena/tests/core/Makefile.am
+++ b/milena/tests/core/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
alias \
diff --git a/milena/tests/core/alias/Makefile.am b/milena/tests/core/alias/Makefile.am
index 9c47da2..51c16fd 100644
--- a/milena/tests/core/alias/Makefile.am
+++ b/milena/tests/core/alias/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box1d \
diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am
index 5ac8889..d3bfb4a 100644
--- a/milena/tests/core/image/Makefile.am
+++ b/milena/tests/core/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
# (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
dmorph \
diff --git a/milena/tests/core/image/dmorph/Makefile.am b/milena/tests/core/image/dmorph/Makefile.am
index 3faee32..0d0240f 100644
--- a/milena/tests/core/image/dmorph/Makefile.am
+++ b/milena/tests/core/image/dmorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
hexa \
diff --git a/milena/tests/core/image/imorph/Makefile.am b/milena/tests/core/image/imorph/Makefile.am
index b019f1c..2d986ca 100644
--- a/milena/tests/core/image/imorph/Makefile.am
+++ b/milena/tests/core/image/imorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
decorated_image \
diff --git a/milena/tests/core/image/vmorph/Makefile.am b/milena/tests/core/image/vmorph/Makefile.am
index 5f7eb98..ef55c8a 100644
--- a/milena/tests/core/image/vmorph/Makefile.am
+++ b/milena/tests/core/image/vmorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
cast_image \
diff --git a/milena/tests/core/other/Makefile.am b/milena/tests/core/other/Makefile.am
index 85ce865..c435eed 100644
--- a/milena/tests/core/other/Makefile.am
+++ b/milena/tests/core/other/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box_runstart_piter \
diff --git a/milena/tests/core/routine/Makefile.am b/milena/tests/core/routine/Makefile.am
index 2640c47..07af185 100644
--- a/milena/tests/core/routine/Makefile.am
+++ b/milena/tests/core/routine/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
duplicate \
diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am
index e092e73..5a29e5f 100644
--- a/milena/tests/core/site_set/Makefile.am
+++ b/milena/tests/core/site_set/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box \
diff --git a/milena/tests/data.hh.in b/milena/tests/data.hh.in
index 1953989..ae6f446 100644
--- a/milena/tests/data.hh.in
+++ b/milena/tests/data.hh.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
@@ -33,12 +33,12 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the img directory of Milena.
-# define MLN_IMG_DIR "@abs_top_srcdir@/milena/img"
+# define MLN_IMG_DIR "@abs_top_srcdir@/img"
/// The absolute path to the img directory of Milena.
-# define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/milena/tests/img"
+# define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/tests/img"
/// The absolute path to the mesh directory of Milena.
-# define MLN_MESH_DIR "@abs_top_srcdir@/milena/mesh"
+# define MLN_MESH_DIR "@abs_top_srcdir@/mesh"
#endif // ! TESTS_DATA_HH
diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am
index 205337e..e24b8c9 100644
--- a/milena/tests/data/Makefile.am
+++ b/milena/tests/data/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = approx naive
diff --git a/milena/tests/data/approx/Makefile.am b/milena/tests/data/approx/Makefile.am
index 6f94721..bebdee0 100644
--- a/milena/tests/data/approx/Makefile.am
+++ b/milena/tests/data/approx/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
median
diff --git a/milena/tests/data/naive/Makefile.am b/milena/tests/data/naive/Makefile.am
index d42bcc6..74787ea 100644
--- a/milena/tests/data/naive/Makefile.am
+++ b/milena/tests/data/naive/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
median
diff --git a/milena/tests/debug/Makefile.am b/milena/tests/debug/Makefile.am
index 0346f1a..f6b51c1 100644
--- a/milena/tests/debug/Makefile.am
+++ b/milena/tests/debug/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
println \
diff --git a/milena/tests/display/Makefile.am b/milena/tests/display/Makefile.am
index bdd6d0f..e8d2789 100644
--- a/milena/tests/display/Makefile.am
+++ b/milena/tests/display/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
# Remember not to execute display tests by default. They require a
# running X11 server (as well as a `pkill' binary...). Perform the
diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am
index c823cfb..3a1b771 100644
--- a/milena/tests/draw/Makefile.am
+++ b/milena/tests/draw/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
line \
diff --git a/milena/tests/estim/Makefile.am b/milena/tests/estim/Makefile.am
index 2490ef9..6d422b5 100644
--- a/milena/tests/estim/Makefile.am
+++ b/milena/tests/estim/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
mean \
diff --git a/milena/tests/extension/Makefile.am b/milena/tests/extension/Makefile.am
index 85f9835..aca0fe2 100644
--- a/milena/tests/extension/Makefile.am
+++ b/milena/tests/extension/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fill
diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am
index 2168f8d..7c7f98e 100644
--- a/milena/tests/extract/Makefile.am
+++ b/milena/tests/extract/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet).
diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am
index 82d6e89..a7776ba 100644
--- a/milena/tests/fun/Makefile.am
+++ b/milena/tests/fun/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
i2v \
diff --git a/milena/tests/fun/i2v/Makefile.am b/milena/tests/fun/i2v/Makefile.am
index a3de8f9..74b140d 100644
--- a/milena/tests/fun/i2v/Makefile.am
+++ b/milena/tests/fun/i2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
all_to \
diff --git a/milena/tests/fun/p2b/Makefile.am b/milena/tests/fun/p2b/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/fun/p2b/Makefile.am
+++ b/milena/tests/fun/p2b/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/fun/p2p/Makefile.am b/milena/tests/fun/p2p/Makefile.am
index 862c78b..bd381a1 100644
--- a/milena/tests/fun/p2p/Makefile.am
+++ b/milena/tests/fun/p2p/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fold \
diff --git a/milena/tests/fun/p2v/Makefile.am b/milena/tests/fun/p2v/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/fun/p2v/Makefile.am
+++ b/milena/tests/fun/p2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/fun/stat/Makefile.am b/milena/tests/fun/stat/Makefile.am
index aac5327..c4c8720 100644
--- a/milena/tests/fun/stat/Makefile.am
+++ b/milena/tests/fun/stat/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
mahalanobis
diff --git a/milena/tests/fun/v2i/Makefile.am b/milena/tests/fun/v2i/Makefile.am
index e67e7d0..a1812c7 100644
--- a/milena/tests/fun/v2i/Makefile.am
+++ b/milena/tests/fun/v2i/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
index_of_value
diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am
index ad0f173..343626a 100644
--- a/milena/tests/fun/v2v/Makefile.am
+++ b/milena/tests/fun/v2v/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
norm \
diff --git a/milena/tests/fun/vv2v/Makefile.am b/milena/tests/fun/vv2v/Makefile.am
index d180e3d..4d5a09b 100644
--- a/milena/tests/fun/vv2v/Makefile.am
+++ b/milena/tests/fun/vv2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
max \
diff --git a/milena/tests/fun/x2x/Makefile.am b/milena/tests/fun/x2x/Makefile.am
index 6ac5c22..27e7f20 100644
--- a/milena/tests/fun/x2x/Makefile.am
+++ b/milena/tests/fun/x2x/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
composed \
diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am
index 670561b..d19f37a 100644
--- a/milena/tests/geom/Makefile.am
+++ b/milena/tests/geom/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bbox \
diff --git a/milena/tests/graph/Makefile.am b/milena/tests/graph/Makefile.am
index 608b6d9..aa534e8 100644
--- a/milena/tests/graph/Makefile.am
+++ b/milena/tests/graph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = attribute
diff --git a/milena/tests/graph/attribute/Makefile.am b/milena/tests/graph/attribute/Makefile.am
index cb07318..22b353a 100644
--- a/milena/tests/graph/attribute/Makefile.am
+++ b/milena/tests/graph/attribute/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/histo/Makefile.am b/milena/tests/histo/Makefile.am
index b5f7e7e..62d8fde 100644
--- a/milena/tests/histo/Makefile.am
+++ b/milena/tests/histo/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
compute \
diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am
index bd6c0a4..6dd7ed3 100644
--- a/milena/tests/io/Makefile.am
+++ b/milena/tests/io/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
## ---------------------- ##
## Built-in I/O support. ##
diff --git a/milena/tests/io/dicom/Makefile.am b/milena/tests/io/dicom/Makefile.am
index d8a4ea8..d06e2ce 100644
--- a/milena/tests/io/dicom/Makefile.am
+++ b/milena/tests/io/dicom/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = dicom
diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am
index dedd818..1c88fcb 100644
--- a/milena/tests/io/dump/Makefile.am
+++ b/milena/tests/io/dump/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dump
diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am
index f692f35..614c40e 100644
--- a/milena/tests/io/fits/Makefile.am
+++ b/milena/tests/io/fits/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(CFITSIO_CPPFLAGS)
AM_LDFLAGS = $(CFITSIO_LDFLAGS)
diff --git a/milena/tests/io/fld/Makefile.am b/milena/tests/io/fld/Makefile.am
index 7cbe50b..58dbbcc 100644
--- a/milena/tests/io/fld/Makefile.am
+++ b/milena/tests/io/fld/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fld2d \
diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am
index c04147f..5414ddb 100644
--- a/milena/tests/io/magick/Makefile.am
+++ b/milena/tests/io/magick/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(MAGICKXX_CPPFLAGS)
AM_LDFLAGS = $(MAGICKXX_LDFLAGS)
diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am
index 4029729..5d1f07b 100644
--- a/milena/tests/io/off/Makefile.am
+++ b/milena/tests/io/off/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load_bin \
diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am
index 690c895..488e240 100644
--- a/milena/tests/io/pbm/Makefile.am
+++ b/milena/tests/io/pbm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pbm \
diff --git a/milena/tests/io/pbms/Makefile.am b/milena/tests/io/pbms/Makefile.am
index f6d9770..459964d 100644
--- a/milena/tests/io/pbms/Makefile.am
+++ b/milena/tests/io/pbms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/pfm/Makefile.am b/milena/tests/io/pfm/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/io/pfm/Makefile.am
+++ b/milena/tests/io/pfm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am
index 8fdc560..fd505ee 100644
--- a/milena/tests/io/pgm/Makefile.am
+++ b/milena/tests/io/pgm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pgm16 \
diff --git a/milena/tests/io/pgms/Makefile.am b/milena/tests/io/pgms/Makefile.am
index c5ac784..7a8fb2e 100644
--- a/milena/tests/io/pgms/Makefile.am
+++ b/milena/tests/io/pgms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/pnm/Makefile.am b/milena/tests/io/pnm/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/io/pnm/Makefile.am
+++ b/milena/tests/io/pnm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am
index 695e5d7..61cda9c 100644
--- a/milena/tests/io/ppm/Makefile.am
+++ b/milena/tests/io/ppm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
ppm16 \
diff --git a/milena/tests/io/ppms/Makefile.am b/milena/tests/io/ppms/Makefile.am
index b11b52b..ffabb4b 100644
--- a/milena/tests/io/ppms/Makefile.am
+++ b/milena/tests/io/ppms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/tiff/Makefile.am b/milena/tests/io/tiff/Makefile.am
index 356214b..57f3edc 100644
--- a/milena/tests/io/tiff/Makefile.am
+++ b/milena/tests/io/tiff/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(TIFF_CPPFLAGS)
AM_LDFLAGS = $(TIFF_LDFLAGS)
diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am
index c272da4..0251353 100644
--- a/milena/tests/labeling/Makefile.am
+++ b/milena/tests/labeling/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
background \
diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am
index 8842b8d..25acf9c 100644
--- a/milena/tests/linear/Makefile.am
+++ b/milena/tests/linear/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
local
diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am
index 952a711..c70892c 100644
--- a/milena/tests/linear/gaussian/Makefile.am
+++ b/milena/tests/linear/gaussian/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet).
diff --git a/milena/tests/linear/local/Makefile.am b/milena/tests/linear/local/Makefile.am
index 9f53cfb..04b4f69 100644
--- a/milena/tests/linear/local/Makefile.am
+++ b/milena/tests/linear/local/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
convolve
diff --git a/milena/tests/literal/Makefile.am b/milena/tests/literal/Makefile.am
index ef86851..658c4c9 100644
--- a/milena/tests/literal/Makefile.am
+++ b/milena/tests/literal/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
black \
diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am
index ca59622..8661090 100644
--- a/milena/tests/logical/Makefile.am
+++ b/milena/tests/logical/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
and \
diff --git a/milena/tests/make/Makefile.am b/milena/tests/make/Makefile.am
index 34e0eff..12465e3 100644
--- a/milena/tests/make/Makefile.am
+++ b/milena/tests/make/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dual_neighb \
diff --git a/milena/tests/math/Makefile.am b/milena/tests/math/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/math/Makefile.am
+++ b/milena/tests/math/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/metal/Makefile.am b/milena/tests/metal/Makefile.am
index bc24893..93c0358 100644
--- a/milena/tests/metal/Makefile.am
+++ b/milena/tests/metal/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = make math
diff --git a/milena/tests/metal/make/Makefile.am b/milena/tests/metal/make/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/metal/make/Makefile.am
+++ b/milena/tests/metal/make/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/metal/math/Makefile.am b/milena/tests/metal/math/Makefile.am
index cc48940..9a7762e 100644
--- a/milena/tests/metal/math/Makefile.am
+++ b/milena/tests/metal/math/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pow \
diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am
index a2e460e..cae082a 100644
--- a/milena/tests/morpho/Makefile.am
+++ b/milena/tests/morpho/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx \
diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am
index fcc347e..1a44c1a 100644
--- a/milena/tests/morpho/approx/Makefile.am
+++ b/milena/tests/morpho/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dilation \
diff --git a/milena/tests/morpho/attribute/Makefile.am b/milena/tests/morpho/attribute/Makefile.am
index ae0a5e5..11ad352 100644
--- a/milena/tests/morpho/attribute/Makefile.am
+++ b/milena/tests/morpho/attribute/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am
index 8502e59..3806130 100644
--- a/milena/tests/morpho/closing/Makefile.am
+++ b/milena/tests/morpho/closing/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx
diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am
index 101bbe5..b0e4de5 100644
--- a/milena/tests/morpho/closing/approx/Makefile.am
+++ b/milena/tests/morpho/closing/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
structural
diff --git a/milena/tests/morpho/elementary/Makefile.am b/milena/tests/morpho/elementary/Makefile.am
index 37a726a..dc047eb 100644
--- a/milena/tests/morpho/elementary/Makefile.am
+++ b/milena/tests/morpho/elementary/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
laplacian \
diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am
index 4c06dc4..519353a 100644
--- a/milena/tests/morpho/opening/Makefile.am
+++ b/milena/tests/morpho/opening/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx
diff --git a/milena/tests/morpho/opening/approx/Makefile.am b/milena/tests/morpho/opening/approx/Makefile.am
index 101bbe5..b0e4de5 100644
--- a/milena/tests/morpho/opening/approx/Makefile.am
+++ b/milena/tests/morpho/opening/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
structural
diff --git a/milena/tests/morpho/reconstruction/Makefile.am b/milena/tests/morpho/reconstruction/Makefile.am
index 4ea328e..cae02a5 100644
--- a/milena/tests/morpho/reconstruction/Makefile.am
+++ b/milena/tests/morpho/reconstruction/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
by_dilation \
diff --git a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
index 48f1460..1bf1f7d 100644
--- a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
+++ b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
index 48f1460..1bf1f7d 100644
--- a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
+++ b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/morpho/tree/Makefile.am b/milena/tests/morpho/tree/Makefile.am
index 303bd7c..7721536 100644
--- a/milena/tests/morpho/tree/Makefile.am
+++ b/milena/tests/morpho/tree/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
compute_attribute_image \
diff --git a/milena/tests/morpho/tree/filter/Makefile.am b/milena/tests/morpho/tree/filter/Makefile.am
index 41a0603..65079aa 100644
--- a/milena/tests/morpho/tree/filter/Makefile.am
+++ b/milena/tests/morpho/tree/filter/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
filter
diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am
index 01a28bc..0237863 100644
--- a/milena/tests/morpho/watershed/Makefile.am
+++ b/milena/tests/morpho/watershed/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
flooding \
diff --git a/milena/tests/norm/Makefile.am b/milena/tests/norm/Makefile.am
index 4c335be..2316660 100644
--- a/milena/tests/norm/Makefile.am
+++ b/milena/tests/norm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
l1 \
diff --git a/milena/tests/opt/Makefile.am b/milena/tests/opt/Makefile.am
index 27f0f0d..5b3e806 100644
--- a/milena/tests/opt/Makefile.am
+++ b/milena/tests/opt/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
at
diff --git a/milena/tests/pw/Makefile.am b/milena/tests/pw/Makefile.am
index ae5a829..422b847 100644
--- a/milena/tests/pw/Makefile.am
+++ b/milena/tests/pw/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
image \
diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am
index 2910259..358e7a3 100644
--- a/milena/tests/registration/Makefile.am
+++ b/milena/tests/registration/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet) and currently disabled.
diff --git a/milena/tests/set/Makefile.am b/milena/tests/set/Makefile.am
index ab6e345..7ac5d69 100644
--- a/milena/tests/set/Makefile.am
+++ b/milena/tests/set/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/subsampling/Makefile.am b/milena/tests/subsampling/Makefile.am
index 7e859b4..6264bfb 100644
--- a/milena/tests/subsampling/Makefile.am
+++ b/milena/tests/subsampling/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/tag/Makefile.am b/milena/tests/tag/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/tag/Makefile.am
+++ b/milena/tests/tag/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/test/Makefile.am b/milena/tests/test/Makefile.am
index 6e42c2c..4242e4f 100644
--- a/milena/tests/test/Makefile.am
+++ b/milena/tests/test/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
positive
diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk
index 85ee5d5..da51f6b 100644
--- a/milena/tests/tests.mk
+++ b/milena/tests/tests.mk
@@ -2,7 +2,7 @@
## Shared configuration for tests.
-## Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+## Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
## Laboratory (LRDE)
##
## This file is part of Olena.
@@ -20,11 +20,11 @@
## along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# FIXME: Revamp (see Olena 0.11's test suite).
+# FIXME: Revamp? (See Olena 0.11's test suite).
# Look for Milena header in srcdir and for (generated) test headers
# (like data.hh) in builddir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# FIXME: Add
#
@@ -55,4 +55,4 @@ TIFF_LDFLAGS = @TIFF_LDFLAGS@
# Inject rules to compile tests (recursively), without running them.
-include $(top_srcdir)/milena/tests/tests-recursive.mk
+include $(top_srcdir)/tests/tests-recursive.mk
diff --git a/milena/tests/topo/Makefile.am b/milena/tests/topo/Makefile.am
index b8684bf..e22f880 100644
--- a/milena/tests/topo/Makefile.am
+++ b/milena/tests/topo/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = skeleton
diff --git a/milena/tests/topo/skeleton/Makefile.am b/milena/tests/topo/skeleton/Makefile.am
index 0e60ff6..78b35d9 100644
--- a/milena/tests/topo/skeleton/Makefile.am
+++ b/milena/tests/topo/skeleton/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
crest \
diff --git a/milena/tests/trace/Makefile.am b/milena/tests/trace/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/trace/Makefile.am
+++ b/milena/tests/trace/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/trait/Makefile.am b/milena/tests/trait/Makefile.am
index f3411f9..bdd172c 100644
--- a/milena/tests/trait/Makefile.am
+++ b/milena/tests/trait/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = image op value
diff --git a/milena/tests/trait/image/Makefile.am b/milena/tests/trait/image/Makefile.am
index a428a33..8eda761 100644
--- a/milena/tests/trait/image/Makefile.am
+++ b/milena/tests/trait/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
images
diff --git a/milena/tests/trait/op/Makefile.am b/milena/tests/trait/op/Makefile.am
index 8d83dd2..ca048a3 100644
--- a/milena/tests/trait/op/Makefile.am
+++ b/milena/tests/trait/op/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
plus \
diff --git a/milena/tests/trait/value/Makefile.am b/milena/tests/trait/value/Makefile.am
index 30e6d67..2c653cd 100644
--- a/milena/tests/trait/value/Makefile.am
+++ b/milena/tests/trait/value/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
comp \
diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am
index 933483d..569f5b0 100644
--- a/milena/tests/transform/Makefile.am
+++ b/milena/tests/transform/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bench_closest_point_geodesic \
diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am
index 4ee9885..b324796 100644
--- a/milena/tests/unit_test/Makefile.am
+++ b/milena/tests/unit_test/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
COND_TESTS = cond_tests_boost-tuple \
cond_tests_cfitsio \
@@ -42,7 +42,7 @@ regen-am:
# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@
#
# `$(abs_top_srcdir)' is required because of the change of directory
-# at the beginning og the action.
+# at the beginning of the action.
$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests $(COND_TESTS)
cd $(top_srcdir) \
&& ./build-aux/build_unit_test.sh \
diff --git a/milena/tests/upscaling/Makefile.am b/milena/tests/upscaling/Makefile.am
index 3d0016f..f0c34e2 100644
--- a/milena/tests/upscaling/Makefile.am
+++ b/milena/tests/upscaling/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
art
diff --git a/milena/tests/upscaling/art/Makefile.am b/milena/tests/upscaling/art/Makefile.am
index 01900f4..5f10400 100644
--- a/milena/tests/upscaling/art/Makefile.am
+++ b/milena/tests/upscaling/art/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am
index 0a1119e..bb9b681 100644
--- a/milena/tests/util/Makefile.am
+++ b/milena/tests/util/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am
index 975d471..d932933 100644
--- a/milena/tests/value/Makefile.am
+++ b/milena/tests/value/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
builtin \
diff --git a/milena/tests/value/builtin/Makefile.am b/milena/tests/value/builtin/Makefile.am
index 31ac350..2150e61 100644
--- a/milena/tests/value/builtin/Makefile.am
+++ b/milena/tests/value/builtin/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
builtin \
diff --git a/milena/tests/value/concept/Makefile.am b/milena/tests/value/concept/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/value/concept/Makefile.am
+++ b/milena/tests/value/concept/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/win/Makefile.am b/milena/tests/win/Makefile.am
index 9c58718..39314f8 100644
--- a/milena/tests/win/Makefile.am
+++ b/milena/tests/win/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
backdiag2d \
diff --git a/milena/tests/world/Makefile.am b/milena/tests/world/Makefile.am
index 3bae089..9634ec5 100644
--- a/milena/tests/world/Makefile.am
+++ b/milena/tests/world/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
binary_2d \
diff --git a/milena/tests/world/binary_2d/Makefile.am b/milena/tests/world/binary_2d/Makefile.am
index a52757c..25fd269 100644
--- a/milena/tests/world/binary_2d/Makefile.am
+++ b/milena/tests/world/binary_2d/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
enlarge
diff --git a/milena/tests/world/inter_pixel/Makefile.am b/milena/tests/world/inter_pixel/Makefile.am
index 2d08ba2..8f1386e 100644
--- a/milena/tests/world/inter_pixel/Makefile.am
+++ b/milena/tests/world/inter_pixel/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
dim2
diff --git a/milena/tests/world/inter_pixel/dim2/Makefile.am b/milena/tests/world/inter_pixel/dim2/Makefile.am
index 10ac0fb..6404f7a 100644
--- a/milena/tests/world/inter_pixel/dim2/Makefile.am
+++ b/milena/tests/world/inter_pixel/dim2/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
make_edge_image
diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am
index f7114d0..2f7b3dd 100644
--- a/milena/tools/Makefile.am
+++ b/milena/tools/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tools/tools.mk
+include $(top_srcdir)/tools/tools.mk
bin_PROGRAMS = \
seed2tiling \
diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk
index 9d9a046..97a8082 100644
--- a/milena/tools/tools.mk
+++ b/milena/tools/tools.mk
@@ -18,7 +18,7 @@
## FIXME: Revamp (see Olena 0.11's test suite).
# Look for Milena header in srcdir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena
+AM_CPPFLAGS = -I$(top_srcdir)
# FIXME: Add
#
--
1.5.6.5
* configure.ac: New.
* Makefile.am (ACLOCAL_AMFLAGS): New.
(SUBDIRS): Add build-aux.
(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES): New.
(dist-hook): New target.
* AUTHORS: New.
* NEWS: New (imported from Olena and updated).
* COPYING: New (imported from Olena).
* INSTALL: New (generated by Automake).
* README: New.
* m4/autotroll.m4,
* m4/boost.m4,
* m4/oln-with-lib.m4,
* m4/pkg.m4:
New (imported from Olena).
* build-aux/autotroll.mk,
* build-aux/build_unit_test.sh,
* build-aux/extra-recursive-targets.mk,
* build-aux/generate_dist_headers.sh,
* build-aux/regen-recursive.mk,
* build-aux/tex.mk,
* build-aux/texi2dvi:
New (imported from Olena).
* build-aux/Makefile.am: New.
* apps/constrained-connectivity/Makefile.am,
* apps/graph-morpho/Makefile.am,
* apps/mesh-segm-skel/Makefile.am,
* apps/papers/levillain.09.ismm/Makefile.am,
* doc/Makefile.am,
* mesh/Makefile.am,
* tests/Makefile.am,
* tests/accu/Makefile.am,
* tests/accu/image/Makefile.am,
* tests/accu/math/Makefile.am,
* tests/accu/shape/Makefile.am,
* tests/accu/site_set/Makefile.am,
* tests/accu/stat/Makefile.am,
* tests/algebra/Makefile.am,
* tests/arith/Makefile.am,
* tests/binarization/Makefile.am,
* tests/border/Makefile.am,
* tests/canvas/Makefile.am,
* tests/canvas/browsing/Makefile.am,
* tests/canvas/morpho/Makefile.am,
* tests/convert/Makefile.am,
* tests/convert/impl/Makefile.am,
* tests/core/Makefile.am,
* tests/core/alias/Makefile.am,
* tests/core/image/Makefile.am,
* tests/core/image/dmorph/Makefile.am,
* tests/core/image/imorph/Makefile.am,
* tests/core/image/vmorph/Makefile.am,
* tests/core/other/Makefile.am,
* tests/core/routine/Makefile.am,
* tests/core/site_set/Makefile.am,
* tests/data/Makefile.am,
* tests/data/approx/Makefile.am,
* tests/data/naive/Makefile.am,
* tests/debug/Makefile.am,
* tests/display/Makefile.am,
* tests/draw/Makefile.am,
* tests/estim/Makefile.am,
* tests/extension/Makefile.am,
* tests/extract/Makefile.am,
* tests/fun/Makefile.am,
* tests/fun/i2v/Makefile.am,
* tests/fun/p2b/Makefile.am,
* tests/fun/p2p/Makefile.am,
* tests/fun/p2v/Makefile.am,
* tests/fun/stat/Makefile.am,
* tests/fun/v2i/Makefile.am,
* tests/fun/v2v/Makefile.am,
* tests/fun/vv2v/Makefile.am,
* tests/fun/x2x/Makefile.am,
* tests/geom/Makefile.am,
* tests/graph/Makefile.am,
* tests/graph/attribute/Makefile.am,
* tests/histo/Makefile.am,
* tests/io/Makefile.am,
* tests/io/dicom/Makefile.am,
* tests/io/dump/Makefile.am,
* tests/io/fits/Makefile.am,
* tests/io/fld/Makefile.am,
* tests/io/magick/Makefile.am,
* tests/io/off/Makefile.am,
* tests/io/pbm/Makefile.am,
* tests/io/pbms/Makefile.am,
* tests/io/pfm/Makefile.am,
* tests/io/pgm/Makefile.am,
* tests/io/pgms/Makefile.am,
* tests/io/pnm/Makefile.am,
* tests/io/ppm/Makefile.am,
* tests/io/ppms/Makefile.am,
* tests/io/tiff/Makefile.am,
* tests/labeling/Makefile.am,
* tests/linear/Makefile.am,
* tests/linear/gaussian/Makefile.am,
* tests/linear/local/Makefile.am,
* tests/literal/Makefile.am,
* tests/logical/Makefile.am,
* tests/make/Makefile.am,
* tests/math/Makefile.am,
* tests/metal/Makefile.am,
* tests/metal/make/Makefile.am,
* tests/metal/math/Makefile.am,
* tests/morpho/Makefile.am,
* tests/morpho/approx/Makefile.am,
* tests/morpho/attribute/Makefile.am,
* tests/morpho/closing/Makefile.am,
* tests/morpho/closing/approx/Makefile.am,
* tests/morpho/elementary/Makefile.am,
* tests/morpho/opening/Makefile.am,
* tests/morpho/opening/approx/Makefile.am,
* tests/morpho/reconstruction/Makefile.am,
* tests/morpho/reconstruction/by_dilation/Makefile.am,
* tests/morpho/reconstruction/by_erosion/Makefile.am,
* tests/morpho/tree/Makefile.am,
* tests/morpho/tree/filter/Makefile.am,
* tests/morpho/watershed/Makefile.am,
* tests/norm/Makefile.am,
* tests/opt/Makefile.am,
* tests/pw/Makefile.am,
* tests/registration/Makefile.am,
* tests/set/Makefile.am,
* tests/subsampling/Makefile.am,
* tests/tag/Makefile.am,
* tests/test/Makefile.am,
* tests/topo/Makefile.am,
* tests/topo/skeleton/Makefile.am,
* tests/trace/Makefile.am,
* tests/trait/Makefile.am,
* tests/trait/image/Makefile.am,
* tests/trait/op/Makefile.am,
* tests/trait/value/Makefile.am,
* tests/transform/Makefile.am,
* tests/unit_test/Makefile.am,
* tests/upscaling/Makefile.am,
* tests/upscaling/art/Makefile.am,
* tests/util/Makefile.am,
* tests/value/Makefile.am,
* tests/value/builtin/Makefile.am,
* tests/value/concept/Makefile.am,
* tests/win/Makefile.am,
* tests/world/Makefile.am,
* tests/world/binary_2d/Makefile.am,
* tests/world/inter_pixel/Makefile.am,
* tests/world/inter_pixel/dim2/Makefile.am,
* tools/Makefile.am:
Adjust paths.
* tests/tests.mk,
* tools/tools.mk:
Likewise.
* apps/data.hh.in,
* tests/data.hh.in:
Likewise.
* apps/constrained-connectivity/test-constrained-connectivity.in,
* apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in,
* apps/mesh-segm-skel/test-mesh-complex-max-curv.in,
* apps/mesh-segm-skel/test-mesh-complex-segm.in,
* apps/mesh-segm-skel/test-mesh-complex-skel.in,
* apps/mesh-segm-skel/test-mesh-max-curv.in,
* apps/mesh-segm-skel/test-mesh-segm.in:
Likewise.
---
milena/.gitignore | 22 ++
milena/AUTHORS | 1 +
{scribo => milena}/COPYING | 0
milena/ChangeLog | 168 +++++++++
INSTALL => milena/INSTALL | 0
milena/Makefile.am | 96 +++++
{scribo => milena}/NEWS | 6 +-
README => milena/README | 303 ++++-------------
milena/apps/constrained-connectivity/Makefile.am | 4 +-
.../test-constrained-connectivity.in | 2 +-
milena/apps/data.hh.in | 6 +-
milena/apps/graph-morpho/Makefile.am | 2 +-
milena/apps/mesh-segm-skel/Makefile.am | 10 +-
.../test-mesh-complex-max-curv-segm.in | 5 +-
.../mesh-segm-skel/test-mesh-complex-max-curv.in | 5 +-
.../apps/mesh-segm-skel/test-mesh-complex-segm.in | 5 +-
.../apps/mesh-segm-skel/test-mesh-complex-skel.in | 4 +-
milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 5 +-
milena/apps/mesh-segm-skel/test-mesh-segm.in | 5 +-
milena/apps/papers/levillain.09.ismm/Makefile.am | 7 +-
{build-aux => milena/build-aux}/Makefile.am | 0
{scribo => milena}/build-aux/autotroll.mk | 0
{scribo => milena}/build-aux/build_unit_test.sh | 0
milena/build-aux/extra-recursive-targets.mk | 1 +
.../build-aux/generate_dist_headers.sh | 0
{scribo => milena}/build-aux/regen-recursive.mk | 0
milena/build-aux/strip-lrde | 1 +
{build-aux => milena/build-aux}/tex.mk | 0
{build-aux => milena/build-aux}/texi2dvi | 0
configure.ac => milena/configure.ac | 364 +++++++++-----------
milena/doc/Makefile.am | 6 +-
{scribo => milena}/m4/autotroll.m4 | 0
milena/m4/boost.m4 | 1 +
{scribo => milena}/m4/oln-with-lib.m4 | 0
{scribo => milena}/m4/pkg.m4 | 0
milena/mesh/Makefile.am | 15 +-
milena/tests/Makefile.am | 6 +-
milena/tests/accu/Makefile.am | 2 +-
milena/tests/accu/image/Makefile.am | 4 +-
milena/tests/accu/math/Makefile.am | 4 +-
milena/tests/accu/shape/Makefile.am | 4 +-
milena/tests/accu/site_set/Makefile.am | 4 +-
milena/tests/accu/stat/Makefile.am | 4 +-
milena/tests/algebra/Makefile.am | 5 +-
milena/tests/arith/Makefile.am | 4 +-
milena/tests/binarization/Makefile.am | 4 +-
milena/tests/border/Makefile.am | 4 +-
milena/tests/canvas/Makefile.am | 4 +-
milena/tests/canvas/browsing/Makefile.am | 4 +-
milena/tests/canvas/morpho/Makefile.am | 5 +-
milena/tests/convert/Makefile.am | 2 +-
milena/tests/convert/impl/Makefile.am | 4 +-
milena/tests/core/Makefile.am | 4 +-
milena/tests/core/alias/Makefile.am | 5 +-
milena/tests/core/image/Makefile.am | 4 +-
milena/tests/core/image/dmorph/Makefile.am | 4 +-
milena/tests/core/image/imorph/Makefile.am | 4 +-
milena/tests/core/image/vmorph/Makefile.am | 4 +-
milena/tests/core/other/Makefile.am | 5 +-
milena/tests/core/routine/Makefile.am | 5 +-
milena/tests/core/site_set/Makefile.am | 5 +-
milena/tests/data.hh.in | 8 +-
milena/tests/data/Makefile.am | 5 +-
milena/tests/data/approx/Makefile.am | 4 +-
milena/tests/data/naive/Makefile.am | 4 +-
milena/tests/debug/Makefile.am | 5 +-
milena/tests/display/Makefile.am | 4 +-
milena/tests/draw/Makefile.am | 4 +-
milena/tests/estim/Makefile.am | 4 +-
milena/tests/extension/Makefile.am | 5 +-
milena/tests/extract/Makefile.am | 4 +-
milena/tests/fun/Makefile.am | 4 +-
milena/tests/fun/i2v/Makefile.am | 5 +-
milena/tests/fun/p2b/Makefile.am | 5 +-
milena/tests/fun/p2p/Makefile.am | 4 +-
milena/tests/fun/p2v/Makefile.am | 5 +-
milena/tests/fun/stat/Makefile.am | 4 +-
milena/tests/fun/v2i/Makefile.am | 4 +-
milena/tests/fun/v2v/Makefile.am | 4 +-
milena/tests/fun/vv2v/Makefile.am | 5 +-
milena/tests/fun/x2x/Makefile.am | 4 +-
milena/tests/geom/Makefile.am | 2 +-
milena/tests/graph/Makefile.am | 4 +-
milena/tests/graph/attribute/Makefile.am | 4 +-
milena/tests/histo/Makefile.am | 4 +-
milena/tests/io/Makefile.am | 4 +-
milena/tests/io/dicom/Makefile.am | 4 +-
milena/tests/io/dump/Makefile.am | 2 +-
milena/tests/io/fits/Makefile.am | 2 +-
milena/tests/io/fld/Makefile.am | 5 +-
milena/tests/io/magick/Makefile.am | 2 +-
milena/tests/io/off/Makefile.am | 2 +-
milena/tests/io/pbm/Makefile.am | 2 +-
milena/tests/io/pbms/Makefile.am | 2 +-
milena/tests/io/pfm/Makefile.am | 5 +-
milena/tests/io/pgm/Makefile.am | 2 +-
milena/tests/io/pgms/Makefile.am | 2 +-
milena/tests/io/pnm/Makefile.am | 5 +-
milena/tests/io/ppm/Makefile.am | 2 +-
milena/tests/io/ppms/Makefile.am | 2 +-
milena/tests/io/tiff/Makefile.am | 4 +-
milena/tests/labeling/Makefile.am | 2 +-
milena/tests/linear/Makefile.am | 4 +-
milena/tests/linear/gaussian/Makefile.am | 2 +-
milena/tests/linear/local/Makefile.am | 4 +-
milena/tests/literal/Makefile.am | 4 +-
milena/tests/logical/Makefile.am | 4 +-
milena/tests/make/Makefile.am | 4 +-
milena/tests/math/Makefile.am | 5 +-
milena/tests/metal/Makefile.am | 4 +-
milena/tests/metal/make/Makefile.am | 5 +-
milena/tests/metal/math/Makefile.am | 4 +-
milena/tests/morpho/Makefile.am | 2 +-
milena/tests/morpho/approx/Makefile.am | 2 +-
milena/tests/morpho/attribute/Makefile.am | 4 +-
milena/tests/morpho/closing/Makefile.am | 2 +-
milena/tests/morpho/closing/approx/Makefile.am | 2 +-
milena/tests/morpho/elementary/Makefile.am | 5 +-
milena/tests/morpho/opening/Makefile.am | 2 +-
milena/tests/morpho/opening/approx/Makefile.am | 2 +-
milena/tests/morpho/reconstruction/Makefile.am | 4 +-
.../morpho/reconstruction/by_dilation/Makefile.am | 4 +-
.../morpho/reconstruction/by_erosion/Makefile.am | 4 +-
milena/tests/morpho/tree/Makefile.am | 5 +-
milena/tests/morpho/tree/filter/Makefile.am | 4 +-
milena/tests/morpho/watershed/Makefile.am | 2 +-
milena/tests/norm/Makefile.am | 5 +-
milena/tests/opt/Makefile.am | 5 +-
milena/tests/pw/Makefile.am | 4 +-
milena/tests/registration/Makefile.am | 5 +-
milena/tests/set/Makefile.am | 4 +-
milena/tests/subsampling/Makefile.am | 2 +-
milena/tests/tag/Makefile.am | 5 +-
milena/tests/test/Makefile.am | 5 +-
milena/tests/tests.mk | 8 +-
milena/tests/topo/Makefile.am | 5 +-
milena/tests/topo/skeleton/Makefile.am | 4 +-
milena/tests/trace/Makefile.am | 5 +-
milena/tests/trait/Makefile.am | 4 +-
milena/tests/trait/image/Makefile.am | 4 +-
milena/tests/trait/op/Makefile.am | 4 +-
milena/tests/trait/value/Makefile.am | 4 +-
milena/tests/transform/Makefile.am | 5 +-
milena/tests/unit_test/Makefile.am | 4 +-
milena/tests/upscaling/Makefile.am | 4 +-
milena/tests/upscaling/art/Makefile.am | 4 +-
milena/tests/util/Makefile.am | 4 +-
milena/tests/value/Makefile.am | 4 +-
milena/tests/value/builtin/Makefile.am | 2 +-
milena/tests/value/concept/Makefile.am | 5 +-
milena/tests/win/Makefile.am | 4 +-
milena/tests/world/Makefile.am | 4 +-
milena/tests/world/binary_2d/Makefile.am | 4 +-
milena/tests/world/inter_pixel/Makefile.am | 4 +-
milena/tests/world/inter_pixel/dim2/Makefile.am | 4 +-
milena/tools/Makefile.am | 5 +-
milena/tools/tools.mk | 2 +-
157 files changed, 811 insertions(+), 707 deletions(-)
create mode 120000 milena/AUTHORS
copy {scribo => milena}/COPYING (100%)
copy INSTALL => milena/INSTALL (100%)
copy {scribo => milena}/NEWS (99%)
copy README => milena/README (55%)
copy {build-aux => milena/build-aux}/Makefile.am (100%)
copy {scribo => milena}/build-aux/autotroll.mk (100%)
copy {scribo => milena}/build-aux/build_unit_test.sh (100%)
create mode 120000 milena/build-aux/extra-recursive-targets.mk
copy {scribo => milena}/build-aux/generate_dist_headers.sh (100%)
copy {scribo => milena}/build-aux/regen-recursive.mk (100%)
create mode 120000 milena/build-aux/strip-lrde
copy {build-aux => milena/build-aux}/tex.mk (100%)
copy {build-aux => milena/build-aux}/texi2dvi (100%)
copy configure.ac => milena/configure.ac (60%)
copy {scribo => milena}/m4/autotroll.m4 (100%)
create mode 120000 milena/m4/boost.m4
copy {scribo => milena}/m4/oln-with-lib.m4 (100%)
copy {scribo => milena}/m4/pkg.m4 (100%)
diff --git a/milena/.gitignore b/milena/.gitignore
index 8c2049a..7b3a5ed 100644
--- a/milena/.gitignore
+++ b/milena/.gitignore
@@ -1,3 +1,11 @@
+/build-aux/config.guess
+/build-aux/config.sub
+/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/ltmain.sh
+/build-aux/missing
+/build-aux/py-compile
+
/doc/Doxyfile_user
/doc/user-refman
/doc/user-refman.pdf
@@ -16,4 +24,18 @@
/doc/white-paper.pdf
/doc/white-paper/
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+
/tests/unit_test/mln_*.cc
+
+/*aclocal.m4
+/autom4te.cache*
+/config.h
+/config.h?in*
+/config.hin
+/configure
+/configure.scan
diff --git a/milena/AUTHORS b/milena/AUTHORS
new file mode 120000
index 0000000..9eadf71
--- /dev/null
+++ b/milena/AUTHORS
@@ -0,0 +1 @@
+../AUTHORS
\ No newline at end of file
diff --git a/scribo/COPYING b/milena/COPYING
similarity index 100%
copy from scribo/COPYING
copy to milena/COPYING
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 8e94f5d..3812f84 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,173 @@
2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+ Autoconfiscate Milena.
+
+ * configure.ac: New.
+ * Makefile.am (ACLOCAL_AMFLAGS): New.
+ (SUBDIRS): Add build-aux.
+ (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES): New.
+ (dist-hook): New target.
+ * AUTHORS: New.
+ * NEWS: New (imported from Olena and updated).
+ * COPYING: New (imported from Olena).
+ * INSTALL: New (generated by Automake).
+ * README: New.
+ * m4/autotroll.m4,
+ * m4/boost.m4,
+ * m4/oln-with-lib.m4,
+ * m4/pkg.m4:
+ New (imported from Olena).
+ * build-aux/autotroll.mk,
+ * build-aux/build_unit_test.sh,
+ * build-aux/extra-recursive-targets.mk,
+ * build-aux/generate_dist_headers.sh,
+ * build-aux/regen-recursive.mk,
+ * build-aux/tex.mk,
+ * build-aux/texi2dvi:
+ New (imported from Olena).
+ * build-aux/Makefile.am: New.
+ * apps/constrained-connectivity/Makefile.am,
+ * apps/graph-morpho/Makefile.am,
+ * apps/mesh-segm-skel/Makefile.am,
+ * apps/papers/levillain.09.ismm/Makefile.am,
+ * doc/Makefile.am,
+ * mesh/Makefile.am,
+ * tests/Makefile.am,
+ * tests/accu/Makefile.am,
+ * tests/accu/image/Makefile.am,
+ * tests/accu/math/Makefile.am,
+ * tests/accu/shape/Makefile.am,
+ * tests/accu/site_set/Makefile.am,
+ * tests/accu/stat/Makefile.am,
+ * tests/algebra/Makefile.am,
+ * tests/arith/Makefile.am,
+ * tests/binarization/Makefile.am,
+ * tests/border/Makefile.am,
+ * tests/canvas/Makefile.am,
+ * tests/canvas/browsing/Makefile.am,
+ * tests/canvas/morpho/Makefile.am,
+ * tests/convert/Makefile.am,
+ * tests/convert/impl/Makefile.am,
+ * tests/core/Makefile.am,
+ * tests/core/alias/Makefile.am,
+ * tests/core/image/Makefile.am,
+ * tests/core/image/dmorph/Makefile.am,
+ * tests/core/image/imorph/Makefile.am,
+ * tests/core/image/vmorph/Makefile.am,
+ * tests/core/other/Makefile.am,
+ * tests/core/routine/Makefile.am,
+ * tests/core/site_set/Makefile.am,
+ * tests/data/Makefile.am,
+ * tests/data/approx/Makefile.am,
+ * tests/data/naive/Makefile.am,
+ * tests/debug/Makefile.am,
+ * tests/display/Makefile.am,
+ * tests/draw/Makefile.am,
+ * tests/estim/Makefile.am,
+ * tests/extension/Makefile.am,
+ * tests/extract/Makefile.am,
+ * tests/fun/Makefile.am,
+ * tests/fun/i2v/Makefile.am,
+ * tests/fun/p2b/Makefile.am,
+ * tests/fun/p2p/Makefile.am,
+ * tests/fun/p2v/Makefile.am,
+ * tests/fun/stat/Makefile.am,
+ * tests/fun/v2i/Makefile.am,
+ * tests/fun/v2v/Makefile.am,
+ * tests/fun/vv2v/Makefile.am,
+ * tests/fun/x2x/Makefile.am,
+ * tests/geom/Makefile.am,
+ * tests/graph/Makefile.am,
+ * tests/graph/attribute/Makefile.am,
+ * tests/histo/Makefile.am,
+ * tests/io/Makefile.am,
+ * tests/io/dicom/Makefile.am,
+ * tests/io/dump/Makefile.am,
+ * tests/io/fits/Makefile.am,
+ * tests/io/fld/Makefile.am,
+ * tests/io/magick/Makefile.am,
+ * tests/io/off/Makefile.am,
+ * tests/io/pbm/Makefile.am,
+ * tests/io/pbms/Makefile.am,
+ * tests/io/pfm/Makefile.am,
+ * tests/io/pgm/Makefile.am,
+ * tests/io/pgms/Makefile.am,
+ * tests/io/pnm/Makefile.am,
+ * tests/io/ppm/Makefile.am,
+ * tests/io/ppms/Makefile.am,
+ * tests/io/tiff/Makefile.am,
+ * tests/labeling/Makefile.am,
+ * tests/linear/Makefile.am,
+ * tests/linear/gaussian/Makefile.am,
+ * tests/linear/local/Makefile.am,
+ * tests/literal/Makefile.am,
+ * tests/logical/Makefile.am,
+ * tests/make/Makefile.am,
+ * tests/math/Makefile.am,
+ * tests/metal/Makefile.am,
+ * tests/metal/make/Makefile.am,
+ * tests/metal/math/Makefile.am,
+ * tests/morpho/Makefile.am,
+ * tests/morpho/approx/Makefile.am,
+ * tests/morpho/attribute/Makefile.am,
+ * tests/morpho/closing/Makefile.am,
+ * tests/morpho/closing/approx/Makefile.am,
+ * tests/morpho/elementary/Makefile.am,
+ * tests/morpho/opening/Makefile.am,
+ * tests/morpho/opening/approx/Makefile.am,
+ * tests/morpho/reconstruction/Makefile.am,
+ * tests/morpho/reconstruction/by_dilation/Makefile.am,
+ * tests/morpho/reconstruction/by_erosion/Makefile.am,
+ * tests/morpho/tree/Makefile.am,
+ * tests/morpho/tree/filter/Makefile.am,
+ * tests/morpho/watershed/Makefile.am,
+ * tests/norm/Makefile.am,
+ * tests/opt/Makefile.am,
+ * tests/pw/Makefile.am,
+ * tests/registration/Makefile.am,
+ * tests/set/Makefile.am,
+ * tests/subsampling/Makefile.am,
+ * tests/tag/Makefile.am,
+ * tests/test/Makefile.am,
+ * tests/topo/Makefile.am,
+ * tests/topo/skeleton/Makefile.am,
+ * tests/trace/Makefile.am,
+ * tests/trait/Makefile.am,
+ * tests/trait/image/Makefile.am,
+ * tests/trait/op/Makefile.am,
+ * tests/trait/value/Makefile.am,
+ * tests/transform/Makefile.am,
+ * tests/unit_test/Makefile.am,
+ * tests/upscaling/Makefile.am,
+ * tests/upscaling/art/Makefile.am,
+ * tests/util/Makefile.am,
+ * tests/value/Makefile.am,
+ * tests/value/builtin/Makefile.am,
+ * tests/value/concept/Makefile.am,
+ * tests/win/Makefile.am,
+ * tests/world/Makefile.am,
+ * tests/world/binary_2d/Makefile.am,
+ * tests/world/inter_pixel/Makefile.am,
+ * tests/world/inter_pixel/dim2/Makefile.am,
+ * tools/Makefile.am:
+ Adjust paths.
+ * tests/tests.mk,
+ * tools/tools.mk:
+ Likewise.
+ * apps/data.hh.in,
+ * tests/data.hh.in:
+ Likewise.
+ * apps/constrained-connectivity/test-constrained-connectivity.in,
+ * apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in,
+ * apps/mesh-segm-skel/test-mesh-complex-max-curv.in,
+ * apps/mesh-segm-skel/test-mesh-complex-segm.in,
+ * apps/mesh-segm-skel/test-mesh-complex-skel.in,
+ * apps/mesh-segm-skel/test-mesh-max-curv.in,
+ * apps/mesh-segm-skel/test-mesh-segm.in:
+ Likewise.
+
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
Fix Boost.Tuple handling.
* tests/accu/Makefile.am (tuple_CPPFLAGS): New.
diff --git a/INSTALL b/milena/INSTALL
similarity index 100%
copy from INSTALL
copy to milena/INSTALL
diff --git a/milena/Makefile.am b/milena/Makefile.am
index 769006d..133cbad 100644
--- a/milena/Makefile.am
+++ b/milena/Makefile.am
@@ -15,7 +15,10 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS = \
+ build-aux \
external \
doc \
mesh \
@@ -112,3 +115,96 @@ EXTRA_DIST += \
tests/img/test_rgb8.tif \
tests/img/test_bw.tif \
tests/img/test_gl.tif
+
+
+#<<lrde
+## FIXME: All of this it too much ad hoc. Use Git branches to
+## distinguish distributed files from non distributed ones after the
+## conversion of the repository.
+
+## FIXME: Moreover, this list is partially duplicated in Olena's
+## `Makefile.am', so that pruning also occurs both when rolling an
+## Olena tarball or a (standalone) Milena tarball.
+
+LRDE_STRIPPED_DIST_FILES = \
+ $(distdir)/Makefile.am \
+ $(distdir)/configure.ac \
+ $(distdir)/mln/accu/math/all.hh \
+ $(distdir)/mln/all.hh \
+ $(distdir)/mln/core/image/vmorph/all.hh \
+ $(distdir)/mln/core/image/vmorph/fun_image.hh \
+ $(distdir)/mln/data/all.hh \
+ $(distdir)/mln/essential/routine.hh \
+ $(distdir)/mln/fun/all.hh \
+ $(distdir)/mln/fun/essential.hh \
+ $(distdir)/mln/fun/v2v/all.hh \
+ $(distdir)/mln/fun/v2v/essential.hh \
+ $(distdir)/mln/linear/all.hh \
+ $(distdir)/mln/trait/all.hh \
+ $(distdir)/mln/trait/ch_value.hh \
+ $(distdir)/mln/value/all.hh \
+ $(distdir)/mln/value/essential.hh \
+ $(distdir)/tests/Makefile.am \
+ $(distdir)/tests/convert/Makefile.am \
+ $(distdir)/tests/extract/Makefile.am \
+ $(distdir)/tests/fun/v2v/Makefile.am \
+ $(distdir)/tests/linear/Makefile.am \
+ $(distdir)/tests/linear/gaussian/Makefile.am \
+ $(distdir)/tests/registration/Makefile.am \
+ $(distdir)/tests/trait/ch_value.cc \
+ $(distdir)/tests/value/Makefile.am
+
+LRDE_NODIST_FILES = \
+ $(distdir)/tests/convert/to_hsl.cc \
+ $(distdir)/tests/extract/blue.cc \
+ $(distdir)/tests/extract/green.cc \
+ $(distdir)/tests/extract/hue.cc \
+ $(distdir)/tests/extract/lum.cc \
+ $(distdir)/tests/extract/red.cc \
+ $(distdir)/tests/extract/sat.cc \
+ $(distdir)/tests/fun/v2v/component.cc \
+ $(distdir)/tests/fun/v2v/hsl_to_rgb.cc \
+ $(distdir)/tests/fun/v2v/rgb_to_hsl.cc \
+ $(distdir)/tests/linear/gaussian.cc \
+ $(distdir)/tests/linear/gaussian/filter.cc \
+ $(distdir)/tests/registration/registration.cc \
+ $(distdir)/tests/value/stack.cc
+
+## FIXME: Running `build-aux/build_unit_test.sh' just to update
+## `milena/tests/unit_test/unit-tests.mk' is overkill:
+##
+## 1. It recreates *all* the sources (more than 1200 `.cc' files!).
+## => We should just regen `unit-tests.mk', not the `.cc' files.
+##
+## 2. It visits (almost) all the directories and files under
+## milena/mln/ (which admittedly a smaller issue compared to the
+## previous one)
+## => Prune `unit-tests.mk' instead of regenerating it. The
+## simplest solution is probably to equip `unit-tests.mk' in the
+## first place with `<<lrde'/`>>' tags, then prune it with
+## dist-strip.
+##
+
+# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde).
+# Then, regen files; and if the `distdir' (or `dist' or `distcheck')
+# target was run from Milena's (and not Olena's) source directory,
+# call `autoreconf'.
+dist-hook:
+ for f in $(LRDE_STRIPPED_DIST_FILES); do \
+ $(srcdir)/build-aux/strip-lrde $$f; \
+ done; \
+ rm -rf $(LRDE_NODIST_FILES) \
+ && $(srcdir)/build-aux/build_unit_test.sh \
+ $(distdir)/mln \
+ $(distdir)/tests/unit_test \
+ $(srcdir)/tests/unit_test/disabled_tests \
+ mln \
+ && if test x$(distdir) = x$(top_distdir); then \
+ ( \
+ cd $(distdir); \
+ set -evx; \
+ autoreconf -f -v -i; \
+ find . -name autom4te.cache | xargs rm -rf \
+ ) \
+ fi
+#>>
diff --git a/scribo/NEWS b/milena/NEWS
similarity index 99%
copy from scribo/NEWS
copy to milena/NEWS
index b7abbba..0a303c7 100644
--- a/scribo/NEWS
+++ b/milena/NEWS
@@ -1,11 +1,9 @@
-* Swilena 1.0a
+* Olena 1.0a
- * Starting with Olena 1.1, Scribo is an independent component
+ * Starting with Olena 1.1, Milena is an independent component
of the project, distributed both together with the Olena
package and as a standalone package.
- * Misc fixes and improvements.
-
* Olena 1.0 July 14, 2009
diff --git a/README b/milena/README
similarity index 55%
copy from README
copy to milena/README
index cc49a02..b351d0b 100644
--- a/README
+++ b/milena/README
@@ -19,63 +19,44 @@ The complete GNU General Public License Notice can also be found in
the 'COPYING' file in the root directory.
-=====================
-Introduction to Olena
-=====================
+======================
+Introduction to Milena
+======================
-Olena_, a platform dedicated to image processing.
+Milena is a part of Olena_, a generic and efficient platform
+dedicated to image processing.
.. _Olena: http://olena.lrde.epita.fr
+Milena is a generic C++ library and the core component of the Olena
+project.
---------
-Overview
---------
-
-Olena is a platform dedicated to image processing. At the moment it is
-mainly composed of a C++ library: Milena. This library features many
-tools to easily perform image processing tasks. Its main
-characteristic is its genericity: it allows to write an algorithm once
-and run it over many kinds of images (gray scale, color, 1D, 2D, 3D,
-...).
+Milena is distributed in two ways:
-Olena is a project developed by the `EPITA Research and Development
-Laboratory (LRDE)`__ since 1997. We did numerous prototypes and
-throwaway experiments before settling into the kind of programming
-paradigm which is finally here.
+ * as a component of the Olena package
-__ http://www.lrde.epita.fr
+ * and a standalone package.
-We do our image processing research using this library, but most
-importantly we have gathered (and still do) generic programming
-expertise from the library development.
+If you obtained Milena as an project embedded an Olena package, we
+advise you to read Olena's README, at the top-level directory of the
+package, and not to configure nor compile Milena separately (i.e., do
+not use `milena/configure', use the top-level `configure' instead
+and run `make' from the top-level directory).
-Yet, Olena is an ongoing development project. Few algorithms or
-definitions may change in a near future. A list of potential changes
-is maintained here :
-http://olena.lrde.epita.fr/FeaturesSubjectToChange.
+Otherwise, you are in the case of a standalone package, and you might
+want to read the rest of this file.
-Likewise, the documentation does not cover the whole project yet. In the
-`doc/' directory you will find the first draft of a reference
-manual. It includes a quick reference guide and a tutorial. This is a
-good start. In `milena/tools' and `milena/doc/examples' few sample
-programs are available. Most of them are already used to illustrate
-the tutorial. For the rest, we're afraid you will have to dig the
-code or e-mail us.
-
- Please direct any question or comments to <olena(a)lrde.epita.fr>, or
-<olena-bugs(a)lrde.epita.fr>.
-
- Olena also has a web page, located at
-<http://olena.lrde.epita.fr>.
+==========================================
+Detailed Instructions (Standalone Package)
+==========================================
-----------------
Required Software
-----------------
Here is a non-exhaustive list of required software required to build
-Olena successfully.
+Milena successfully.
* to compile the user examples:
@@ -85,51 +66,6 @@ Olena successfully.
- a `make' utility, like GNU `make'
-Optional:
-
- * to use various image types:
-
- - Magick++
-
- - libtiff
-
- - GDCM
-
-
-==================
-Quick Start Manual
-==================
-
-This section summarizes the installation procedure. For more
-information about building and installing Olena, see the next
-sections.
-
-To install Olena on your system, create a `_build' directory (even
-though it is not mandatory) and type in the classical sequence at the
-command prompt::
-
- mkdir _build
- cd _build
- ../configure
- make
- make install (as root)
-
-Note that an installation is specific to the compiler used to install
-it. Indeed, the call to ``../configure`` enables some workarounds
-and, consequently, users must compile with the same compiler to avoid
-compatibility problems.
-
-Between ``make`` and ``make install``, you may also want to run::
-
- make check
-
- ``make check`` will run the test suite to check the whole library.
-Running the test suite may require up several hours.
-
-
-=====================
-Detailed Instructions
-=====================
-------------
Configuration
@@ -138,10 +74,10 @@ Configuration
In order to prepare the build process, you need to configure the source
tree.
- Assuming your Olena distribution is uncompressed in directory
-`olena-1.0', follow these steps:
+ Assuming your Milena distribution is uncompressed in directory
+`milena-1.1', follow these steps:
- % cd olena-1.0
+ % cd milena-1.1
% mkdir _build
% cd _build
% ../configure
@@ -149,30 +85,11 @@ tree.
The build process can be altered by a number of options you can pass
to the `configure' script. The following sections describe them.
- Additionally, if you are an Olena maintainer (a person who runs
-`make distcheck'), _prefer setting `CXXFLAGS' as an environment
-variable_: the flags given on the command line to `configure' are not
-propagated to recursive runs by `make distcheck'. Or better: use the
-environment CONFIG_SITE to set up a configuration environment (see
-Autoconf's manual).
-
-
-Verbose Display
-===============
-
-A more verbose display can be turned on by passing the
-`--enable-verbose' flag to configure:
-
- % ../configure --enable-verbose
-
-Before configuring files, configure will display a summary of the
-configuration step.
-
Installation Path
=================
-By default, Olena is installed in the standard "local" directory of
+By default, Milena is installed in the standard "local" directory of
your system. This is usually `/usr/local' under Unix.
You can change this path with the following flag:
@@ -216,89 +133,6 @@ C++ flags by giving `configure' your selection of flags:
% ../configure CXXFLAGS="<your-favorite-flags>"
-Additional Components
-=====================
-
-In additional to Milena, several build targets can be enabled. These
-parts are called "components", and you can obtain a list of them by
-running:
-
- % ../configure --help
-
-Swilena
--------
-
-Swilena is an optional component of Olena exposing Milena to other
-languages thanks to the Simplified Wrapper and Interface Generator
-(SWIG_).
-
-.. _SWIG: http://www.swig.org
-
-For the moment, only some Python_ bindings are provided. They are
-disabled by default because they require extra dependencies (SWIG and
-Python).
-
-.. _Python: http://www.python.org
-
-To enable the installation of this module use::
-
- ./configure --enable-swilena
-
-Tools
------
-
-Sample tools are shipped with the tarball. To enable the installation of
-these tools use::
-
- ./configure --enable-tools
-
-Applications
-------------
-Sample applications are shipped with the tarball. To enable the
-installation of these applications use::
-
- ./configure --enable-apps
-
-Trimesh
--------
-
-Trimesh, a third-party library that we have been using to manipulate
-3D meshes, is shipped with Olena. (We will probably drop Trimesh from
-the distribution someday.) To enable it, use::
-
- ./configure --enable-trimesh
-
-Input/output libraries
-----------------------
-
-To read/write TIFF images with Olena, libtiff is required. If
-``configure`` is unable to find libtiff on your system, you can help
-it by specifying the base directory of libtiff, e.g.::
-
- ./configure --with-tiff=/usr/local
-
-To read/write DICOM images with Olena, GDCM is required. Likewise,
-you can tell ``configure`` where to find it by giving its install
-prefix, e.g.::
-
- ./configure --with-gdcm=/usr/local
-
-Olena use Magick++ to read and write images in common formats. As for
-other optional dependencies, you can specify where it is located (if
-needed) at configuration time::
-
- ./configure --with-magickxx=/usr/local/
-
-Other libraries
----------------
-
-The Boost Tuple library is used to implement a tuple accumulator
-class. This project is a part of the Boost libraries; you can help
-configure find these libraries using the `--with-boost flag':
-
- ./configure --with-boost=/usr/local/
-
-
--------
Building
--------
@@ -307,7 +141,7 @@ Once your build directory is `configure'd, you can run
% make
-to recursively build all the selected components.
+to build Milena.
Additionally, you can build and run the test suite with:
@@ -315,14 +149,14 @@ to recursively build all the selected components.
% make check
However, this process is time- and memory- consuming, and you probably
-do not need it except if you are developing/debugging Olena.
+do not need it except if you are developing/debugging Milena.
----------
Installing
----------
-To install the Olena headers and additional files on your system, run:
+To install Milena on your system, run:
% make install
@@ -336,89 +170,72 @@ from the build directory.
* sample images and meshes in `/usr/local/share/olena/images/',
- * the documentation in `/usr/local/share/doc/olena/`
-
-And optionally:
-
- * Swilena's Python bindings in `/usr/local/lib/python2.x/site-packages/',
-
- * Trimesh programs in `/usr/local/bin/',
+ * the documentation in `/usr/local/share/doc/olena/`.
- * Trimesh libraries in `/usr/local/lib/',
- * Trimesh headers in `/usr/local/share/trimesh/',
-
-
- You can later remove Olena from your system by running
+ You can later remove Milena from your system by running
% make uninstall
from the build directory (if you have kept it). We recommend the use
-of GNU Stow (or any similar program) during the installation of Olena,
-to make the uninstallation of Olena easier.
+of GNU Stow (or any similar program) during the installation of Milena,
+to make the uninstallation of Milena easier.
=====================
Layout of the Tarball
=====================
-The Olena project directory layout is as follows:
+The Milena project directory layout is as follows:
+
+apps
+ Application examples.
build-aux
Auxiliary tools used by the GNU Build System during ``configure``
and ``make`` stages.
-external
- Sources of Shipped dependencies.
-
-m4
- Extra Autoconf macros.
+demos
+ Demos of Milena.
-milena
+doc
+ Documentation.
- apps
- Application examples.
-
- mln
- Headers of the Milena library.
-
- tests
- The test suite.
-
- doc
- The documentation.
+external
+ Sources of bundled dependencies.
- tools
- Example tools.
+ trimesh
+ Trimesh2 library.
- mesh
- Some 3D meshes, mostly used for test purpose.
+img
+ Some (2D) images, mostly used for test purpose.
- img
- Some (2D) images, mostly used for test purpose.
+mesh
+ Some 3D meshes, mostly used for test purpose.
- demos
- Demos of Milena.
+mln
+ Headers of the Milena library.
-swilena
+tests
+ The test suite.
- python
- Some Python bindings for Milena.
+tools
+ Example tools.
===================
Supported Platforms
===================
-Olena has been tested on the following configurations:
+Milena has been tested on the following configurations:
=========================== =============================================
System Compiler
=========================== =============================================
-GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 3.4, 4.0, 4.1, 4.2 and 4.3
+GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 4.1, 4.2 and 4.4
GNU/Linux on IA-32 icpc (Intel C/C++ Compiler) 10.1 and 11.0
GNU/Linux on AMD64/Intel 64 g++ (GNU GCC) 4.1
-Mac OS X (10.5) on IA-32 g++ (GNU GCC) 4.0.1
+Mac OS X (10.6) on IA-32 g++ (GNU GCC) 4.2.1
=========================== =============================================
@@ -433,7 +250,7 @@ To enable I/O with GDCM images, `GDCM`_ must be installed.
.. _GDCM: http://sourceforge.net/apps/mediawiki/gdcm/
-To support many image formats in Olena's I/O system, `Magick++`_ must
+To support many image formats in Milena's I/O system, `Magick++`_ must
be installed.
.. _Magick++: http://www.imagemagick.org/Magick++/
@@ -466,7 +283,7 @@ There are other sources of interest in the distribution.
License
=======
-Olena is released under the GNU General Public Licence. See the file
+Milena is released under the GNU General Public Licence. See the file
``COPYING`` (at the root of the source tree) for details.
@@ -487,7 +304,7 @@ mail address follows.
Bibliography
============
-Further information about Olena can be found into the following related
+Further information about Milena can be found into the following related
papers.
About Image Processing Programming:
diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am
index 84a6ed2..f5c563d 100644
--- a/milena/apps/constrained-connectivity/Makefile.am
+++ b/milena/apps/constrained-connectivity/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -15,7 +15,7 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
diff --git a/milena/apps/constrained-connectivity/test-constrained-connectivity.in b/milena/apps/constrained-connectivity/test-constrained-connectivity.in
index a0d6a88..42090b5 100644
--- a/milena/apps/constrained-connectivity/test-constrained-connectivity.in
+++ b/milena/apps/constrained-connectivity/test-constrained-connectivity.in
@@ -18,6 +18,6 @@
set -ex
-srcdir="@top_srcdir@/milena/apps/constrained-connectivity"
+srcdir="@top_srcdir@/apps/constrained-connectivity"
time ./constrained-connectivity "$srcdir/soille.pgm"
diff --git a/milena/apps/data.hh.in b/milena/apps/data.hh.in
index 8adb35f..8a64e47 100644
--- a/milena/apps/data.hh.in
+++ b/milena/apps/data.hh.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
@@ -33,9 +33,9 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the img directory of Milena.
-# define MLN_IMG_DIR "@abs_top_srcdir@/milena/img"
+# define MLN_IMG_DIR "@abs_top_srcdir@/img"
/// The absolute path to the apps directory of Milena.
-# define MLN_APPS_DIR "@abs_top_srcdir@/milena/apps/"
+# define MLN_APPS_DIR "@abs_top_srcdir@/apps"
#endif // ! APPS_DATA_HH
diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am
index 7e3d4db..8f2e551 100644
--- a/milena/apps/graph-morpho/Makefile.am
+++ b/milena/apps/graph-morpho/Makefile.am
@@ -15,7 +15,7 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am
index 78bc7ca..7794c48 100644
--- a/milena/apps/mesh-segm-skel/Makefile.am
+++ b/milena/apps/mesh-segm-skel/Makefile.am
@@ -16,12 +16,12 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Linking with gluit and GLUT/OpenGL.
-gluit_builddir = $(top_builddir)/milena/external/trimesh/gluit
-include $(top_srcdir)/milena/external/trimesh/gluit/gluit.mk
+gluit_builddir = $(top_builddir)/external/trimesh/gluit
+include $(top_srcdir)/external/trimesh/gluit/gluit.mk
# Find Milena and trimesh headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena
-CPPFLAGS_trimesh = -I$(top_srcdir)/milena/external/trimesh/include
+AM_CPPFLAGS = -I$(top_srcdir)
+CPPFLAGS_trimesh = -I$(top_srcdir)/external/trimesh/include
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
@@ -32,7 +32,7 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS)
# LDFLAGS_trimesh instead. Likewise for CPPFLAGS_trimesh and
# LDADD_trimesh, for symmetry reasons.
LDFLAGS_trimesh = $(GLFLAGS)
-LDADD_trimesh = -L$(top_builddir)/milena/external/trimesh/libsrc -ltrimesh $(GLLIBS)
+LDADD_trimesh = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS)
bin_PROGRAMS =
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
index ac5a1e7..09ed25b 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-max-curv-segm $mesh_dir/socket.off 25 socket-complex-max-curv-segm.off
time ./mesh-complex-max-curv-segm $mesh_dir/teapot.off 50 teapot-complex-max-curv-segm.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
index a60eede..dd29cfe 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,6 +19,6 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-max-curv $mesh_dir/teapot.off teapot-complex-max-curv.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
index 58cd47e..8b72ae8 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-segm $mesh_dir/socket-max-curv.off 25 socket-max-curv-segm.off
time ./mesh-complex-segm $mesh_dir/teapot-max-curv.off 50 teapot-max-curv-segm.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
index f6b787b..a4a711f 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +18,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-skel $mesh_dir/three-triangles.off 1 three-triangles-skel.off
time ./mesh-complex-skel $mesh_dir/socket-max-curv.off 10 socket-max-curv-skel.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
index e5eaf96..00c554b 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,6 +19,6 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-max-curv $mesh_dir/teapot.off teapot-max-curv.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-segm.in b/milena/apps/mesh-segm-skel/test-mesh-segm.in
index e70e63a..3038a6c 100755
--- a/milena/apps/mesh-segm-skel/test-mesh-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-segm $mesh_dir/socket.off 25 socket-segm.off
time ./mesh-segm $mesh_dir/teapot.off 50 teapot-segm.off
diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am
index ec5d328..4dd172b 100644
--- a/milena/apps/papers/levillain.09.ismm/Makefile.am
+++ b/milena/apps/papers/levillain.09.ismm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -17,7 +18,7 @@
# Illustrations from the ISMM 2009 paper.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
@@ -37,7 +38,7 @@ dist_noinst_DATA = seeds.pgm m283-c.off
noinst_DATA = lena-s.ppm graph-s.png m283-s.off
MOSTLYCLEANFILES = $(noinst_DATA) graph-s.neato
-lena-s.ppm: $(top_srcdir)/milena/img/lena.pgm image2d$(EXEEXT)
+lena-s.ppm: $(top_srcdir)/img/lena.pgm image2d$(EXEEXT)
./image2d$(EXEEXT) $< 1000 $@
graph-s.png: graph-s.neato
diff --git a/build-aux/Makefile.am b/milena/build-aux/Makefile.am
similarity index 100%
copy from build-aux/Makefile.am
copy to milena/build-aux/Makefile.am
diff --git a/scribo/build-aux/autotroll.mk b/milena/build-aux/autotroll.mk
similarity index 100%
copy from scribo/build-aux/autotroll.mk
copy to milena/build-aux/autotroll.mk
diff --git a/scribo/build-aux/build_unit_test.sh b/milena/build-aux/build_unit_test.sh
similarity index 100%
copy from scribo/build-aux/build_unit_test.sh
copy to milena/build-aux/build_unit_test.sh
diff --git a/milena/build-aux/extra-recursive-targets.mk b/milena/build-aux/extra-recursive-targets.mk
new file mode 120000
index 0000000..dabc25d
--- /dev/null
+++ b/milena/build-aux/extra-recursive-targets.mk
@@ -0,0 +1 @@
+../../build-aux/extra-recursive-targets.mk
\ No newline at end of file
diff --git a/scribo/build-aux/generate_dist_headers.sh b/milena/build-aux/generate_dist_headers.sh
similarity index 100%
copy from scribo/build-aux/generate_dist_headers.sh
copy to milena/build-aux/generate_dist_headers.sh
diff --git a/scribo/build-aux/regen-recursive.mk b/milena/build-aux/regen-recursive.mk
similarity index 100%
copy from scribo/build-aux/regen-recursive.mk
copy to milena/build-aux/regen-recursive.mk
diff --git a/milena/build-aux/strip-lrde b/milena/build-aux/strip-lrde
new file mode 120000
index 0000000..11926a1
--- /dev/null
+++ b/milena/build-aux/strip-lrde
@@ -0,0 +1 @@
+../../build-aux/strip-lrde
\ No newline at end of file
diff --git a/build-aux/tex.mk b/milena/build-aux/tex.mk
similarity index 100%
copy from build-aux/tex.mk
copy to milena/build-aux/tex.mk
diff --git a/build-aux/texi2dvi b/milena/build-aux/texi2dvi
similarity index 100%
copy from build-aux/texi2dvi
copy to milena/build-aux/texi2dvi
diff --git a/configure.ac b/milena/configure.ac
similarity index 60%
copy from configure.ac
copy to milena/configure.ac
index 074672f..8ae6c3e 100644
--- a/configure.ac
+++ b/milena/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.61])
## Package set up. ##
## ---------------- ##
-AC_INIT([Olena], [1.0a], [olena(a)lrde.epita.fr], [olena])
+AC_INIT([Milena], [1.0a], [olena(a)lrde.epita.fr], [milena])
# M4 macros.
AC_CONFIG_MACRO_DIR([m4])
@@ -37,7 +37,7 @@ AC_CONFIG_FILES([build-aux/Makefile])
AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall])
# Package metadata.
-AC_CONFIG_FILES([milena/mln/version.hh])
+AC_CONFIG_FILES([mln/version.hh])
AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"],
[Package Full name.])
AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
@@ -72,8 +72,8 @@ if test "$GXX" = yes; then
# The code generated for mln::data::impl::memcpy__() by g++ 4.2 with
# a high optimization level (`-O3') and without
# `-fno-strict-aliasing' might be wrong, at least with Debian's g++
- # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this
- # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc.
+ # 4.2 on IA-32 (see also mln/memcpy_.hh). We observed this
+ # behavior with e.g. apps/graph-morpho/samples-image2d.cc.
# Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine.
#
# So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS
@@ -154,7 +154,7 @@ fi
## ``Enable Everything'' Switch. ##
## ------------------------------ ##
-# Enable all bundled features (trimesh2, Swilena, apps, tools). This
+# Enable all bundled features (trimesh2, apps, tools). This
# option is useful to maintainers to ensure they do not break optional
# parts while modifying the core of the project. If both
# ``--enable-all'' is set and a given feature is disabled (say,
@@ -164,10 +164,6 @@ AC_ARG_ENABLE([all],
[AS_HELP_STRING([--enable-all], [enable maintainer mode])],
[if test "x$enable_all" != xno; then
enable_trimesh=yes
- enable_swilena=yes
-dnl<<lrde
- enable_scribo=yes
-dnl>>
enable_apps=yes
enable_tools=yes
fi])
@@ -239,39 +235,22 @@ OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm],
[ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8],
[ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]))
-# ---------------------------- #
-# (Bundled) trimesh2 library. #
-# ---------------------------- #
+
+## ---------------------------- ##
+## External, bundled projects. ##
+## ---------------------------- ##
+
+AC_CONFIG_FILES([external/Makefile])
+
+# ------------------ ##
+# Trimesh2 library. ##
+# ------------------ ##
AC_ARG_ENABLE([trimesh],
[AS_HELP_STRING([--enable-trimesh],
[build the (bundled) trimesh2 library])])
AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes])
-AC_CONFIG_SUBDIRS([milena/external/trimesh])
-
-
-## --------- ##
-## Swilena. ##
-## --------- ##
-
-AC_ARG_ENABLE([swilena],
- [AS_HELP_STRING([--enable-swilena],
- [build Swilena Python bindings])])
-AM_CONDITIONAL([ENABLE_SWILENA], [test "x$enable_swilena" = xyes])
-AC_CONFIG_SUBDIRS([swilena])
-
-
-dnl<<lrde
-## -------- ##
-## Scribo. ##
-## -------- ##
-
-AC_ARG_ENABLE([scribo],
- [AS_HELP_STRING([--enable-scribo],
- [enable Scribo])])
-AM_CONDITIONAL([ENABLE_SCRIBO], [test "x$enable_scribo" = xyes])
-AC_CONFIG_SUBDIRS([scribo])
-dnl>>
+AC_CONFIG_SUBDIRS([external/trimesh])
## --------------- ##
@@ -281,17 +260,15 @@ dnl>>
# Ask for config.h creation.
AC_CONFIG_HEADERS([config.h])
-# Ask for the creation of a milena/doc/tool/data.hh, used to access to
+# Ask for the creation of a doc/tool/data.hh, used to access to
# data (images) from the documentation.
-AC_CONFIG_FILES([milena/doc/tools/data.hh])
+AC_CONFIG_FILES([doc/tools/data.hh])
# Ask for the Makefile creations.
AC_CONFIG_FILES([
Makefile
- milena/Makefile
- milena/doc/Makefile
- milena/external/Makefile
- milena/mesh/Makefile
+ doc/Makefile
+ mesh/Makefile
])
@@ -299,132 +276,132 @@ AC_CONFIG_FILES([
## Tests. ##
## ------- ##
-# Ask for the creation of a milena/tests/data.hh, used to access to
+# Ask for the creation of a tests/data.hh, used to access to
# data (images) from tests.
-AC_CONFIG_FILES([milena/tests/data.hh])
+AC_CONFIG_FILES([tests/data.hh])
# Ask for the creation of tests' Makefiles.
AC_CONFIG_FILES([
- milena/tests/Makefile
- milena/tests/accu/Makefile
- milena/tests/accu/image/Makefile
- milena/tests/accu/site_set/Makefile
- milena/tests/accu/stat/Makefile
- milena/tests/accu/math/Makefile
- milena/tests/accu/shape/Makefile
- milena/tests/algebra/Makefile
- milena/tests/arith/Makefile
- milena/tests/binarization/Makefile
- milena/tests/border/Makefile
- milena/tests/canvas/Makefile
- milena/tests/canvas/browsing/Makefile
- milena/tests/canvas/morpho/Makefile
- milena/tests/convert/Makefile
- milena/tests/convert/impl/Makefile
- milena/tests/core/Makefile
- milena/tests/core/alias/Makefile
- milena/tests/core/image/Makefile
- milena/tests/core/image/dmorph/Makefile
- milena/tests/core/image/imorph/Makefile
- milena/tests/core/image/vmorph/Makefile
- milena/tests/core/other/Makefile
- milena/tests/core/routine/Makefile
- milena/tests/core/site_set/Makefile
- milena/tests/data/Makefile
- milena/tests/data/approx/Makefile
- milena/tests/data/naive/Makefile
- milena/tests/debug/Makefile
- milena/tests/display/Makefile
- milena/tests/draw/Makefile
- milena/tests/estim/Makefile
- milena/tests/extension/Makefile
- milena/tests/fun/Makefile
- milena/tests/fun/i2v/Makefile
- milena/tests/fun/p2b/Makefile
- milena/tests/fun/p2p/Makefile
- milena/tests/fun/p2v/Makefile
- milena/tests/fun/stat/Makefile
- milena/tests/fun/v2v/Makefile
- milena/tests/fun/vv2v/Makefile
- milena/tests/fun/x2x/Makefile
- milena/tests/geom/Makefile
- milena/tests/graph/Makefile
- milena/tests/graph/attribute/Makefile
- milena/tests/histo/Makefile
- milena/tests/io/Makefile
- milena/tests/io/dicom/Makefile
- milena/tests/io/dump/Makefile
- milena/tests/io/fits/Makefile
- milena/tests/io/fld/Makefile
- milena/tests/io/magick/Makefile
- milena/tests/io/off/Makefile
- milena/tests/io/pbm/Makefile
- milena/tests/io/pbms/Makefile
- milena/tests/io/pfm/Makefile
- milena/tests/io/pgm/Makefile
- milena/tests/io/pgms/Makefile
- milena/tests/io/pnm/Makefile
- milena/tests/io/ppm/Makefile
- milena/tests/io/ppms/Makefile
- milena/tests/io/tiff/Makefile
- milena/tests/labeling/Makefile
- milena/tests/linear/Makefile
- milena/tests/linear/local/Makefile
- milena/tests/literal/Makefile
- milena/tests/logical/Makefile
- milena/tests/make/Makefile
- milena/tests/math/Makefile
- milena/tests/metal/Makefile
- milena/tests/metal/make/Makefile
- milena/tests/metal/math/Makefile
- milena/tests/morpho/Makefile
- milena/tests/morpho/approx/Makefile
- milena/tests/morpho/attribute/Makefile
- milena/tests/morpho/closing/Makefile
- milena/tests/morpho/closing/approx/Makefile
- milena/tests/morpho/elementary/Makefile
- milena/tests/morpho/opening/Makefile
- milena/tests/morpho/opening/approx/Makefile
- milena/tests/morpho/reconstruction/Makefile
- milena/tests/morpho/reconstruction/by_dilation/Makefile
- milena/tests/morpho/reconstruction/by_erosion/Makefile
- milena/tests/morpho/tree/Makefile
- milena/tests/morpho/tree/filter/Makefile
- milena/tests/morpho/watershed/Makefile
- milena/tests/norm/Makefile
- milena/tests/opt/Makefile
- milena/tests/pw/Makefile
- milena/tests/set/Makefile
- milena/tests/tag/Makefile
- milena/tests/test/Makefile
- milena/tests/topo/Makefile
- milena/tests/topo/skeleton/Makefile
- milena/tests/trace/Makefile
- milena/tests/trait/Makefile
- milena/tests/trait/image/Makefile
- milena/tests/trait/op/Makefile
- milena/tests/trait/value/Makefile
- milena/tests/transform/Makefile
- milena/tests/unit_test/Makefile
- milena/tests/upscaling/Makefile
- milena/tests/upscaling/art/Makefile
- milena/tests/util/Makefile
- milena/tests/value/Makefile
- milena/tests/value/builtin/Makefile
- milena/tests/value/concept/Makefile
- milena/tests/win/Makefile
- milena/tests/world/Makefile
- milena/tests/world/binary_2d/Makefile
- milena/tests/world/inter_pixel/Makefile
- milena/tests/world/inter_pixel/dim2/Makefile
+ tests/Makefile
+ tests/accu/Makefile
+ tests/accu/image/Makefile
+ tests/accu/site_set/Makefile
+ tests/accu/stat/Makefile
+ tests/accu/math/Makefile
+ tests/accu/shape/Makefile
+ tests/algebra/Makefile
+ tests/arith/Makefile
+ tests/binarization/Makefile
+ tests/border/Makefile
+ tests/canvas/Makefile
+ tests/canvas/browsing/Makefile
+ tests/canvas/morpho/Makefile
+ tests/convert/Makefile
+ tests/convert/impl/Makefile
+ tests/core/Makefile
+ tests/core/alias/Makefile
+ tests/core/image/Makefile
+ tests/core/image/dmorph/Makefile
+ tests/core/image/imorph/Makefile
+ tests/core/image/vmorph/Makefile
+ tests/core/other/Makefile
+ tests/core/routine/Makefile
+ tests/core/site_set/Makefile
+ tests/data/Makefile
+ tests/data/approx/Makefile
+ tests/data/naive/Makefile
+ tests/debug/Makefile
+ tests/display/Makefile
+ tests/draw/Makefile
+ tests/estim/Makefile
+ tests/extension/Makefile
+ tests/fun/Makefile
+ tests/fun/i2v/Makefile
+ tests/fun/p2b/Makefile
+ tests/fun/p2p/Makefile
+ tests/fun/p2v/Makefile
+ tests/fun/stat/Makefile
+ tests/fun/v2v/Makefile
+ tests/fun/vv2v/Makefile
+ tests/fun/x2x/Makefile
+ tests/geom/Makefile
+ tests/graph/Makefile
+ tests/graph/attribute/Makefile
+ tests/histo/Makefile
+ tests/io/Makefile
+ tests/io/dicom/Makefile
+ tests/io/dump/Makefile
+ tests/io/fits/Makefile
+ tests/io/fld/Makefile
+ tests/io/magick/Makefile
+ tests/io/off/Makefile
+ tests/io/pbm/Makefile
+ tests/io/pbms/Makefile
+ tests/io/pfm/Makefile
+ tests/io/pgm/Makefile
+ tests/io/pgms/Makefile
+ tests/io/pnm/Makefile
+ tests/io/ppm/Makefile
+ tests/io/ppms/Makefile
+ tests/io/tiff/Makefile
+ tests/labeling/Makefile
+ tests/linear/Makefile
+ tests/linear/local/Makefile
+ tests/literal/Makefile
+ tests/logical/Makefile
+ tests/make/Makefile
+ tests/math/Makefile
+ tests/metal/Makefile
+ tests/metal/make/Makefile
+ tests/metal/math/Makefile
+ tests/morpho/Makefile
+ tests/morpho/approx/Makefile
+ tests/morpho/attribute/Makefile
+ tests/morpho/closing/Makefile
+ tests/morpho/closing/approx/Makefile
+ tests/morpho/elementary/Makefile
+ tests/morpho/opening/Makefile
+ tests/morpho/opening/approx/Makefile
+ tests/morpho/reconstruction/Makefile
+ tests/morpho/reconstruction/by_dilation/Makefile
+ tests/morpho/reconstruction/by_erosion/Makefile
+ tests/morpho/tree/Makefile
+ tests/morpho/tree/filter/Makefile
+ tests/morpho/watershed/Makefile
+ tests/norm/Makefile
+ tests/opt/Makefile
+ tests/pw/Makefile
+ tests/set/Makefile
+ tests/tag/Makefile
+ tests/test/Makefile
+ tests/topo/Makefile
+ tests/topo/skeleton/Makefile
+ tests/trace/Makefile
+ tests/trait/Makefile
+ tests/trait/image/Makefile
+ tests/trait/op/Makefile
+ tests/trait/value/Makefile
+ tests/transform/Makefile
+ tests/unit_test/Makefile
+ tests/upscaling/Makefile
+ tests/upscaling/art/Makefile
+ tests/util/Makefile
+ tests/value/Makefile
+ tests/value/builtin/Makefile
+ tests/value/concept/Makefile
+ tests/win/Makefile
+ tests/world/Makefile
+ tests/world/binary_2d/Makefile
+ tests/world/inter_pixel/Makefile
+ tests/world/inter_pixel/dim2/Makefile
])
dnl<<lrde
AC_CONFIG_FILES([
- milena/tests/extract/Makefile
- milena/tests/linear/gaussian/Makefile
- milena/tests/registration/Makefile
- milena/tests/subsampling/Makefile
+ tests/extract/Makefile
+ tests/linear/gaussian/Makefile
+ tests/registration/Makefile
+ tests/subsampling/Makefile
])
dnl>>
@@ -433,9 +410,9 @@ dnl>>
## Applications. ##
## -------------- ##
-# Ask for the creation of a milena/apps/data.hh, used to access to
+# Ask for the creation of a apps/data.hh, used to access to
# data (images) from apps.
-AC_CONFIG_FILES([milena/apps/data.hh])
+AC_CONFIG_FILES([apps/data.hh])
AC_ARG_ENABLE([apps],
[AS_HELP_STRING([--enable-apps],
@@ -444,32 +421,32 @@ AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"])
# Ask for the creation of applications' Makefiles.
AC_CONFIG_FILES([
- milena/apps/Makefile
- milena/apps/constrained-connectivity/Makefile
- milena/apps/graph-morpho/Makefile
- milena/apps/mesh-segm-skel/Makefile
- milena/apps/papers/Makefile
- milena/apps/papers/levillain.09.ismm/Makefile
+ apps/Makefile
+ apps/constrained-connectivity/Makefile
+ apps/graph-morpho/Makefile
+ apps/mesh-segm-skel/Makefile
+ apps/papers/Makefile
+ apps/papers/levillain.09.ismm/Makefile
])
# Configure tests.
# FIXME: Consider using `sed' instead of `configure' to create these
# tests for the sake of speed.
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-skel],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel])
-
-AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectivity],
- [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-max-curv],
+ [chmod +x apps/mesh-segm-skel/test-mesh-max-curv])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-max-curv],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-max-curv])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-skel],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-skel])
+
+AC_CONFIG_FILES([apps/constrained-connectivity/test-constrained-connectivity],
+ [chmod +x apps/constrained-connectivity/test-constrained-connectivity])
# Flags for apps.
AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications])
@@ -491,7 +468,7 @@ AC_ARG_ENABLE([tools],
AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"])
# Ask for the creation of tools' Makefiles.
-AC_CONFIG_FILES([milena/tools/Makefile])
+AC_CONFIG_FILES([tools/Makefile])
# Flags for tools.
AC_ARG_VAR([TOOLS_CXXFLAGS], [C++ compiler flags for tools])
@@ -536,23 +513,8 @@ CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio
GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm
Magick++ --with-magickxx $oln_have_magickxx
Qt --with-qt $oln_have_qt
-Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract
TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff
-Trimesh --enable-trimesh $enable_trimesh
--------------------------------------------------------------------------------
-
-
-
-
-===========
-| Modules |
-===========
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Scribo --enable-scribo $enable_scribo
-Swilena --enable-swilena $enable_swilena
+Trimesh --enable-trimesh enable_trimesh
-------------------------------------------------------------------------------
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 273b3d8..e2c9acd 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -18,7 +18,7 @@
# Look for Milena headers in srcdir and for (generated) test headers
# (like data.hh) in builddir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
DOXYGEN = doxygen
@@ -215,7 +215,7 @@ edit = sed -e "s|@ID@|$$Id|" \
-e 's,@builddir\@,$(builddir),g'
$(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in
- Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
+ Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog \
| sed -e 's/\\\$$//g'`; \
$(edit) $< >$@
MAINTAINERCLEANFILES += $(DOXYFILE_USER)
@@ -292,7 +292,7 @@ edit_devel = sed \
$(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in
rm -f $@.tmp
- Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
+ Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog \
| sed -e 's/\\\$$//g'`; \
$(edit) $< >$@.tmp
$(edit_devel) $@.tmp >$@
diff --git a/scribo/m4/autotroll.m4 b/milena/m4/autotroll.m4
similarity index 100%
copy from scribo/m4/autotroll.m4
copy to milena/m4/autotroll.m4
diff --git a/milena/m4/boost.m4 b/milena/m4/boost.m4
new file mode 120000
index 0000000..247b410
--- /dev/null
+++ b/milena/m4/boost.m4
@@ -0,0 +1 @@
+../../m4/boost.m4
\ No newline at end of file
diff --git a/scribo/m4/oln-with-lib.m4 b/milena/m4/oln-with-lib.m4
similarity index 100%
copy from scribo/m4/oln-with-lib.m4
copy to milena/m4/oln-with-lib.m4
diff --git a/scribo/m4/pkg.m4 b/milena/m4/pkg.m4
similarity index 100%
copy from scribo/m4/pkg.m4
copy to milena/m4/pkg.m4
diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am
index eebfaab..c66b9f0 100644
--- a/milena/mesh/Makefile.am
+++ b/milena/mesh/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -49,9 +50,9 @@ dist_mesh_DATA += $(more_meshes)
## Pseudo-inverse curvature of meshes. ##
## ------------------------------------ ##
-mesh_pinv_curv = $(top_builddir)/milena/apps/mesh-segm-skel/mesh-pinv-curv
-mesh_pinv_curv: $(top_srcdir)/milena/apps/mesh-segm-skel/mesh-pinv-curv.cc
- cd $(top_builddir)/milena/apps/mesh-segm-skel/mesh-pinv-curv && \
+mesh_pinv_curv = $(top_builddir)/apps/mesh-segm-skel/mesh-pinv-curv
+mesh_pinv_curv: $(top_srcdir)/apps/mesh-segm-skel/mesh-pinv-curv.cc
+ cd $(top_builddir)/apps/mesh-segm-skel/mesh-pinv-curv && \
$(MAKE) $(AM_MAKEFLAGS) mesh_pinv_curv
# FIXME: *-pinv-curv.off files should not be regenerated
@@ -67,9 +68,9 @@ dist_mesh_DATA += $(pinv_curv)
## Maximum curvature of meshes. ##
## ----------------------------- ##
-mesh_max_curv = $(top_builddir)/milena/apps/mesh-segm-skel/mesh-max-curv
-mesh_max_curv: $(top_srcdir)/milena/apps/mesh-segm-skel/mesh-max-curv.cc
- cd $(top_builddir)/milena/apps/mesh-segm-skel/mesh-max-curv && \
+mesh_max_curv = $(top_builddir)/apps/mesh-segm-skel/mesh-max-curv
+mesh_max_curv: $(top_srcdir)/apps/mesh-segm-skel/mesh-max-curv.cc
+ cd $(top_builddir)/apps/mesh-segm-skel/mesh-max-curv && \
$(MAKE) $(AM_MAKEFLAGS) mesh_max_curv
# FIXME: *-max-curv.off files should not be regenerated
diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am
index 83f946e..198b355 100644
--- a/milena/tests/Makefile.am
+++ b/milena/tests/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
accu \
@@ -88,7 +88,7 @@ TESTS = $(check_PROGRAMS)
EXTRA_DIST = tools/pretty_check.sh
.PHONY: pretty-check
pretty-check:
- $(top_srcdir)/milena/tests/tools/pretty_check.sh
+ $(top_srcdir)/tests/tools/pretty_check.sh
# Regen files recursively.
include $(top_srcdir)/build-aux/regen-recursive.mk
diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am
index d494d46..201aba6 100644
--- a/milena/tests/accu/Makefile.am
+++ b/milena/tests/accu/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
image \
diff --git a/milena/tests/accu/image/Makefile.am b/milena/tests/accu/image/Makefile.am
index 141300f..a0cfb24 100644
--- a/milena/tests/accu/image/Makefile.am
+++ b/milena/tests/accu/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
init \
diff --git a/milena/tests/accu/math/Makefile.am b/milena/tests/accu/math/Makefile.am
index ca5358b..a9b0a0f 100644
--- a/milena/tests/accu/math/Makefile.am
+++ b/milena/tests/accu/math/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
count
diff --git a/milena/tests/accu/shape/Makefile.am b/milena/tests/accu/shape/Makefile.am
index 374ce89..7ad278d 100644
--- a/milena/tests/accu/shape/Makefile.am
+++ b/milena/tests/accu/shape/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bbox
diff --git a/milena/tests/accu/site_set/Makefile.am b/milena/tests/accu/site_set/Makefile.am
index a44676e..12386d0 100644
--- a/milena/tests/accu/site_set/Makefile.am
+++ b/milena/tests/accu/site_set/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
rectangularity
diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am
index c331db0..f945239 100644
--- a/milena/tests/accu/stat/Makefile.am
+++ b/milena/tests/accu/stat/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
var \
diff --git a/milena/tests/algebra/Makefile.am b/milena/tests/algebra/Makefile.am
index 471389e..b441e4a 100644
--- a/milena/tests/algebra/Makefile.am
+++ b/milena/tests/algebra/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
h_mat \
diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am
index 89dfc9e..5bd2aae 100644
--- a/milena/tests/arith/Makefile.am
+++ b/milena/tests/arith/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff_abs \
diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am
index 601d163..c299519 100644
--- a/milena/tests/binarization/Makefile.am
+++ b/milena/tests/binarization/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Copyright (C) 2008, 2009, 2010, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
threshold
diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am
index 80241ad..b9f1a7b 100644
--- a/milena/tests/border/Makefile.am
+++ b/milena/tests/border/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
adjust \
diff --git a/milena/tests/canvas/Makefile.am b/milena/tests/canvas/Makefile.am
index d8db016..f98d236 100644
--- a/milena/tests/canvas/Makefile.am
+++ b/milena/tests/canvas/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = browsing morpho
diff --git a/milena/tests/canvas/browsing/Makefile.am b/milena/tests/canvas/browsing/Makefile.am
index 66b5b44..2b53f13 100644
--- a/milena/tests/canvas/browsing/Makefile.am
+++ b/milena/tests/canvas/browsing/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fwd \
diff --git a/milena/tests/canvas/morpho/Makefile.am b/milena/tests/canvas/morpho/Makefile.am
index 0504c8e..ef1e9b1 100644
--- a/milena/tests/canvas/morpho/Makefile.am
+++ b/milena/tests/canvas/morpho/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS=attribute_filter
diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am
index e4e3545..66ec621 100644
--- a/milena/tests/convert/Makefile.am
+++ b/milena/tests/convert/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
include $(top_srcdir)/build-aux/autotroll.mk
SUBDIRS = impl
diff --git a/milena/tests/convert/impl/Makefile.am b/milena/tests/convert/impl/Makefile.am
index a7cb10c..8c4c532 100644
--- a/milena/tests/convert/impl/Makefile.am
+++ b/milena/tests/convert/impl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
from_site_set_to_image
diff --git a/milena/tests/core/Makefile.am b/milena/tests/core/Makefile.am
index ba4b041..b942219 100644
--- a/milena/tests/core/Makefile.am
+++ b/milena/tests/core/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
alias \
diff --git a/milena/tests/core/alias/Makefile.am b/milena/tests/core/alias/Makefile.am
index 9c47da2..51c16fd 100644
--- a/milena/tests/core/alias/Makefile.am
+++ b/milena/tests/core/alias/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box1d \
diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am
index 5ac8889..d3bfb4a 100644
--- a/milena/tests/core/image/Makefile.am
+++ b/milena/tests/core/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
# (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
dmorph \
diff --git a/milena/tests/core/image/dmorph/Makefile.am b/milena/tests/core/image/dmorph/Makefile.am
index 3faee32..0d0240f 100644
--- a/milena/tests/core/image/dmorph/Makefile.am
+++ b/milena/tests/core/image/dmorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
hexa \
diff --git a/milena/tests/core/image/imorph/Makefile.am b/milena/tests/core/image/imorph/Makefile.am
index b019f1c..2d986ca 100644
--- a/milena/tests/core/image/imorph/Makefile.am
+++ b/milena/tests/core/image/imorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
decorated_image \
diff --git a/milena/tests/core/image/vmorph/Makefile.am b/milena/tests/core/image/vmorph/Makefile.am
index 5f7eb98..ef55c8a 100644
--- a/milena/tests/core/image/vmorph/Makefile.am
+++ b/milena/tests/core/image/vmorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
cast_image \
diff --git a/milena/tests/core/other/Makefile.am b/milena/tests/core/other/Makefile.am
index 85ce865..c435eed 100644
--- a/milena/tests/core/other/Makefile.am
+++ b/milena/tests/core/other/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box_runstart_piter \
diff --git a/milena/tests/core/routine/Makefile.am b/milena/tests/core/routine/Makefile.am
index 2640c47..07af185 100644
--- a/milena/tests/core/routine/Makefile.am
+++ b/milena/tests/core/routine/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
duplicate \
diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am
index e092e73..5a29e5f 100644
--- a/milena/tests/core/site_set/Makefile.am
+++ b/milena/tests/core/site_set/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box \
diff --git a/milena/tests/data.hh.in b/milena/tests/data.hh.in
index 1953989..ae6f446 100644
--- a/milena/tests/data.hh.in
+++ b/milena/tests/data.hh.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
@@ -33,12 +33,12 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the img directory of Milena.
-# define MLN_IMG_DIR "@abs_top_srcdir@/milena/img"
+# define MLN_IMG_DIR "@abs_top_srcdir@/img"
/// The absolute path to the img directory of Milena.
-# define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/milena/tests/img"
+# define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/tests/img"
/// The absolute path to the mesh directory of Milena.
-# define MLN_MESH_DIR "@abs_top_srcdir@/milena/mesh"
+# define MLN_MESH_DIR "@abs_top_srcdir@/mesh"
#endif // ! TESTS_DATA_HH
diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am
index 205337e..e24b8c9 100644
--- a/milena/tests/data/Makefile.am
+++ b/milena/tests/data/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = approx naive
diff --git a/milena/tests/data/approx/Makefile.am b/milena/tests/data/approx/Makefile.am
index 6f94721..bebdee0 100644
--- a/milena/tests/data/approx/Makefile.am
+++ b/milena/tests/data/approx/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
median
diff --git a/milena/tests/data/naive/Makefile.am b/milena/tests/data/naive/Makefile.am
index d42bcc6..74787ea 100644
--- a/milena/tests/data/naive/Makefile.am
+++ b/milena/tests/data/naive/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
median
diff --git a/milena/tests/debug/Makefile.am b/milena/tests/debug/Makefile.am
index 0346f1a..f6b51c1 100644
--- a/milena/tests/debug/Makefile.am
+++ b/milena/tests/debug/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
println \
diff --git a/milena/tests/display/Makefile.am b/milena/tests/display/Makefile.am
index bdd6d0f..e8d2789 100644
--- a/milena/tests/display/Makefile.am
+++ b/milena/tests/display/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
# Remember not to execute display tests by default. They require a
# running X11 server (as well as a `pkill' binary...). Perform the
diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am
index c823cfb..3a1b771 100644
--- a/milena/tests/draw/Makefile.am
+++ b/milena/tests/draw/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
line \
diff --git a/milena/tests/estim/Makefile.am b/milena/tests/estim/Makefile.am
index 2490ef9..6d422b5 100644
--- a/milena/tests/estim/Makefile.am
+++ b/milena/tests/estim/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
mean \
diff --git a/milena/tests/extension/Makefile.am b/milena/tests/extension/Makefile.am
index 85f9835..aca0fe2 100644
--- a/milena/tests/extension/Makefile.am
+++ b/milena/tests/extension/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fill
diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am
index 2168f8d..7c7f98e 100644
--- a/milena/tests/extract/Makefile.am
+++ b/milena/tests/extract/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet).
diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am
index 82d6e89..a7776ba 100644
--- a/milena/tests/fun/Makefile.am
+++ b/milena/tests/fun/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
i2v \
diff --git a/milena/tests/fun/i2v/Makefile.am b/milena/tests/fun/i2v/Makefile.am
index a3de8f9..74b140d 100644
--- a/milena/tests/fun/i2v/Makefile.am
+++ b/milena/tests/fun/i2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
all_to \
diff --git a/milena/tests/fun/p2b/Makefile.am b/milena/tests/fun/p2b/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/fun/p2b/Makefile.am
+++ b/milena/tests/fun/p2b/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/fun/p2p/Makefile.am b/milena/tests/fun/p2p/Makefile.am
index 862c78b..bd381a1 100644
--- a/milena/tests/fun/p2p/Makefile.am
+++ b/milena/tests/fun/p2p/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fold \
diff --git a/milena/tests/fun/p2v/Makefile.am b/milena/tests/fun/p2v/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/fun/p2v/Makefile.am
+++ b/milena/tests/fun/p2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/fun/stat/Makefile.am b/milena/tests/fun/stat/Makefile.am
index aac5327..c4c8720 100644
--- a/milena/tests/fun/stat/Makefile.am
+++ b/milena/tests/fun/stat/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
mahalanobis
diff --git a/milena/tests/fun/v2i/Makefile.am b/milena/tests/fun/v2i/Makefile.am
index e67e7d0..a1812c7 100644
--- a/milena/tests/fun/v2i/Makefile.am
+++ b/milena/tests/fun/v2i/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
index_of_value
diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am
index ad0f173..343626a 100644
--- a/milena/tests/fun/v2v/Makefile.am
+++ b/milena/tests/fun/v2v/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
norm \
diff --git a/milena/tests/fun/vv2v/Makefile.am b/milena/tests/fun/vv2v/Makefile.am
index d180e3d..4d5a09b 100644
--- a/milena/tests/fun/vv2v/Makefile.am
+++ b/milena/tests/fun/vv2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
max \
diff --git a/milena/tests/fun/x2x/Makefile.am b/milena/tests/fun/x2x/Makefile.am
index 6ac5c22..27e7f20 100644
--- a/milena/tests/fun/x2x/Makefile.am
+++ b/milena/tests/fun/x2x/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
composed \
diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am
index 670561b..d19f37a 100644
--- a/milena/tests/geom/Makefile.am
+++ b/milena/tests/geom/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bbox \
diff --git a/milena/tests/graph/Makefile.am b/milena/tests/graph/Makefile.am
index 608b6d9..aa534e8 100644
--- a/milena/tests/graph/Makefile.am
+++ b/milena/tests/graph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = attribute
diff --git a/milena/tests/graph/attribute/Makefile.am b/milena/tests/graph/attribute/Makefile.am
index cb07318..22b353a 100644
--- a/milena/tests/graph/attribute/Makefile.am
+++ b/milena/tests/graph/attribute/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/histo/Makefile.am b/milena/tests/histo/Makefile.am
index b5f7e7e..62d8fde 100644
--- a/milena/tests/histo/Makefile.am
+++ b/milena/tests/histo/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
compute \
diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am
index bd6c0a4..6dd7ed3 100644
--- a/milena/tests/io/Makefile.am
+++ b/milena/tests/io/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
## ---------------------- ##
## Built-in I/O support. ##
diff --git a/milena/tests/io/dicom/Makefile.am b/milena/tests/io/dicom/Makefile.am
index d8a4ea8..d06e2ce 100644
--- a/milena/tests/io/dicom/Makefile.am
+++ b/milena/tests/io/dicom/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = dicom
diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am
index dedd818..1c88fcb 100644
--- a/milena/tests/io/dump/Makefile.am
+++ b/milena/tests/io/dump/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dump
diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am
index f692f35..614c40e 100644
--- a/milena/tests/io/fits/Makefile.am
+++ b/milena/tests/io/fits/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(CFITSIO_CPPFLAGS)
AM_LDFLAGS = $(CFITSIO_LDFLAGS)
diff --git a/milena/tests/io/fld/Makefile.am b/milena/tests/io/fld/Makefile.am
index 7cbe50b..58dbbcc 100644
--- a/milena/tests/io/fld/Makefile.am
+++ b/milena/tests/io/fld/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fld2d \
diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am
index c04147f..5414ddb 100644
--- a/milena/tests/io/magick/Makefile.am
+++ b/milena/tests/io/magick/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(MAGICKXX_CPPFLAGS)
AM_LDFLAGS = $(MAGICKXX_LDFLAGS)
diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am
index 4029729..5d1f07b 100644
--- a/milena/tests/io/off/Makefile.am
+++ b/milena/tests/io/off/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load_bin \
diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am
index 690c895..488e240 100644
--- a/milena/tests/io/pbm/Makefile.am
+++ b/milena/tests/io/pbm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pbm \
diff --git a/milena/tests/io/pbms/Makefile.am b/milena/tests/io/pbms/Makefile.am
index f6d9770..459964d 100644
--- a/milena/tests/io/pbms/Makefile.am
+++ b/milena/tests/io/pbms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/pfm/Makefile.am b/milena/tests/io/pfm/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/io/pfm/Makefile.am
+++ b/milena/tests/io/pfm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am
index 8fdc560..fd505ee 100644
--- a/milena/tests/io/pgm/Makefile.am
+++ b/milena/tests/io/pgm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pgm16 \
diff --git a/milena/tests/io/pgms/Makefile.am b/milena/tests/io/pgms/Makefile.am
index c5ac784..7a8fb2e 100644
--- a/milena/tests/io/pgms/Makefile.am
+++ b/milena/tests/io/pgms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/pnm/Makefile.am b/milena/tests/io/pnm/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/io/pnm/Makefile.am
+++ b/milena/tests/io/pnm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am
index 695e5d7..61cda9c 100644
--- a/milena/tests/io/ppm/Makefile.am
+++ b/milena/tests/io/ppm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
ppm16 \
diff --git a/milena/tests/io/ppms/Makefile.am b/milena/tests/io/ppms/Makefile.am
index b11b52b..ffabb4b 100644
--- a/milena/tests/io/ppms/Makefile.am
+++ b/milena/tests/io/ppms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/tiff/Makefile.am b/milena/tests/io/tiff/Makefile.am
index 356214b..57f3edc 100644
--- a/milena/tests/io/tiff/Makefile.am
+++ b/milena/tests/io/tiff/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(TIFF_CPPFLAGS)
AM_LDFLAGS = $(TIFF_LDFLAGS)
diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am
index c272da4..0251353 100644
--- a/milena/tests/labeling/Makefile.am
+++ b/milena/tests/labeling/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
background \
diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am
index 8842b8d..25acf9c 100644
--- a/milena/tests/linear/Makefile.am
+++ b/milena/tests/linear/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
local
diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am
index 952a711..c70892c 100644
--- a/milena/tests/linear/gaussian/Makefile.am
+++ b/milena/tests/linear/gaussian/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet).
diff --git a/milena/tests/linear/local/Makefile.am b/milena/tests/linear/local/Makefile.am
index 9f53cfb..04b4f69 100644
--- a/milena/tests/linear/local/Makefile.am
+++ b/milena/tests/linear/local/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
convolve
diff --git a/milena/tests/literal/Makefile.am b/milena/tests/literal/Makefile.am
index ef86851..658c4c9 100644
--- a/milena/tests/literal/Makefile.am
+++ b/milena/tests/literal/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
black \
diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am
index ca59622..8661090 100644
--- a/milena/tests/logical/Makefile.am
+++ b/milena/tests/logical/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
and \
diff --git a/milena/tests/make/Makefile.am b/milena/tests/make/Makefile.am
index 34e0eff..12465e3 100644
--- a/milena/tests/make/Makefile.am
+++ b/milena/tests/make/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dual_neighb \
diff --git a/milena/tests/math/Makefile.am b/milena/tests/math/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/math/Makefile.am
+++ b/milena/tests/math/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/metal/Makefile.am b/milena/tests/metal/Makefile.am
index bc24893..93c0358 100644
--- a/milena/tests/metal/Makefile.am
+++ b/milena/tests/metal/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = make math
diff --git a/milena/tests/metal/make/Makefile.am b/milena/tests/metal/make/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/metal/make/Makefile.am
+++ b/milena/tests/metal/make/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/metal/math/Makefile.am b/milena/tests/metal/math/Makefile.am
index cc48940..9a7762e 100644
--- a/milena/tests/metal/math/Makefile.am
+++ b/milena/tests/metal/math/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pow \
diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am
index a2e460e..cae082a 100644
--- a/milena/tests/morpho/Makefile.am
+++ b/milena/tests/morpho/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx \
diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am
index fcc347e..1a44c1a 100644
--- a/milena/tests/morpho/approx/Makefile.am
+++ b/milena/tests/morpho/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dilation \
diff --git a/milena/tests/morpho/attribute/Makefile.am b/milena/tests/morpho/attribute/Makefile.am
index ae0a5e5..11ad352 100644
--- a/milena/tests/morpho/attribute/Makefile.am
+++ b/milena/tests/morpho/attribute/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am
index 8502e59..3806130 100644
--- a/milena/tests/morpho/closing/Makefile.am
+++ b/milena/tests/morpho/closing/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx
diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am
index 101bbe5..b0e4de5 100644
--- a/milena/tests/morpho/closing/approx/Makefile.am
+++ b/milena/tests/morpho/closing/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
structural
diff --git a/milena/tests/morpho/elementary/Makefile.am b/milena/tests/morpho/elementary/Makefile.am
index 37a726a..dc047eb 100644
--- a/milena/tests/morpho/elementary/Makefile.am
+++ b/milena/tests/morpho/elementary/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
laplacian \
diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am
index 4c06dc4..519353a 100644
--- a/milena/tests/morpho/opening/Makefile.am
+++ b/milena/tests/morpho/opening/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx
diff --git a/milena/tests/morpho/opening/approx/Makefile.am b/milena/tests/morpho/opening/approx/Makefile.am
index 101bbe5..b0e4de5 100644
--- a/milena/tests/morpho/opening/approx/Makefile.am
+++ b/milena/tests/morpho/opening/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
structural
diff --git a/milena/tests/morpho/reconstruction/Makefile.am b/milena/tests/morpho/reconstruction/Makefile.am
index 4ea328e..cae02a5 100644
--- a/milena/tests/morpho/reconstruction/Makefile.am
+++ b/milena/tests/morpho/reconstruction/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
by_dilation \
diff --git a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
index 48f1460..1bf1f7d 100644
--- a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
+++ b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
index 48f1460..1bf1f7d 100644
--- a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
+++ b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/morpho/tree/Makefile.am b/milena/tests/morpho/tree/Makefile.am
index 303bd7c..7721536 100644
--- a/milena/tests/morpho/tree/Makefile.am
+++ b/milena/tests/morpho/tree/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
compute_attribute_image \
diff --git a/milena/tests/morpho/tree/filter/Makefile.am b/milena/tests/morpho/tree/filter/Makefile.am
index 41a0603..65079aa 100644
--- a/milena/tests/morpho/tree/filter/Makefile.am
+++ b/milena/tests/morpho/tree/filter/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
filter
diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am
index 01a28bc..0237863 100644
--- a/milena/tests/morpho/watershed/Makefile.am
+++ b/milena/tests/morpho/watershed/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
flooding \
diff --git a/milena/tests/norm/Makefile.am b/milena/tests/norm/Makefile.am
index 4c335be..2316660 100644
--- a/milena/tests/norm/Makefile.am
+++ b/milena/tests/norm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
l1 \
diff --git a/milena/tests/opt/Makefile.am b/milena/tests/opt/Makefile.am
index 27f0f0d..5b3e806 100644
--- a/milena/tests/opt/Makefile.am
+++ b/milena/tests/opt/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
at
diff --git a/milena/tests/pw/Makefile.am b/milena/tests/pw/Makefile.am
index ae5a829..422b847 100644
--- a/milena/tests/pw/Makefile.am
+++ b/milena/tests/pw/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
image \
diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am
index 2910259..358e7a3 100644
--- a/milena/tests/registration/Makefile.am
+++ b/milena/tests/registration/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet) and currently disabled.
diff --git a/milena/tests/set/Makefile.am b/milena/tests/set/Makefile.am
index ab6e345..7ac5d69 100644
--- a/milena/tests/set/Makefile.am
+++ b/milena/tests/set/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/subsampling/Makefile.am b/milena/tests/subsampling/Makefile.am
index 7e859b4..6264bfb 100644
--- a/milena/tests/subsampling/Makefile.am
+++ b/milena/tests/subsampling/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/tag/Makefile.am b/milena/tests/tag/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/tag/Makefile.am
+++ b/milena/tests/tag/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/test/Makefile.am b/milena/tests/test/Makefile.am
index 6e42c2c..4242e4f 100644
--- a/milena/tests/test/Makefile.am
+++ b/milena/tests/test/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
positive
diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk
index 85ee5d5..da51f6b 100644
--- a/milena/tests/tests.mk
+++ b/milena/tests/tests.mk
@@ -2,7 +2,7 @@
## Shared configuration for tests.
-## Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+## Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
## Laboratory (LRDE)
##
## This file is part of Olena.
@@ -20,11 +20,11 @@
## along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# FIXME: Revamp (see Olena 0.11's test suite).
+# FIXME: Revamp? (See Olena 0.11's test suite).
# Look for Milena header in srcdir and for (generated) test headers
# (like data.hh) in builddir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# FIXME: Add
#
@@ -55,4 +55,4 @@ TIFF_LDFLAGS = @TIFF_LDFLAGS@
# Inject rules to compile tests (recursively), without running them.
-include $(top_srcdir)/milena/tests/tests-recursive.mk
+include $(top_srcdir)/tests/tests-recursive.mk
diff --git a/milena/tests/topo/Makefile.am b/milena/tests/topo/Makefile.am
index b8684bf..e22f880 100644
--- a/milena/tests/topo/Makefile.am
+++ b/milena/tests/topo/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = skeleton
diff --git a/milena/tests/topo/skeleton/Makefile.am b/milena/tests/topo/skeleton/Makefile.am
index 0e60ff6..78b35d9 100644
--- a/milena/tests/topo/skeleton/Makefile.am
+++ b/milena/tests/topo/skeleton/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
crest \
diff --git a/milena/tests/trace/Makefile.am b/milena/tests/trace/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/trace/Makefile.am
+++ b/milena/tests/trace/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/trait/Makefile.am b/milena/tests/trait/Makefile.am
index f3411f9..bdd172c 100644
--- a/milena/tests/trait/Makefile.am
+++ b/milena/tests/trait/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = image op value
diff --git a/milena/tests/trait/image/Makefile.am b/milena/tests/trait/image/Makefile.am
index a428a33..8eda761 100644
--- a/milena/tests/trait/image/Makefile.am
+++ b/milena/tests/trait/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
images
diff --git a/milena/tests/trait/op/Makefile.am b/milena/tests/trait/op/Makefile.am
index 8d83dd2..ca048a3 100644
--- a/milena/tests/trait/op/Makefile.am
+++ b/milena/tests/trait/op/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
plus \
diff --git a/milena/tests/trait/value/Makefile.am b/milena/tests/trait/value/Makefile.am
index 30e6d67..2c653cd 100644
--- a/milena/tests/trait/value/Makefile.am
+++ b/milena/tests/trait/value/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
comp \
diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am
index 933483d..569f5b0 100644
--- a/milena/tests/transform/Makefile.am
+++ b/milena/tests/transform/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bench_closest_point_geodesic \
diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am
index 4ee9885..b324796 100644
--- a/milena/tests/unit_test/Makefile.am
+++ b/milena/tests/unit_test/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
COND_TESTS = cond_tests_boost-tuple \
cond_tests_cfitsio \
@@ -42,7 +42,7 @@ regen-am:
# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@
#
# `$(abs_top_srcdir)' is required because of the change of directory
-# at the beginning og the action.
+# at the beginning of the action.
$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests $(COND_TESTS)
cd $(top_srcdir) \
&& ./build-aux/build_unit_test.sh \
diff --git a/milena/tests/upscaling/Makefile.am b/milena/tests/upscaling/Makefile.am
index 3d0016f..f0c34e2 100644
--- a/milena/tests/upscaling/Makefile.am
+++ b/milena/tests/upscaling/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
art
diff --git a/milena/tests/upscaling/art/Makefile.am b/milena/tests/upscaling/art/Makefile.am
index 01900f4..5f10400 100644
--- a/milena/tests/upscaling/art/Makefile.am
+++ b/milena/tests/upscaling/art/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am
index 0a1119e..bb9b681 100644
--- a/milena/tests/util/Makefile.am
+++ b/milena/tests/util/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am
index 975d471..d932933 100644
--- a/milena/tests/value/Makefile.am
+++ b/milena/tests/value/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
builtin \
diff --git a/milena/tests/value/builtin/Makefile.am b/milena/tests/value/builtin/Makefile.am
index 31ac350..2150e61 100644
--- a/milena/tests/value/builtin/Makefile.am
+++ b/milena/tests/value/builtin/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
builtin \
diff --git a/milena/tests/value/concept/Makefile.am b/milena/tests/value/concept/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/value/concept/Makefile.am
+++ b/milena/tests/value/concept/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/win/Makefile.am b/milena/tests/win/Makefile.am
index 9c58718..39314f8 100644
--- a/milena/tests/win/Makefile.am
+++ b/milena/tests/win/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
backdiag2d \
diff --git a/milena/tests/world/Makefile.am b/milena/tests/world/Makefile.am
index 3bae089..9634ec5 100644
--- a/milena/tests/world/Makefile.am
+++ b/milena/tests/world/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
binary_2d \
diff --git a/milena/tests/world/binary_2d/Makefile.am b/milena/tests/world/binary_2d/Makefile.am
index a52757c..25fd269 100644
--- a/milena/tests/world/binary_2d/Makefile.am
+++ b/milena/tests/world/binary_2d/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
enlarge
diff --git a/milena/tests/world/inter_pixel/Makefile.am b/milena/tests/world/inter_pixel/Makefile.am
index 2d08ba2..8f1386e 100644
--- a/milena/tests/world/inter_pixel/Makefile.am
+++ b/milena/tests/world/inter_pixel/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
dim2
diff --git a/milena/tests/world/inter_pixel/dim2/Makefile.am b/milena/tests/world/inter_pixel/dim2/Makefile.am
index 10ac0fb..6404f7a 100644
--- a/milena/tests/world/inter_pixel/dim2/Makefile.am
+++ b/milena/tests/world/inter_pixel/dim2/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
make_edge_image
diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am
index f7114d0..2f7b3dd 100644
--- a/milena/tools/Makefile.am
+++ b/milena/tools/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tools/tools.mk
+include $(top_srcdir)/tools/tools.mk
bin_PROGRAMS = \
seed2tiling \
diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk
index 9d9a046..97a8082 100644
--- a/milena/tools/tools.mk
+++ b/milena/tools/tools.mk
@@ -18,7 +18,7 @@
## FIXME: Revamp (see Olena 0.11's test suite).
# Look for Milena header in srcdir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena
+AM_CPPFLAGS = -I$(top_srcdir)
# FIXME: Add
#
--
1.5.6.5
* configure.ac: New.
* configure.gnu: New.
* Makefile.am (ACLOCAL_AMFLAGS): New.
(SUBDIRS): Add build-aux.
(EXTRA_DIST): Add configure.gnu.
* AUTHORS: New.
* NEWS: New (imported from Olena and updated).
* COPYING: New (imported from Olena).
* INSTALL: New (generated by Automake).
* README, src/README: Update copyright headers.
* m4/autotroll.m4,
* m4/oln-with-lib.m4,
* m4/pkg.m4:
New (imported from Olena).
* build-aux/autotroll.mk,
* build-aux/build_unit_test.sh,
* build-aux/generate_dist_headers.sh,
* build-aux/regen-recursive.mk:
New (imported from Olena).
* build-aux/Makefile.am: New.
* demo/review/Makefile.am,
* src/Makefile.am,
* src/binarization/Makefile.am,
* src/contest/Makefile.am,
* src/contest/hdibco-2010/Makefile.am,
* src/debug/Makefile.am,
* src/filter/Makefile.am,
* src/misc/Makefile.am,
* src/postprocessing/Makefile.am,
* src/preprocessing/Makefile.am,
* src/primitive/Makefile.am,
* src/primitive/extract/Makefile.am,
* src/primitive/find/Makefile.am,
* src/primitive/group/Makefile.am,
* src/table/Makefile.am,
* src/text/Makefile.am,
* tests/binarization/Makefile.am,
* tests/core/Makefile.am,
* tests/filter/Makefile.am,
* tests/preprocessing/Makefile.am,
* tests/table/Makefile.am,
* tests/text/Makefile.am,
* tests/toolchain/Makefile.am,
* tests/toolchain/nepomuk/Makefile.am,
* tests/unit_test/Makefile.am:
Adjust paths.
* tests/data.hh.in: Likewise.
* scribo.mk, tests/tests.mk: Likewise.
(MILENA_CPPFLAGS): New. Use it...
(AM_CPPFLAGS): ...here.
---
scribo/.gitignore | 19 ++
scribo/AUTHORS | 35 +++
{swilena => scribo}/COPYING | 0
scribo/ChangeLog | 55 ++++
INSTALL => scribo/INSTALL | 0
scribo/Makefile.am | 7 +-
scribo/NEWS | 376 ++++++++++++++++++++++++++++
scribo/README | 8 +-
scribo/build-aux/Makefile.am | 19 ++
scribo/build-aux/autotroll.mk | 1 +
scribo/build-aux/build_unit_test.sh | 1 +
scribo/build-aux/generate_dist_headers.sh | 1 +
scribo/build-aux/regen-recursive.mk | 1 +
scribo/configure.ac | 294 ++++++++++++++++++++++
{swilena => scribo}/configure.gnu | 0
scribo/demo/review/Makefile.am | 2 +-
scribo/m4/autotroll.m4 | 1 +
scribo/m4/oln-with-lib.m4 | 1 +
scribo/m4/pkg.m4 | 1 +
scribo/scribo.mk | 12 +-
scribo/src/Makefile.am | 2 +-
scribo/src/README | 8 +-
scribo/src/binarization/Makefile.am | 2 +-
scribo/src/contest/Makefile.am | 4 +-
scribo/src/contest/hdibco-2010/Makefile.am | 2 +-
scribo/src/debug/Makefile.am | 2 +-
scribo/src/filter/Makefile.am | 4 +-
scribo/src/misc/Makefile.am | 4 +-
scribo/src/postprocessing/Makefile.am | 2 +-
scribo/src/preprocessing/Makefile.am | 2 +-
scribo/src/primitive/Makefile.am | 4 +-
scribo/src/primitive/extract/Makefile.am | 4 +-
scribo/src/primitive/find/Makefile.am | 4 +-
scribo/src/primitive/group/Makefile.am | 2 +-
scribo/src/table/Makefile.am | 4 +-
scribo/src/text/Makefile.am | 4 +-
scribo/tests/binarization/Makefile.am | 4 +-
scribo/tests/core/Makefile.am | 2 +-
scribo/tests/data.hh.in | 4 +-
scribo/tests/filter/Makefile.am | 4 +-
scribo/tests/preprocessing/Makefile.am | 2 +-
scribo/tests/table/Makefile.am | 4 +-
scribo/tests/tests.mk | 11 +-
scribo/tests/text/Makefile.am | 4 +-
scribo/tests/toolchain/Makefile.am | 2 +-
scribo/tests/toolchain/nepomuk/Makefile.am | 2 +-
scribo/tests/unit_test/Makefile.am | 2 +-
47 files changed, 870 insertions(+), 59 deletions(-)
create mode 100644 scribo/AUTHORS
copy {swilena => scribo}/COPYING (100%)
copy INSTALL => scribo/INSTALL (100%)
create mode 100644 scribo/NEWS
create mode 100644 scribo/build-aux/Makefile.am
create mode 120000 scribo/build-aux/autotroll.mk
create mode 120000 scribo/build-aux/build_unit_test.sh
create mode 120000 scribo/build-aux/generate_dist_headers.sh
create mode 120000 scribo/build-aux/regen-recursive.mk
create mode 100644 scribo/configure.ac
copy {swilena => scribo}/configure.gnu (100%)
create mode 120000 scribo/m4/autotroll.m4
create mode 120000 scribo/m4/oln-with-lib.m4
create mode 120000 scribo/m4/pkg.m4
diff --git a/scribo/.gitignore b/scribo/.gitignore
index 4dd853a..31b3fa4 100644
--- a/scribo/.gitignore
+++ b/scribo/.gitignore
@@ -1 +1,20 @@
+/build-aux/config.guess
+/build-aux/config.sub
+/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/ltmain.sh
+/build-aux/missing
+/build-aux/py-compile
+
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+
+/*aclocal.m4
+/autom4te.cache*
+/configure
+/configure.scan
+
/tests/unit_test/scribo_*.cc
diff --git a/scribo/AUTHORS b/scribo/AUTHORS
new file mode 100644
index 0000000..0cbd32a
--- /dev/null
+++ b/scribo/AUTHORS
@@ -0,0 +1,35 @@
+This package was written by and with the assistance of
+
+==================
+Active LRDE Staff.
+==================
+
+* Thierry Géraud theo(a)lrde.epita.fr
+* Guillaume Lazzara z(a)lrde.epita.fr
+* Roland Levillain roland(a)lrde.epita.fr
+
+================================
+Past contributors of LRDE Staff.
+================================
+
+* Yann Jacquelet jacquelet(a)lrde.epita.fr
+
+========
+Interns.
+========
+
+* Arthur Crépin-Leblond
+
+=========
+Students.
+=========
+
+* Florent D'Halluin
+* Edwin Carlinet
+* Jérôme Galtier
+
+
+.. Local Variables:
+.. mode: rst
+.. ispell-local-dictionary: "american"
+.. End:
diff --git a/swilena/COPYING b/scribo/COPYING
similarity index 100%
copy from swilena/COPYING
copy to scribo/COPYING
diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 104f9c6..9789fc5 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,3 +1,58 @@
+2010-10-26 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Autoconfiscate Scribo.
+
+ * configure.ac: New.
+ * configure.gnu: New.
+ * Makefile.am (ACLOCAL_AMFLAGS): New.
+ (SUBDIRS): Add build-aux.
+ (EXTRA_DIST): Add configure.gnu.
+ * AUTHORS: New.
+ * NEWS: New (imported from Olena and updated).
+ * COPYING: New (imported from Olena).
+ * INSTALL: New (generated by Automake).
+ * README, src/README: Update copyright headers.
+ * m4/autotroll.m4,
+ * m4/oln-with-lib.m4,
+ * m4/pkg.m4:
+ New (imported from Olena).
+ * build-aux/autotroll.mk,
+ * build-aux/build_unit_test.sh,
+ * build-aux/generate_dist_headers.sh,
+ * build-aux/regen-recursive.mk:
+ New (imported from Olena).
+ * build-aux/Makefile.am: New.
+ * demo/review/Makefile.am,
+ * src/Makefile.am,
+ * src/binarization/Makefile.am,
+ * src/contest/Makefile.am,
+ * src/contest/hdibco-2010/Makefile.am,
+ * src/debug/Makefile.am,
+ * src/filter/Makefile.am,
+ * src/misc/Makefile.am,
+ * src/postprocessing/Makefile.am,
+ * src/preprocessing/Makefile.am,
+ * src/primitive/Makefile.am,
+ * src/primitive/extract/Makefile.am,
+ * src/primitive/find/Makefile.am,
+ * src/primitive/group/Makefile.am,
+ * src/table/Makefile.am,
+ * src/text/Makefile.am,
+ * tests/binarization/Makefile.am,
+ * tests/core/Makefile.am,
+ * tests/filter/Makefile.am,
+ * tests/preprocessing/Makefile.am,
+ * tests/table/Makefile.am,
+ * tests/text/Makefile.am,
+ * tests/toolchain/Makefile.am,
+ * tests/toolchain/nepomuk/Makefile.am,
+ * tests/unit_test/Makefile.am:
+ Adjust paths.
+ * tests/data.hh.in: Likewise.
+ * scribo.mk, tests/tests.mk: Likewise.
+ (MILENA_CPPFLAGS): New. Use it...
+ (AM_CPPFLAGS): ...here.
+
2010-10-22 Roland Levillain <roland(a)lrde.epita.fr>
Require Tesseract for scribo/toolchain/text_in_doc.hh's unit test.
diff --git a/INSTALL b/scribo/INSTALL
similarity index 100%
copy from INSTALL
copy to scribo/INSTALL
diff --git a/scribo/Makefile.am b/scribo/Makefile.am
index b18366b..463753d 100644
--- a/scribo/Makefile.am
+++ b/scribo/Makefile.am
@@ -15,7 +15,12 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-SUBDIRS = demo tests src
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = build-aux demo tests src
+
+# `configure' wrapper used in recursive configuration.
+EXTRA_DIST = configure.gnu
.PHONY: bin
diff --git a/scribo/NEWS b/scribo/NEWS
new file mode 100644
index 0000000..b7abbba
--- /dev/null
+++ b/scribo/NEWS
@@ -0,0 +1,376 @@
+* Swilena 1.0a
+
+ * Starting with Olena 1.1, Scribo is an independent component
+ of the project, distributed both together with the Olena
+ package and as a standalone package.
+
+ * Misc fixes and improvements.
+
+
+* Olena 1.0 July 14, 2009
+
+ * The core C++ library, renamed to Milena, has been rewritten from
+ scratch and features numerous additions over the past releases.
+ Some features have also been dropped or disabled, and some of them
+ will be reintegrated in future releases. The programming
+ interface has changed from previous versions, but most programs
+ using Olena 0.11 can be adapted to the Olena 1.0 API.
+
+ * Milena uses a simplified version of the SCOOP 2 paradigm
+ (informally called SCOOP 1.5), to improve the speed of compilation
+ and make developing easier while still providing very good
+ run-time performances.
+
+ * A first (re)implementation of Swilena featuring Python wrappers
+ for a very small subset of Milena is available. The bundled
+ Swilena Python Shell (sps) allows interactive Olena sessions.
+
+ * A reference documentation including a tutorial and a quick
+ reference guide have been started. They do not cover the whole
+ Milena library yet.
+
+ * Olena includes some demos and applications using Milena.
+
+
+* Olena 0.11 February 21, 2007
+
+ * The whole Olena distribution compiles with the GNU C++
+ Compiler (G++) 4.0 and 4.1. The compatibility with previous
+ versions of the compiler has been broken.
+
+ * Revamp of Swilena.
+ The Swilena wrappers have been repaired, as they had become
+ incompatible with recent versions of SWIG, G++, Python and Ruby.
+ Moreover, a lot of small bugs have been fixed in Swilena.
+ The test suite of Rblena, the Ruby wrappers for Olena, has
+ been completed and is comparable to Pylena's (the Python
+ wrappers for Olena).
+
+ * Libtool.
+ The whole package uses GNU Libtool to handle libraries.
+ Swilena benefits this, and uses Libtool to create shared
+ libraries upon which SWIG wrappers are built.
+
+ * Miscellaneous corrections in Olena and Integre, as well as in
+ their test suites.
+
+
+* Olena 0.10 April 15, 2004
+
+ * New documentation system.
+ Now any comment should use Doxygen style (i.e. /*! ... */).
+ You can also write some programs inside the comments. They are
+ compiled at documentation generation time. It is useful to
+ illustrate some algorithms with concrete input and output. To
+ use this feature the program has to be between \code and \endcode
+ tags. If you produce an image, you can include it in the comments
+ with the \image command, using the same name you used to produce
+ it, but with the png extension. To make sure your image will not
+ overwrite another existing one, you should name it taking care of
+ the namespace you are using: e.g. if you comment the function
+ oln::boo::bar::fun, the image should be named oln_foo_bar_fun.ppm.
+ The macros IMG_IN and IMG_OUT correspond to the path of the images.
+
+ * Border behavior can be controlled with the behavior hierarchy.
+ If an algorithm support it, you can choose the way the image
+ border will be seen. Three behaviors are available: mirror,
+ replicate or user defined value.
+
+ * Attribute opening/closing enhancement
+ - Make the algorithm more generic.
+ - Add a lot of attributes (area, disk, square, dist,
+ rectangle, volume, height, maxvalue, minvalue).
+
+ * Change the color conversion system
+ - CIE RGB is the main color system i.e. it can be converted
+ directly into any other color system.
+ - Conversion between 2 color systems should pass by the RGB one.
+
+ * Generic and concrete morphers are now implemented in Olena.
+ - Five morphers are included in this release:
+ Color morpher
+ Sub quantifying morpher
+ Piece morpher
+ Iter morpher
+ Slicing morpher
+ - These morphers can be manipulated as if they were normal images.
+
+
+* Olena 0.9 August 8, 2003
+
+ * New static hierarchy paradigm
+ - Complete rewrite of the image hierarchy.
+ - The new hierarchy benefits from multiple inheritance and
+ diamond constructs.
+ - Objects' abstract interfaces made available, leading to
+ safer and easier algorithm writing.
+ - Label images such as binary_image or vectorial_image added.
+
+ * Partial rewrite of images I/O
+ - Support for 1d, 3d images and windows.
+ - Better handling of built-in types.
+
+ * Color conversions fixed and improved.
+
+ * Cleanup and coding style conformance.
+
+ * Many bug fixes.
+ * Improved test-suite.
+
+
+* Olena 0.8 April 10, 2003
+
+ IMPORTANT NOTE: This version is not compatible with older
+ versions of Olena. The project has been split into three part,
+ so many header files have moved and new namespaces have been
+ created. Please read the UPGRADING file for more information.
+
+ * Many source code cleanups.
+ * The source code has been split into 3 parts: image
+ processing (olena/), data types (integre/) and meta-programming
+ tools (metalic/).
+ * First part of the new static hierarchy paradigm implementation.
+ * Support for combinatorial maps.
+ * Many bug fixes.
+
+
+* Olena 0.7 February 10, 2003
+
+ * Manual pages for the command-line utilities.
+ * New, saner, source tree layout.
+ * Each `part' of the source tree can be excluded from the
+ build process with configuration flags.
+ * New `oln.m4' file for use by autoconf'ed user projects.
+ * Major documentation updates.
+ * New `oln-config.sh' scripts for user Makefiles.
+ * Olena now works on Mac OS X, NetBSD, FreeBSD and Cygwin.
+
+
+* Olena 0.6 January 15, 2003
+
+ * Complete rewriting of data types.
+ * Command line utilities.
+ * Fully implementation of convolutions
+ * Fast Fourier Transform (FFT)
+ * Discrete Wavelet Transform (Daubechie's wavelet) (DWT)
+ * Many bug fixes.
+
+
+* Olena 0.5 July 25, 2002
+
+ * Documentation in LaTeX (instead of Texinfo).
+ * Support reading/writing gziped images
+ (include <oln/io/gz.hh> and link with libz).
+ * Complete rewrite of the static arrays
+ (meta::array1d, meta::array2d, meta::array3d).
+ * Preliminary implementation of convolutions
+ (oln::convol::convolve)
+ * All headers should now be referenced with the `oln/' prefix,
+ as in `#include <oln/basics2d.hh>'.
+ * New conversion operator: convert::stretch.
+ * Many bug fixes.
+
+
+* Olena 0.4.1 April 25, 2002
+
+ * Buglet in the 0.4 Makefiles.
+
+
+* Olena 0.4 April 24, 2002
+
+ * New morpho:: operators:
+ - thinning
+ - thickening
+ * New convert:: operators:
+ - ng_to_se
+ - ng_to_cse
+ * First sketch of a test suite.
+ * Many bug fixes.
+
+
+* Olena 0.3 January 14, 2002
+
+ * fast_morpho() speeded-up.
+ * Minor bug fixes.
+ * "Documentation" updates.
+
+
+* Olena 0.2b December 13, 2001
+
+ * Value:
+ - Support for HSL and HSV color systems.
+ - Define internal::default_less<vec<N,T>>.
+
+ * Core:
+ - New window generator: mk_win_ellipse, mk_win_disc,
+ mk_win_ellipsoid, and mk_win_ball.
+
+ * Various #include fixes.
+
+
+* Olena 0.2 November 28, 2001
+
+ * Color:
+ - nrgb_8, nrgb_16, nrgb_32: new types for NTSC RGB. The
+ conversion from and to YIQ and HSI which assumed NTSC RGB
+ has been adjusted to actually use nrgb_* (instead of rgb_*)
+ and renamed accordingly.
+ - yuv_8, yuv_16, yuv_32: New types.
+
+ The currently available conversions are
+
+ hsi yuv
+ \ /
+ rgb -- nrgb
+ \ / \
+ xyz yiq
+
+ * Various cleanups and bug fixes. Especially:
+ - border handling (mirroring, copying) simplified and fixed.
+ - ++k, --k: return a value with the same type as k.
+
+ * I/O:
+ - pnm/P1, pnm/P3, and pnm/P6 support for image_3d.
+
+
+* Olena 0.1f November 22, 2001
+
+ * Core:
+ - Several bug fixes in memory handling.
+
+ * Types:
+ - New color types: HSI, YIQ; with conversions to and from RGB.
+ - `min()' and `max()' are now defined with the types (i.e.
+ not in math/macros.hh), along with the other operators.
+ Also, these procedures will two arguments of different
+ types.
+
+ * Casts:
+ - `cast::round': similar to C's round()
+ - `cast::rbound': ditto, but constrained to fit the
+ output type's range.
+
+ * I/O:
+ - Support for `image_3d<int_u<N> >' (as PNM P2 & P5).
+
+ * Processings
+ - `level::is_greater_or_equal', `level::is_greater',
+ `level::is_lower_or_equal', `level::is_lower',
+ `level::is_equal': Comparisons between images.
+ - `level::connected_component': Number connected components.
+ - `morpho::geodesic_dilation', `morpho::simple_geodesic_dilation'.
+ - `morpho::geodesic_erosion', `morpho::simple_geodesic_erosion'.
+ - `morpho::get_plus_se_only', `morpho::get_plus_se_p',
+ `morpho::get_minus_se_only', `morpho::get_minus_se_p': Split
+ a structural element in a `plus' (lexically before than the center)
+ and `minus' (after).
+
+ * Misc:
+ - `utils::timer': for benchmarking
+ - `level::lut', `level::hlut': Lookup tables.
+
+
+* Olena 0.1d November 15, 2001
+
+ * Core:
+ - `point's, `dpoint's, and `image_size's feature a `nth()' method,
+ that returns the value of the nth coordinate.
+ - `fold': new high order operator.
+
+ * Types:
+ - `vec<N,T>' uses an array to store its elements
+ and accepts builtin types.
+ - `rgb<T>' has been replaced by `rgb_8', `rgb_16', `rgb_32'
+ - `xyz_8', `xyz_16', `xyz_32' are new types.
+ - the latter six types are instances of the `color' type.
+
+ * Processings:
+ - All basic morphological processings (`opening',
+ `hit_or_miss', `beucher_gradient', etc.) from namespace
+ `morpho::' have their fast equivalent in namespace
+ `morpho::fast::'.
+ - `convert::apply' is similar to `apply' but will work
+ for all types of conversions while `apply' can only work
+ on `conversion_to_type' conversions.
+
+ * Tools:
+ - `utils::fill': fill an image
+ - `utils::f_moments', `utils::f_minmax': statistical functors.
+
+ * Casts:
+ - `cast::bound': similar to `convert::bound'.
+
+ * I/O:
+ - It's possible to load and save as PPM any kind of image2d
+ whose color has 3 components on 8 bits.
+
+
+* Olena 0.1b November 8, 2001
+
+ * New type: rgb<T>
+
+ * New processings:
+ - morpho::watershed_con
+ - convol::fast::gaussian
+ - convol::fast::gaussian_derivative
+ - convol::fast::gaussian_second_derivative
+
+ * Conversion are organized in the following hierarchy
+
+ conversion<Inferior>
+ ^
+ |
+ conversion_to_type<To,Inferior>
+ ^
+ |
+ conversion_from_type_to_type<From,To,Inferior>
+
+ All children of conversion_from_type_to_type are models of
+ Adaptable Unary Function. See conversion.hh for more comments.
+
+ * The only two functions that perform file i/o are `load' and
+ `save'. The other functions (`read', `write', `read_pnm',
+ `write_pnm') have been removed.
+
+ * image2d<rgb<int_u8> > can be loaded and saved as ppm.
+
+ * All iterators support a new method, cur(), that returns
+ the current point (or dpoint). It is meant to be used
+ at places where the compiler is unable to implicitly convert
+ an iterator into a point (or dpoint).
+
+ * Bug fixes:
+ - Olena now compiles successfully with -pedantic.
+ - `image2d<int_u8> lena = load("lena.pgm");' works.
+ - Multiplications and subtractions on 'vec' no longer
+ perform additions.
+
+
+* Olena 0.1 November 1, 2001
+
+ * Initial public release.
+
+
+Local Variables:
+mode: outline
+ispell-local-dictionary: "american"
+End:
+
+----
+
+Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009, 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/>.
diff --git a/scribo/README b/scribo/README
index 8506c66..e3e4a99 100644
--- a/scribo/README
+++ b/scribo/README
@@ -1,12 +1,12 @@
Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE)
-This file is part of Scribo.
+This file is part of Olena.
-Scribo is free software: you can redistribute it and/or modify it under
+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.
-Scribo is distributed in the hope that it will be useful,
+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.
@@ -49,4 +49,4 @@ scribo/
The C++ headers of Scribo.
src/
- Various small tools related to DIA. See src/README.
\ No newline at end of file
+ Various small tools related to DIA. See src/README.
diff --git a/scribo/build-aux/Makefile.am b/scribo/build-aux/Makefile.am
new file mode 100644
index 0000000..7fa77cb
--- /dev/null
+++ b/scribo/build-aux/Makefile.am
@@ -0,0 +1,19 @@
+# Copyright (C) 2006, 2009, 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/>.
+
+# File generators.
+EXTRA_DIST = generate_dist_headers.sh build_unit_test.sh
diff --git a/scribo/build-aux/autotroll.mk b/scribo/build-aux/autotroll.mk
new file mode 120000
index 0000000..b37e671
--- /dev/null
+++ b/scribo/build-aux/autotroll.mk
@@ -0,0 +1 @@
+../../build-aux/autotroll.mk
\ No newline at end of file
diff --git a/scribo/build-aux/build_unit_test.sh b/scribo/build-aux/build_unit_test.sh
new file mode 120000
index 0000000..15a20e9
--- /dev/null
+++ b/scribo/build-aux/build_unit_test.sh
@@ -0,0 +1 @@
+../../build-aux/build_unit_test.sh
\ No newline at end of file
diff --git a/scribo/build-aux/generate_dist_headers.sh b/scribo/build-aux/generate_dist_headers.sh
new file mode 120000
index 0000000..ffa8b88
--- /dev/null
+++ b/scribo/build-aux/generate_dist_headers.sh
@@ -0,0 +1 @@
+../../build-aux/generate_dist_headers.sh
\ No newline at end of file
diff --git a/scribo/build-aux/regen-recursive.mk b/scribo/build-aux/regen-recursive.mk
new file mode 120000
index 0000000..25c382c
--- /dev/null
+++ b/scribo/build-aux/regen-recursive.mk
@@ -0,0 +1 @@
+../../build-aux/regen-recursive.mk
\ No newline at end of file
diff --git a/scribo/configure.ac b/scribo/configure.ac
new file mode 100644
index 0000000..59ecc49
--- /dev/null
+++ b/scribo/configure.ac
@@ -0,0 +1,294 @@
+# Copyright (C) 2006, 2007, 2008, 2009, 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/>.
+
+m4_pattern_forbid([^OLN_])
+
+AC_PREREQ([2.61])
+
+
+## ---------------- ##
+## Package set up. ##
+## ---------------- ##
+
+AC_INIT([Olena-Scribo], [1.0a], [olena(a)lrde.epita.fr], [olena-scribo])
+
+# M4 macros.
+AC_CONFIG_MACRO_DIR([m4])
+
+# Auxiliary files.
+AC_CONFIG_AUX_DIR([build-aux])
+### AC_CONFIG_FILES([build-aux/Makefile])
+
+# Automake.
+AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall])
+
+## --------------------- ##
+## C++ compiler set up. ##
+## --------------------- ##
+
+# If the user doesn't provide any CXXFLAGS, prevent Autoconf from
+# settings its own default ones (e.g., `-g -O2' for g++).
+if test ! ${CXXFLAGS+set}; then
+ CXXFLAGS=""
+fi
+
+# Look for a C++ compiler.
+AC_LANG([C++])
+AC_PROG_CXX
+
+# Set `ICPC' to `yes' if the Intel C++ compiler is used.
+test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes
+
+# GNU C++ compiler setup.
+if test "$GXX" = yes; then
+ # Speed up compiling times.
+ CXXFLAGS="$CXXFLAGS -pipe"
+
+ # The code generated for mln::data::impl::memcpy__() by g++ 4.2 with
+ # a high optimization level (`-O3') and without
+ # `-fno-strict-aliasing' might be wrong, at least with Debian's g++
+ # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this
+ # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc.
+ # Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine.
+ #
+ # So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS
+ # to `-fno-strict-aliasing'.
+ if $CXX --version | head -n 1 | grep '\b4\.2' >/dev/null 2>&1; then
+ STRICT_ALIASING_CXXFLAGS=-fno-strict-aliasing
+ fi
+fi
+AC_SUBST([STRICT_ALIASING_CXXFLAGS])
+
+
+# Adjusting warning options according to compilers.
+AC_ARG_VAR([WARNINGS_CXXFLAGS], [C++ compiler warning flags])
+case "$CXX" in
+ # Intel compiler
+ *icpc*)
+ WARNINGS_CXXFLAGS="-Wall -wd111,193,279,383,444,522,654,810,981,1418"
+ ;;
+ *)
+ WARNINGS_CXXFLAGS="-Wall -W"
+ ;;
+esac
+
+
+## -------- ##
+## Milena. ##
+## -------- ##
+
+# The current approach to providing Scribo a path to Milena's headers
+# is naive: for instance, we cannot provide two paths (source and
+# build dirs) in the case of an Olena build using a parallel build
+# (where srcdir != builddir). Improve if needed.
+
+AC_ARG_WITH([milena],
+ [AC_HELP_STRING([--with-milena=DIR], [path to Milena headers])],
+ [if test x"$with_milena" = xno; then
+ AC_MSG_ERROR([Milena is required for Scribo. Try to invoke configure
+without `--with-milena=no' nor `--without-milena.'])
+ fi])
+if test -n "$with_milena" && test x"$with_milena" != xyes; then
+ MILENA_CPPFLAGS="-I$with_milena"
+fi
+swl_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$MILENA_CPPFLAGS $CPPFLAGS"
+AC_CHECK_HEADER([mln/core/essential.hh], [],
+ AC_MSG_ERROR([Cannot find Milena's headers. Try to invoke configure with
+`--with-milena=DIR'.]))
+CPPFLAGS=$swl_save_CPPFLAGS
+AC_SUBST([MILENA_CPPFLAGS])
+
+
+## ------------------ ##
+## Libraries set up. ##
+## ------------------ ##
+
+# Use Libtool.
+# To be replaced by a call to LT_INIT as soon as Libtool 2.2 is used.
+AC_PROG_LIBTOOL
+
+
+## -------------------- ##
+## External libraries. ##
+## -------------------- ##
+
+# ---------- #
+# Magick++. #
+# ---------- #
+
+OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx],
+ [MAGICKXX], [], [ImageMagick++])
+
+# ---- #
+# Qt. #
+# ---- #
+
+AT_WITH_QT([xml], [], [], [:], [oln_have_qt=yes])
+if test x$oln_have_qt = xyes; then
+ AT_REQUIRE_QT_VERSION([4],
+ AC_MSG_WARN([Qt-dependent programs will be disabled.]),
+ oln_have_expected_qt_version=yes)
+fi
+AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_expected_qt_version" = xyes])
+
+# ----------- #
+# Tesseract. #
+# ----------- #
+
+OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full],
+ [tesseract], [TESSERACT])
+
+# -------------- #
+# TIFF library. #
+# -------------- #
+
+OLN_WITH_LIB([TIFF], [tiff.h], [tiff])
+
+
+dnl<<lrde
+## -------- ##
+## Scribo. ##
+## -------- ##
+
+AC_ARG_ENABLE([scribo],
+ [AS_HELP_STRING([--enable-scribo],
+ [enable Scribo])])
+AM_CONDITIONAL([ENABLE_SCRIBO], [test "x$enable_scribo" = xyes])
+
+AC_CONFIG_FILES([
+ Makefile
+ build-aux/Makefile
+ demo/Makefile
+ demo/review/Makefile
+ demo/viewer/Makefile
+ src/Makefile
+ src/binarization/Makefile
+ src/contest/Makefile
+ src/contest/hdibco-2010/Makefile
+ src/debug/Makefile
+ src/filter/Makefile
+ src/misc/Makefile
+ src/postprocessing/Makefile
+ src/preprocessing/Makefile
+ src/primitive/Makefile
+ src/primitive/extract/Makefile
+ src/primitive/find/Makefile
+ src/primitive/group/Makefile
+ src/table/Makefile
+ src/text/Makefile
+])
+
+AC_CONFIG_FILES([tests/data.hh])
+
+AC_CONFIG_FILES([
+ tests/Makefile
+ tests/binarization/Makefile
+ tests/core/Makefile
+ tests/filter/Makefile
+ tests/preprocessing/Makefile
+ tests/table/Makefile
+ tests/text/Makefile
+ tests/toolchain/Makefile
+ tests/toolchain/nepomuk/Makefile
+ tests/unit_test/Makefile
+])
+
+# Flags for Scribo
+AC_ARG_VAR([SCRIBO_CXXFLAGS], [C++ compiler flags for Scribo binaries])
+AC_ARG_VAR([SCRIBO_TESTS_CXXFLAGS], [C++ compiler flags for Scribo tests])
+if test "$GXX" = yes || test "$ICPC" = yes; then
+ test -z "$SCRIBO_CXXFLAGS" && SCRIBO_CXXFLAGS="-DNDEBUG -O2"
+ # FIXME: We might want to use -ggdb when g++ is used.
+ test -z "$SCRIBO_TESTS_CXXFLAGS" && SCRIBO_TESTS_CXXFLAGS="-g -O0"
+fi
+dnl>>
+
+## ----------------- ##
+## Verbose display. ##
+## ----------------- ##
+
+# Do not print this information by default, since `configure' outputs
+# should be kept short. Longer explanations are always available in
+# config.log.
+
+AC_ARG_ENABLE([verbose],
+ [AS_HELP_STRING([--enable-verbose], [enable verbose display])],
+ [if test "x$enable_verbose" != xno; then
+ AC_MSG_RESULT([
+-------------------------------------------------------------------------------
+Configuration summary.
+
+
+Host system type: $host
+Build system type: $build
+
+================
+| Dependencies |
+================
+
+
+ Option Enabled and available
+-------------------------------------------------------------------------------
+Magick++ --with-magickxx $oln_have_magickxx
+Qt --with-qt $oln_have_qt
+Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract
+TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff
+-------------------------------------------------------------------------------
+
+
+
+
+Options used to compile and link:
+ PREFIX = $PREFIX_DIR
+ EXEC-PREFIX = $EXEC_PREFIX_DIR
+ VERSION = $PACKAGE_VERSION
+ CC = $CC
+ CFLAGS = $CFLAGS
+ CPPFLAGS = $MAGICK_CPPFLAGS
+ DEFS = $DEFS
+ LDFLAGS = $LDFLAGS
+ LIBS = $MAGICK_LIBS
+ CXX = $CXX
+ CXXFLAGS = $CXXFLAGS
+ PKG_CONFIG = $PKG_CONFIG
+ QT_PATH = $QT_PATH
+ QMAKE = $QMAKE
+ MOC = $MOC
+ UIC = $UIC
+ RCC = $RCC
+ MAGICKXX_CFLAGS = $MAGICKXX_CPPFLAGS
+ MAGICKXX_LIBS = $MAGICKXX_LDFLAGS
+ SCRIBO_CXXFLAGS = $SCRIBO_CXXFLAGS
+
+
+
+*******************************************************************************
+Scribo is configured as stated above. Please verify that this configuration
+matches your expectations.
+
+Then, type 'make' to build Olena and 'make install' to install it on
+your system.
+])
+fi])
+
+
+## -------- ##
+## Output. ##
+## -------- ##
+
+AC_OUTPUT
diff --git a/swilena/configure.gnu b/scribo/configure.gnu
similarity index 100%
copy from swilena/configure.gnu
copy to scribo/configure.gnu
diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am
index b51084e..3fd0e02 100644
--- a/scribo/demo/review/Makefile.am
+++ b/scribo/demo/review/Makefile.am
@@ -1,6 +1,6 @@
## Process this file through Automake to create Makefile.in.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
.PHONY : demo
diff --git a/scribo/m4/autotroll.m4 b/scribo/m4/autotroll.m4
new file mode 120000
index 0000000..cd1f77e
--- /dev/null
+++ b/scribo/m4/autotroll.m4
@@ -0,0 +1 @@
+../../m4/autotroll.m4
\ No newline at end of file
diff --git a/scribo/m4/oln-with-lib.m4 b/scribo/m4/oln-with-lib.m4
new file mode 120000
index 0000000..446a869
--- /dev/null
+++ b/scribo/m4/oln-with-lib.m4
@@ -0,0 +1 @@
+../../m4/oln-with-lib.m4
\ No newline at end of file
diff --git a/scribo/m4/pkg.m4 b/scribo/m4/pkg.m4
new file mode 120000
index 0000000..38eeb23
--- /dev/null
+++ b/scribo/m4/pkg.m4
@@ -0,0 +1 @@
+../../m4/pkg.m4
\ No newline at end of file
diff --git a/scribo/scribo.mk b/scribo/scribo.mk
index c899631..ad0b76e 100644
--- a/scribo/scribo.mk
+++ b/scribo/scribo.mk
@@ -15,13 +15,13 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
+MILENA_CPPFLAGS = @MILENA_CPPFLAGS@
-# Add path to Scribo's headers
-AM_CPPFLAGS = \
- -I$(top_srcdir)/scribo \
- -I$(top_builddir)/scribo\
- -I$(top_srcdir)/milena \
- -I$(top_builddir)/milena
+# Add paths to Scribo's and Milena's headers.
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(MILENA_CPPFLAGS)
SCRIBO_CXXFLAGS = @SCRIBO_CXXFLAGS@
AM_CXXFLAGS = $(SCRIBO_CXXFLAGS)
diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am
index 52df66d..c8eca53 100644
--- a/scribo/src/Makefile.am
+++ b/scribo/src/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
SUBDIRS = \
binarization \
diff --git a/scribo/src/README b/scribo/src/README
index 582168d..e0d00d8 100644
--- a/scribo/src/README
+++ b/scribo/src/README
@@ -1,12 +1,12 @@
Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE)
-This file is part of Scribo.
+This file is part of Olena.
-Scribo is free software: you can redistribute it and/or modify it under
+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.
-Scribo is distributed in the hope that it will be useful,
+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.
@@ -36,4 +36,4 @@ Here is a description of some of them:
text_recognition_in_picture: Localize, extract and try to
recognize text in pictures
- (experimental).
\ No newline at end of file
+ (experimental).
diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am
index 277125a..42420d9 100644
--- a/scribo/src/binarization/Makefile.am
+++ b/scribo/src/binarization/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
pgm_global_threshold_auto \
diff --git a/scribo/src/contest/Makefile.am b/scribo/src/contest/Makefile.am
index 81f314b..8a0c7de 100644
--- a/scribo/src/contest/Makefile.am
+++ b/scribo/src/contest/Makefile.am
@@ -17,7 +17,7 @@
## Process this file through Automake to create Makefile.in.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
- hdibco-2010
\ No newline at end of file
+ hdibco-2010
diff --git a/scribo/src/contest/hdibco-2010/Makefile.am b/scribo/src/contest/hdibco-2010/Makefile.am
index a59e424..624f57d 100644
--- a/scribo/src/contest/hdibco-2010/Makefile.am
+++ b/scribo/src/contest/hdibco-2010/Makefile.am
@@ -17,7 +17,7 @@
## Process this file through Automake to create Makefile.in.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
bin_PROGRAMS = sauvola_ms_hdibco
diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am
index f3dd4f9..5e0b68a 100644
--- a/scribo/src/debug/Makefile.am
+++ b/scribo/src/debug/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
show_info_x_height \
diff --git a/scribo/src/filter/Makefile.am b/scribo/src/filter/Makefile.am
index 4e2b8d1..15b097c 100644
--- a/scribo/src/filter/Makefile.am
+++ b/scribo/src/filter/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
objects_large \
diff --git a/scribo/src/misc/Makefile.am b/scribo/src/misc/Makefile.am
index 693b579..88a672c 100644
--- a/scribo/src/misc/Makefile.am
+++ b/scribo/src/misc/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
dmap \
diff --git a/scribo/src/postprocessing/Makefile.am b/scribo/src/postprocessing/Makefile.am
index b21cac2..ecfa50e 100644
--- a/scribo/src/postprocessing/Makefile.am
+++ b/scribo/src/postprocessing/Makefile.am
@@ -17,7 +17,7 @@
## Process this file through Automake to create Makefile.in.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
fill_object_holes
diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am
index 0c6e00a..25bddd3 100644
--- a/scribo/src/preprocessing/Makefile.am
+++ b/scribo/src/preprocessing/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
denoise_bg \
diff --git a/scribo/src/primitive/Makefile.am b/scribo/src/primitive/Makefile.am
index 7e46a66..8ef9877 100644
--- a/scribo/src/primitive/Makefile.am
+++ b/scribo/src/primitive/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
SUBDIRS = \
extract \
diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am
index 6f20ea3..f2141dd 100644
--- a/scribo/src/primitive/extract/Makefile.am
+++ b/scribo/src/primitive/extract/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
diff --git a/scribo/src/primitive/find/Makefile.am b/scribo/src/primitive/find/Makefile.am
index 3b5dbd2..eb6e2a0 100644
--- a/scribo/src/primitive/find/Makefile.am
+++ b/scribo/src/primitive/find/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am
index afc4f8e..bfe8d27 100644
--- a/scribo/src/primitive/group/Makefile.am
+++ b/scribo/src/primitive/group/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
group_from_double_link \
diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am
index 7fc7008..b90c093 100644
--- a/scribo/src/table/Makefile.am
+++ b/scribo/src/table/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
erase \
diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am
index fc03ae8..6f4df18 100644
--- a/scribo/src/text/Makefile.am
+++ b/scribo/src/text/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/scribo.mk
+include $(top_srcdir)/scribo.mk
bin_PROGRAMS = \
cleantxt
diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am
index c845b43..92c45e6 100644
--- a/scribo/tests/binarization/Makefile.am
+++ b/scribo/tests/binarization/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -17,7 +17,7 @@
## Process this file through Automake to create Makefile.in.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
global_threshold \
diff --git a/scribo/tests/core/Makefile.am b/scribo/tests/core/Makefile.am
index cf1c528..5affcdc 100644
--- a/scribo/tests/core/Makefile.am
+++ b/scribo/tests/core/Makefile.am
@@ -18,7 +18,7 @@
## Process this file through Automake to create Makefile.in.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS =
diff --git a/scribo/tests/data.hh.in b/scribo/tests/data.hh.in
index 6a6f95f..fb551a8 100644
--- a/scribo/tests/data.hh.in
+++ b/scribo/tests/data.hh.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2008, 2010 EPITA Research and Development Laboratory (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
@@ -34,6 +34,6 @@
(as well as additional burden in Makefiles, too.). */
/// \brief The absolute path to the img directory of Scribo.
-# define SCRIBO_IMG_DIR "@abs_top_srcdir@/scribo/tests/img"
+# define SCRIBO_IMG_DIR "@abs_top_srcdir@/tests/img"
#endif // ! SCRIBO_TESTS_DATA_HH
diff --git a/scribo/tests/filter/Makefile.am b/scribo/tests/filter/Makefile.am
index b0659be..0d585bd 100644
--- a/scribo/tests/filter/Makefile.am
+++ b/scribo/tests/filter/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
objects_with_holes \
diff --git a/scribo/tests/preprocessing/Makefile.am b/scribo/tests/preprocessing/Makefile.am
index 24686fe..9e4bfc6 100644
--- a/scribo/tests/preprocessing/Makefile.am
+++ b/scribo/tests/preprocessing/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
crop \
diff --git a/scribo/tests/table/Makefile.am b/scribo/tests/table/Makefile.am
index 3427e6b..ce50c40 100644
--- a/scribo/tests/table/Makefile.am
+++ b/scribo/tests/table/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
extract_lines_with_rank \
diff --git a/scribo/tests/tests.mk b/scribo/tests/tests.mk
index d95e4d2..b0c57ad 100644
--- a/scribo/tests/tests.mk
+++ b/scribo/tests/tests.mk
@@ -15,11 +15,12 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = \
- -I$(top_srcdir)/scribo \
- -I$(top_builddir)/scribo\
- -I$(top_srcdir)/milena \
- -I$(top_builddir)/milena
+MILENA_CPPFLAGS = @MILENA_CPPFLAGS@
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(MILENA_CPPFLAGS)
SCRIBO_TESTS_CXXFLAGS = @SCRIBO_TESTS_CXXFLAGS@
AM_CXXFLAGS = $(SCRIBO_TESTS_CXXFLAGS)
diff --git a/scribo/tests/text/Makefile.am b/scribo/tests/text/Makefile.am
index 0d48025..6c8d51d 100644
--- a/scribo/tests/text/Makefile.am
+++ b/scribo/tests/text/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS =
diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/tests/toolchain/Makefile.am
index 1e4a032..4350a41 100644
--- a/scribo/tests/toolchain/Makefile.am
+++ b/scribo/tests/toolchain/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
nepomuk
diff --git a/scribo/tests/toolchain/nepomuk/Makefile.am b/scribo/tests/toolchain/nepomuk/Makefile.am
index 4bce3bd..0d24045 100644
--- a/scribo/tests/toolchain/nepomuk/Makefile.am
+++ b/scribo/tests/toolchain/nepomuk/Makefile.am
@@ -17,7 +17,7 @@
## Process this file through Automake to create Makefile.in.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS =
diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am
index b150824..631337b 100644
--- a/scribo/tests/unit_test/Makefile.am
+++ b/scribo/tests/unit_test/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/scribo/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
COND_TESTS = cond_tests_qt \
cond_tests_qt_tesseract_tiff \
--
1.5.6.5