From a5e9616b1ad0a5d63a315b449243678f0d0f5c5f Mon Sep 17 00:00:00 2001 From: mrg Date: Sat, 22 May 2010 23:04:01 +0000 Subject: [PATCH] find libdrm files in their new place. --- 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 ++-- .../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(-) diff --git a/external/mit/xorg/server/drivers/xf86-video-glint/Makefile b/external/mit/xorg/server/drivers/xf86-video-glint/Makefile index a279b6ea3c02..c753e612bd49 100644 --- a/external/mit/xorg/server/drivers/xf86-video-glint/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-glint/Makefile @@ -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+= -DPPC_MMIO_IS_BE 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 --git a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile index 7e72fa4392cc..a65b0c5addb8 100644 --- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile @@ -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 @@ MAN= intel.4 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 --git a/external/mit/xorg/server/drivers/xf86-video-mga/Makefile b/external/mit/xorg/server/drivers/xf86-video-mga/Makefile index 451d50cfb432..cc7f5952fea8 100644 --- a/external/mit/xorg/server/drivers/xf86-video-mga/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-mga/Makefile @@ -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 @@ -27,7 +27,7 @@ CPPFLAGS+= -DUSE_XAA 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 --git a/external/mit/xorg/server/drivers/xf86-video-r128/Makefile b/external/mit/xorg/server/drivers/xf86-video-r128/Makefile index bd5d47530347..e245684ce63b 100644 --- a/external/mit/xorg/server/drivers/xf86-video-r128/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-r128/Makefile @@ -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 @@ MAN= r128.4 CPPFLAGS+= -DWITH_VGAHW .endif +CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm + .include "../Makefile.xf86-driver" diff --git a/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile b/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile index e39e9eb0401b..36756e8480d3 100644 --- a/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile @@ -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 @@ -35,7 +35,7 @@ CPPFLAGS+= -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS \ 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 --git a/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile b/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile index 6298a57fd6bf..288b1416e624 100644 --- a/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile @@ -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 @@ -32,7 +32,8 @@ MAN= radeonhd.4 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 --git a/external/mit/xorg/server/drivers/xf86-video-savage/Makefile b/external/mit/xorg/server/drivers/xf86-video-savage/Makefile index e2938493fafc..64f48d6a5334 100644 --- a/external/mit/xorg/server/drivers/xf86-video-savage/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-savage/Makefile @@ -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 @@ MAN= savage.4 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 --git a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile index 31331b3646c9..22377357f381 100644 --- a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile @@ -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+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include 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 --git a/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile b/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile index f8af8c6fc751..d42e1ca9f52e 100644 --- a/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile @@ -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 @@ MAN= tdfx.4 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