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
......@@ -27,29 +27,21 @@ 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
if HAVE_QT
check_PROGRAMS += to_qimage
to_qimage_SOURCES = to_qimage.cc
to_qimage_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir)
to_qimage_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3
to_qimage_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS)
to_qimage_LDADD = $(QT_LIBS) $(LDADD)
check_PROGRAMS += to_qimage_nocopy
to_qimage_nocopy_SOURCES = to_qimage_nocopy.cc
to_qimage_nocopy_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir)
to_qimage_nocopy_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3
to_qimage_nocopy_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS)
to_qimage_nocopy_LDADD = $(QT_LIBS) $(LDADD)
endif HAVE_QT
......
# 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 = \
from_site_set_to_image
from_site_set_to_image_SOURCES = from_site_set_to_image.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.
#
......@@ -33,20 +34,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)
# 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.
#
......@@ -37,15 +37,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)
# 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,13 +26,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)
# 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,10 +23,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)
# 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 = \
cast_image \
fun_image
cast_image_SOURCES = cast_image.cc
fun_image_SOURCES = fun_image.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.
#
......@@ -37,24 +38,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)
# 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,10 +24,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)
# 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.
#
......@@ -32,19 +33,4 @@ check_PROGRAMS = \
p_vaccess \
p_vertices
box_SOURCES = box.cc
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)
# 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.
#
......@@ -41,31 +42,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
paste_without_localization_SOURCES = paste_without_localization.cc
saturate_SOURCES = saturate.cc
split_SOURCES = split.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)
......
# 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,7 +19,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
......
# 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,7 +19,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
......
# 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.
#
......@@ -22,9 +23,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)
# 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 = \
line \
graph
line_SOURCES = line.cc
graph_SOURCES = graph.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 = \
mean \
min_max
mean_SOURCES = mean.cc
min_max_SOURCES = min_max.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 = \
fill
fill_SOURCES = fill.cc
TESTS = $(check_PROGRAMS)
# Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development
# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
......@@ -31,6 +31,4 @@ SUBDIRS = \
check_PROGRAMS = \
ops
ops_SOURCES = ops.cc
TESTS = $(check_PROGRAMS)
# 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,8 +22,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)
# 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 = \
fold \
translation
fold_SOURCES = fold.cc
translation_SOURCES = translation.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