[src/trunk]: src/x11 use X11FLAGS.OS_DEFINES

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

details:   https://anonhg.NetBSD.org/src/rev/133d0df8b329
branches:  trunk
changeset: 555424:133d0df8b329
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Nov 17 05:18:20 2003 +0000

description:
use X11FLAGS.OS_DEFINES

diffstat:

 x11/Xserver/hw/vfb/Makefile   |   4 ++--
 x11/Xserver/hw/xnest/Makefile |   4 ++--
 x11/Xserver/os/Makefile       |   8 +++++---
 x11/Xserver/printer/Makefile  |   7 ++++---
 x11/bin/lbxproxy/Makefile     |   4 ++--
 x11/bin/xfs/Makefile          |  10 +++++-----
 6 files changed, 20 insertions(+), 17 deletions(-)

diffs (125 lines):

diff -r c4e44b4337d9 -r 133d0df8b329 x11/Xserver/hw/vfb/Makefile
--- a/x11/Xserver/hw/vfb/Makefile       Mon Nov 17 05:14:21 2003 +0000
+++ b/x11/Xserver/hw/vfb/Makefile       Mon Nov 17 05:18:20 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2003/11/17 05:18:20 lukem Exp $
 
 .include "../../Makefile.serverlib"
 
@@ -25,7 +25,7 @@
                -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/programs/Xserver/render
 
-CPPFLAGS+=     -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF \
+CPPFLAGS+=     ${X11FLAGS.OS_DEFINES} \
                -DHAS_SHM -DHAS_MMAP -UXFree86LOADER
 
 CPPFLAGS.InitInput.c=  ${X11FLAGS.EXTENSION}
diff -r c4e44b4337d9 -r 133d0df8b329 x11/Xserver/hw/xnest/Makefile
--- a/x11/Xserver/hw/xnest/Makefile     Mon Nov 17 05:14:21 2003 +0000
+++ b/x11/Xserver/hw/xnest/Makefile     Mon Nov 17 05:18:20 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2003/11/17 05:18:20 lukem Exp $
 
 .include "../../Makefile.serverlib"
 
@@ -25,7 +25,7 @@
                -I${X11SRCDIR.xc}/programs/Xserver/os \
                -I${DESTDIR}${X11INCDIR}/X11/extensions
 
-CPPFLAGS+=     -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF \
+CPPFLAGS+=     ${X11FLAGS.OS_DEFINES} \
                ${X11FLAGS.EXTENSION} \
                -DNO_HW_ONLY_EXTS -UXFree86LOADER -UMITSHM
 
diff -r c4e44b4337d9 -r 133d0df8b329 x11/Xserver/os/Makefile
--- a/x11/Xserver/os/Makefile   Mon Nov 17 05:14:21 2003 +0000
+++ b/x11/Xserver/os/Makefile   Mon Nov 17 05:18:20 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2003/10/03 00:13:39 itojun Exp $
+#      $NetBSD: Makefile,v 1.5 2003/11/17 05:18:20 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -24,8 +24,10 @@
                -I${X11SRCDIR.xc}/programs/Xserver/lbx
 
 CPPFLAGS+=     -DXSERV_t -DTRANS_SERVER \
-               ${X11FLAGS.CONNECTION} -DHASXDMAUTH -DDDXOSINIT \
-               -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF -DUSE_RGB_TXT
+               ${X11FLAGS.CONNECTION} \
+               -DHASXDMAUTH \
+               ${X11FLAGS.OS_DEFINES} \
+               -DUSE_RGB_TXT
 
 CPPFLAGS.WaitFor.c=    ${X11FLAGS.EXTENSION}
 CPPFLAGS.access.c=     -DXDMCP -DBSD44SOCKETS -DHAS_GETIFADDRS
diff -r c4e44b4337d9 -r 133d0df8b329 x11/Xserver/printer/Makefile
--- a/x11/Xserver/printer/Makefile      Mon Nov 17 05:14:21 2003 +0000
+++ b/x11/Xserver/printer/Makefile      Mon Nov 17 05:18:20 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:30 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2003/11/17 05:18:20 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -32,8 +32,9 @@
 
 
 BUILDOBJS=             ddxInit.o dpmsstubs.o miinitext.o
-BUILDCPPFLAGS=         -DPRINT_ONLY_SERVER -DDDXOSINIT -DSERVER_LOCK \
-                       -DDDXOSFATALERROR -DDDXOSVERRORF ${X11FLAGS.EXTENSION}
+BUILDCPPFLAGS=         -DPRINT_ONLY_SERVER \
+                       ${X11FLAGS.OS_DEFINES} \
+                       ${X11FLAGS.EXTENSION}
 CPPFLAGS.ddxInit.c=    ${BUILDCPPFLAGS}
 CPPFLAGS.dpmsstubs.c=  ${BUILDCPPFLAGS} -DXPRINT
 CPPFLAGS.miinitext.c=  ${BUILDCPPFLAGS} -DXPRINT -UGLXEXT
diff -r c4e44b4337d9 -r 133d0df8b329 x11/bin/lbxproxy/Makefile
--- a/x11/bin/lbxproxy/Makefile Mon Nov 17 05:14:21 2003 +0000
+++ b/x11/bin/lbxproxy/Makefile Mon Nov 17 05:18:20 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:30 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2003/11/17 05:18:20 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -27,7 +27,7 @@
 SRCS+=         ${SRCS.os}
 .for _S in ${SRCS.os}
 CPPFLAGS.${_S}=        ${X11FLAGS.CONNECTION} \
-               -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF
+               ${X11FLAGS.OS_DEFINES}
 .endfor
 
 CPPFLAGS.connection.c+=        -DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS
diff -r c4e44b4337d9 -r 133d0df8b329 x11/bin/xfs/Makefile
--- a/x11/bin/xfs/Makefile      Mon Nov 17 05:14:21 2003 +0000
+++ b/x11/bin/xfs/Makefile      Mon Nov 17 05:18:20 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/20 06:20:50 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2003/11/17 05:18:20 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -23,14 +23,14 @@
 
 CPPFLAGS.main.c=       -DDEFAULT_CONFIG_FILE=\"${X11LIBDIR}/fs/config\"
 CPPFLAGS.initfonts.c=  -DFONT_PCF -DFONT_FS -DFONT_SPEEDO -DFONTCACHE
-CPPFLAGS.connection.c= ${CONN_DEFINES} -DBSD44SOCKETS -DDDXOSINIT \
-                       -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF
+CPPFLAGS.connection.c= ${CONN_DEFINES} -DBSD44SOCKETS \
+                       ${X11FLAGS.OS_DEFINES}
 CPPFLAGS.utils.c=      -DXFSPIDDIR=\"/var/run\"
 CPPFLAGS.io.c=         ${CONN_DEFINES}
 CPPFLAGS.waitfor.c=    ${CONN_DEFINES}
 CPPFLAGS.error.c=      -DUSE_SYSLOG
-CPPFLAGS.osglue.c=     ${CONN_DEFINES} -DDDXOSINIT \
-                       -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF
+CPPFLAGS.osglue.c=     ${CONN_DEFINES} \
+                       ${X11FLAGS.OS_DEFINES}
 CPPFLAGS.config.c=     ${CONN_DEFINES} -DFONTCACHE