Module Name: src
Committed By: tsutsui
Date: Sat Oct 23 15:27:50 UTC 2010
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
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?
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/external/mit/xorg/server/drivers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.48 src/external/mit/xorg/server/drivers/Makefile:1.49
--- src/external/mit/xorg/server/drivers/Makefile:1.48 Sat Oct 23 15:16:04 2010
+++ src/external/mit/xorg/server/drivers/Makefile Sat Oct 23 15:27:50 2010
@@ -1,26 +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" || \
+ ${MACHINE_ARCH} == "x86_64"
+SUBDIR+= \
+ xf86-input-vmmouse
+
.if ${MACHINE_ARCH} == "i386"
SUBDIR+= \
- xf86-input-elographics \
- xf86-video-geode
+ xf86-input-elographics
.endif
-.if ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_ARCH} == "x86_64"
-SUBDIR+= \
- xf86-input-vmmouse \
- xf86-video-vmware \
- xf86-video-vesa \
- xf86-video-wsfb
.endif
-.if ${MACHINE} == "cats"
+
+# xf86-video drivers
+
+.if ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
xf86-video-apm \
xf86-video-ark \
@@ -33,77 +36,40 @@
xf86-video-glint \
xf86-video-i128 \
xf86-video-i740 \
+
+# needs porting for xorg-server 1.6
+# xf86-video-imstt \
+
+SUBDIR+= \
+ xf86-video-intel \
+ xf86-video-mach64 \
xf86-video-mga \
xf86-video-neomagic \
xf86-video-nv \
+ xf86-video-openchrome \
+ 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-vmware \
xf86-video-vesa \
xf86-video-wsfb
-.endif # ${MACHINE} == "cats"
-
-.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"
+# xf86-video-rendition
-.if ${MACHINE} == "shark"
+.if ${MACHINE_ARCH} == "i386"
SUBDIR+= \
- xf86-video-chips \
- xf86-video-igs \
- xf86-video-wsfb
-.endif # ${MACHINE} == "shark"
+ xf86-video-geode
+.endif # ${MACHINE_ARCH} == "i386"
-.if ${MACHINE} == "sgimips"
-SUBDIR+= \
- xf86-video-crime \
- xf86-video-wsfb \
- xf86-video-newport
-.endif # ${MACHINE} == "sgimips"
+.endif # ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
.if ${MACHINE} == "alpha"
SUBDIR+= \
@@ -137,7 +103,17 @@
# xf86-video-imstt
.endif # ${MACHINE} == "alpha"
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE} == "bebox"
+SUBDIR+= \
+ xf86-video-cirrus \
+ xf86-video-cirrus_alpine \
+ xf86-video-mga \
+ xf86-video-s3 \
+ xf86-video-s3virge \
+ xf86-video-vga
+.endif # ${MACHINE} == "bebox"
+
+.if ${MACHINE} == "cats"
SUBDIR+= \
xf86-video-apm \
xf86-video-ark \
@@ -150,46 +126,54 @@
xf86-video-glint \
xf86-video-i128 \
xf86-video-i740 \
-
-# needs porting for xorg-server 1.6
-# xf86-video-imstt \
-
-SUBDIR+= \
- xf86-video-intel \
- xf86-video-mach64 \
xf86-video-mga \
xf86-video-neomagic \
xf86-video-nv \
- xf86-video-openchrome \
- 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 \
-
-.endif # ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+ 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"
+.if ${MACHINE} == "hpcarm" || \
+ ${MACHINE} == "hpcmips" || \
+ ${MACHINE} == "hpcsh"
SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
-.if ${MACHINE} == "zaurus"
+.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
-.endif ${MACHINE} == "zaurus"
+# xf86-video-imstt
+.endif # ${MACHINE} == "macppc"
+
+.if ${MACHINE} == "netwinder"
+SUBDIR+= \
+ xf86-video-wsfb
+# xf86-video-igs
+.endif # ${MACHINE} == "netwinder"
.if ${MACHINE} == "prep"
SUBDIR+= \
@@ -200,15 +184,46 @@
xf86-video-vga
.endif # ${MACHINE} == "prep"
-.if ${MACHINE} == "bebox"
+.if ${MACHINE} == "sgimips"
SUBDIR+= \
- xf86-video-cirrus \
- xf86-video-cirrus_alpine \
+ xf86-video-crime \
+ xf86-video-newport \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "sgimips"
+
+.if ${MACHINE} == "shark"
+SUBDIR+= \
+ xf86-video-chips \
+ xf86-video-igs \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "shark"
+
+.if ${MACHINE} == "sparc" || \
+ ${MACHINE} == "sparc64"
+SUBDIR+= \
+ xf86-video-ag10e \
+ xf86-video-ati \
+ xf86-video-glint \
+ xf86-video-mach64 \
xf86-video-mga \
- xf86-video-s3 \
- xf86-video-s3virge \
- xf86-video-vga
-.endif # ${MACHINE} == "bebox"
+ 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} == "sparc" || ${MACHINE} == "sparc64"
+
+.if ${MACHINE} == "zaurus"
+SUBDIR+= \
+ xf86-video-wsfb
+.endif ${MACHINE} == "zaurus"
# broken with xorg-server 1.6
# x86
@@ -217,6 +232,4 @@
# alpha
# xf86-video-vga \
-#xf86-video-rendition
-
.include <bsd.subdir.mk>
