[src/trunk]: src/external/mit/xorg/server Prepare to build Xorg servers for h...

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

details:   https://anonhg.NetBSD.org/src/rev/ea5e51efb2e7
branches:  trunk
changeset: 755739:ea5e51efb2e7
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Jun 18 09:15:23 2010 +0000

description:
Prepare to build Xorg servers for hpcarm/hpcmips/hpcsh.

XXX: ${MACHINE} dependent definitions in these Makefiles look a bit messy
XXX: like old xfree's NetBSD.cf...

diffstat:

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

diffs (92 lines):

diff -r 266c63cc5348 -r ea5e51efb2e7 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Fri Jun 18 09:11:44 2010 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Fri Jun 18 09:15:23 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.42 2010/05/28 04:16:06 mrg Exp $
+#      $NetBSD: Makefile,v 1.43 2010/06/18 09:15:23 tsutsui Exp $
 
 SUBDIR= \
        xf86-input-keyboard \
@@ -161,6 +161,9 @@
        xf86-video-trident \
        xf86-video-tseng \
 
+.elif ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+SUBDIR+= \
+       xf86-video-wsfb
 .elif ${MACHINE} == "zaurus"
 SUBDIR+= \
        xf86-video-wsfb
diff -r 266c63cc5348 -r ea5e51efb2e7 external/mit/xorg/server/xorg-server/Makefile.common
--- a/external/mit/xorg/server/xorg-server/Makefile.common      Fri Jun 18 09:11:44 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.common      Fri Jun 18 09:15:23 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.common,v 1.10 2009/12/13 05:04:36 nonaka Exp $
+#      $NetBSD: Makefile.common,v 1.11 2010/06/18 09:15:23 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -41,6 +41,9 @@
 
 # XFree86 servers all need XFONT as well.
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
+    ${MACHINE} == "hpcarm" || \
+    ${MACHINE} == "hpcmips" || \
+    ${MACHINE} == "hpcsh" ||\
     ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
     ${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
     ${MACHINE} == "netwinder" || ${MACHINE} == "sparc64" || \
@@ -50,9 +53,9 @@
 XSERVER_XFREE86=       yes
 .endif
 
-.if ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcsh"
-XSERVER_XHPC=          yes
-.endif
+#.if ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+#XSERVER_XHPC=         yes
+#.endif
 
 .if ${MACHINE} == "mac68k"
 XSERVER_XMAC68K=       yes
diff -r 266c63cc5348 -r ea5e51efb2e7 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Fri Jun 18 09:11:44 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile   Fri Jun 18 09:15:23 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2009/12/13 05:04:36 nonaka Exp $
+#      $NetBSD: Makefile,v 1.20 2010/06/18 09:15:23 tsutsui Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -54,7 +54,8 @@
 .endfor
 .endif
 
-.if ${MACHINE} == "sgimips"
+.if ${MACHINE} == "hpcmips" || \
+    ${MACHINE} == "sgimips"
 SRCS.bsd+=     ppc_video.c stdResource.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=       -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@@ -62,6 +63,7 @@
 .endif
 
 .if ${MACHINE} == "cats" || \
+    ${MACHINE} == "hpcarm" || \
     ${MACHINE} == "shark" || \
     ${MACHINE} == "netwinder" || \
     ${MACHINE} == "zaurus"
@@ -72,6 +74,13 @@
 CPPFLAGS.arm_video.c=  -Wno-error
 .endif
 
+.if ${MACHINE} == "hpcsh"
+SRCS.bsd+=     ppc_video.c stdResource.c pm_noop.c agp_noop.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}=       -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.endfor
+.endif
+
 # some platforms will probably need ioperm_noop.c
 
 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus