Provide a better way to customize the list of drivers per architecture.

Enable the via driver on i386 now that libdrm is available.

1 files changed, 62 insertions, 23 deletions

diff --git a/driver/Makefile b/driver/Makefile
index 76e740f3d..de3097a2c 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,31 +1,51 @@
-# $OpenBSD: Makefile,v 1.5 2006/12/17 19:52:56 matthieu Exp $
+# $OpenBSD: Makefile,v 1.6 2007/01/01 10:36:43 matthieu Exp $
 
-INPUT_DRV= \
+# Broken
+# xf86-input-calcomp  xf86-input-citron  xf86-input-dmc
+# xf86-input-dynapro xf86-input-elo2300 xf86-input-microtouch 
+# xf86-input-penmount
+
+INPUT_DRV_DEFAULT= \
+	openbsd-input-usbtablet \
+	xf86-input-keyboard \
+	xf86-input-mouse \
+	xf86-input-void
+
+INPUT_DRV_COMMON= \
+	${INPUT_DRV_DEFAULT} \
 	xf86-input-acecad \
 	xf86-input-digitaledge \
 	xf86-input-elographics xf86-input-fpit \
 	xf86-input-hyperpen xf86-input-jamstudio xf86-input-joystick \
-	xf86-input-keyboard xf86-input-magellan xf86-input-magictouch \
-	xf86-input-mouse xf86-input-mutouch \
+	xf86-input-magellan xf86-input-magictouch \
+	xf86-input-mutouch \
 	xf86-input-palmax xf86-input-spaceorb \
-	xf86-input-summa xf86-input-tek4957 xf86-input-void
+	xf86-input-summa xf86-input-tek4957
 
-# Broken
-# xf86-input-calcomp  xf86-input-citron  xf86-input-dmc
-# xf86-input-dynapro xf86-input-elo2300 xf86-input-microtouch 
-# xf86-input-penmount
+INPUT_DRV_alpha= ${INPUT_DRV_COMMON}
 
-.if ${MACHINE} == i386 || ${MACHINE} == amd64
-INPUT_DRV+=xf86-input-vmmouse
-.endif
+INPUT_DRV_amd64= ${INPUT_DRV_COMMON} xf86-input-vmmouse
 
-INPUT_DRV+=openbsd-input-usbtablet
+INPUT_DRV_i386= ${INPUT_DRV_COMMON} xf86-input-vmmouse
 
-.if ${MACHINE} == zaurus
-INPUT_DRV+=openbsd-input-ws
+INPUT_DRV_macppc= ${INPUT_DRV_COMMON}
+
+INPUT_DRV_mvme68k=
+INPUT_DRV_mvme88k=
+INPUT_DRV_sgi=
+
+INPUT_DRV_sparc64= ${INPUT_DRV_COMMON}
+
+INPUT_DRV_zaurus= ${INPUT_DRV_DEFAULT} openbsd-input-ws
+
+.if defined(INPUT_DRV_${MACHINE})
+INPUT_DRV= ${INPUT_DRV_${MACHINE}}
+.else
+INPUT_DRV= ${INPUT_DRV_DEFAULT}
 .endif
 
-VIDEO_DRV= \
+
+VIDEO_DRV_COMMON= \
 	xf86-video-apm xf86-video-ark xf86-video-ati xf86-video-chips  \
 	xf86-video-cirrus xf86-video-cyrix xf86-video-dummy \
 	xf86-video-glint xf86-video-i128 xf86-video-mga \
@@ -34,17 +54,36 @@ VIDEO_DRV= \
 	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-vga  \
+
+VIDEO_DRV_alpha= \
+	${VIDEO_DRV_COMMON} \
 	xf86-video-wsfb
 
-# uhg needs libdrm ? 
-# xf86-video-via
+VIDEO_DRV_amd64= \
+	${VIDEO_DRV_COMMON} \
+	xf86-video-intel xf86-video-vmware
 
-.if ${MACHINE} == i386
-VIDEO_DRV+= xf86-video-i740 xf86-video-nsc xf86-video-voodoo
-.endif
+VIDEO_DRV_i386= \
+	${VIDEO_DRV_COMMON} \
+	xf86-video-intel xf86-video-vmware \
+	xf86-video-i740 xf86-video-nsc \
+	xf86-video-via xf86-video-voodoo \
+	xf86-video-wsfb
+
+VIDEO_DRV_macppc= \
+	xf86-video-ati xf86-video-nv xf86-video-wsfb
+
+VIDEO_DRV_mvme68k=
+VIDEO_DRV_mvme88k=
+VIDEO_DRV_sgi=
+
+VIDEO_DRV_sparc64= \
+	xf86-video-ati xf86-video-wsfb
 
-.if ${MACHINE} == i386 || ${MACHINE} == amd64
-VIDEO_DRV+= xf86-video-intel xf86-video-vmware
+.if defined(VIDEO_DRV_${MACHINE})
+VIDEO_DRV= ${VIDEO_DRV_${MACHINE}}
+.else
+VIDEO_DRV= xf86-video-wsfb
 .endif
 
 SUBDIR= ${INPUT_DRV} ${VIDEO_DRV}