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) 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 = \
mahalanobis
mahalanobis_SOURCES = mahalanobis.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 = \
index_of_value
index_of_value_SOURCES = index_of_value.cc
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.
......@@ -22,10 +22,6 @@ check_PROGRAMS = \
projection \
wrap
norm_SOURCES = norm.cc
projection_SOURCES = projection.cc
wrap_SOURCES = wrap.cc
if HAVE_QT
......@@ -34,11 +30,10 @@ qt_rgb_to_int_u_SOURCES = qt_rgb_to_int_u.cc
endif HAVE_QT
check_PROGRAMS += \
hsl_to_rgb \
rgb_to_hsl
hsl_to_rgb_SOURCES = hsl_to_rgb.cc
rgb_to_hsl_SOURCES = rgb_to_hsl.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.
#
......@@ -20,7 +21,5 @@ check_PROGRAMS = \
max \
min
max_SOURCES = max.cc
min_SOURCES = min.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.
#
......@@ -22,8 +22,5 @@ check_PROGRAMS = \
rotation \
translation
composed_SOURCES = composed.cc
rotation_SOURCES = rotation.cc
translation_SOURCES = translation.cc
TESTS = $(check_PROGRAMS)
......@@ -40,27 +40,4 @@ seed2tiling_roundness \
translate \
vertical_symmetry
bbox_SOURCES = bbox.cc
horizontal_symmetry_SOURCES = horizontal_symmetry.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
vertical_symmetry_SOURCES = vertical_symmetry.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 @@ SUBDIRS = attribute
check_PROGRAMS = \
labeling
labeling_SOURCES = labeling.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 = \
card \
representative
card_SOURCES = card.cc
representative_SOURCES = representative.cc
TESTS = $(check_PROGRAMS)
# 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.
......@@ -22,8 +22,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)
# 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,6 +23,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)
......@@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
dump
dump_SOURCES = dump.cc
TESTS = $(check_PROGRAMS)
......
......@@ -22,7 +22,6 @@ AM_LDFLAGS = $(CFITSIO_LDFLAGS)
check_PROGRAMS = fits
fits_SOURCES = fits.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 = \
fld1d \
fld3d
fld2d_SOURCES = fld2d.cc
fld3d_SOURCES = fld3d.cc
fld1d_SOURCES = fld1d.cc
TESTS = $(check_PROGRAMS)
......@@ -23,8 +23,6 @@ check_PROGRAMS = \
load \
save
load_SOURCES = load.cc
save_SOURCES = save.cc
TESTS = $(check_PROGRAMS)
......
......@@ -22,10 +22,7 @@ check_PROGRAMS = \
load_save_bin \
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)
......
......@@ -21,8 +21,6 @@ check_PROGRAMS = \
pbm \
pbm_ascii
pbm_SOURCES = pbm.cc
pbm_ascii_SOURCES = pbm_ascii.cc
TESTS = $(check_PROGRAMS)
......
......@@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
load
load_SOURCES = load.cc
TESTS = $(check_PROGRAMS)
......
......@@ -24,11 +24,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)
......
......@@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
load
load_SOURCES = load.cc
TESTS = $(check_PROGRAMS)
......
......@@ -22,9 +22,6 @@ check_PROGRAMS = \
ppm23 \
ppm
ppm16_SOURCES = ppm16.cc
ppm23_SOURCES = ppm23.cc
ppm_SOURCES = ppm.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