[src/trunk]: src/external/mit/xorg/server minor clean ups and use ${XORG_SERV...

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

details:   https://anonhg.NetBSD.org/src/rev/025c320e1234
branches:  trunk
changeset: 815968:025c320e1234
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jun 10 03:37:34 2016 +0000

description:
minor clean ups and use ${XORG_SERVER_SUBDIR} where necessary

diffstat:

 external/mit/xorg/server/Makefile                                       |   6 +---
 external/mit/xorg/server/xorg-server/Makefile.Xserver                   |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils    |  11 +++------
 4 files changed, 10 insertions(+), 15 deletions(-)

diffs (75 lines):

diff -r d21818af29a9 -r 025c320e1234 external/mit/xorg/server/Makefile
--- a/external/mit/xorg/server/Makefile Fri Jun 10 03:36:55 2016 +0000
+++ b/external/mit/xorg/server/Makefile Fri Jun 10 03:37:34 2016 +0000
@@ -1,12 +1,10 @@
-#      $NetBSD: Makefile,v 1.8 2013/06/12 21:35:29 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2016/06/10 03:37:34 mrg Exp $
 
 # Makefile for modular-xorg-server and drivers
 
 .include <bsd.own.mk>
 
-.include "xorg-server/Makefile.common"
-
-SUBDIR=        xorg-server
+SUBDIR=        ${XORG_SERVER_SUBDIR}
 
 # We only make drivers if we make the actual Xorg server,
 # as opposed to Xvfb and Xnest.
diff -r d21818af29a9 -r 025c320e1234 external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver     Fri Jun 10 03:36:55 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver     Fri Jun 10 03:37:34 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xserver,v 1.13 2012/10/03 21:50:14 gsutre Exp $
+#      $NetBSD: Makefile.Xserver,v 1.14 2016/06/10 03:37:34 mrg Exp $
 
 .for _SL in \
        mi \
@@ -63,7 +63,7 @@
        hw/xfree86/xf86modes
 
 .if !defined(LIBDIR.${_SL})
-LIBDIR.${_SL}!=        cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/${_SL} && ${PRINTOBJDIR}
+LIBDIR.${_SL}!=        cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/${_SL} && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=LIBDIR.${_SL}
 .endif
 LDADD.${_SL}=  ${LIBDIR.${_SL}}/lib${_SL:T}.a
diff -r d21818af29a9 -r 025c320e1234 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile   Fri Jun 10 03:36:55 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile   Fri Jun 10 03:37:34 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/11/23 08:22:32 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/10 03:37:34 mrg Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
 
@@ -34,7 +34,7 @@
 CPPFLAGS.xf86dga2.c=   -Wno-error
 CPPFLAGS.xf86vmode.c=  -Wno-error      # XXX xf86vmstr.h
 
-XEXTMODULEOBJDIR!=  cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/Xext/Xextmodule && ${PRINTOBJDIR}
+XEXTMODULEOBJDIR!=  cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/Xext/Xextmodule && ${PRINTOBJDIR}
 LIBXEXTMODULE= ${XEXTMODULEOBJDIR}/libXextmodule.a
 
 LDADD=  -L${XEXTMODULEOBJDIR} -lXextmodule
diff -r d21818af29a9 -r 025c320e1234 external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils      Fri Jun 10 03:36:55 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils      Fri Jun 10 03:37:34 2016 +0000
@@ -1,13 +1,10 @@
-#      $NetBSD: Makefile.utils,v 1.5 2008/08/15 15:55:06 rtr Exp $
+#      $NetBSD: Makefile.utils,v 1.6 2016/06/10 03:37:34 mrg Exp $
 
 .include <bsd.own.mk>
 
-#SCANPCIINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/bin/xf86cfg && ${PRINTOBJDIR}
-#XF86OBJDIR!=  cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xf86config && ${PRINTOBJDIR}
-#XLOADEROBJDIR!=       cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xloader && ${PRINTOBJDIR}
-DUMMYOBJDIR!=  cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/hw/xfree86/dummy && ${PRINTOBJDIR}
-SCANPCIOBJDIR!=        cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci && ${PRINTOBJDIR}
-XORGOSOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos && ${PRINTOBJDIR}
+DUMMYOBJDIR!=  cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/dummy && ${PRINTOBJDIR}
+SCANPCIOBJDIR!=        cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/scanpci && ${PRINTOBJDIR}
+XORGOSOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/xorgos && ${PRINTOBJDIR}
 
 LIBDUMMY=      ${DUMMYOBJDIR}/libdummy.a
 LIBXORGOS=     ${XORGOSOBJDIR}/libxorgos.a