* apps/generic-skel/Makefile.am,
* apps/mesh-segm-skel/Makefile.am:
Here.
---
milena/ChangeLog | 8 ++++++++
milena/apps/generic-skel/Makefile.am | 22 ++++++++++------------
milena/apps/mesh-segm-skel/Makefile.am | 2 +-
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 78bf909..7d65502 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,13 @@
2013-08-31 Roland Levillain <roland(a)lrde.epita.fr>
+ Aesthetic changes in Milena apps Makefiles.
+
+ * apps/generic-skel/Makefile.am,
+ * apps/mesh-segm-skel/Makefile.am:
+ Here.
+
+2013-08-31 Roland Levillain <roland(a)lrde.epita.fr>
+
Factor the generation of tests in Milena's apps/mesh-segm-skel.
* apps/mesh-segm-skel/Makefile.am: Here.
diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am
index 06f6cf8..7724ef1 100644
--- a/milena/apps/generic-skel/Makefile.am
+++ b/milena/apps/generic-skel/Makefile.am
@@ -39,20 +39,11 @@ noinst_PROGRAMS += \
image3d-skel-with-end-points \
image3d-skel-with-1d-isthmuses
-EXTRA_DIST = \
- test-image2d-skel-unconstrained.in \
- test-image2d-skel-with-end-points.in
-
-# Use Make to generate Doxyfile instead of `configure', as advised by
+# Use Make to generate tests instead of `configure', as advised by
# Autoconf's manual (see section ``Installation Directory
# Variables'').
edit = sed -e 's|@top_srcdir[@]|$(top_srcdir)|g'
-# Tests for the 2D case.
-generated_tests = \
- test-image2d-skel-unconstrained \
- test-image2d-skel-with-end-points
-
$(generated_tests): Makefile
rm -f $@ $@.tmp
srcdir=''; \
@@ -62,12 +53,19 @@ $(generated_tests): Makefile
chmod a-w $@.tmp
mv $@.tmp $@
+# Tests for the 2D case.
+generated_tests = \
+ test-image2d-skel-unconstrained \
+ test-image2d-skel-with-end-points
+
+EXTRA_DIST = \
+ test-image2d-skel-unconstrained.in \
+ test-image2d-skel-with-end-points.in
test-image2d-skel-unconstrained: $(srcdir)/test-image2d-skel-unconstrained.in
test-image2d-skel-with-end-points: $(srcdir)/test-image2d-skel-with-end-points.in
-CLEANFILES = $(generated_tests)
-
TESTS = $(generated_tests)
+CLEANFILES = $(generated_tests)
# Tests for the 3D case.
# FIXME: Create real test cases with inputs passed as argument.
diff --git a/milena/apps/mesh-segm-skel/Makefile.am
b/milena/apps/mesh-segm-skel/Makefile.am
index 57bf632..ea0ed50 100644
--- a/milena/apps/mesh-segm-skel/Makefile.am
+++ b/milena/apps/mesh-segm-skel/Makefile.am
@@ -24,9 +24,9 @@ APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
noinst_PROGRAMS =
-TESTS =
generated_tests =
EXTRA_DIST =
+TESTS =
MOSTLYCLEANFILES =
# Use Make to generate tests instead of `configure', as advised by
--
1.7.10.4
Show replies by date