On Sun, Sep 18, 2011 at 01:01:58 -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) > Shouldn't XI_CFLAGS and MALLOC_ZERO_CFLAGS be in CPPFLAGS as well?
The conflation of changing the ordering and moving things from CFLAGS to CPPFLAGS makes this fix more confusing than it needs to be... Cheers, Julien _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
