* apps/generic-skel/Makefile.am,
* apps/mesh-segm-skel/Makefile.am,
* tests/io/vtk/Makefile.am,
* tests/transform/Makefile.am,
* tools/Makefile.am:
Here.
---
milena/ChangeLog | 11 +++++++++++
milena/apps/generic-skel/Makefile.am | 19 ++++++-------------
milena/apps/mesh-segm-skel/Makefile.am | 8 +-------
milena/tests/io/vtk/Makefile.am | 7 ++-----
milena/tests/transform/Makefile.am | 3 +--
milena/tools/Makefile.am | 7 +------
6 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index e248291..f91ace5 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,16 @@
2013-08-30 Roland Levillain <roland(a)lrde.epita.fr>
+ Simplify even more Milena Makefiles thanks to AM_DEFAULT_SOURCE_EXT.
+
+ * apps/generic-skel/Makefile.am,
+ * apps/mesh-segm-skel/Makefile.am,
+ * tests/io/vtk/Makefile.am,
+ * tests/transform/Makefile.am,
+ * tools/Makefile.am:
+ Here.
+
+2013-08-30 Roland Levillain <roland(a)lrde.epita.fr>
+
Regen images of the Milena documentation.
* doc/figures/extend-1.ppm,
diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am
index 41f022e..1d4f73e 100644
--- a/milena/apps/generic-skel/Makefile.am
+++ b/milena/apps/generic-skel/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2012 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2010-2013 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -24,24 +24,17 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS)
# FIXME: Really install these programs?
+# 2D cases.
bin_PROGRAMS = \
image2d-skel-unconstrained \
- image2d-skel-with-end-points \
- \
+ image2d-skel-with-end-points
+
+# 3D cases, slow versions.
+bin_PROGRAMS += \
image3d-skel-unconstrained \
image3d-skel-with-end-points \
image3d-skel-with-1d-isthmuses
-# 2D cases.
-image2d_skel_unconstrained_SOURCES = image2d-skel-unconstrained.cc
-image2d_skel_with_end_points_SOURCES = image2d-skel-with-end-points.cc
-
-# 3D cases, slow versions.
-noinst_HEADERS = image3d-skel.hh
-image3d_skel_unconstrained_SOURCES = image3d-skel-unconstrained.cc
-image3d_skel_with_end_points_SOURCES = image3d-skel-with-end-points.cc
-image3d_skel_with_1d_isthmuses_SOURCES = image3d-skel-with-1d-isthmuses.cc
-
EXTRA_DIST = \
test-image2d-skel-unconstrained.in \
test-image2d-skel-with-end-points.in
diff --git a/milena/apps/mesh-segm-skel/Makefile.am
b/milena/apps/mesh-segm-skel/Makefile.am
index c738963..2faefb9 100644
--- a/milena/apps/mesh-segm-skel/Makefile.am
+++ b/milena/apps/mesh-segm-skel/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development
+# Copyright (C) 2008, 2009, 2010, 2012, 2013 EPITA Research and Development
# Laboratory (LRDE)
#
# This file is part of Olena.
@@ -70,7 +70,6 @@ MOSTLYCLEANFILES += teapot-complex-max-curv.off
# surface of a triangle mesh and displaying its local minima
# (in blue) and maxima (in red).
bin_PROGRAMS += mesh-complex-max-curv-extrema
-mesh_complex_max_curv_extrema_SOURCES = mesh-complex-max-curv-extrema.cc
TESTS += test-mesh-complex-max-curv-extrema
MOSTLYCLEANFILES += \
socket-complex-max-curv-extrema.off \
@@ -104,7 +103,6 @@ MOSTLYCLEANFILES += \
# Likewise, but using pseudo-inverse curvature.
bin_PROGRAMS += mesh-complex-pinv-curv-segm
-mesh_complex_pinv_curv_segm_SOURCES = mesh-complex-pinv-curv-segm.cc
TESTS += test-mesh-complex-pinv-curv-segm
MOSTLYCLEANFILES += \
socket-complex-pinv-curv-segm.off \
@@ -126,7 +124,6 @@ edit = sed \
# Performing a 2-collapse on a pseudo-manifold.
bin_PROGRAMS += mesh-complex-2-collapse
-mesh_complex_2_collapse_SOURCES = mesh-complex-2-collapse.cc
test-mesh-complex-2-collapse: test-mesh-complex-2-collapse.in Makefile
rm -f $@ $@.tmp
@@ -143,7 +140,6 @@ MOSTLYCLEANFILES += pseudo-manifold-2-collapse.vtk
# Program computing the max curvature from a mesh, then performing a
# 2-collapse on it.
bin_PROGRAMS += mesh-complex-max-curv-2-collapse
-mesh_complex_max_curv_2_collapse_SOURCES = mesh-complex-max-curv-2-collapse.cc
# FIXME: Factor action with test-mesh-complex-2-collapse's.
test-mesh-complex-max-curv-2-collapse: test-mesh-complex-max-curv-2-collapse.in Makefile
@@ -163,7 +159,6 @@ MOSTLYCLEANFILES += \
# Program computing the max curvature from a mesh, then performing a
# 1-collapse on it.
bin_PROGRAMS += mesh-complex-max-curv-1-collapse
-mesh_complex_max_curv_1_collapse_SOURCES = mesh-complex-max-curv-1-collapse.cc
# FIXME: Factor action with test-mesh-complex-1-collapse's.
test-mesh-complex-max-curv-1-collapse: test-mesh-complex-max-curv-1-collapse.in Makefile
@@ -215,7 +210,6 @@ MOSTLYCLEANFILES += \
# Convert a binary OFF file (e.g. no value attached to faces) into a
# VTK file.
bin_PROGRAMS += off-to-vtk-bin
-off_to_vtk_bin_SOURCES = off-to-vtk-bin.cc
## ------------- ##
## Mixed tests. ##
diff --git a/milena/tests/io/vtk/Makefile.am b/milena/tests/io/vtk/Makefile.am
index 9554a4b..4caaf7a 100644
--- a/milena/tests/io/vtk/Makefile.am
+++ b/milena/tests/io/vtk/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2010, 2011, 2013 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,10 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = load_bin load_save_bin save
-load_bin_SOURCES = load_bin.cc
-load_save_bin_SOURCES = load_save_bin.cc
-save_SOURCES = save.cc
-
TESTS = $(check_PROGRAMS)
MOSTLYCLEANFILES = \
diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am
index a49ae65..42d74c7 100644
--- a/milena/tests/transform/Makefile.am
+++ b/milena/tests/transform/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development
+# Copyright (C) 2008, 2009, 2010, 2012, 2013 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -32,7 +32,6 @@ check_PROGRAMS = \
if HAVE_FFTW3
check_PROGRAMS += fft
-fft_SOURCES = fft.cc
fft_CPPFLAGS = $(AM_CPPFLAGS) $(FFTW3_CPPFLAGS)
fft_LDFLAGS = $(AM_LDFLAGS) $(FFTW3_LDFLAGS)
diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am
index dce1cad..0cbe661 100644
--- a/milena/tools/Makefile.am
+++ b/milena/tools/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development
+# Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development
# Laboratory (LRDE)
#
# This file is part of Olena.
@@ -27,7 +27,6 @@ noinst_PROGRAMS = compute_local_configurations
noinst_HEADERS = connectivity_numbers_3d.hh
noinst_PROGRAMS += connectivity_numbers_3d
-connectivity_numbers_3d_SOURCES = connectivity_numbers_3d.cc
# FIXME: Hard-coded paths.
@@ -39,17 +38,14 @@ extra: $(EXTRA_PROGRAMS)
noinst_HEADERS += connectivity_numbers_3d_tbb.hh
EXTRA_PROGRAMS = connectivity_numbers_3d_tbb
-connectivity_numbers_3d_tbb_SOURCES = connectivity_numbers_3d_tbb.cc
connectivity_numbers_3d_tbb_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_TBB)
connectivity_numbers_3d_tbb_LDFLAGS = $(LDFLAGS_TBB)
noinst_HEADERS += simple_point3d_lut.hh
EXTRA_PROGRAMS += simple_point3d_lut
-simple_point3d_lut_SOURCES = simple_point3d_lut.cc
noinst_HEADERS += simple_point3d_lut_tbb.hh
EXTRA_PROGRAMS += simple_point3d_lut_tbb
-simple_point3d_lut_tbb_SOURCES = simple_point3d_lut_tbb.cc
simple_point3d_lut_tbb_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_TBB)
simple_point3d_lut_tbb_LDFLAGS = $(LDFLAGS_TBB)
@@ -83,7 +79,6 @@ nodist_libsimple_point3d_lut_26_6_la_SOURCES =
simple_point3d_lut_26_6.hh
simple_point3d_lut_26_6.lo: simple_point3d_lut_26_6.hh
EXTRA_PROGRAMS += test_simple_point3d_lut_26_6
-test_simple_point3d_lut_26_6_SOURCES = test_simple_point3d_lut_26_6.cc
test_simple_point3d_lut_26_6_LDADD = libsimple_point3d_lut_26_6.la
# Generate this build dependency of test_simple_point3d_lut_26_6.
test_simple_point3d_lut_26_6.o: simple_point3d_lut_26_6.hh
--
1.7.10.4