Commit 245453d3 authored by Roland Levillain's avatar Roland Levillain
Browse files

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.
parent 1db398e0
# 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,11 +24,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)
......
# 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.
#
......@@ -19,6 +19,5 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
filter
filter_SOURCES = filter.cc
TESTS = $(check_PROGRAMS)
......@@ -21,9 +21,6 @@ check_PROGRAMS = \
superpose \
topological
flooding_SOURCES = flooding.cc
superpose_SOURCES = superpose.cc
topological_SOURCES = topological.cc
TESTS = $(check_PROGRAMS)
......
# 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.
#
......@@ -19,6 +20,5 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
at
at_SOURCES = at.cc
TESTS = $(check_PROGRAMS)
# 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.
#
......@@ -21,7 +21,5 @@ check_PROGRAMS = \
image \
value
image_SOURCES = image.cc
value_SOURCES = value.cc
TESTS = $(check_PROGRAMS)
# 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.
#
......@@ -27,13 +27,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)
# 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.
#
......@@ -19,6 +20,5 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
positive
positive_SOURCES = positive.cc
TESTS = $(check_PROGRAMS)
......@@ -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,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
# 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
......
# 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.
#
......@@ -21,6 +22,5 @@ SUBDIRS = skeleton
check_PROGRAMS = \
complex
complex_SOURCES = complex.cc
TESTS = $(check_PROGRAMS)
# 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.
#
......@@ -20,7 +20,5 @@ check_PROGRAMS = \
crest \
is_simple_point
crest_SOURCES = crest.cc
is_simple_point_SOURCES = is_simple_point.cc
TESTS = $(check_PROGRAMS)
# 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 +23,5 @@ check_PROGRAMS = \
ch_value \
super
ch_value_SOURCES = ch_value.cc
super_SOURCES = super.cc
TESTS = $(check_PROGRAMS)
# 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.
#
......@@ -20,6 +20,5 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
images
images_SOURCES = images.cc
TESTS = $(check_PROGRAMS)
# 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.
#
......@@ -21,7 +21,5 @@ check_PROGRAMS = \
plus \
uminus
plus_SOURCES = plus.cc
uminus_SOURCES = uminus.cc
TESTS = $(check_PROGRAMS)
# 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.
#
......@@ -21,7 +21,5 @@ check_PROGRAMS = \
comp \
values
comp_SOURCES = comp.cc
values_SOURCES = values.cc
TESTS = $(check_PROGRAMS)
# 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,13 +27,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)
# 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,8 +22,6 @@ check_PROGRAMS = \
scale3x
scale2x_SOURCES = scale2x.cc
scale3x_SOURCES = scale3x.cc
TESTS = $(check_PROGRAMS)
# 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.
#
......@@ -36,21 +36,5 @@ 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)
# Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and Development
# Laboratory (LRDE).
# Copyright (C) 2007, 2008, 2009, 2010, 2012, 2013 EPITA Research and
# Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -41,23 +41,6 @@ check_PROGRAMS = \
# float01_f
# 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
# FIXME: Enable when make check_full works.
# check_full_PROGRAMS = \
......@@ -65,9 +48,6 @@ sign_SOURCES = sign.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.
......
......@@ -17,12 +17,9 @@
include $(top_srcdir)/milena/tests/tests.mk
# FIXME: Rename this test, as `builtin' is not enough relevant.
check_PROGRAMS = \
builtin \
floatings
# FIXME: Rename this test, as `builtin' is not enough relevant.
builtin_SOURCES = builtin.cc
floatings_SOURCES = floatings.cc
TESTS = $(check_PROGRAMS)
# 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,21 +35,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)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment