Module Name: src
Committed By: mrg
Date: Fri Jun 10 03:37:34 UTC 2016
Modified Files:
src/external/mit/xorg/server: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils:
Makefile.utils
Log Message:
minor clean ups and use ${XORG_SERVER_SUBDIR} where necessary
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/server/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
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/Makefile
diff -u src/external/mit/xorg/server/Makefile:1.8 src/external/mit/xorg/server/Makefile:1.9
--- src/external/mit/xorg/server/Makefile:1.8 Wed Jun 12 21:35:29 2013
+++ src/external/mit/xorg/server/Makefile Fri Jun 10 03:37:34 2016
@@ -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.
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.13 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.14
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.13 Wed Oct 3 21:50:14 2012
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Fri Jun 10 03:37:34 2016
@@ -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
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.10 Tue Nov 23 08:22:32 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile Fri Jun 10 03:37:34 2016
@@ -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.xf86RandR12.c= -Wno-error
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
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.5 Fri Aug 15 15:55:06 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils Fri Jun 10 03:37:34 2016
@@ -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
