diff options
| -rw-r--r-- | driver/Makefile | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/driver/Makefile b/driver/Makefile index 3051231a5..be638bf85 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -1,11 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2012/06/20 19:56:34 matthieu Exp $ - -# Check for Xserver 1.12 or later -USING_XSERVER_112 != if pkg-config --atleast-version 1.10 xorg-server; then \ - echo 1; \ - else \ - echo 0; \ - fi +# $OpenBSD: Makefile,v 1.52 2012/08/11 09:56:55 matthieu Exp $ INPUT_DRV_DEFAULT= \ xf86-input-keyboard \ @@ -55,21 +48,17 @@ INPUT_DRV= ${INPUT_DRV_DEFAULT} VIDEO_DRV_alpha= VIDEO_DRV_amd64= \ - xf86-video-apm xf86-video-ark xf86-video-ati \ + xf86-video-apm xf86-video-ark xf86-video-ati 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-radeonold xf86-video-s3 \ + xf86-video-radeonold 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-vesa xf86-video-vmware \ + xf86-video-tseng xf86-video-vesa xf86-video-vmware \ xf86-video-wsudl -.if !$(USING_XSERVER_112) -VIDEO_DRV_amd64 += xf86-video-chips xf86-video-rendition xf86-video-tseng -.endif - VIDEO_DRV_armish= \ xf86-video-wsfb xf86-video-wsudl @@ -82,11 +71,8 @@ VIDEO_DRV_hppa= \ VIDEO_DRV_i386= \ ${VIDEO_DRV_amd64} \ xf86-video-geode \ - xf86-video-i740 - -.if !$(USING_XSERVER_112) -VIDEO_DRV_i386 += xf86-video-voodoo -.endif + xf86-video-i740 \ + xf86-video-voodoo VIDEO_DRV_landisk= |