Module Name: src
Committed By: tsutsui
Date: Sat Jul 31 15:01:12 UTC 2010
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.common
Log Message:
Move and sort definitions for legacy MD Xservers per ${MACHINE}.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/Makefile.common
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/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.16 src/external/mit/xorg/server/xorg-server/Makefile.common:1.17
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.16 Sat Jul 31 14:45:19 2010
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Sat Jul 31 15:01:12 2010
@@ -1,40 +1,10 @@
-# $NetBSD: Makefile.common,v 1.16 2010/07/31 14:45:19 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.17 2010/07/31 15:01:12 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
# below for descriptions of each variable.
-.if ${MACHINE} == "x68k"
-XSERVER_X68K= yes
-.endif
-
-.if ${MACHINE} == "alpha"
-XSERVER_XALPHANETBSD= yes
-.endif
-
-.if ${MACHINE} == "amiga"
-XSERVER_XAMIGA= yes
-XSERVER_HAS_AFB= yes
-.endif
-
-.if ${MACHINE} == "acorn32"
-XSERVER_XARM32VIDC= yes
-.endif
-
-.if ${MACHINE} == "alpha" || ${MACHINE} == "pmax"
-XSERVER_XDECNETBSD= yes
-.endif
-
-.if ${MACHINE} == "atari"
-XSERVER_HAS_IPLAN?= yes
-#XSERVER_XFREE68= yes
-.endif
-
-.if ${MACHINE} == "newsmips"
-XSERVER_XNEWSMIPS?= yes
-.endif
-
# XFree86 servers all need XFONT as well.
.if \
${MACHINE} == "alpha" || \
@@ -57,6 +27,26 @@
XSERVER_XFREE86= yes
.endif
+
+.if ${MACHINE} == "acorn32"
+XSERVER_XARM32VIDC= yes
+.endif
+
+.if ${MACHINE} == "alpha"
+XSERVER_XALPHANETBSD= yes
+XSERVER_XDECNETBSD= yes
+.endif
+
+.if ${MACHINE} == "amiga"
+XSERVER_XAMIGA= yes
+XSERVER_HAS_AFB= yes
+.endif
+
+.if ${MACHINE} == "atari"
+XSERVER_HAS_IPLAN?= yes
+#XSERVER_XFREE68= yes
+.endif
+
.if ${MACHINE} == "mac68k"
XSERVER_XMAC68K= yes
XSERVER_HAS_CFB= yes
@@ -66,17 +56,28 @@
XSERVER_XMACPPC= yes
.endif
+.if ${MACHINE} == "newsmips"
+XSERVER_XNEWSMIPS?= yes
+.endif
+
.if ${MACHINE} == "pmax"
+XSERVER_XDECNETBSD= yes
XSERVER_XPMAX= no # XXX should be yes but may be obsoleted
.endif
-.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || ${MACHINE} == "sun3"
+.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
XSERVER_XSUN= yes
XSERVER_XSUNMONO= yes
+XSERVER_XSUN24= yes
.endif
-.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-XSERVER_XSUN24= yes
+.if ${MACHINE} == "sun3"
+XSERVER_XSUN= yes
+XSERVER_XSUNMONO= yes
+.endif
+
+.if ${MACHINE} == "x68k"
+XSERVER_X68K= yes
.endif
@@ -93,31 +94,32 @@
# Does this server use iplan2p? libraries?
XSERVER_HAS_IPLAN?= no
-# Does this platform build X68k X servers?
-XSERVER_X68K?= no
+# Does this platform build XFree86 X server?
+XSERVER_XFREE86?= no
+
# Does this platform build the XalphaNetBSD server?
XSERVER_XALPHANETBSD?= no
-# Does this platform build Xvfb X server?
+# Does this platform build the Xamiga server?
XSERVER_XAMIGA?= no
# Does this platform build the Xarm32VIDC server?
XSERVER_XARM32VIDC?= no
# Does this platform build the XdecNetBSD server?
XSERVER_XDECNETBSD?= no
-# Does this platform build the Xnewsmips server?
-XSERVER_XNEWSMIPS?= no
# Does this platform build the Xfree68 servers?
XSERVER_XFREE68?= no
-# Does this platform build XFree86 X server?
-XSERVER_XFREE86?= no
# Does this platform build the Xmac68k X server?
XSERVER_XMAC68K?= no
# Does this platform build Xmacppc X server?
XSERVER_XMACPPC?= no
+# Does this platform build the Xnewsmips server?
+XSERVER_XNEWSMIPS?= no
# Does this platform build Xpmax X servers?
XSERVER_XPMAX?= no
# Does this platform build Xsun* X servers?
XSERVER_XSUN?= no
XSERVER_XSUNMONO?= no
XSERVER_XSUN24?= no
+# Does this platform build X68k X servers?
+XSERVER_X68K?= no
# Does this platform build Xvfb X server?
XSERVER_XVFB?= yes
