[PATCH libXi] Use AM_CPPFLAGS to use in tree headers before installed headers

Jeremy Huddleston jeremyhu at apple.com
Sun Sep 18 01:01:58 PDT 2011


This addresses a build failure found by the tinderbox.

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---

See: http://tinderbox.x.org/builds/2011-09-17-0000/logs/libXi

 src/Makefile.am |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index c036ae7..806265c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,10 +64,11 @@ libXi_la_SOURCES = \
 
 libXi_la_LIBADD = $(XI_LIBS)
 
-AM_CFLAGS = -I$(top_srcdir)/include \
-            -I$(top_srcdir)/include/X11 \
-            -I$(top_srcdir)/include/X11/extensions \
-            $(XI_CFLAGS) \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+              -I$(top_srcdir)/include/X11 \
+              -I$(top_srcdir)/include/X11/extensions
+
+AM_CFLAGS = $(XI_CFLAGS) \
             $(MALLOC_ZERO_CFLAGS) \
             $(CWARNFLAGS)
 
-- 
1.7.5.2






More information about the xorg-devel mailing list