On Thu, Jul 23, 2015 at 05:44:34PM +0200, Christophe Milard wrote: > The goal of this patch is to remove the src directory > and current directory from the standard include search > path (gcc -I<path>), so that #include <...> and #include "..." > actually search different locations. > This enables standard filenames (such as errno.h) to be used > locally. > > Signed-off-by: Christophe Milard <[email protected]> > --- > test/Makefile.inc | 5 ++--- > test/validation/Makefile.inc | 2 ++ > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/test/Makefile.inc b/test/Makefile.inc > index d5b4770..2700b18 100644 > --- a/test/Makefile.inc > +++ b/test/Makefile.inc > @@ -6,8 +6,7 @@ LIB = $(top_builddir)/lib > #before libodp by setting PRE_LDADD before the inclusion. > LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp.la > > -INCFLAGS = -I$(srcdir) \ > - -I$(top_srcdir)/test \ > +INCFLAGS = -I$(top_srcdir)/test \ > -I$(top_srcdir)/platform/@with_platform@/include \ > -I$(top_srcdir)/platform/linux-generic/include \ > -I$(top_srcdir)/include \ > @@ -20,4 +19,4 @@ AM_LDFLAGS += -L$(LIB) > @VALGRIND_CHECK_RULES@ > valgrind_tools = memcheck drd sgcheck > > -TESTS_ENVIRONMENT= ODP_PLATFORM=${with_platform} EXEEXT=${EXEEXT} > \ No newline at end of file > +TESTS_ENVIRONMENT= ODP_PLATFORM=${with_platform} EXEEXT=${EXEEXT} > diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc > index 31729b8..fcaf5a5 100644 > --- a/test/validation/Makefile.inc > +++ b/test/validation/Makefile.inc > @@ -1,5 +1,7 @@ > include $(top_srcdir)/test/Makefile.inc > > +DEFAULT_INCLUDES = > +
./bootstrap doesn't like this; + automake --add-missing --copy --warnings=all test/validation/buffer/../Makefile.inc:3: warning: user variable 'DEFAULT_INCLUDES' defined here ... test/validation/buffer/Makefile.am:1: 'test/validation/buffer/../Makefile.inc' included from here /usr/share/automake-1.14/am/compile.am: ... overrides Automake variable 'DEFAULT_INCLUDES' defined here test/validation/classification/../Makefile.inc:3: warning: user variable 'DEFAULT_INCLUDES' defined here ... I had a google and found some suggestions to use the nostdinc option; https://www.gnu.org/software/automake/manual/html_node/Program-Variables.html Adding this to Makefile.inc allows it to build; AUTOMAKE_OPTIONS = nostdinc -- Stuart. _______________________________________________ lng-odp mailing list [email protected] https://lists.linaro.org/mailman/listinfo/lng-odp
