build: fix -I options

* configure.ac (AM_INIT_AUTOMAKE): Add nostdinc.
* Makefile.am (AM_CPPFLAGS): Append -I$(builddir) and -I$(srcdir).
* tests/Makefile.am (AM_CPPFLAGS): Likewise.

diff --git a/Makefile.am b/Makefile.am
index f70f6d2bef3332e6cde69dcd087e6133a3f527b2..9800a3a4093820a5cec9a051227b499b95eb70d0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,9 @@ AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = -I$(builddir)/$(OS)/$(ARCH) \
              -I$(srcdir)/$(OS)/$(ARCH) \
              -I$(builddir)/$(OS) \
-             -I$(srcdir)/$(OS)
+             -I$(srcdir)/$(OS) \
+             -I$(builddir) \
+             -I$(srcdir)
 
 include xlat/Makemodule.am
 

diff --git a/configure.ac b/configure.ac
index 2f43b1883f86879c1d56cb13fbde8b9fee8b7157..eeb618e7ba10bf6e653761cdb5c72249df5b73d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([strace],
 AC_CONFIG_SRCDIR([strace.c])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules parallel-tests])
+AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules parallel-tests])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9b1703cc9d7af672a6411f0ccb1728203523574a..7b2986fb599e9567ff621dd66e3d31250fb31642 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,9 @@ AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = -I$(top_builddir)/$(OS)/$(ARCH) \
              -I$(top_srcdir)/$(OS)/$(ARCH) \
              -I$(top_builddir)/$(OS) \
-             -I$(top_srcdir)/$(OS)
+             -I$(top_srcdir)/$(OS) \
+             -I$(top_builddir) \
+             -I$(top_srcdir)
 
 check_PROGRAMS = \
        aio \