[src/trunk]: src/share/mk Remove duplicate -DPIXPRIV from X11FLAGS.SERVER

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

details:   https://anonhg.NetBSD.org/src/rev/8552ccfa787c
branches:  trunk
changeset: 556558:8552ccfa787c
user:      rtr <rtr%NetBSD.org@localhost>
date:      Sat Dec 20 14:24:29 2003 +0000

description:
Remove duplicate -DPIXPRIV from X11FLAGS.SERVER
Don't define -DXINPUT -DXFree86XDGA -DXF86VIDMODE -DDXTIME for sparc
Add X11FLAGS.LOADABLE for for module control/module flags.

diffstat:

 share/mk/bsd.x11.mk |  34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diffs (56 lines):

diff -r 26c73cc4d031 -r 8552ccfa787c share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Sat Dec 20 13:31:42 2003 +0000
+++ b/share/mk/bsd.x11.mk       Sat Dec 20 14:24:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.10 2003/12/08 10:10:46 rtr Exp $
+#      $NetBSD: bsd.x11.mk,v 1.11 2003/12/20 14:24:29 rtr Exp $
 
 .include <bsd.init.mk>
 
@@ -22,22 +22,38 @@
 
 #       EXT_DEFINES
 X11FLAGS.EXTENSION=    -DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC -DXRECORD \
-                       -DMITSHM -DBIGREQS -DXF86VIDMODE -DXF86MISC -DDBE \
-                       -DDPMSExtension -DEVI -DSCREENSAVER -DXV -DXVMC \
-                       -DGLXEXT -DGLX_USE_MESA -DFONTCACHE -DRES
+                       -DMITSHM -DBIGREQS -DXF86MISC -DDBE -DDPMSExtension \
+                       -DEVI -DSCREENSAVER -DXV -DXVMC -DGLXEXT \
+                       -DGLX_USE_MESA -DFONTCACHE -DRES
 
 #       ServerDefines
-X11FLAGS.SERVER=       -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY \
+X11FLAGS.SERVER=       -DSHAPE -DXKB -DLBX -DXAPPGROUP -DXCSECURITY \
                        -DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV \
                        -DPANORAMIX -DRENDER -DRANDR -DGCCUSESGAS \
-                       -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA \
-                       -DXvExtension -DXFree86LOADER -DXFree86Server \
-                       -DXF86VIDMODE -DXvMCExtension -DSMART_SCHEDULE \
+                       -DAVOID_GLYPHBLT -DSINGLEDEPTH -DXvExtension \
+                       -DXFree86Server -DXvMCExtension -DSMART_SCHEDULE \
                        -DBUILDDEBUG -DXResExtension -DNDEBUG -DX_BYTE_ORDER=0
 
 #       OS_DEFINES
 X11FLAGS.OS_DEFINES=   -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \
-                       -DDDXOSVERRORF -DDDXTIME
+                       -DDDXOSVERRORF
+
+.if ${MACHINE} != "sparc" && ${MACHINE} != "sparc64"
+#      EXT_DEFINES
+X11FLAGS.EXTENSION+=   -DXF86VIDMODE
+
+#      ServerDefines
+X11FLAGS.SERVER+=      -DXINPUT -DXFree86XDGA -DXF86VIDMODE
+
+#      OS_DEFINES
+X11FLAGS.OS_DEFINES+=  -DDDXTIME
+
+.endif
+
+.if ${MACHINE} == "i386" || ${MACHINE} == "macppc"
+#      LOADABLE
+X11FLAGS.LOADABLE=     -DXFree86LOADER -DIN_MODULE -DXFree86Module
+.endif
 
 
 # Commandline to convert 'XCOMM' comments to #