Mesa (master): osmesa: fix out-of-tree build

Andreas Boll ab at kemper.freedesktop.org
Tue Mar 19 17:13:00 UTC 2013


Module: Mesa
Branch: master
Commit: 92e6260c1960f78692417433206c38170ec1a625
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=92e6260c1960f78692417433206c38170ec1a625

Author: Andreas Boll <andreas.boll.dev at gmail.com>
Date:   Sat Mar 16 14:00:44 2013 +0100

osmesa: fix out-of-tree build

Taken from downstream:
http://anonscm.debian.org/gitweb/?p=pkg-xorg/lib/mesa.git;a=blob;f=debian/patches/14-fix-osmesa-build.diff;h=00581d0e1833c5492d9050e1bf3d5e658cad782e;hb=refs/heads/ubuntu%2B1

v2: Move the added line immediately after -I$(top_srcdir)/src/mapi

NOTE: This is a candidate for the 9.1 and 9.0 branches.

Acked-by: Kenneth Graunke <kenneth at whitecape.org> (v1)
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/osmesa/Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index c4b178b..2503401 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -24,6 +24,7 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/mapi \
+	-I$(top_builddir)/src/mapi \
 	-I$(top_srcdir)/src/mesa/ \
 	$(DEFINES) \
 	$(API_DEFINES)




More information about the mesa-commit mailing list