Module Name: src
Committed By: mrg
Date: Thu Nov 18 08:20:17 UTC 2010
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:
enable xfree86 server build for ofppc, and a bunch of drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.23 -r1.24 \
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.49 src/external/mit/xorg/server/drivers/Makefile:1.50
--- src/external/mit/xorg/server/drivers/Makefile:1.49 Sat Oct 23 15:27:50 2010
+++ src/external/mit/xorg/server/drivers/Makefile Thu Nov 18 08:20:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2010/10/23 15:27:50 tsutsui Exp $
+# $NetBSD: Makefile,v 1.50 2010/11/18 08:20:16 mrg Exp $
# xf86-input drivers
@@ -169,6 +169,19 @@
# xf86-video-imstt
.endif # ${MACHINE} == "macppc"
+.if ${MACHINE} == "ofppc"
+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} == "macppc"
+
.if ${MACHINE} == "netwinder"
SUBDIR+= \
xf86-video-wsfb
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.18 src/external/mit/xorg/server/xorg-server/Makefile.common:1.19
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.18 Sun Aug 1 06:24:31 2010
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Thu Nov 18 08:20:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2010/08/01 06:24:31 kiyohara Exp $
+# $NetBSD: Makefile.common,v 1.19 2010/11/18 08:20:17 mrg Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -19,6 +19,7 @@
${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "prep" || \
+ ${MACHINE} == "ofppc" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "shark" || \
${MACHINE} == "sparc" || \
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.23 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.24
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.23 Sun Aug 1 06:24:31 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Thu Nov 18 08:20:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2010/08/01 06:24:31 kiyohara Exp $
+# $NetBSD: Makefile,v 1.24 2010/11/18 08:20:17 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -32,7 +32,7 @@
.endfor
.endif
-.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc"
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@@ -91,7 +91,7 @@
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
- ${MACHINE} == "prep" || ${MACHINE} == "bebox"
+ ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc"
#SRCS.bus+= netbsdPci.c
.endif
