[Mesa-dev] [PATCH] nouveau: don't assume libdrm include prefix

Jonathan Gray jsg at jsg.id.au
Fri Jul 19 23:18:32 PDT 2013


Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
---
 src/gallium/drivers/nouveau/Makefile.am       | 2 +-
 src/gallium/drivers/nouveau/nouveau_context.h | 2 +-
 src/gallium/drivers/nouveau/nouveau_screen.c  | 2 +-
 src/gallium/drivers/nouveau/nouveau_winsys.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git src/gallium/drivers/nouveau/Makefile.am src/gallium/drivers/nouveau/Makefile.am
index 12e3da0..85f0b33 100644
--- src/gallium/drivers/nouveau/Makefile.am
+++ src/gallium/drivers/nouveau/Makefile.am
@@ -30,6 +30,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/gallium/drivers \
 	-I$(top_srcdir)/include \
 	$(GALLIUM_CFLAGS) \
-	$(LIBDRM_CFLAGS)
+	$(NOUVEAU_CFLAGS)
 
 libnouveau_la_SOURCES = $(C_SOURCES)
diff --git src/gallium/drivers/nouveau/nouveau_context.h src/gallium/drivers/nouveau/nouveau_context.h
index bad5ab7..c8d9d84 100644
--- src/gallium/drivers/nouveau/nouveau_context.h
+++ src/gallium/drivers/nouveau/nouveau_context.h
@@ -2,7 +2,7 @@
 #define __NOUVEAU_CONTEXT_H__
 
 #include "pipe/p_context.h"
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
 
 #define NOUVEAU_MAX_SCRATCH_BUFS 4
 
diff --git src/gallium/drivers/nouveau/nouveau_screen.c src/gallium/drivers/nouveau/nouveau_screen.c
index d129a55..4eb730a 100644
--- src/gallium/drivers/nouveau/nouveau_screen.c
+++ src/gallium/drivers/nouveau/nouveau_screen.c
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <libdrm/nouveau_drm.h>
+#include <nouveau_drm.h>
 
 #include "nouveau_winsys.h"
 #include "nouveau_screen.h"
diff --git src/gallium/drivers/nouveau/nouveau_winsys.h src/gallium/drivers/nouveau/nouveau_winsys.h
index 9993ed6..51effb1 100644
--- src/gallium/drivers/nouveau/nouveau_winsys.h
+++ src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -6,7 +6,7 @@
 
 #include "pipe/p_defines.h"
 
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
 
 #ifndef NV04_PFIFO_MAX_PACKET_LEN
 #define NV04_PFIFO_MAX_PACKET_LEN 2047
-- 
1.8.3.2



More information about the mesa-dev mailing list