Commit 9c2f117f authored by Roland Levillain's avatar Roland Levillain
Browse files

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.
parent 9d5b6b6c
2013-09-09 Roland Levillain <roland@lrde.epita.fr>
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 <roland@lrde.epita.fr> 2013-09-06 Roland Levillain <roland@lrde.epita.fr>
   
Force make to regen Milena's mln/version.hh before other files. Force make to regen Milena's mln/version.hh before other files.
# 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. # This file is part of Olena.
# #
...@@ -17,7 +18,9 @@ ...@@ -17,7 +18,9 @@
include $(top_srcdir)/milena/common.mk include $(top_srcdir)/milena/common.mk
# Find Milena headers. # 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. # Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@ APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS) AM_CXXFLAGS = $(APPS_CXXFLAGS)
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
include $(top_srcdir)/milena/common.mk include $(top_srcdir)/milena/common.mk
# Find Milena and trimesh headers. # Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated file). # Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code. # Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@ APPS_CXXFLAGS = @APPS_CXXFLAGS@
......
# 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. # This file is part of Olena.
# #
...@@ -17,7 +18,9 @@ ...@@ -17,7 +18,9 @@
include $(top_srcdir)/milena/common.mk include $(top_srcdir)/milena/common.mk
# Find Milena headers. # 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. # Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@ APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS) AM_CXXFLAGS = $(APPS_CXXFLAGS)
......
...@@ -18,7 +18,9 @@ ...@@ -18,7 +18,9 @@
include $(top_srcdir)/milena/common.mk include $(top_srcdir)/milena/common.mk
# Find Milena headers. # 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. # Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@ APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS) AM_CXXFLAGS = $(APPS_CXXFLAGS)
......
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
include $(top_srcdir)/milena/common.mk include $(top_srcdir)/milena/common.mk
# Find Milena headers. # 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. # Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@ APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS) AM_CXXFLAGS = $(APPS_CXXFLAGS)
......
# Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development # Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development
# Laboratory (LRDE). # Laboratory (LRDE).
# #
# This file is part of Olena. # This file is part of Olena.
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
include $(top_srcdir)/milena/common.mk include $(top_srcdir)/milena/common.mk
# Find Milena headers. # 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. # Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@ APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS) AM_CXXFLAGS = $(APPS_CXXFLAGS)
......
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>. # along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Look for Milena headers in srcdir and for (generated) test headers # Find Milena headers.
# (like data.hh) in builddir. AM_CPPFLAGS = -I$(top_srcdir)/milena
AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Find tests/data.hh and doc/tools/data.hh (generated headers).
AM_CPPFLAGS += -I$(top_builddir)/milena
DOXYGEN = doxygen DOXYGEN = doxygen
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
## Shared configuration for tests. ## 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) ## Laboratory (LRDE)
## ##
## This file is part of Olena. ## This file is part of Olena.
...@@ -21,9 +21,10 @@ ...@@ -21,9 +21,10 @@
include $(top_srcdir)/milena/common.mk include $(top_srcdir)/milena/common.mk
# Look for Milena header in srcdir and for (generated) test headers # Find Milena headers.
# (like data.hh) in builddir. AM_CPPFLAGS = -I$(top_srcdir)/milena
AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Find test/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ TESTS_CXXFLAGS = @TESTS_CXXFLAGS@
AM_CXXFLAGS = $(TESTS_CXXFLAGS) AM_CXXFLAGS = $(TESTS_CXXFLAGS)
......
# Copyright (C) 2009, 2010, 2011 EPITA Research and Development # Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development
# Laboratory (LRDE) # Laboratory (LRDE)
# #
# This file is part of Olena. # This file is part of Olena.
...@@ -17,18 +17,8 @@ ...@@ -17,18 +17,8 @@
include $(top_srcdir)/milena/common.mk include $(top_srcdir)/milena/common.mk
## FIXME: Revamp (see Olena 0.11's test suite). # Find Milena headers.
# Look for Milena headers in srcdir.
AM_CPPFLAGS = -I$(top_srcdir)/milena 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@ TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@
AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_CXXFLAGS = $(TOOLS_CXXFLAGS)
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