From 88e363f1dfec49a156c0be4f8368728871401122 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 7 May 2013 10:02:23 +0800 Subject: [PATCH 1/1] 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 --- test/lib/Makefile.am | 1 - test/parser/Makefile.am | 1 - test/urls/Makefile.am | 1 - ui/common/Makefile.am | 1 - ui/ncurses/Makefile.am | 1 - ui/test/Makefile.am | 1 - ui/twin/Makefile.am | 1 - utils/Makefile.am | 1 - 8 files changed, 8 deletions(-) diff --git a/test/lib/Makefile.am b/test/lib/Makefile.am index 5a3a34a..bfcf9c2 100644 --- 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 \ - -I$(includedir) \ $(DEFAULT_CPPFLAGS) AM_CFLAGS = \ diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am index 7360926..5e7c765 100644 --- a/test/parser/Makefile.am +++ b/test/parser/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ - -I$(includedir) \ $(DEFAULT_CPPFLAGS) AM_CFLAGS = \ diff --git a/test/urls/Makefile.am b/test/urls/Makefile.am index da6fcbf..e2731c1 100644 --- 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 \ - -I$(includedir) \ $(DEFAULT_CPPFLAGS) AM_CFLAGS = \ diff --git a/ui/common/Makefile.am b/ui/common/Makefile.am index e629f1c..a7b2f0f 100644 --- a/ui/common/Makefile.am +++ b/ui/common/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ - -I$(includedir) \ $(DEFAULT_CPPFLAGS) AM_CFLAGS = \ diff --git a/ui/ncurses/Makefile.am b/ui/ncurses/Makefile.am index 3df9105..6d360d2 100644 --- a/ui/ncurses/Makefile.am +++ b/ui/ncurses/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ - -I$(includedir) \ $(DEFAULT_CPPFLAGS) AM_CFLAGS = \ diff --git a/ui/test/Makefile.am b/ui/test/Makefile.am index 1daf78e..63b7d8c 100644 --- a/ui/test/Makefile.am +++ b/ui/test/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ - -I$(includedir) \ $(DEFAULT_CPPFLAGS) AM_CFLAGS = \ diff --git a/ui/twin/Makefile.am b/ui/twin/Makefile.am index dc6ec53..053e73c 100644 --- a/ui/twin/Makefile.am +++ b/ui/twin/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ - -I$(includedir) \ $(DEFAULT_CPPFLAGS) \ $(twin_CFLAGS) diff --git a/utils/Makefile.am b/utils/Makefile.am index 2f2b569..67d64cc 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib \ - -I$(includedir) \ $(DEFAULT_CPPFLAGS) AM_CFLAGS = \ -- 2.39.2