On Sun, 2011-09-18 at 01:01 -0700, Jeremy Huddleston wrote: > This addresses a build failure found by the tinderbox. > > Signed-off-by: Jeremy Huddleston <[email protected]> > --- > > 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) >
The patch separates the preprocessor flags from the compiler as it should be anyway. For a developer, it picks the header file from the libXi include directory rather than the installed directory which is necessary. Reviewed-by: Gaetan Nadon <[email protected]>
signature.asc
Description: This is a digitally signed message part
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
