[src/trunk]: src/external/mit/xorg/server Add definitions for newsmips Xorg s...

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

details:   https://anonhg.NetBSD.org/src/rev/7a5815933c16
branches:  trunk
changeset: 766673:7a5815933c16
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Jun 29 14:49:12 2011 +0000

description:
Add definitions for newsmips Xorg server.  Build test only.

diffstat:

 external/mit/xorg/server/drivers/Makefile                       |  7 ++++++-
 external/mit/xorg/server/xorg-server/Makefile.common            |  9 +++++----
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile |  3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diffs (68 lines):

diff -r c6ebd4387aef -r 7a5815933c16 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Wed Jun 29 14:38:02 2011 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Wed Jun 29 14:49:12 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.56 2011/06/29 14:38:02 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.57 2011/06/29 14:49:12 tsutsui Exp $
 
 # xf86-input drivers
 
@@ -197,6 +197,11 @@
        xf86-video-wsfb
 .endif # ${MACHINE} == "ofppc"
 
+.if ${MACHINE} == "newsmips"
+SUBDIR+= \
+       xf86-video-wsfb
+.endif # ${MACHINE} == "newsmips"
+
 .if ${MACHINE} == "prep"
 SUBDIR+= \
        xf86-video-cirrus \
diff -r c6ebd4387aef -r 7a5815933c16 external/mit/xorg/server/xorg-server/Makefile.common
--- a/external/mit/xorg/server/xorg-server/Makefile.common      Wed Jun 29 14:38:02 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.common      Wed Jun 29 14:49:12 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.common,v 1.20 2011/02/09 13:37:48 tsutsui Exp $
+#      $NetBSD: Makefile.common,v 1.21 2011/06/29 14:49:13 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -20,6 +20,7 @@
     ${MACHINE} == "i386"       || \
     ${MACHINE} == "macppc"     || \
     ${MACHINE} == "netwinder"  || \
+    ${MACHINE} == "newsmips"   || \
     ${MACHINE} == "prep"       || \
     ${MACHINE} == "ofppc"      || \
     ${MACHINE} == "sgimips"    || \
@@ -60,9 +61,9 @@
 XSERVER_XMACPPC=       yes
 .endif
 
-.if ${MACHINE} == "newsmips"
-XSERVER_XNEWSMIPS?=    yes
-.endif
+#.if ${MACHINE} == "newsmips"
+#XSERVER_XNEWSMIPS?=   yes
+#.endif
 
 .if ${MACHINE} == "pmax"
 XSERVER_XDECNETBSD=    yes
diff -r c6ebd4387aef -r 7a5815933c16 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Wed Jun 29 14:38:02 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Wed Jun 29 14:49:12 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.28 2011/02/21 04:42:17 mrg Exp $
+#      $NetBSD: Makefile,v 1.29 2011/06/29 14:49:14 tsutsui Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -59,6 +59,7 @@
 
 .if ${MACHINE} == "ews4800mips" || \
     ${MACHINE} == "hpcmips" || \
+    ${MACHINE} == "newsmips" || \
     ${MACHINE} == "sgimips"
 SRCS.bsd+=     ppc_video.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}