[src/trunk]: src/external/mit/xorg/server/drivers Reorder SUBDIR entries to m...

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

details:   https://anonhg.NetBSD.org/src/rev/1d1e237038c1
branches:  trunk
changeset: 758161:1d1e237038c1
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Oct 23 15:27:50 2010 +0000

description:
Reorder SUBDIR entries to make this more maintainable/readable:
 - put xf86-input drivers first then xf86-video
 - put x86 (i386/amd64) first then other ${MACHINE}s in alphabetical order

XXX1: is it better to use Makefile.${MACHINE} (or something else)?
XXX2: should all ports include xf86-video-wsfb unconditionally?
XXX3: should we have common definitions for MI PCI video drivers?

diffstat:

 external/mit/xorg/server/drivers/Makefile |  305 +++++++++++++++--------------
 1 files changed, 159 insertions(+), 146 deletions(-)

diffs (truncated from 353 to 300 lines):

diff -r 1fcf9fd463d3 -r 1d1e237038c1 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Sat Oct 23 15:16:04 2010 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Sat Oct 23 15:27:50 2010 +0000
@@ -1,143 +1,29 @@
-#      $NetBSD: Makefile,v 1.48 2010/10/23 15:16:04 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.49 2010/10/23 15:27:50 tsutsui Exp $
+
+# xf86-input drivers
 
 SUBDIR= \
        xf86-input-keyboard \
        xf86-input-mouse \
        xf86-input-ws
 
-.if ${MACHINE_ARCH} == "i386"
-SUBDIR+= \
-       xf86-input-elographics \
-       xf86-video-geode
-.endif
-
 .if ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "x86_64"
 SUBDIR+= \
-       xf86-input-vmmouse \
-       xf86-video-vmware \
-       xf86-video-vesa \
-       xf86-video-wsfb
+       xf86-input-vmmouse
+
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+= \
+       xf86-input-elographics
 .endif
 
-.if ${MACHINE} == "cats"
-SUBDIR+= \
-       xf86-video-apm \
-       xf86-video-ark \
-       xf86-video-ast \
-       xf86-video-ati \
-       xf86-video-chips \
-       xf86-video-cirrus \
-       xf86-video-cirrus_alpine \
-       xf86-video-cirrus_laguna \
-       xf86-video-glint \
-       xf86-video-i128 \
-       xf86-video-i740 \
-       xf86-video-mga \
-       xf86-video-neomagic \
-       xf86-video-nv \
-       xf86-video-radeon \
-       xf86-video-radeonhd \
-       xf86-video-s3 \
-       xf86-video-s3virge \
-       xf86-video-savage \
-       xf86-video-siliconmotion \
-       xf86-video-tdfx \
-       xf86-video-tga \
-       xf86-video-trident \
-       xf86-video-tseng \
-       xf86-video-vesa \
-       xf86-video-wsfb
-.endif # ${MACHINE} == "cats"
+.endif
 
-.if ${MACHINE} == "macppc"
-SUBDIR+= \
-       xf86-video-ati \
-       xf86-video-chips \
-       xf86-video-mach64 \
-       xf86-video-mga \
-       xf86-video-nv \
-       xf86-video-radeon \
-       xf86-video-r128 \
-       xf86-video-tdfx \
-       xf86-video-wsfb
-#      xf86-video-imstt
-.endif # ${MACHINE} == "macppc"
-
-.if ${MACHINE} == "netwinder"
-SUBDIR+= \
-       xf86-video-wsfb
-#      xf86-video-igs
-.endif # ${MACHINE} == "netwinder"
 
-.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
-SUBDIR+= \
-       xf86-video-ag10e \
-       xf86-video-ati \
-       xf86-video-glint \
-       xf86-video-mach64 \
-       xf86-video-mga \
-       xf86-video-r128 \
-       xf86-video-radeon \
-       xf86-video-suncg6 \
-       xf86-video-sunffb \
-       xf86-video-sunleo \
-       xf86-video-wsfb
-.if ${MACHINE} == "sparc"
-SUBDIR+= \
-       xf86-video-pnozz \
-       xf86-video-suncg14 \
-       xf86-video-suntcx
-.endif # ${MACHINE} == "sparc"
-.endif # ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
-
-.if ${MACHINE} == "shark"
-SUBDIR+= \
-       xf86-video-chips \
-        xf86-video-igs \
-        xf86-video-wsfb
-.endif # ${MACHINE} == "shark"
+# xf86-video drivers
 
-.if ${MACHINE} == "sgimips"
-SUBDIR+= \
-       xf86-video-crime \
-       xf86-video-wsfb \
-       xf86-video-newport
-.endif # ${MACHINE} == "sgimips"
-
-.if ${MACHINE} == "alpha"
-SUBDIR+= \
-       xf86-video-apm \
-       xf86-video-ark \
-       xf86-video-ast \
-       xf86-video-ati \
-       xf86-video-chips \
-       xf86-video-cirrus \
-       xf86-video-cirrus_alpine \
-       xf86-video-cirrus_laguna \
-       xf86-video-glint \
-       xf86-video-i128 \
-       xf86-video-i740 \
-       xf86-video-mach64 \
-       xf86-video-mga \
-       xf86-video-nv \
-       xf86-video-r128 \
-       xf86-video-radeon \
-       xf86-video-radeonhd \
-       xf86-video-s3 \
-       xf86-video-s3virge \
-       xf86-video-savage \
-       xf86-video-siliconmotion \
-       xf86-video-sis \
-       xf86-video-tdfx \
-       xf86-video-tga \
-       xf86-video-trident \
-       xf86-video-tseng \
-       xf86-video-wsfb
-#      xf86-video-imstt
-.endif # ${MACHINE} == "alpha"
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "x86_64"
 SUBDIR+= \
        xf86-video-apm \
        xf86-video-ark \
@@ -173,32 +59,49 @@
        xf86-video-tga \
        xf86-video-trident \
        xf86-video-tseng \
+       xf86-video-vmware \
+       xf86-video-vesa \
+       xf86-video-wsfb
+#      xf86-video-rendition
+
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+= \
+       xf86-video-geode
+.endif # ${MACHINE_ARCH} == "i386"
 
 .endif # ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 
-.if ${MACHINE} == "dreamcast"
-SUBDIR+= \
-       xf86-video-wsfb
-.endif # ${MACHINE} == "dreamcast"
-
-.if ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+.if ${MACHINE} == "alpha"
 SUBDIR+= \
-       xf86-video-wsfb
-.endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
-
-.if ${MACHINE} == "zaurus"
-SUBDIR+= \
-       xf86-video-wsfb
-.endif ${MACHINE} == "zaurus"
-
-.if ${MACHINE} == "prep"
-SUBDIR+= \
+       xf86-video-apm \
+       xf86-video-ark \
+       xf86-video-ast \
+       xf86-video-ati \
+       xf86-video-chips \
        xf86-video-cirrus \
        xf86-video-cirrus_alpine \
+       xf86-video-cirrus_laguna \
+       xf86-video-glint \
+       xf86-video-i128 \
+       xf86-video-i740 \
+       xf86-video-mach64 \
        xf86-video-mga \
+       xf86-video-nv \
+       xf86-video-r128 \
+       xf86-video-radeon \
+       xf86-video-radeonhd \
        xf86-video-s3 \
-       xf86-video-vga
-.endif # ${MACHINE} == "prep"
+       xf86-video-s3virge \
+       xf86-video-savage \
+       xf86-video-siliconmotion \
+       xf86-video-sis \
+       xf86-video-tdfx \
+       xf86-video-tga \
+       xf86-video-trident \
+       xf86-video-tseng \
+       xf86-video-wsfb
+#      xf86-video-imstt
+.endif # ${MACHINE} == "alpha"
 
 .if ${MACHINE} == "bebox"
 SUBDIR+= \
@@ -210,6 +113,118 @@
        xf86-video-vga
 .endif # ${MACHINE} == "bebox"
 
+.if ${MACHINE} == "cats"
+SUBDIR+= \
+       xf86-video-apm \
+       xf86-video-ark \
+       xf86-video-ast \
+       xf86-video-ati \
+       xf86-video-chips \
+       xf86-video-cirrus \
+       xf86-video-cirrus_alpine \
+       xf86-video-cirrus_laguna \
+       xf86-video-glint \
+       xf86-video-i128 \
+       xf86-video-i740 \
+       xf86-video-mga \
+       xf86-video-neomagic \
+       xf86-video-nv \
+       xf86-video-radeon \
+       xf86-video-radeonhd \
+       xf86-video-s3 \
+       xf86-video-s3virge \
+       xf86-video-savage \
+       xf86-video-siliconmotion \
+       xf86-video-tdfx \
+       xf86-video-tga \
+       xf86-video-trident \
+       xf86-video-tseng \
+       xf86-video-vesa \
+       xf86-video-wsfb
+.endif # ${MACHINE} == "cats"
+
+.if ${MACHINE} == "dreamcast"
+SUBDIR+= \
+       xf86-video-wsfb
+.endif # ${MACHINE} == "dreamcast"
+
+.if ${MACHINE} == "hpcarm" || \
+    ${MACHINE} == "hpcmips" || \
+    ${MACHINE} == "hpcsh"
+SUBDIR+= \
+       xf86-video-wsfb
+.endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+
+.if ${MACHINE} == "macppc"
+SUBDIR+= \
+       xf86-video-ati \
+       xf86-video-chips \
+       xf86-video-mach64 \
+       xf86-video-mga \
+       xf86-video-nv \
+       xf86-video-radeon \
+       xf86-video-r128 \
+       xf86-video-tdfx \
+       xf86-video-wsfb
+#      xf86-video-imstt
+.endif # ${MACHINE} == "macppc"
+
+.if ${MACHINE} == "netwinder"
+SUBDIR+= \
+       xf86-video-wsfb
+#      xf86-video-igs
+.endif # ${MACHINE} == "netwinder"
+
+.if ${MACHINE} == "prep"
+SUBDIR+= \
+       xf86-video-cirrus \
+       xf86-video-cirrus_alpine \
+       xf86-video-mga \
+       xf86-video-s3 \
+       xf86-video-vga