[src/trunk]: src/external/mit/xorg/server/drivers find libdrm files in their ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3e0a4d026605
branches:  trunk
changeset: 755111:3e0a4d026605
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat May 22 23:04:01 2010 +0000

description:
find libdrm files in their new place.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-glint/Makefile    |  4 ++--
 external/mit/xorg/server/drivers/xf86-video-intel/Makefile    |  4 ++--
 external/mit/xorg/server/drivers/xf86-video-mga/Makefile      |  4 ++--
 external/mit/xorg/server/drivers/xf86-video-r128/Makefile     |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-radeon/Makefile   |  4 ++--
 external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile |  5 +++--
 external/mit/xorg/server/drivers/xf86-video-savage/Makefile   |  4 ++--
 external/mit/xorg/server/drivers/xf86-video-sis/Makefile      |  4 ++--
 external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile     |  4 ++--
 9 files changed, 20 insertions(+), 17 deletions(-)

diffs (161 lines):

diff -r 15f49c96ea3f -r 3e0a4d026605 external/mit/xorg/server/drivers/xf86-video-glint/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-glint/Makefile        Sat May 22 23:03:13 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-glint/Makefile        Sat May 22 23:04:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2010/05/22 07:18:37 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2010/05/22 23:04:01 mrg Exp $
 
 DRIVER=                xf86-video-glint
 DRIVER_NAME=   glint_drv
@@ -20,7 +20,7 @@
 CPPFLAGS+=     -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/drm
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
 COPTS.glint_driver.c=  -Wno-error      # XXX xf86dgastr.h
 
diff -r 15f49c96ea3f -r 3e0a4d026605 external/mit/xorg/server/drivers/xf86-video-intel/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Sat May 22 23:03:13 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Sat May 22 23:04:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2009/10/08 19:06:50 snj Exp $
+#      $NetBSD: Makefile,v 1.8 2010/05/22 23:04:01 mrg Exp $
 
 DRIVER=                xf86-video-intel
 DRIVER_NAME=   intel_drv
@@ -17,7 +17,7 @@
 
 CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/drm
+CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/libdrm
 CPPFLAGS+=     -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
 
 LDADD+=                -ldrm_intel
diff -r 15f49c96ea3f -r 3e0a4d026605 external/mit/xorg/server/drivers/xf86-video-mga/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Sat May 22 23:03:13 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Sat May 22 23:04:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2009/10/08 19:06:51 snj Exp $
+#      $NetBSD: Makefile,v 1.8 2010/05/22 23:04:01 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -27,7 +27,7 @@
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/drm
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
 CPPFLAGS.mga_driver.c= -Wno-error      # XXX fix me please
 CPPFLAGS.mga_dacG.c=   -Wno-error      # XXX fix me please
diff -r 15f49c96ea3f -r 3e0a4d026605 external/mit/xorg/server/drivers/xf86-video-r128/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Sat May 22 23:03:13 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Sat May 22 23:04:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2009/04/21 02:45:25 rafal Exp $
+#      $NetBSD: Makefile,v 1.3 2010/05/22 23:04:01 mrg Exp $
 
 DRIVER=                xf86-video-r128
 DRIVER_NAME=   r128_drv
@@ -13,4 +13,6 @@
 CPPFLAGS+=     -DWITH_VGAHW
 .endif
 
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
+
 .include "../Makefile.xf86-driver"
diff -r 15f49c96ea3f -r 3e0a4d026605 external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile       Sat May 22 23:03:13 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile       Sat May 22 23:04:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2010/05/22 10:18:03 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2010/05/22 23:04:01 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -35,7 +35,7 @@
 CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/X11/dri \
-               -I${DESTDIR}${X11INCDIR}/drm \
+               -I${DESTDIR}${X11INCDIR}/libdrm \
                -I${X11SRCDIR.${DRIVER}}/../include
 
 # XXX
diff -r 15f49c96ea3f -r 3e0a4d026605 external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile     Sat May 22 23:03:13 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile     Sat May 22 23:04:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2009/11/09 01:46:51 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2010/05/22 23:04:01 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -32,7 +32,8 @@
 
 CPPFLAGS+=     -DDRIVER_PARSER -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS
 
-CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes
+CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
+               -I${DESTDIR}${X11INCDIR}/libdrm
 CPPFLAGS+=     -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
 
 # XXX
diff -r 15f49c96ea3f -r 3e0a4d026605 external/mit/xorg/server/drivers/xf86-video-savage/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-savage/Makefile       Sat May 22 23:03:13 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-savage/Makefile       Sat May 22 23:04:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2009/10/08 19:06:51 snj Exp $
+#      $NetBSD: Makefile,v 1.8 2010/05/22 23:04:02 mrg Exp $
 
 DRIVER=                xf86-video-savage
 DRIVER_NAME=   savage_drv
@@ -21,7 +21,7 @@
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/drm
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
 CPPFLAGS.savage_driver.c=      -DPACKAGE_VERSION=\"${PACKAGE_MAJOR}\"
 CPPFLAGS.savage_exa.c=         -Wno-error      # volatile -> mempcy
diff -r 15f49c96ea3f -r 3e0a4d026605 external/mit/xorg/server/drivers/xf86-video-sis/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile  Sat May 22 23:03:13 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile  Sat May 22 23:04:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2009/10/08 19:06:51 snj Exp $
+#      $NetBSD: Makefile,v 1.8 2010/05/22 23:04:02 mrg Exp $
 
 DRIVER=                xf86-video-sis
 DRIVER_NAME=   sis_drv
@@ -14,7 +14,7 @@
 CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/src
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/drm
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
 # XXX
 COPTS.sis_driver.c=    -Wno-error
diff -r 15f49c96ea3f -r 3e0a4d026605 external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Sat May 22 23:03:13 2010 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Sat May 22 23:04:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2009/10/08 19:06:51 snj Exp $
+#      $NetBSD: Makefile,v 1.7 2010/05/22 23:04:02 mrg Exp $
 
 DRIVER=                xf86-video-tdfx
 DRIVER_NAME=   tdfx_drv
@@ -10,7 +10,7 @@
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/drm
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
 COPTS.tdfx_driver.c=      -Wno-error   # XXX deprecated