[Olena-patches] last-svn-commit-184-gaa63bcb Factor Makefiles' helpers.

* scribo.mk, tests/tests.mk (AM_CPPFLAGS): Move... * common.mk: ...here. --- scribo/ChangeLog | 7 +++++++ scribo/common.mk | 4 ++++ scribo/scribo.mk | 3 --- scribo/tests/tests.mk | 2 -- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index cf9c0c1..48b0d04 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> + Factor Makefiles' helpers. + + * scribo.mk, tests/tests.mk (AM_CPPFLAGS): Move... + * common.mk: ...here. + +2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> + Use AM_DEFAULT_SOURCE_EXT to simplify Scribo's Makefiles. * common.mk: New. diff --git a/scribo/common.mk b/scribo/common.mk index 3623290..ef59d88 100644 --- a/scribo/common.mk +++ b/scribo/common.mk @@ -20,3 +20,7 @@ # C++ sources. AM_DEFAULT_SOURCE_EXT = .cc + +# Add paths to Scribo's headers. +AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ \ + -I$(top_srcdir)/milena -I$(top_builddir)/milena diff --git a/scribo/scribo.mk b/scribo/scribo.mk index d35addc..341bf8b 100644 --- a/scribo/scribo.mk +++ b/scribo/scribo.mk @@ -16,8 +16,5 @@ include $(top_srcdir)/scribo/common.mk -# Add path to Scribo's headers -AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ -I$(top_srcdir)/milena -I$(top_builddir)/milena - SCRIBO_CXXFLAGS = @SCRIBO_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_CXXFLAGS) diff --git a/scribo/tests/tests.mk b/scribo/tests/tests.mk index 48b20c5..462a67f 100644 --- a/scribo/tests/tests.mk +++ b/scribo/tests/tests.mk @@ -16,7 +16,5 @@ include $(top_srcdir)/scribo/common.mk -AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ -I$(top_srcdir)/milena -I$(top_builddir)/milena - SCRIBO_TESTS_CXXFLAGS = @SCRIBO_TESTS_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_TESTS_CXXFLAGS) -- 1.5.6.5