Mesa (master): nouveau: fix build against out of tree libdrm

Dave Airlie airlied at kemper.freedesktop.org
Mon Jan 17 05:55:26 UTC 2011


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jan 17 15:41:49 2011 +1000

nouveau: fix build against out of tree libdrm

For doing builds against a separated libdrm these cflags are needed.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/nouveau/Makefile |    1 +
 src/gallium/drivers/nv50/Makefile    |    3 +++
 src/gallium/drivers/nvc0/Makefile    |    3 +++
 src/gallium/drivers/nvfx/Makefile    |    1 +
 4 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/nouveau/Makefile b/src/gallium/drivers/nouveau/Makefile
index db591b7..a33bf5e 100644
--- a/src/gallium/drivers/nouveau/Makefile
+++ b/src/gallium/drivers/nouveau/Makefile
@@ -4,6 +4,7 @@ include $(TOP)/configs/current
 LIBNAME = nouveau
 
 LIBRARY_INCLUDES = \
+	$(LIBDRM_CFLAGS) \
 	-I$(TOP)/src/gallium/drivers/nouveau/include
 
 C_SOURCES = nouveau_screen.c 
diff --git a/src/gallium/drivers/nv50/Makefile b/src/gallium/drivers/nv50/Makefile
index bf1e820..b3535c0 100644
--- a/src/gallium/drivers/nv50/Makefile
+++ b/src/gallium/drivers/nv50/Makefile
@@ -29,4 +29,7 @@ C_SOURCES = \
 	nv50_pc_optimize.c \
 	nv50_pc_regalloc.c
 
+LIBRARY_INCLUDES = \
+	$(LIBDRM_CFLAGS)
+
 include ../../Makefile.template
diff --git a/src/gallium/drivers/nvc0/Makefile b/src/gallium/drivers/nvc0/Makefile
index da8f9a2..54f1ab7 100644
--- a/src/gallium/drivers/nvc0/Makefile
+++ b/src/gallium/drivers/nvc0/Makefile
@@ -31,4 +31,7 @@ C_SOURCES = \
 	nvc0_mm.c \
 	nvc0_query.c
 
+LIBRARY_INCLUDES = \
+	$(LIBDRM_CFLAGS)
+
 include ../../Makefile.template
diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile
index 46bb082..a3b76ac 100644
--- a/src/gallium/drivers/nvfx/Makefile
+++ b/src/gallium/drivers/nvfx/Makefile
@@ -27,6 +27,7 @@ C_SOURCES = \
 	nvfx_vertprog.c
 
 LIBRARY_INCLUDES = \
+	$(LIBDRM_CFLAGS) \
 	-I$(TOP)/src/gallium/drivers/nouveau/include
 
 include ../../Makefile.template




More information about the mesa-commit mailing list