Module Name: src
Committed By: tsutsui
Date: Wed Jun 29 14:49:14 UTC 2011
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
Add definitions for newsmips Xorg server. Build test only.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.28 -r1.29 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/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.56 src/external/mit/xorg/server/drivers/Makefile:1.57
--- src/external/mit/xorg/server/drivers/Makefile:1.56 Wed Jun 29 14:38:02 2011
+++ src/external/mit/xorg/server/drivers/Makefile Wed Jun 29 14:49:12 2011
@@ -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 \
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.20 src/external/mit/xorg/server/xorg-server/Makefile.common:1.21
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.20 Wed Feb 9 13:37:48 2011
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Wed Jun 29 14:49:13 2011
@@ -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
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.28 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.29
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.28 Mon Feb 21 04:42:17 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Wed Jun 29 14:49:14 2011
@@ -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}
