Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor clean ups and use ${XORG_SERVER_SUBDIR} where necessary

Browse Source
This commit is contained in:
mrg 2016-06-10 03:37:34 +00:00
parent 1fcfc09354
commit e0debda5d5
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/mit/xorg/server/Makefile vendored
View File

@ -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.

4
external/mit/xorg/server/xorg-server/Makefile.Xserver vendored
View File

@ -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

4
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile vendored
View File

@ -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

11
external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils vendored
View File

@ -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