<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.32.2">
</HEAD>
<BODY>
On Sun, 2011-09-18 at 01:01 -0700, Jeremy Huddleston wrote:
<BLOCKQUOTE TYPE=CITE>
<PRE>
This addresses a build failure found by the tinderbox.
Signed-off-by: Jeremy Huddleston <<A HREF="mailto:jeremyhu@apple.com">jeremyhu@apple.com</A>>
---
See: <A HREF="http://tinderbox.x.org/builds/2011-09-17-0000/logs/libXi">http://tinderbox.x.org/builds/2011-09-17-0000/logs/libXi</A>
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)
</PRE>
</BLOCKQUOTE>
<BR>
The patch separates the preprocessor flags from the compiler as it should be anyway.<BR>
For a developer, it picks the header file from the libXi include directory rather than the installed directory which is necessary.<BR>
<BR>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
</BODY>
</HTML>