diff mbox

[PATCHv3,02/20] test: removing current dir from -I

Message ID 1438018732-2778-3-git-send-email-christophe.milard@linaro.org
State Accepted
Commit b9feb72a32e0186f1eb5da309b43891644a1e7f6
Headers show

Commit Message

Christophe Milard July 27, 2015, 5:38 p.m. UTC 
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 <christophe.milard@linaro.org>
---
 test/Makefile.inc            | 5 ++---
 test/validation/Makefile.inc | 5 +++++
 2 files changed, 7 insertions(+), 3 deletions(-)
diff mbox

Patch

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 ac80814..49efbda 100644
--- a/test/validation/Makefile.inc
+++ b/test/validation/Makefile.inc
@@ -2,6 +2,11 @@  include $(top_srcdir)/test/Makefile.inc
 
 COMMON_DIR = $(top_builddir)/test/validation/common
 
+#the following option ensure that option '-I.' is not passed to gcc,
+#therefore distinguishing between '#include "X"' and '#include <X>'.
+#It allows common filenames (such as 'errno.h') to be used locally.
+AUTOMAKE_OPTIONS = nostdinc
+
 AM_CFLAGS += -I$(top_srcdir)/test/validation/common
 AM_LDFLAGS += -static