* apps/constrained-connectivity/Makefile.am,
* apps/generic-skel/Makefile.am,
* apps/graph-morpho/Makefile.am,
* apps/mesh-segm-skel/Makefile.am,
* apps/morphers/Makefile.am,
* apps/papers/levillain.09.ismm/Makefile.am,
* tests/tests.mk,
* tools/tools.mk:
Here, as Automake 1.11+ already takes care of this.
---
milena/ChangeLog | 14 ++++++++++++++
milena/apps/constrained-connectivity/Makefile.am | 1 -
milena/apps/generic-skel/Makefile.am | 1 -
milena/apps/graph-morpho/Makefile.am | 2 --
milena/apps/mesh-segm-skel/Makefile.am | 1 -
milena/apps/morphers/Makefile.am | 1 -
milena/apps/papers/levillain.09.ismm/Makefile.am | 1 -
milena/tests/tests.mk | 20 --------------------
milena/tools/tools.mk | 1 -
9 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index c27a410..f88f452 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,17 @@
+2013-09-10 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Milena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's.
+
+ * apps/constrained-connectivity/Makefile.am,
+ * apps/generic-skel/Makefile.am,
+ * apps/graph-morpho/Makefile.am,
+ * apps/mesh-segm-skel/Makefile.am,
+ * apps/morphers/Makefile.am,
+ * apps/papers/levillain.09.ismm/Makefile.am,
+ * tests/tests.mk,
+ * tools/tools.mk:
+ Here, as Automake 1.11+ already takes care of this.
+
2013-09-09 Roland Levillain <roland(a)lrde.epita.fr>
Milena: Do not look for headers in the build tree uselessly.
diff --git a/milena/apps/constrained-connectivity/Makefile.am
b/milena/apps/constrained-connectivity/Makefile.am
index 1141317..0ccb4c9 100644
--- a/milena/apps/constrained-connectivity/Makefile.am
+++ b/milena/apps/constrained-connectivity/Makefile.am
@@ -22,7 +22,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
-APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
noinst_PROGRAMS = constrained-connectivity
diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am
index 44fc0dd..7736788 100644
--- a/milena/apps/generic-skel/Makefile.am
+++ b/milena/apps/generic-skel/Makefile.am
@@ -21,7 +21,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
-APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
generated_checked_tests =
diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am
index 61eede8..bc725aa 100644
--- a/milena/apps/graph-morpho/Makefile.am
+++ b/milena/apps/graph-morpho/Makefile.am
@@ -22,9 +22,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
-APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
-STRICT_ALIASING_CXXFLAGS = @STRICT_ALIASING_CXXFLAGS@
noinst_HEADERS = convert.hh debug.hh make.hh morpho.hh make_complex2d.hh
diff --git a/milena/apps/mesh-segm-skel/Makefile.am
b/milena/apps/mesh-segm-skel/Makefile.am
index 90af4ee..7c58008 100644
--- a/milena/apps/mesh-segm-skel/Makefile.am
+++ b/milena/apps/mesh-segm-skel/Makefile.am
@@ -22,7 +22,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
-APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
noinst_PROGRAMS =
diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am
index f874601..989ee59 100644
--- a/milena/apps/morphers/Makefile.am
+++ b/milena/apps/morphers/Makefile.am
@@ -24,7 +24,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
-APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
noinst_PROGRAMS = \
diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am
b/milena/apps/papers/levillain.09.ismm/Makefile.am
index fbc3567..db9ce42 100644
--- a/milena/apps/papers/levillain.09.ismm/Makefile.am
+++ b/milena/apps/papers/levillain.09.ismm/Makefile.am
@@ -24,7 +24,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
-APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
noinst_HEADERS = chain.hh io.hh influence_zones.hh
diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk
index 9a41031..dc6e80d 100644
--- a/milena/tests/tests.mk
+++ b/milena/tests/tests.mk
@@ -26,27 +26,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find test/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
-TESTS_CXXFLAGS = @TESTS_CXXFLAGS@
AM_CXXFLAGS = $(TESTS_CXXFLAGS)
-TESTS_CXXFLAGS_SPEED = @TESTS_CXXFLAGS_SPEED@
-TESTS_CXXFLAGS_DEBUG = @TESTS_CXXFLAGS_DEBUG@
-
-
-# Flags for optional dependencies.
-
-GDCM_CPPFLAGS = @GDCM_CPPFLAGS@
-GDCM_LDFLAGS = @GDCM_LDFLAGS@
-
-CFITSIO_CPPFLAGS = @CFITSIO_CPPFLAGS@
-CFITSIO_LDFLAGS = @CFITSIO_LDFLAGS@
-
-MAGICKXX_CPPFLAGS = @MAGICKXX_CPPFLAGS@
-MAGICKXX_LDFLAGS = @MAGICKXX_LDFLAGS@
-
-TIFF_CPPFLAGS = @TIFF_CPPFLAGS@
-TIFF_LDFLAGS = @TIFF_LDFLAGS@
-
-
# Inject rules to compile tests (recursively), without running them.
include $(top_srcdir)/build-aux/tests-recursive.mk
diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk
index f75daa2..a60f4d0 100644
--- a/milena/tools/tools.mk
+++ b/milena/tools/tools.mk
@@ -20,5 +20,4 @@ include $(top_srcdir)/milena/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
-TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@
AM_CXXFLAGS = $(TOOLS_CXXFLAGS)
--
1.7.10.4
Show replies by date