Makefiles: remove -I$(includedir)

Currently, we include the system include dir in some of our makefiles;
this is causing build problems when cross-compiling, as the system
include dir may not contain files for the host.

The compiler should be searing in the proper system include dir, so just
remove the redundant -I.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/test/lib/Makefile.am b/test/lib/Makefile.am
index 5a3a34abcbf2ccee2709d210c060cab1b9dfae58..bfcf9c25efaf98463c6905b01b6ca0cd18a45881 100644 (file)
--- a/test/lib/Makefile.am
+++ b/test/lib/Makefile.am
@@ -16,7 +16,6 @@ AUTOMAKE_OPTIONS = parallel-tests
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \

-       -I$(includedir) \

        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \
        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 7360926056bfd3c36feca4bb07394cd64fb3a042..5e7c76583192738b395af237f047e39dd6eac317 100644 (file)
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -15,7 +15,6 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \

-       -I$(includedir) \

        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \
        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \

diff --git a/test/urls/Makefile.am b/test/urls/Makefile.am
index da6fcbfbcc4d0c5dd2a2b276172e2ea9d00a8929..e2731c1719b290ecb2ad6e2059da07752e89af47 100644 (file)
--- a/test/urls/Makefile.am
+++ b/test/urls/Makefile.am
@@ -16,7 +16,6 @@ AUTOMAKE_OPTIONS = parallel-tests
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \

-       -I$(includedir) \

        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \
        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \

diff --git a/ui/common/Makefile.am b/ui/common/Makefile.am
index e629f1c3720b2ce2f24f08781fa037afd0ba04e0..a7b2f0ff9338b0e041fcebfd0c0ca7fc8314f0f9 100644 (file)
--- a/ui/common/Makefile.am
+++ b/ui/common/Makefile.am
@@ -15,7 +15,6 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \

-       -I$(includedir) \

        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \
        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \

diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am
index 3df91053bb25a673f455cf3451e254a795c97dde..6d360d2dae91600a060ec501c5e2ac9110f216d5 100644 (file)
--- a/ui/ncurses/Makefile.am
+++ b/ui/ncurses/Makefile.am
@@ -15,7 +15,6 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \

-       -I$(includedir) \

        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \
        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \

diff --git a/ui/test/Makefile.am b/ui/test/Makefile.am
index 1daf78ec83079dccfc7f5c59d5b054652da666b3..63b7d8c285dc19763bd1da5a803ec4bef4eefa9d 100644 (file)
--- a/ui/test/Makefile.am
+++ b/ui/test/Makefile.am
@@ -15,7 +15,6 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \

-       -I$(includedir) \

        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \
        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \

diff --git a/ui/twin/Makefile.am b/ui/twin/Makefile.am
index dc6ec533ec4068be210011e80b0b067cd7e13c8e..053e73c37512d9ca3fe6417cd8fd3b49da4e262d 100644 (file)
--- a/ui/twin/Makefile.am
+++ b/ui/twin/Makefile.am
@@ -15,7 +15,6 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \

-       -I$(includedir) \

        $(DEFAULT_CPPFLAGS) \
        $(twin_CFLAGS)
 
        $(DEFAULT_CPPFLAGS) \
        $(twin_CFLAGS)
 

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 2f2b569cf21e76bdef5b2c025a579fbc78bb7612..67d64ccb60bc6ffd40c710e3eeee71283c7b29ad 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -15,7 +15,6 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib \

-       -I$(includedir) \

        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \
        $(DEFAULT_CPPFLAGS)
 
 AM_CFLAGS = \