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
......@@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
load
load_SOURCES = load.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.
#
......@@ -21,6 +21,5 @@ AM_LDFLAGS = $(TIFF_LDFLAGS)
check_PROGRAMS = load
load_SOURCES = load.cc
TESTS = $(check_PROGRAMS)
......@@ -34,27 +34,10 @@ check_PROGRAMS = \
value \
wrap
background_SOURCES = background.cc
blobs_SOURCES = blobs.cc
blobs_and_compute_SOURCES = blobs_and_compute.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
### FIXME: Disable this test, since labeling::colorize depends on
### rand(), which does not behave uniformly among the various targeted
### platforms.
## check_PROGRAMS += \
## colorize \
## colorize_SOURCES = colorize.cc
## colorize
TESTS = $(check_PROGRAMS)
# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development
# Copyright (C) 2007, 2008, 2009, 2010, 2012 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
......@@ -28,12 +28,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
check_PROGRAMS += gaussian_
gaussian__SOURCES = gaussian.cc
......
# 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 = \
convolve
convolve_SOURCES = convolve.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.
#
......@@ -24,10 +24,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)
# 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,10 +24,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)
# 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.
#
......@@ -33,19 +33,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)
# 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 +24,5 @@ check_PROGRAMS = \
is \
unconst
converts_to_SOURCES = converts_to.cc
is_SOURCES = is.cc
unconst_SOURCES = unconst.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 = \
pow \
root
pow_SOURCES = pow.cc
root_SOURCES = root.cc
TESTS = $(check_PROGRAMS)
......@@ -58,45 +58,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)
......
......@@ -20,8 +20,6 @@ check_PROGRAMS = \
dilation \
erosion
dilation_SOURCES = dilation.cc
erosion_SOURCES = erosion.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,9 +22,5 @@ check_PROGRAMS = \
volume \
height
card_SOURCES = card.cc
sum_SOURCES = sum.cc
volume_SOURCES = volume.cc
height_SOURCES = height.cc
TESTS = $(check_PROGRAMS)
......@@ -29,14 +29,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)
......
......@@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
structural
structural_SOURCES = structural.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.
#
......@@ -27,14 +28,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)
......@@ -29,14 +29,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)
......
......@@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
structural
structural_SOURCES = structural.cc
TESTS = $(check_PROGRAMS)
......
......@@ -20,9 +20,6 @@ check_PROGRAMS = \
union_find_on_functions \
union_find_on_sets
union_find_on_functions_SOURCES = union_find_on_functions.cc
union_find_on_sets_SOURCES = union_find_on_sets.cc
TESTS = $(check_PROGRAMS)
# Reconstruction by dilation on sets in not implemented yet.
......
......@@ -20,9 +20,6 @@ check_PROGRAMS = \
union_find_on_functions \
union_find_on_sets
union_find_on_functions_SOURCES = union_find_on_functions.cc
union_find_on_sets_SOURCES = union_find_on_sets.cc
TESTS = $(check_PROGRAMS)
# Reconstruction by erosion on sets in not implemented yet.
......
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