* common.mk: New. Include it... * tests/tests.mk, * tools/tools.mk: ...here. * 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/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/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/p2p/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/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/pgm/Makefile.am, * tests/io/pgms/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/metal/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/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/opt/Makefile.am, * tests/pw/Makefile.am, * tests/registration/Makefile.am, * tests/set/Makefile.am, * tests/test/Makefile.am, * tests/topo/Makefile.am, * tests/topo/skeleton/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/upscaling/art/Makefile.am, * tests/util/Makefile.am, * tests/value/Makefile.am, * tests/value/builtin/Makefile.am, * tests/win/Makefile.am, * tests/world/binary_2d/Makefile.am, * tests/world/inter_pixel/Makefile.am, * tests/world/inter_pixel/dim2/Makefile.am: Remove (now useless) `*_SOURCES' variables using sed -ri '/^(\s|#)*\S+_SOURCES\s*=\s*\S+.cc\s*$/d'. * apps/constrained-connectivity/Makefile.am, * apps/graph-morpho/Makefile.am, * apps/mesh-segm-skel/Makefile.am, * apps/papers/levillain.09.ismm/Makefile.am * tools/Makefile.am: Likewise. Include common.mk. --- milena/ChangeLog | 118 ++++++++++++++++++++ milena/apps/constrained-connectivity/Makefile.am | 5 +- milena/apps/graph-morpho/Makefile.am | 8 +- milena/apps/mesh-segm-skel/Makefile.am | 9 +- milena/apps/papers/levillain.09.ismm/Makefile.am | 8 +- milena/common.mk | 22 ++++ milena/tests/Makefile.am | 4 +- milena/tests/accu/Makefile.am | 16 +--- milena/tests/accu/image/Makefile.am | 9 +-- milena/tests/accu/math/Makefile.am | 3 +- milena/tests/accu/shape/Makefile.am | 3 +- milena/tests/accu/site_set/Makefile.am | 3 +- milena/tests/accu/stat/Makefile.am | 11 +-- milena/tests/algebra/Makefile.am | 10 +-- milena/tests/arith/Makefile.am | 8 +- milena/tests/binarization/Makefile.am | 4 +- milena/tests/border/Makefile.am | 23 +---- milena/tests/canvas/Makefile.am | 4 +- milena/tests/canvas/browsing/Makefile.am | 10 +-- milena/tests/canvas/morpho/Makefile.am | 4 +- milena/tests/convert/Makefile.am | 10 +-- milena/tests/convert/impl/Makefile.am | 3 +- milena/tests/core/alias/Makefile.am | 18 +--- milena/tests/core/image/Makefile.am | 14 +-- milena/tests/core/image/dmorph/Makefile.am | 10 +-- milena/tests/core/image/imorph/Makefile.am | 7 +- milena/tests/core/image/vmorph/Makefile.am | 4 +- milena/tests/core/other/Makefile.am | 22 +---- milena/tests/core/routine/Makefile.am | 8 +- milena/tests/core/site_set/Makefile.am | 16 +--- milena/tests/data/Makefile.am | 25 +---- milena/tests/data/approx/Makefile.am | 3 +- milena/tests/data/naive/Makefile.am | 3 +- milena/tests/debug/Makefile.am | 7 +- milena/tests/draw/Makefile.am | 5 +- milena/tests/estim/Makefile.am | 5 +- milena/tests/extension/Makefile.am | 4 +- milena/tests/extract/Makefile.am | 8 +- milena/tests/fun/Makefile.am | 3 +- milena/tests/fun/i2v/Makefile.am | 6 +- milena/tests/fun/p2p/Makefile.am | 4 +- milena/tests/fun/stat/Makefile.am | 3 +- milena/tests/fun/v2i/Makefile.am | 3 +- milena/tests/fun/v2v/Makefile.am | 10 +-- milena/tests/fun/vv2v/Makefile.am | 5 +- milena/tests/fun/x2x/Makefile.am | 6 +- milena/tests/geom/Makefile.am | 22 +---- milena/tests/graph/Makefile.am | 3 +- milena/tests/graph/attribute/Makefile.am | 4 +- milena/tests/histo/Makefile.am | 6 +- milena/tests/io/dicom/Makefile.am | 3 +- milena/tests/io/dump/Makefile.am | 3 +- milena/tests/io/fits/Makefile.am | 4 +- milena/tests/io/fld/Makefile.am | 6 +- milena/tests/io/magick/Makefile.am | 4 +- milena/tests/io/off/Makefile.am | 6 +- milena/tests/io/pbm/Makefile.am | 5 +- milena/tests/io/pbms/Makefile.am | 3 +- milena/tests/io/pgm/Makefile.am | 8 +- milena/tests/io/pgms/Makefile.am | 3 +- milena/tests/io/ppm/Makefile.am | 6 +- milena/tests/io/ppms/Makefile.am | 3 +- milena/tests/io/tiff/Makefile.am | 3 +- milena/tests/labeling/Makefile.am | 19 +--- milena/tests/linear/Makefile.am | 8 +- milena/tests/linear/gaussian/Makefile.am | 3 +- milena/tests/linear/local/Makefile.am | 4 +- milena/tests/literal/Makefile.am | 8 +- milena/tests/logical/Makefile.am | 8 +- milena/tests/make/Makefile.am | 17 +--- milena/tests/metal/Makefile.am | 6 +- milena/tests/metal/math/Makefile.am | 5 +- milena/tests/morpho/Makefile.am | 30 +----- milena/tests/morpho/approx/Makefile.am | 4 +- milena/tests/morpho/attribute/Makefile.am | 6 +- milena/tests/morpho/closing/Makefile.am | 10 +-- milena/tests/morpho/closing/approx/Makefile.am | 3 +- milena/tests/morpho/elementary/Makefile.am | 12 +-- milena/tests/morpho/opening/Makefile.am | 10 +-- milena/tests/morpho/opening/approx/Makefile.am | 3 +- .../morpho/reconstruction/by_dilation/Makefile.am | 3 +- .../morpho/reconstruction/by_erosion/Makefile.am | 3 +- milena/tests/morpho/tree/Makefile.am | 8 +- milena/tests/morpho/tree/filter/Makefile.am | 3 +- milena/tests/morpho/watershed/Makefile.am | 5 +- milena/tests/opt/Makefile.am | 4 +- milena/tests/pw/Makefile.am | 5 +- milena/tests/registration/Makefile.am | 4 +- milena/tests/set/Makefile.am | 11 +-- milena/tests/test/Makefile.am | 4 +- milena/tests/tests.mk | 3 +- milena/tests/topo/Makefile.am | 4 +- milena/tests/topo/skeleton/Makefile.am | 4 +- milena/tests/trait/Makefile.am | 5 +- milena/tests/trait/image/Makefile.am | 4 +- milena/tests/trait/op/Makefile.am | 5 +- milena/tests/trait/value/Makefile.am | 5 +- milena/tests/transform/Makefile.am | 11 +-- milena/tests/upscaling/art/Makefile.am | 4 +- milena/tests/util/Makefile.am | 19 +--- milena/tests/value/Makefile.am | 25 +---- milena/tests/value/builtin/Makefile.am | 4 +- milena/tests/win/Makefile.am | 19 +--- milena/tests/world/binary_2d/Makefile.am | 4 +- milena/tests/world/inter_pixel/Makefile.am | 7 +- milena/tests/world/inter_pixel/dim2/Makefile.am | 3 +- milena/tools/Makefile.am | 6 +- milena/tools/tools.mk | 3 +- 108 files changed, 317 insertions(+), 610 deletions(-) create mode 100644 milena/common.mk

diff --git a/milena/ChangeLog b/milena/ChangeLog index 39cc7f3..0fc13f8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,121 @@ +2010-04-22 Roland Levillain roland@lrde.epita.fr + + Use AM_DEFAULT_SOURCE_EXT to simplify Milena's Makefiles. + + * common.mk: New. + Include it... + * tests/tests.mk, + * tools/tools.mk: + ...here. + * 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/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/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/p2p/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/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/pgm/Makefile.am, + * tests/io/pgms/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/metal/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/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/opt/Makefile.am, + * tests/pw/Makefile.am, + * tests/registration/Makefile.am, + * tests/set/Makefile.am, + * tests/test/Makefile.am, + * tests/topo/Makefile.am, + * tests/topo/skeleton/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/upscaling/art/Makefile.am, + * tests/util/Makefile.am, + * tests/value/Makefile.am, + * tests/value/builtin/Makefile.am, + * tests/win/Makefile.am, + * tests/world/binary_2d/Makefile.am, + * tests/world/inter_pixel/Makefile.am, + * tests/world/inter_pixel/dim2/Makefile.am: + Remove (now useless) `*_SOURCES' variables using + sed -ri '/^(\s|#)*\S+_SOURCES\s*=\s*\S+.cc\s*$/d'. + * apps/constrained-connectivity/Makefile.am, + * apps/graph-morpho/Makefile.am, + * apps/mesh-segm-skel/Makefile.am, + * apps/papers/levillain.09.ismm/Makefile.am + * tools/Makefile.am: + Likewise. + Include common.mk. + 2010-04-27 Roland Levillain roland@lrde.epita.fr

Help g++ 3.3 compile Milena code. diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am index 84a6ed2..9c3e9bf 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. # @@ -14,6 +14,8 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see http://www.gnu.org/licenses/.

+include $(top_srcdir)/milena/common.mk + # Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Produce fast code. @@ -21,7 +23,6 @@ APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS)

noinst_PROGRAMS = constrained-connectivity -constrained_connectivity_SOURCES = constrained-connectivity.cc

TESTS = test-constrained-connectivity

diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index 7e3d4db..d85a9ca 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -14,6 +14,8 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see http://www.gnu.org/licenses/.

+include $(top_srcdir)/milena/common.mk + # Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Produce fast code. @@ -24,10 +26,6 @@ STRICT_ALIASING_CXXFLAGS = @STRICT_ALIASING_CXXFLAGS@ noinst_HEADERS = convert.hh debug.hh make.hh morpho.hh make_complex2d.hh

noinst_PROGRAMS = samples-complex1d samples-image2d asf-complex1d asf-image2d -samples_complex1d_SOURCES = samples-complex1d.cc -samples_image2d_SOURCES = samples-image2d.cc -asf_complex1d_SOURCES = asf-complex1d.cc -asf_image2d_SOURCES = asf-image2d.cc samples_image2d_CXXFLAGS = $(AM_CXXFLAGS) $(STRICT_ALIASING_CXXFLAGS)

TESTS = samples-complex1d samples-image2d diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 0185535..d104192 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/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. # @@ -13,9 +14,8 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see http://www.gnu.org/licenses/. -#

-## Process this file through Automake to produce Makefile.in. +include $(top_srcdir)/milena/common.mk

# Linking with gluit and GLUT/OpenGL. gluit_builddir = $(top_builddir)/external/trimesh/gluit @@ -107,7 +107,6 @@ EXTRA_DIST = trimesh/README # A small program exercising the curvature computation routines ported # from Trimesh to Milena. bin_PROGRAMS += mesh-complex-max-curv -mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv CLEANFILES += teapot-complex-max-curv.off

@@ -117,7 +116,6 @@ CLEANFILES += teapot-complex-max-curv.off

# Segmentation program working on precomputed meshes with curvatures data. bin_PROGRAMS += mesh-complex-segm -mesh_complex_segm_SOURCES = mesh-complex-segm.cc TESTS += test-mesh-complex-segm CLEANFILES += \ socket-max-curv-segm.off \ @@ -130,7 +128,6 @@ CLEANFILES += \ # `mesh-complex-segm', data are read from polygons, which implies an # extra averaging step). bin_PROGRAMS += mesh-complex-max-curv-segm -mesh_complex_max_curv_segm_SOURCES = mesh-complex-max-curv-segm.cc TESTS += test-mesh-complex-max-curv-segm CLEANFILES += \ socket-complex-max-curv-segm.off \ diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index f397567..6321d51 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. # @@ -16,6 +17,8 @@

# Illustrations from the ISMM 2009 paper.

+include $(top_srcdir)/milena/common.mk + # Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Produce fast code. @@ -25,9 +28,6 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_HEADERS = chain.hh

noinst_PROGRAMS = image2d graph complex -image2d_SOURCES = image2d.cc -graph_SOURCES = graph.cc -complex_SOURCES = complex.cc

# Input images. # FIXME: Move them to milena/img/? diff --git a/milena/common.mk b/milena/common.mk new file mode 100644 index 0000000..3623290 --- /dev/null +++ b/milena/common.mk @@ -0,0 +1,22 @@ +## common.mk -*- Makefile-Automake -*- + +## Common Automake parameters. + +## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +## +## This file is part of Olena. +## +## Olena is free software: you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free +## Software Foundation, version 2 of the License. +## +## Olena is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Olena. If not, see http://www.gnu.org/licenses/. + +# C++ sources. +AM_DEFAULT_SOURCE_EXT = .cc diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 562078e..5f61049 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. @@ -77,13 +77,11 @@ check_PROGRAMS = \ essential_headers \ global_vars

-all_headers_SOURCES = all_headers.cc all_headers_CPPFLAGS = $(AM_CPPFLAGS) \ $(CFITSIO_CPPFLAGS) $(GDCM_CPPFLAGS) $(MAGICKXX_CPPFLAGS) $(TIFF_CPPFLAGS) all_headers_LDFLAGS = \ $(CFITSIO_LDFLAGS) $(GDCM_LDFLAGS) $(MAGICKXX_LDFLAGS) $(TIFF_LDFLAGS)

-essential_headers_SOURCES = essential_headers.cc global_vars_SOURCES = global_vars1.cc global_vars2.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index 5e8fb52..4339516 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -41,18 +42,5 @@ check_PROGRAMS = \ transform_snake \ tuple

-all_accus_SOURCES = all_accus.cc -compute_SOURCES = compute.cc -histo_SOURCES = histo.cc -line_SOURCES = line.cc -max_site_SOURCES = max_site.cc -nil_SOURCES = nil.cc -pair_SOURCES = pair.cc -transform_SOURCES = transform.cc -transform_diagonal_SOURCES = transform_diagonal.cc -transform_directional_SOURCES = transform_directional.cc -transform_line_SOURCES = transform_line.cc -transform_snake_SOURCES = transform_snake.cc -tuple_SOURCES = tuple.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/image/Makefile.am b/milena/tests/accu/image/Makefile.am index 903f0eb..6de419d 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. # @@ -28,12 +28,5 @@ check_PROGRAMS = \ to_result \ untake

-init_SOURCES = init.cc -set_value_SOURCES = set_value.cc -take_SOURCES = take.cc -take_as_init_SOURCES = take_as_init.cc -take_n_times_SOURCES = take_n_times.cc -to_result_SOURCES = to_result.cc -untake_SOURCES = untake.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/math/Makefile.am b/milena/tests/accu/math/Makefile.am index 14f863b..0de41a3 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. # @@ -22,6 +22,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ count

-count_SOURCES = count.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/shape/Makefile.am b/milena/tests/accu/shape/Makefile.am index 4677fc6..79d427f 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. # @@ -22,6 +22,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ bbox

-bbox_SOURCES = bbox.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/site_set/Makefile.am b/milena/tests/accu/site_set/Makefile.am index 6319f07..29fe664 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. # @@ -22,6 +22,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ rectangularity

-rectangularity_SOURCES = rectangularity.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am index ab7e52e..1a1d3b4 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. # @@ -30,15 +30,6 @@ check_PROGRAMS = \ mean \ rank

-var_SOURCES = var.cc -mean_SOURCES = mean.cc -median_h_SOURCES = median_h.cc -min_SOURCES = min.cc -min_h_SOURCES = min_h.cc -max_SOURCES = max.cc -max_h_SOURCES = max_h.cc -min_max_SOURCES = min_max.cc -rank_SOURCES = rank.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/algebra/Makefile.am b/milena/tests/algebra/Makefile.am index a954f1b..b405d7d 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. # @@ -28,12 +29,5 @@ check_PROGRAMS = \ vec \ vec2

-h_mat_SOURCES = h_mat.cc -h_vec_SOURCES = h_vec.cc -mat_SOURCES = mat.cc -mat2_SOURCES = mat2.cc -quat_SOURCES = quat.cc -vec_SOURCES = vec.cc -vec2_SOURCES = vec2.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am index c7539a7..4338462 100644 --- a/milena/tests/arith/Makefile.am +++ b/milena/tests/arith/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -26,10 +27,5 @@ check_PROGRAMS = \ revert \ times

-diff_abs_SOURCES = diff_abs.cc -minus_SOURCES = minus.cc -plus_SOURCES = plus.cc -revert_SOURCES = revert.cc -times_SOURCES = times.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am index 3a258fd..bcac019 100644 --- a/milena/tests/binarization/Makefile.am +++ b/milena/tests/binarization/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. # @@ -22,7 +23,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ threshold

-threshold_SOURCES = threshold.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index 9337423..ab91f79 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -41,25 +42,5 @@ check_PROGRAMS = \ resize_sub_image \ resize

-adjust_SOURCES = adjust.cc -duplicate_SOURCES = duplicate.cc -equalize_SOURCES = equalize.cc -fill_SOURCES = fill.cc -find_SOURCES = find.cc -get_SOURCES = get.cc -mirror_SOURCES = mirror.cc -resize_equal_SOURCES = resize_equal.cc -resize_image1d_1_SOURCES = resize_image1d_1.cc -resize_image1d_2_SOURCES = resize_image1d_2.cc -resize_image1d_3_SOURCES = resize_image1d_3.cc -resize_image2d_1_SOURCES = resize_image2d_1.cc -resize_image2d_2_SOURCES = resize_image2d_2.cc -resize_image2d_3_SOURCES = resize_image2d_3.cc -resize_image3d_1_SOURCES = resize_image3d_1.cc -resize_image3d_2_SOURCES = resize_image3d_2.cc -resize_image3d_3_SOURCES = resize_image3d_3.cc -resize_image_if_SOURCES = resize_image_if.cc -resize_sub_image_SOURCES = resize_sub_image.cc -resize_SOURCES = resize.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/canvas/Makefile.am b/milena/tests/canvas/Makefile.am index 57a60c8..4968850 100644 --- a/milena/tests/canvas/Makefile.am +++ b/milena/tests/canvas/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -24,5 +25,4 @@ SUBDIRS = browsing morpho check_PROGRAMS = \ chamfer

-chamfer_SOURCES = chamfer.cc

diff --git a/milena/tests/canvas/browsing/Makefile.am b/milena/tests/canvas/browsing/Makefile.am index e5c4a19..bae2f39 100644 --- a/milena/tests/canvas/browsing/Makefile.am +++ b/milena/tests/canvas/browsing/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -28,12 +29,5 @@ check_PROGRAMS = \ depth_first_search \ breadth_first_search

-fwd_SOURCES = fwd.cc -snake_fwd_SOURCES = snake_fwd.cc -snake_vert_SOURCES = snake_vert.cc -hyper_directional_SOURCES = hyper_directional.cc -dir_struct_elt_incr_update_SOURCES = dir_struct_elt_incr_update.cc -depth_first_search_SOURCES = depth_first_search.cc -breadth_first_search_SOURCES = breadth_first_search.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/canvas/morpho/Makefile.am b/milena/tests/canvas/morpho/Makefile.am index 7909349..37cac6e 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. # @@ -21,4 +22,3 @@ include $(top_srcdir)/milena/tests/tests.mk

check_PROGRAMS=attribute_filter

-attribute_filter_SOURCES=attribute_filter.cc diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am index ab369d9..8243441 100644 --- a/milena/tests/convert/Makefile.am +++ b/milena/tests/convert/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -29,16 +29,10 @@ check_PROGRAMS = \ to_rgb \ to_window

-to_image_SOURCES = to_image.cc -to_p_array_SOURCES = to_p_array.cc -to_p_set_SOURCES = to_p_set.cc -to_rgb_SOURCES = to_rgb.cc -to_window_SOURCES = to_window.cc

#<<lrde # FIXME: Not distributed (yet). check_PROGRAMS += to_hsl -to_hsl_SOURCES = to_hsl.cc #>>

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/convert/impl/Makefile.am b/milena/tests/convert/impl/Makefile.am index 79f9727..b81fd80 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. # @@ -22,6 +22,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ from_site_set_to_image

-from_site_set_to_image_SOURCES = from_site_set_to_image.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/alias/Makefile.am b/milena/tests/core/alias/Makefile.am index dff2fce..af3c122 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. # @@ -36,20 +37,5 @@ window1d \ window2d \ window3d

-box1d_SOURCES = box1d.cc -box2d_SOURCES = box2d.cc -box3d_SOURCES = box3d.cc -dpoint1d_SOURCES = dpoint1d.cc -dpoint2d_SOURCES = dpoint2d.cc -dpoint3d_SOURCES = dpoint3d.cc -point1d_SOURCES = point1d.cc -point2d_SOURCES = point2d.cc -point3d_SOURCES = point3d.cc -w_window1d_int_SOURCES = w_window1d_int.cc -w_window2d_int_SOURCES = w_window2d_int.cc -w_window3d_int_SOURCES = w_window3d_int.cc -window1d_SOURCES = window1d.cc -window2d_SOURCES = window2d.cc -window3d_SOURCES = window3d.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index 0bfff01..51eb2b2 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -1,5 +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. # @@ -40,15 +40,5 @@ check_PROGRAMS = \

noinst_HEADERS = complex_image.hh

-complex_image_SOURCES = complex_image.cc -edge_image_SOURCES = edge_image.cc -flat_image_SOURCES = flat_image.cc -graph_image_SOURCES = graph_image.cc -image1d_SOURCES = image1d.cc -image2d_SOURCES = image2d.cc -image3d_SOURCES = image3d.cc -line_graph_image_SOURCES = line_graph_image.cc -vertex_and_edge_image_SOURCES = vertex_and_edge_image.cc -vertex_image_SOURCES = vertex_image.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/image/dmorph/Makefile.am b/milena/tests/core/image/dmorph/Makefile.am index 28445e9..e71cc66 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. # @@ -29,13 +29,5 @@ check_PROGRAMS = \ transformed_image \ unproject_image

-hexa_SOURCES = hexa.cc -image_if_SOURCES = image_if.cc -image2d_h_SOURCES = image2d_h.cc -p2p_image_SOURCES = p2p_image.cc -slice_image_SOURCES = slice_image.cc -sub_image_SOURCES = sub_image.cc -transformed_image_SOURCES = transformed_image.cc -unproject_image_SOURCES = unproject_image.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/image/imorph/Makefile.am b/milena/tests/core/image/imorph/Makefile.am index aa0ccfc..f728850 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. # @@ -26,10 +26,5 @@ check_PROGRAMS = \ safe_image \ tr_image

-decorated_image_SOURCES = decorated_image.cc -interpolated_SOURCES = interpolated.cc -labeled_image_SOURCES = labeled_image.cc -safe_image_SOURCES = safe_image.cc -tr_image_SOURCES = tr_image.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/image/vmorph/Makefile.am b/milena/tests/core/image/vmorph/Makefile.am index 40e190b..712b730 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. # @@ -23,7 +23,5 @@ check_PROGRAMS = \ cast_image \ fun_image

-cast_image_SOURCES = cast_image.cc -fun_image_SOURCES = fun_image.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/other/Makefile.am b/milena/tests/core/other/Makefile.am index 9443837..6e279ca 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. # @@ -40,24 +41,5 @@ check_PROGRAMS = \ var \ w_window

-box_runstart_piter_SOURCES = box_runstart_piter.cc -box_runend_piter_SOURCES = box_runend_piter.cc -category_SOURCES = category.cc -dpoints_pixter_SOURCES = dpoints_pixter.cc -graph_elt_neighborhood_SOURCES = graph_elt_neighborhood.cc -graph_elt_neighborhood_if_SOURCES = graph_elt_neighborhood_if.cc -graph_elt_window_SOURCES = graph_elt_window.cc -graph_elt_window_if_SOURCES = graph_elt_window_if.cc -neighb_SOURCES = neighb.cc -pixel_SOURCES = pixel.cc -pixter1d_SOURCES = pixter1d.cc -pixter1d_more_SOURCES = pixter1d_more.cc -pixter2d_SOURCES = pixter2d.cc -pixter2d_more_SOURCES = pixter2d_more.cc -pixter3d_SOURCES = pixter3d.cc -pixter3d_more_SOURCES = pixter3d_more.cc -point_set_compatibility_SOURCES = point_set_compatibility.cc -var_SOURCES = var.cc -w_window_SOURCES = w_window.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/routine/Makefile.am b/milena/tests/core/routine/Makefile.am index da4d50b..560a928 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. # @@ -26,10 +27,5 @@ check_PROGRAMS = \ initialize \ primary

-duplicate_SOURCES = duplicate.cc -exact_SOURCES = exact.cc -extend_SOURCES = extend.cc -initialize_SOURCES = initialize.cc -primary_SOURCES = primary.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am index a67544a..1b83d43 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. # @@ -34,18 +35,5 @@ check_PROGRAMS = \ p_vaccess \ p_vertices

-operators_SOURCES = operators.cc -p_array_SOURCES = p_array.cc -p_complex_SOURCES = p_complex.cc -p_image_SOURCES = p_image.cc -p_priority_queue_SOURCES = p_priority_queue.cc -p_queue_SOURCES = p_queue.cc -p_queue_fast_SOURCES = p_queue_fast.cc -p_set_SOURCES = p_set.cc -p_if_SOURCES = p_if.cc -p_transformed_SOURCES = p_transformed.cc -p_vaccess_SOURCES = p_vaccess.cc -p_vertices_SOURCES = p_vertices.cc -p_edges_SOURCES = p_edges.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index 213cdbe..7be7438 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. # @@ -42,29 +43,9 @@ check_PROGRAMS = \ transform_inplace \ update

-abs_SOURCES = abs.cc -apply_SOURCES = apply.cc -compare_SOURCES = compare.cc -compute_SOURCES = compute.cc -convert_SOURCES = convert.cc -fill_SOURCES = fill.cc -fill_with_image_SOURCES = fill_with_image.cc -fill_with_value_SOURCES = fill_with_value.cc -median_SOURCES = median.cc -median_fast_SOURCES = median_fast.cc -memcpy__SOURCES = memcpy_.cc -memset__SOURCES = memset_.cc -paste_SOURCES = paste.cc -saturate_SOURCES = saturate.cc -sort_psites_SOURCES = sort_psites.cc -stretch_SOURCES = stretch.cc -transform_SOURCES = transform.cc -transform_inplace_SOURCES = transform_inplace.cc -update_SOURCES = update.cc

# Lengthy tests. -# FIXME: enable it when make full-check is enabled. -#fill_full_SOURCES = fill_full.cc +# FIXME: Enable `fill_full' it when make full-check is enabled.

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/data/approx/Makefile.am b/milena/tests/data/approx/Makefile.am index 0c33433..654932c 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. # @@ -22,7 +22,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ median

-median_SOURCES = median.cc # FIXME: The current median test is way too long to run. Break it # into two tests: a fast one, executed during `make check', compiled # with no optimization, using a small kernel and a small image; and a diff --git a/milena/tests/data/naive/Makefile.am b/milena/tests/data/naive/Makefile.am index 7a9da64..e6d3986 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. # @@ -22,7 +22,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ median

-median_SOURCES = median.cc # FIXME: The current median test is way too long to run. Break it # into two tests: a fast one, executed during `make check', compiled # with no optimization, using a small kernel and a small image; and a diff --git a/milena/tests/debug/Makefile.am b/milena/tests/debug/Makefile.am index cc44bc1..9da1df3 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. # @@ -25,9 +26,5 @@ check_PROGRAMS = \ iota \ slices_2d

-println_SOURCES = println.cc -println_with_border_SOURCES = println_with_border.cc -iota_SOURCES = iota.cc -slices_2d_SOURCES = slices_2d.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am index 3cb7692..434913f 100644 --- a/milena/tests/draw/Makefile.am +++ b/milena/tests/draw/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,7 +24,5 @@ check_PROGRAMS = \ line \ graph

-line_SOURCES = line.cc -graph_SOURCES = graph.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/estim/Makefile.am b/milena/tests/estim/Makefile.am index d0c5bcf..1be8313 100644 --- a/milena/tests/estim/Makefile.am +++ b/milena/tests/estim/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,7 +24,5 @@ check_PROGRAMS = \ mean \ min_max

-mean_SOURCES = mean.cc -min_max_SOURCES = min_max.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/extension/Makefile.am b/milena/tests/extension/Makefile.am index 890dff7..5fdfabe 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. # @@ -22,6 +23,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ fill

-fill_SOURCES = fill.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am index f7b0c1c..9620482 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. # @@ -29,12 +29,6 @@ check_PROGRAMS = \ red \ sat

-blue_SOURCES = blue.cc -green_SOURCES = green.cc -hue_SOURCES = hue.cc -lum_SOURCES = lum.cc -red_SOURCES = red.cc -sat_SOURCES = sat.cc #>>

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am index a39cf27..9fbbd07 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. @@ -34,4 +34,3 @@ SUBDIRS = \ check_PROGRAMS = \ ops

-ops_SOURCES = ops.cc diff --git a/milena/tests/fun/i2v/Makefile.am b/milena/tests/fun/i2v/Makefile.am index 0b33406..2b5ebda 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. # @@ -24,8 +25,5 @@ check_PROGRAMS = \ array \ value_at_index

-all_to_SOURCES = all_to.cc -array_SOURCES = array.cc -value_at_index_SOURCES = value_at_index.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/p2p/Makefile.am b/milena/tests/fun/p2p/Makefile.am index 12ecb5d..10c60f6 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. # @@ -23,7 +23,5 @@ check_PROGRAMS = \ fold \ translation

-fold_SOURCES = fold.cc -translation_SOURCES = translation.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/stat/Makefile.am b/milena/tests/fun/stat/Makefile.am index bda940a..4372cfa 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. # @@ -22,6 +22,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ mahalanobis

-mahalanobis_SOURCES = mahalanobis.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/v2i/Makefile.am b/milena/tests/fun/v2i/Makefile.am index a3dbd4e..839b075 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. # @@ -22,6 +22,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ index_of_value

-index_of_value_SOURCES = index_of_value.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am index 872c7a5..bc3a9e6 100644 --- a/milena/tests/fun/v2v/Makefile.am +++ b/milena/tests/fun/v2v/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -25,9 +25,6 @@ check_PROGRAMS = \ projection \ wrap

-norm_SOURCES = norm.cc -projection_SOURCES = projection.cc -wrap_SOURCES = wrap.cc

#<<lrde # FIXME: Not distributed (yet). @@ -36,9 +33,6 @@ check_PROGRAMS += \ hsl_to_rgb \ rgb_to_hsl

-component_SOURCES = component.cc -hsl_to_rgb_SOURCES = hsl_to_rgb.cc -rgb_to_hsl_SOURCES = rgb_to_hsl.cc #>>

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/vv2v/Makefile.am b/milena/tests/fun/vv2v/Makefile.am index 7cb53fd..1675252 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. # @@ -23,7 +24,5 @@ check_PROGRAMS = \ max \ min

-max_SOURCES = max.cc -min_SOURCES = min.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/x2x/Makefile.am b/milena/tests/fun/x2x/Makefile.am index a7293e1..20798df 100644 --- a/milena/tests/fun/x2x/Makefile.am +++ b/milena/tests/fun/x2x/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -24,8 +25,5 @@ check_PROGRAMS = \ rotation \ translation

-composed_SOURCES = composed.cc -rotation_SOURCES = rotation.cc -translation_SOURCES = translation.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am index 16600dd..e30585c 100644 --- a/milena/tests/geom/Makefile.am +++ b/milena/tests/geom/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -41,24 +42,5 @@ seed2tiling_roundness \ translate

-bbox_SOURCES = bbox.cc -max_col_SOURCES = max_col.cc -max_ind_SOURCES = max_ind.cc -max_row_SOURCES = max_row.cc -max_sli_SOURCES = max_sli.cc -min_col_SOURCES = min_col.cc -min_ind_SOURCES = min_ind.cc -min_row_SOURCES = min_row.cc -min_sli_SOURCES = min_sli.cc -ncols_SOURCES = ncols.cc -ninds_SOURCES = ninds.cc -nrows_SOURCES = nrows.cc -nsites_SOURCES = nsites.cc -nslis_SOURCES = nslis.cc -pmin_pmax_SOURCES = pmin_pmax.cc -rotate_SOURCES = rotate.cc -seed2tiling_SOURCES = seed2tiling.cc -seed2tiling_roundness_SOURCES = seed2tiling_roundness.cc -translate_SOURCES = translate.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/graph/Makefile.am b/milena/tests/graph/Makefile.am index 0e1349a..b59e3d0 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. # @@ -24,6 +24,5 @@ SUBDIRS = attribute check_PROGRAMS = \ labeling

-labeling_SOURCES = labeling.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/graph/attribute/Makefile.am b/milena/tests/graph/attribute/Makefile.am index b5f900b..de142ba 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. # @@ -23,7 +23,5 @@ check_PROGRAMS = \ card \ representative

-card_SOURCES = card.cc -representative_SOURCES = representative.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/histo/Makefile.am b/milena/tests/histo/Makefile.am index 3bb2752..c415cb1 100644 --- a/milena/tests/histo/Makefile.am +++ b/milena/tests/histo/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -24,8 +25,5 @@ check_PROGRAMS = \ point_from_value \ to_image1d

-compute_SOURCES = compute.cc -point_from_value_SOURCES = point_from_value.cc -to_image1d_SOURCES = to_image1d.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/dicom/Makefile.am b/milena/tests/io/dicom/Makefile.am index da98219..31f3ace 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. # @@ -26,6 +26,5 @@ AM_LDFLAGS = $(GDCM_LDFLAGS)

# FIXME: Upon completion, if this test only read (not write) images, # rename it as load.cc -dicom_SOURCES = dicom.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am index cad3d5b..bf11271 100644 --- a/milena/tests/io/dump/Makefile.am +++ b/milena/tests/io/dump/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. # @@ -22,7 +22,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ dump

-dump_SOURCES = dump.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am index 77770ce..e4210e9 100644 --- a/milena/tests/io/fits/Makefile.am +++ b/milena/tests/io/fits/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. # @@ -24,7 +25,6 @@ AM_LDFLAGS = $(CFITSIO_LDFLAGS)

check_PROGRAMS = fits

-fits_SOURCES = fits.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/fld/Makefile.am b/milena/tests/io/fld/Makefile.am index 776526d..0fa9df3 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. # @@ -24,8 +25,5 @@ check_PROGRAMS = \ fld1d \ fld3d

-fld2d_SOURCES = fld2d.cc -fld3d_SOURCES = fld3d.cc -fld1d_SOURCES = fld1d.cc

TESTS = $(check_PROGRAMS) \ No newline at end of file diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index 0e1d9db..97628fb 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/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. # @@ -26,8 +26,6 @@ check_PROGRAMS = \ load \ save

-load_SOURCES = load.cc -save_SOURCES = save.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am index 2ed2594..071e5e1 100644 --- a/milena/tests/io/off/Makefile.am +++ b/milena/tests/io/off/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. # @@ -25,10 +26,7 @@ check_PROGRAMS = \ \ load_float

-load_bin_SOURCES = load_bin.cc -load_save_bin_SOURCES = load_save_bin.cc

-load_float_SOURCES = load_float.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am index 351207d..a09ce83 100644 --- a/milena/tests/io/pbm/Makefile.am +++ b/milena/tests/io/pbm/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. # @@ -23,8 +24,6 @@ check_PROGRAMS = \ pbm \ pbm_ascii

-pbm_SOURCES = pbm.cc -pbm_ascii_SOURCES = pbm_ascii.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/pbms/Makefile.am b/milena/tests/io/pbms/Makefile.am index 1a3fc5c..eeb5f18 100644 --- a/milena/tests/io/pbms/Makefile.am +++ b/milena/tests/io/pbms/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. # @@ -22,7 +22,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load

-load_SOURCES = load.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am index f6eef7c..75cab7b 100644 --- a/milena/tests/io/pgm/Makefile.am +++ b/milena/tests/io/pgm/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. # @@ -26,11 +27,6 @@ check_PROGRAMS = \ pgm_ascii \ pgm

-pgm16_SOURCES = pgm16.cc -pgm19_SOURCES = pgm19.cc -pgm27_SOURCES = pgm27.cc -pgm_ascii_SOURCES = pgm_ascii.cc -pgm_SOURCES = pgm.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/pgms/Makefile.am b/milena/tests/io/pgms/Makefile.am index 8a4f02a..9957690 100644 --- a/milena/tests/io/pgms/Makefile.am +++ b/milena/tests/io/pgms/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. # @@ -22,7 +22,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load

-load_SOURCES = load.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am index 913dd04..f7e0431 100644 --- a/milena/tests/io/ppm/Makefile.am +++ b/milena/tests/io/ppm/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. # @@ -24,9 +25,6 @@ check_PROGRAMS = \ ppm23 \ ppm

-ppm16_SOURCES = ppm16.cc -ppm23_SOURCES = ppm23.cc -ppm_SOURCES = ppm.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/ppms/Makefile.am b/milena/tests/io/ppms/Makefile.am index 173a9f7..2efbbbc 100644 --- a/milena/tests/io/ppms/Makefile.am +++ b/milena/tests/io/ppms/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. # @@ -22,7 +22,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load

-load_SOURCES = load.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/io/tiff/Makefile.am b/milena/tests/io/tiff/Makefile.am index f21e2c1..cd1c906 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. # @@ -24,6 +24,5 @@ AM_LDFLAGS = $(TIFF_LDFLAGS)

check_PROGRAMS = load

-load_SOURCES = load.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am index 1509d72..7a0fb85 100644 --- a/milena/tests/labeling/Makefile.am +++ b/milena/tests/labeling/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -37,21 +38,5 @@ check_PROGRAMS = \ value \ wrap

-background_SOURCES = background.cc -blobs_SOURCES = blobs.cc -blobs_and_compute_SOURCES = blobs_and_compute.cc -colorize_SOURCES = colorize.cc -compute_SOURCES = compute.cc -fill_holes_SOURCES = fill_holes.cc -flat_zones_SOURCES = flat_zones.cc -foreground_SOURCES = foreground.cc -mean_values_SOURCES = mean_values.cc -n_max_SOURCES = n_max.cc -pack_SOURCES = pack.cc -regional_maxima_SOURCES = regional_maxima.cc -regional_minima_SOURCES = regional_minima.cc -relabel_SOURCES = relabel.cc -value_SOURCES = value.cc -wrap_SOURCES = wrap.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index 3bc1b01..34991ab 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. @@ -36,12 +36,6 @@ check_PROGRAMS = \ log \ sobel_2d

-convolve_SOURCES = convolve.cc -lap_SOURCES = lap.cc -convolve_directional_SOURCES = convolve_directional.cc -convolve_2x1d_SOURCES = convolve_2x1d.cc -log_SOURCES = log.cc -sobel_2d_SOURCES = sobel_2d.cc

#<<lrde # FIXME: Not distributed (yet). diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am index a3000c3..d84628a 100644 --- a/milena/tests/linear/gaussian/Makefile.am +++ b/milena/tests/linear/gaussian/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. # @@ -24,7 +24,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ filter

-filter_SOURCES = filter.cc #>>

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/linear/local/Makefile.am b/milena/tests/linear/local/Makefile.am index bb8608c..74cbe09 100644 --- a/milena/tests/linear/local/Makefile.am +++ b/milena/tests/linear/local/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -22,6 +23,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ convolve

-convolve_SOURCES = convolve.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/literal/Makefile.am b/milena/tests/literal/Makefile.am index 4310a95..9bc62ce 100644 --- a/milena/tests/literal/Makefile.am +++ b/milena/tests/literal/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -26,10 +27,5 @@ check_PROGRAMS = \ white \ zero

-black_SOURCES = black.cc -medium_gray_SOURCES = medium_gray.cc -one_SOURCES = one.cc -white_SOURCES = white.cc -zero_SOURCES = zero.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am index d095301..2b1ac1f 100644 --- a/milena/tests/logical/Makefile.am +++ b/milena/tests/logical/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -26,10 +27,5 @@ check_PROGRAMS = \ or \ xor

-and_SOURCES = and.cc -and_not_SOURCES = and_not.cc -not_SOURCES = not.cc -or_SOURCES = or.cc -xor_SOURCES = xor.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/make/Makefile.am b/milena/tests/make/Makefile.am index 27d65fb..150e819 100644 --- a/milena/tests/make/Makefile.am +++ b/milena/tests/make/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -35,19 +36,5 @@ check_PROGRAMS = \ w_window \ w_window_directional

-dual_neighb_SOURCES = dual_neighb.cc -dummy_p_edges_SOURCES = dummy_p_edges.cc -dummy_p_vertices_SOURCES = dummy_p_vertices.cc -influence_zone_adjacency_graph_SOURCES = influence_zone_adjacency_graph.cc -h_mat_SOURCES = h_mat.cc -image2d_SOURCES = image2d.cc -image3d_SOURCES = image3d.cc -mat_SOURCES = mat.cc -p_edges_with_mass_centers_SOURCES = p_edges_with_mass_centers.cc -p_vertices_with_mass_centers_SOURCES = p_vertices_with_mass_centers.cc -region_adjacency_graph_SOURCES = region_adjacency_graph.cc -rag_and_labeled_wsl_SOURCES = rag_and_labeled_wsl.cc -w_window_SOURCES = w_window.cc -w_window_directional_SOURCES = w_window_directional.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/metal/Makefile.am b/milena/tests/metal/Makefile.am index e7e5f93..9ccde61 100644 --- a/milena/tests/metal/Makefile.am +++ b/milena/tests/metal/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -26,8 +27,5 @@ check_PROGRAMS = \ is \ unconst

-converts_to_SOURCES = converts_to.cc -is_SOURCES = is.cc -unconst_SOURCES = unconst.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/metal/math/Makefile.am b/milena/tests/metal/math/Makefile.am index f6b810d..eaae04d 100644 --- a/milena/tests/metal/math/Makefile.am +++ b/milena/tests/metal/math/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,7 +24,5 @@ check_PROGRAMS = \ pow \ root

-pow_SOURCES = pow.cc -root_SOURCES = root.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 4a7c649..468c1df 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -60,45 +61,22 @@ check_PROGRAMS = \ # -------------- #

# FIXME: Have erosion and dilation perform symmetric tests. -erosion_SOURCES = erosion.cc -contrast_SOURCES = contrast.cc -general_SOURCES = general.cc -gradient_SOURCES = gradient.cc -hit_or_miss_SOURCES = hit_or_miss.cc -laplacian_SOURCES = laplacian.cc -thinning_SOURCES = thinning.cc - -graph_image_morpho_SOURCES = graph_image_morpho.cc -graph_image_wst_SOURCES = graph_image_wst.cc -line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc -line_graph_image_wst_SOURCES = line_graph_image_wst.cc -complex_image_morpho_SOURCES = complex_image_morpho.cc -complex_image_wst_SOURCES = complex_image_wst.cc - -meyer_wst_SOURCES = meyer_wst.cc -rank_filter_SOURCES = rank_filter.cc -skeleton_constrained_SOURCES = skeleton_constrained.cc -top_hat_SOURCES = top_hat.cc -Rd_SOURCES = Rd.cc + +

# --------------- # # Complex tests. # # --------------- #

-artificial_line_graph_image_wst_SOURCES = artificial_line_graph_image_wst.cc artificial_line_graph_image_wst_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED)

-dilation_SOURCES = dilation.cc dilation_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED)

-lena_line_graph_image_wst1_SOURCES = lena_line_graph_image_wst1.cc lena_line_graph_image_wst1_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED)

-lena_line_graph_image_wst2_SOURCES = lena_line_graph_image_wst2.cc lena_line_graph_image_wst2_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED)

-meyer_wst_long_SOURCES = meyer_wst_long.cc meyer_wst_long_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED)

diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am index 85fc367..e75ad84 100644 --- a/milena/tests/morpho/approx/Makefile.am +++ b/milena/tests/morpho/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. # @@ -23,8 +23,6 @@ check_PROGRAMS = \ dilation \ erosion

-dilation_SOURCES = dilation.cc -erosion_SOURCES = erosion.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/morpho/attribute/Makefile.am b/milena/tests/morpho/attribute/Makefile.am index 1fcc2ab..6673791 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. # @@ -25,9 +25,5 @@ check_PROGRAMS = \ volume \ height

-card_SOURCES = card.cc -sum_SOURCES = sum.cc -volume_SOURCES = volume.cc -height_SOURCES = height.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am index c75b590..a2fde5c 100644 --- a/milena/tests/morpho/closing/Makefile.am +++ b/milena/tests/morpho/closing/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. # @@ -32,14 +32,6 @@ check_PROGRAMS = \ structural \ sum

-area_on_vertices_SOURCES = area_on_vertices.cc -leveling_SOURCES = leveling.cc -algebraic_SOURCES = algebraic.cc -height_SOURCES = height.cc -area_SOURCES = area.cc -volume_SOURCES = volume.cc -structural_SOURCES = structural.cc -sum_SOURCES = sum.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am index c9eb6b6..cd6e8a2 100644 --- a/milena/tests/morpho/closing/approx/Makefile.am +++ b/milena/tests/morpho/closing/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. # @@ -22,7 +22,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ structural

-structural_SOURCES = structural.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/morpho/elementary/Makefile.am b/milena/tests/morpho/elementary/Makefile.am index 224585e..864daa2 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. # @@ -30,14 +31,5 @@ check_PROGRAMS = \ gradient \ erosion

-laplacian_SOURCES = laplacian.cc -dilation_SOURCES = dilation.cc -gradient_internal_SOURCES = gradient_internal.cc -opening_SOURCES = opening.cc -closing_SOURCES = closing.cc -top_hat_SOURCES = top_hat.cc -gradient_external_SOURCES = gradient_external.cc -gradient_SOURCES = gradient.cc -erosion_SOURCES = erosion.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am index 2b3425c..ef3b690 100644 --- a/milena/tests/morpho/opening/Makefile.am +++ b/milena/tests/morpho/opening/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. # @@ -32,14 +32,6 @@ check_PROGRAMS = \ structural \ sum

-area_on_vertices_SOURCES = area_on_vertices.cc -leveling_SOURCES = leveling.cc -algebraic_SOURCES = algebraic.cc -height_SOURCES = height.cc -area_SOURCES = area.cc -volume_SOURCES = volume.cc -structural_SOURCES = structural.cc -sum_SOURCES = sum.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/morpho/opening/approx/Makefile.am b/milena/tests/morpho/opening/approx/Makefile.am index 8afb5a9..5d31c71 100644 --- a/milena/tests/morpho/opening/approx/Makefile.am +++ b/milena/tests/morpho/opening/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. # @@ -22,6 +22,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ structural

-structural_SOURCES = structural.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am index e6e8ea3..344d468 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. # @@ -24,7 +24,6 @@ check_PROGRAMS = \ union_find

-union_find_SOURCES = union_find.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am index e6e8ea3..344d468 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. # @@ -24,7 +24,6 @@ check_PROGRAMS = \ union_find

-union_find_SOURCES = union_find.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/tree/Makefile.am b/milena/tests/morpho/tree/Makefile.am index ed34881..60909ac 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. # @@ -26,11 +27,6 @@ check_PROGRAMS = \ data \ max

-compute_attribute_image_SOURCES = compute_attribute_image.cc -compute_parent_SOURCES = compute_parent.cc -dual_input_tree_SOURCES = dual_input_tree.cc -data_SOURCES = data.cc -max_SOURCES = max.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/morpho/tree/filter/Makefile.am b/milena/tests/morpho/tree/filter/Makefile.am index 176971f..926ae07 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. # @@ -22,6 +22,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ filter

-filter_SOURCES = filter.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am index 7e28a00..f3d102e 100644 --- a/milena/tests/morpho/watershed/Makefile.am +++ b/milena/tests/morpho/watershed/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. # @@ -24,9 +24,6 @@ check_PROGRAMS = \ superpose \ topological

-flooding_SOURCES = flooding.cc -superpose_SOURCES = superpose.cc -topological_SOURCES = topological.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/opt/Makefile.am b/milena/tests/opt/Makefile.am index 7f2de05..acdc385 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. # @@ -22,6 +23,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ at

-at_SOURCES = at.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/pw/Makefile.am b/milena/tests/pw/Makefile.am index b4ddc89..6a694d6 100644 --- a/milena/tests/pw/Makefile.am +++ b/milena/tests/pw/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,7 +24,5 @@ check_PROGRAMS = \ image \ value

-image_SOURCES = image.cc -value_SOURCES = value.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am index 79372c7..9978844 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. # @@ -22,7 +23,6 @@ include $(top_srcdir)/milena/tests/tests.mk #<<lrde # FIXME: Not distributed (yet) and currently disabled. # check_PROGRAMS = registration -# registration_SOURCES = registration.cc #>>

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/set/Makefile.am b/milena/tests/set/Makefile.am index 0ce806a..87620c4 100644 --- a/milena/tests/set/Makefile.am +++ b/milena/tests/set/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -29,13 +30,5 @@ check_PROGRAMS = \ uni \ unique

-card_SOURCES = card.cc -compute_SOURCES = compute.cc -compute_with_weights_SOURCES = compute_with_weights.cc -diff_SOURCES = diff.cc -inter_SOURCES = inter.cc -sym_diff_SOURCES = sym_diff.cc -uni_SOURCES = uni.cc -unique_SOURCES = unique.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/test/Makefile.am b/milena/tests/test/Makefile.am index 18ab431..a1215c0 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. # @@ -22,6 +23,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ positive

-positive_SOURCES = positive.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk index 85ee5d5..b331615 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. @@ -19,6 +19,7 @@ ## You should have received a copy of the GNU General Public License ## along with Olena. If not, see http://www.gnu.org/licenses/.

+include $(top_srcdir)/milena/common.mk

# FIXME: Revamp (see Olena 0.11's test suite).

diff --git a/milena/tests/topo/Makefile.am b/milena/tests/topo/Makefile.am index 5b5f73d..56eaa1c 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. # @@ -24,6 +25,5 @@ SUBDIRS = skeleton check_PROGRAMS = \ complex

-complex_SOURCES = complex.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/topo/skeleton/Makefile.am b/milena/tests/topo/skeleton/Makefile.am index 75611e4..83d37ff 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. # @@ -23,7 +23,5 @@ check_PROGRAMS = \ crest \ is_simple_point

-crest_SOURCES = crest.cc -is_simple_point_SOURCES = is_simple_point.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/trait/Makefile.am b/milena/tests/trait/Makefile.am index 66a1cb8..e375dbe 100644 --- a/milena/tests/trait/Makefile.am +++ b/milena/tests/trait/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -25,7 +26,5 @@ check_PROGRAMS = \ ch_value \ super

-ch_value_SOURCES = ch_value.cc -super_SOURCES = super.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/trait/image/Makefile.am b/milena/tests/trait/image/Makefile.am index 978aa1f..221a5f3 100644 --- a/milena/tests/trait/image/Makefile.am +++ b/milena/tests/trait/image/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -22,6 +23,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ images

-images_SOURCES = images.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/trait/op/Makefile.am b/milena/tests/trait/op/Makefile.am index 7f41b15..91ce892 100644 --- a/milena/tests/trait/op/Makefile.am +++ b/milena/tests/trait/op/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,7 +24,5 @@ check_PROGRAMS = \ plus \ uminus

-plus_SOURCES = plus.cc -uminus_SOURCES = uminus.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/trait/value/Makefile.am b/milena/tests/trait/value/Makefile.am index 00d82c3..7b0cb5f 100644 --- a/milena/tests/trait/value/Makefile.am +++ b/milena/tests/trait/value/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,7 +24,5 @@ check_PROGRAMS = \ comp \ values

-comp_SOURCES = comp.cc -values_SOURCES = values.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am index 2184188..58319d2 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. # @@ -29,13 +30,5 @@ check_PROGRAMS = \ influence_zone_geodesic \ influence_zone_geodesic_saturated

-bench_closest_point_geodesic_SOURCES = bench_closest_point_geodesic.cc -distance_and_closest_point_geodesic_SOURCES = distance_and_closest_point_geodesic.cc -distance_front_SOURCES = distance_front.cc -distance_geodesic_SOURCES = distance_geodesic.cc -hough_SOURCES = hough.cc -influence_zone_front_SOURCES = influence_zone_front.cc -influence_zone_geodesic_SOURCES = influence_zone_geodesic.cc -influence_zone_geodesic_saturated_SOURCES = influence_zone_geodesic_saturated.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/upscaling/art/Makefile.am b/milena/tests/upscaling/art/Makefile.am index e001aaa..bbac281 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. # @@ -25,8 +25,6 @@ check_PROGRAMS = \ scale3x

-scale2x_SOURCES = scale2x.cc -scale3x_SOURCES = scale3x.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index 07a3f94..10b50b3 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -38,22 +39,6 @@ check_PROGRAMS = \ tree_fast \ tree_to_fast

-adjacency_matrix_SOURCES = adjacency_matrix.cc -branch_iter_SOURCES = branch_iter.cc -branch_iter_ind_SOURCES = branch_iter_ind.cc -eat_SOURCES = eat.cc -fibonacci_heap_SOURCES = fibonacci_heap.cc -graph_SOURCES = graph.cc -lazy_set_SOURCES = lazy_set.cc -lemmings_SOURCES = lemmings.cc -line_graph_SOURCES = line_graph.cc -ord_SOURCES = ord.cc -ord_pair_SOURCES = ord_pair.cc -set_SOURCES = set.cc -soft_heap_SOURCES = soft_heap.cc -tree_SOURCES = tree.cc -tree_fast_SOURCES = tree_fast.cc -tree_to_fast_SOURCES = tree_to_fast.cc

TESTS = $(check_PROGRAMS)

diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index c61a738..f79575e 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -44,28 +44,10 @@ check_PROGRAMS = \ # graylevel # graylevel_f

-bool_SOURCES = bool.cc -equiv_SOURCES = equiv.cc -#float01_SOURCES = float01.cc -#float01_bis_SOURCES = float01_bis.cc -#float01_f_SOURCES = float01_f.cc -#graylevel_SOURCES = graylevel.cc -#graylevel_f_SOURCES = graylevel_f.cc -int_s_SOURCES = int_s.cc -int_s16_SOURCES = int_s16.cc -int_u8_SOURCES = int_u8.cc -interop_SOURCES = interop.cc -label_SOURCES = label.cc -proxy_SOURCES = proxy.cc -rgb8_SOURCES = rgb8.cc -scalar_SOURCES = scalar.cc -set_SOURCES = set.cc -sign_SOURCES = sign.cc

#<<lrde # FIXME: Not distributed (yet). check_PROGRAMS += stack -stack_SOURCES = stack.cc #>>

# FIXME: Enable when make check_full works. @@ -74,9 +56,6 @@ stack_SOURCES = stack.cc # graylevel_f_full \ # rgb_full # -# graylevel_f_full_SOURCES = graylevel_f_full.cc -# graylevel_full_SOURCES = graylevel_full.cc -# rgb_full_SOURCES = rgb_full.cc

TESTS = $(check_PROGRAMS) # FIXME: Enable when make check_full works. diff --git a/milena/tests/value/builtin/Makefile.am b/milena/tests/value/builtin/Makefile.am index 3a40bbd..0a3bd3a 100644 --- a/milena/tests/value/builtin/Makefile.am +++ b/milena/tests/value/builtin/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,6 +24,5 @@ check_PROGRAMS = \ builtin

# FIXME: Rename this test, as `builtin' is not enough relevant. -builtin_SOURCES = builtin.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/win/Makefile.am b/milena/tests/win/Makefile.am index ad28850..b020d10 100644 --- a/milena/tests/win/Makefile.am +++ b/milena/tests/win/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -37,21 +38,5 @@ check_PROGRAMS = \ sym \ vline2d

-backdiag2d_SOURCES = backdiag2d.cc -ball_SOURCES = ball.cc -cube3d_SOURCES = cube3d.cc -cuboid3d_SOURCES = cuboid3d.cc -diag2d_SOURCES = diag2d.cc -diff_SOURCES = diff.cc -disk2d_SOURCES = disk2d.cc -hline2d_SOURCES = hline2d.cc -inter_SOURCES = inter.cc -octagon2d_SOURCES = octagon2d.cc -rectangle2d_SOURCES = rectangle2d.cc -segment1d_SOURCES = segment1d.cc -shift_SOURCES = shift.cc -sphere3d_SOURCES = sphere3d.cc -sym_SOURCES = sym.cc -vline2d_SOURCES = vline2d.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/world/binary_2d/Makefile.am b/milena/tests/world/binary_2d/Makefile.am index eb97dd5..c106160 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. # @@ -23,7 +23,5 @@ check_PROGRAMS = \ enlarge # enlarge_hq2x

-enlarge_SOURCES = enlarge.cc -#enlarge_hq2x_SOURCES = enlarge_hq2x.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/world/inter_pixel/Makefile.am b/milena/tests/world/inter_pixel/Makefile.am index 327ba60..67408f4 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. # @@ -29,10 +29,5 @@ check_PROGRAMS = \ is_separator \ separator_to_pixels

-compute_SOURCES = compute.cc -immerse_SOURCES = immerse.cc -is_pixel_SOURCES = is_pixel.cc -is_separator_SOURCES = is_separator.cc -separator_to_pixels_SOURCES = separator_to_pixels.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tests/world/inter_pixel/dim2/Makefile.am b/milena/tests/world/inter_pixel/dim2/Makefile.am index 8423f4b..26c0dfb 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. # @@ -22,6 +22,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ make_edge_image

-make_edge_image_SOURCES = make_edge_image.cc

TESTS = $(check_PROGRAMS) diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index be3c3e5..1bfcf25 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. # @@ -23,7 +24,4 @@ bin_PROGRAMS = \ seed2tiling \ area_flooding

-area_flooding_SOURCES = area_flooding.cc -seed2tiling_SOURCES = seed2tiling.cc - # FIXME: Add some tests for these tools. diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk index 9d9a046..35eeaf5 100644 --- a/milena/tools/tools.mk +++ b/milena/tools/tools.mk @@ -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,6 +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/common.mk

## FIXME: Revamp (see Olena 0.11's test suite).