[src/trunk]: src/x11/Xserver Undefine DDXTIME if XFree86 server is being buil...

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

details:   https://anonhg.NetBSD.org/src/rev/d715145f20ac
branches:  trunk
changeset: 557500:d715145f20ac
user:      rtr <rtr%NetBSD.org@localhost>
date:      Sat Jan 10 16:28:29 2004 +0000

description:
Undefine DDXTIME if XFree86 server is being built since XFree86 provides
its own copy of GetTimeInMillis().

+ This allows us to get rid of multiple versions of GetTimeInMillis().
  It is provided by libos.a if DDXTIME is undefined.

XXX macppc may be a special case since it builds both XFree86 and Xmacppc
    will resolve later if found to be an issue.

diffstat:

 x11/Xserver/hw/netbsd/hpc/Makefile    |  4 ++--
 x11/Xserver/hw/netbsd/macppc/Makefile |  4 ++--
 x11/Xserver/os/Makefile               |  9 ++++++++-
 x11/Xserver/printer/Makefile          |  9 ++++++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diffs (89 lines):

diff -r efe791be24af -r d715145f20ac x11/Xserver/hw/netbsd/hpc/Makefile
--- a/x11/Xserver/hw/netbsd/hpc/Makefile        Sat Jan 10 16:23:36 2004 +0000
+++ b/x11/Xserver/hw/netbsd/hpc/Makefile        Sat Jan 10 16:28:29 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2004/01/03 02:05:49 takemura Exp $
+#      $NetBSD: Makefile,v 1.2 2004/01/10 16:28:29 rtr Exp $
 
 .include "../../../Makefile.serverlib"
 
@@ -9,7 +9,7 @@
 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/hpc
 SRCS=  hpc.h xf86Keymap.h atKeynames.h \
        hpcFB.c hpcIo.c hpcKeymap.c hpcScreen.c \
-       hpcInit.c hpcKbd.c hpcMouse.c hpcColormap.c hpcInEx.c GetTime.c
+       hpcInit.c hpcKbd.c hpcMouse.c hpcColormap.c hpcInEx.c
 
 XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
 
diff -r efe791be24af -r d715145f20ac x11/Xserver/hw/netbsd/macppc/Makefile
--- a/x11/Xserver/hw/netbsd/macppc/Makefile     Sat Jan 10 16:23:36 2004 +0000
+++ b/x11/Xserver/hw/netbsd/macppc/Makefile     Sat Jan 10 16:28:29 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2004/01/10 13:04:03 rtr Exp $
+#      $NetBSD: Makefile,v 1.3 2004/01/10 16:28:29 rtr Exp $
 
 .include "../../../Makefile.serverlib"
 
@@ -8,7 +8,7 @@
 
 .PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/macppc
 SRCS=  macppcFbs.c macppcIo.c macppcKeyMap.c macppcOFB.c macppc.h \
-       macppcInit.c macppcKbd.c macppcMouse.c macppcInEx.c GetTime.c
+       macppcInit.c macppcKbd.c macppcMouse.c macppcInEx.c
 
 XSERVERINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
 
diff -r efe791be24af -r d715145f20ac x11/Xserver/os/Makefile
--- a/x11/Xserver/os/Makefile   Sat Jan 10 16:23:36 2004 +0000
+++ b/x11/Xserver/os/Makefile   Sat Jan 10 16:28:29 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2003/11/17 05:18:20 lukem Exp $
+#      $NetBSD: Makefile,v 1.6 2004/01/10 16:28:29 rtr Exp $
 
 .include "../Makefile.serverlib"
 
@@ -12,6 +12,7 @@
                utils.c auth.c mitauth.c secauth.c xdmauth.c xdmcp.c \
                decompress.c transport.c lbxio.c
 
+
 XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/include \
@@ -29,6 +30,12 @@
                ${X11FLAGS.OS_DEFINES} \
                -DUSE_RGB_TXT
 
+.include "../Makefile.common"
+
+.if ${XSERVER_XFREE86} == "no"
+CPPFLAGS+=     -UDDXTIME
+.endif
+
 CPPFLAGS.WaitFor.c=    ${X11FLAGS.EXTENSION}
 CPPFLAGS.access.c=     -DXDMCP -DBSD44SOCKETS -DHAS_GETIFADDRS
 CPPFLAGS.auth.c=       -DXDMCP -DHAVE_ARC4RANDOM
diff -r efe791be24af -r d715145f20ac x11/Xserver/printer/Makefile
--- a/x11/Xserver/printer/Makefile      Sat Jan 10 16:23:36 2004 +0000
+++ b/x11/Xserver/printer/Makefile      Sat Jan 10 16:28:29 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2003/11/17 05:18:20 lukem Exp $
+#      $NetBSD: Makefile,v 1.5 2004/01/10 16:28:29 rtr Exp $
 
 .include "../Makefile.serverlib"
 
@@ -35,6 +35,13 @@
 BUILDCPPFLAGS=         -DPRINT_ONLY_SERVER \
                        ${X11FLAGS.OS_DEFINES} \
                        ${X11FLAGS.EXTENSION}
+
+.include "../Makefile.common"
+
+.if ${XSERVER_XFREE86} == "no"
+BUILDCPPFLAGS+=                -UDDXTIME
+.endif
+
 CPPFLAGS.ddxInit.c=    ${BUILDCPPFLAGS}
 CPPFLAGS.dpmsstubs.c=  ${BUILDCPPFLAGS} -DXPRINT
 CPPFLAGS.miinitext.c=  ${BUILDCPPFLAGS} -DXPRINT -UGLXEXT