From bdc9f3dd533aaf2d8a5ac72da4517794b9fdea06 Mon Sep 17 00:00:00 2001 From: matthieu Date: Mon, 14 Jul 2014 19:06:02 +0000 Subject: [PATCH] Move the logic that says that the openchrome driver requires librm to the drivers Makefile, and don't build it if the user choose not to build libdrm. --- driver/Makefile | 10 ++++++++-- lib/Makefile | 8 ++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/driver/Makefile b/driver/Makefile index 284d1e870..b0ac87f42 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -1,4 +1,6 @@ -# $OpenBSD: Makefile,v 1.60 2014/04/13 10:41:00 matthieu Exp $ +# $OpenBSD: Makefile,v 1.61 2014/07/14 19:06:02 matthieu Exp $ + +.include INPUT_DRV_DEFAULT= \ xf86-input-keyboard \ @@ -53,13 +55,17 @@ VIDEO_DRV_amd64= \ xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-glint \ xf86-video-i128 xf86-video-intel xf86-video-mach64 \ xf86-video-mga xf86-video-neomagic \ - xf86-video-nv xf86-video-openchrome xf86-video-r128 \ + xf86-video-nv xf86-video-r128 \ xf86-video-rendition xf86-video-s3 \ xf86-video-s3virge xf86-video-savage xf86-video-siliconmotion \ xf86-video-sis xf86-video-tdfx xf86-video-trident \ xf86-video-tseng xf86-video-vesa xf86-video-vmware \ xf86-video-wsudl +.if ${XENOCARA_BUILD_GL:L} == "yes" +VIDEO_DRV_amd64+= xf86-video-openchrome +.endif + VIDEO_DRV_armish= \ xf86-video-wsfb xf86-video-wsudl diff --git a/lib/Makefile b/lib/Makefile index cde1344e3..c3bd3dc3f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2014/07/09 21:32:40 jsg Exp $ +# $OpenBSD: Makefile,v 1.27 2014/07/14 19:06:02 matthieu Exp $ .include @@ -50,12 +50,8 @@ SUBDIR= libpthread-stubs \ SUBDIR+= pixman .endif -# libdrm is needed by the via driver built on i386 only -.if ${XENOCARA_BUILD_DRI:L} == "yes" || ${MACHINE} == "i386" -SUBDIR+= libdrm libgbm -.endif - .if ${XENOCARA_BUILD_GL:L} == "yes" +SUBDIR+= libdrm libgbm SUBDIR+= libglapi libGL libEGL libGLESv1_CM libGLESv2 libGLU libGLw libtxc_dxtn .endif