[Olena-patches] olena: olena-2.0-793-g9c2f117 Milena: Do not look for headers in the build tree uselessly.

* tools/tools.mk (AM_CPPFLAGS): Remove Milena's build dir from the file inclusion path. Remove outdated FIXMEs. * apps/constrained-connectivity/Makefile.am, * apps/graph-morpho/Makefile.am, * apps/mesh-segm-skel/Makefile.am, * apps/morphers/Makefile.am, * apps/papers/levillain.09.ismm/Makefile.am (AM_CPPFLAGS): Explain why $(top_builddir)/milena is part of the file inclusion path. * apps/generic-skel/Makefile.am, * doc/Makefile.am, * tests/tests.mk (AM_CPPFLAGS): Uniformity changes. --- milena/ChangeLog | 19 +++++++++++++++++++ milena/apps/constrained-connectivity/Makefile.am | 7 +++++-- milena/apps/generic-skel/Makefile.am | 4 ++-- milena/apps/graph-morpho/Makefile.am | 7 +++++-- milena/apps/mesh-segm-skel/Makefile.am | 4 +++- milena/apps/morphers/Makefile.am | 4 +++- milena/apps/papers/levillain.09.ismm/Makefile.am | 6 ++++-- milena/doc/Makefile.am | 7 ++++--- milena/tests/tests.mk | 9 +++++---- milena/tools/tools.mk | 14 ++------------ 10 files changed, 52 insertions(+), 29 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 05aa014..c27a410 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,22 @@ +2013-09-09 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Milena: Do not look for headers in the build tree uselessly. + + * tools/tools.mk (AM_CPPFLAGS): Remove Milena's build dir from the + file inclusion path. + Remove outdated FIXMEs. + * apps/constrained-connectivity/Makefile.am, + * apps/graph-morpho/Makefile.am, + * apps/mesh-segm-skel/Makefile.am, + * apps/morphers/Makefile.am, + * apps/papers/levillain.09.ismm/Makefile.am + (AM_CPPFLAGS): Explain why $(top_builddir)/milena is part of the + file inclusion path. + * apps/generic-skel/Makefile.am, + * doc/Makefile.am, + * tests/tests.mk + (AM_CPPFLAGS): Uniformity changes. + 2013-09-06 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Force make to regen Milena's mln/version.hh before other files. diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am index 6b3d3f3..1141317 100644 --- a/milena/apps/constrained-connectivity/Makefile.am +++ b/milena/apps/constrained-connectivity/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -17,7 +18,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +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) diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index eb4f8ba..44fc0dd 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -16,9 +16,9 @@ include $(top_srcdir)/milena/common.mk -# Find Milena and trimesh headers. +# Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find apps/data.hh (generated file). +# Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index d85a9ca..61eede8 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -17,7 +18,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +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) diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index afde381..90af4ee 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -18,7 +18,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +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) diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am index ae8e3ff..f874601 100644 --- a/milena/apps/morphers/Makefile.am +++ b/milena/apps/morphers/Makefile.am @@ -20,7 +20,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +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) diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index f9f3808..fbc3567 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/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. @@ -20,7 +20,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +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) diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8ba4971..f0532a2 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -16,9 +16,10 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# Look for Milena headers in srcdir and for (generated) test headers -# (like data.hh) in builddir. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +# Find Milena headers. +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find tests/data.hh and doc/tools/data.hh (generated headers). +AM_CPPFLAGS += -I$(top_builddir)/milena DOXYGEN = doxygen diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk index 304b46e..9a41031 100644 --- a/milena/tests/tests.mk +++ b/milena/tests/tests.mk @@ -2,7 +2,7 @@ ## Shared configuration for tests. -## Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +## Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and Development ## Laboratory (LRDE) ## ## This file is part of Olena. @@ -21,9 +21,10 @@ include $(top_srcdir)/milena/common.mk -# Look for Milena header in srcdir and for (generated) test headers -# (like data.hh) in builddir. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +# Find Milena headers. +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) diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk index 9704d04..f75daa2 100644 --- a/milena/tools/tools.mk +++ b/milena/tools/tools.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -17,18 +17,8 @@ include $(top_srcdir)/milena/common.mk -## FIXME: Revamp (see Olena 0.11's test suite). - -# Look for Milena headers in srcdir. +# Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -# Look for Milena headers in builddir. -AM_CPPFLAGS += -I$(top_builddir)/milena -# FIXME: Add -# -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) -# -# when oln.m4 (or just a part of it) is available in the distribution, -# instead of using the hand-made TOOLS_CXXFLAGS. TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) -- 1.7.10.4