On Tue, Jan 22, 2013 at 10:35 AM, <jfons...@vmware.com> wrote: > From: José Fonseca <jfons...@vmware.com> > > Fixes failures to include libdrm/nouveau.h when drm is not installed in > /usr/include. > --- > src/gallium/drivers/nv30/Makefile.am | 3 ++- > src/gallium/drivers/nv50/Makefile.am | 3 ++- > src/gallium/drivers/nvc0/Makefile.am | 3 ++- > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/src/gallium/drivers/nv30/Makefile.am > b/src/gallium/drivers/nv30/Makefile.am > index 668a8b2..e7d1983 100644 > --- a/src/gallium/drivers/nv30/Makefile.am > +++ b/src/gallium/drivers/nv30/Makefile.am > @@ -28,6 +28,7 @@ noinst_LTLIBRARIES = libnv30.la > AM_CPPFLAGS = \ > -I$(top_srcdir)/src/gallium/drivers \ > -I$(top_srcdir)/include \ > - $(GALLIUM_CFLAGS) > + $(GALLIUM_CFLAGS) \ > + $(NOUVEAU_CFLAGS) > > libnv30_la_SOURCES = $(C_SOURCES) > diff --git a/src/gallium/drivers/nv50/Makefile.am > b/src/gallium/drivers/nv50/Makefile.am > index 93eeb1f..58c26ef 100644 > --- a/src/gallium/drivers/nv50/Makefile.am > +++ b/src/gallium/drivers/nv50/Makefile.am > @@ -28,6 +28,7 @@ noinst_LTLIBRARIES = libnv50.la > AM_CPPFLAGS = \ > -I$(top_srcdir)/src/gallium/drivers \ > -I$(top_srcdir)/include \ > - $(GALLIUM_CFLAGS) > + $(GALLIUM_CFLAGS) \ > + $(NOUVEAU_CFLAGS) > > libnv50_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES) > diff --git a/src/gallium/drivers/nvc0/Makefile.am > b/src/gallium/drivers/nvc0/Makefile.am > index 6a245af..45e5a63 100644 > --- a/src/gallium/drivers/nvc0/Makefile.am > +++ b/src/gallium/drivers/nvc0/Makefile.am > @@ -28,6 +28,7 @@ noinst_LTLIBRARIES = libnvc0.la > AM_CPPFLAGS = \ > -I$(top_srcdir)/src/gallium/drivers \ > -I$(top_srcdir)/include \ > - $(GALLIUM_CFLAGS) > + $(GALLIUM_CFLAGS) \ > + $(NOUVEAU_CFLAGS) > > libnvc0_la_SOURCES = $(C_SOURCES) $(CPP_SOURCES) > -- > 1.7.9.5
Reviewed-by: Matt Turner <matts...@gmail.com> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
