Sun Aug 21 20:51:04 2016 UTC ()
build 'hw' (the actual servers) after everything else.  should fix
a build issue reported by Dave Tyson.


(mrg)
diff -r1.26 -r1.27 src/external/mit/xorg/server/xorg-server/Makefile
cvs diff -r1.26 -r1.27 src/external/mit/xorg/server/xorg-server/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/Makefile 2016/08/19 03:59:30 1.26
+++ src/external/mit/xorg/server/xorg-server/Makefile 2016/08/21 20:51:04 1.27
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile,v 1.26 2016/08/19 03:59:30 mrg Exp $ 1# $NetBSD: Makefile,v 1.27 2016/08/21 20:51:04 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.include "Makefile.common" 5.include "Makefile.common"
6 6
7SUBDIR= doc include .WAIT 7SUBDIR= doc include .WAIT
8SUBDIR+= glx 8SUBDIR+= glx
9SUBDIR+= dix fb mi Xext miext os randr render  9SUBDIR+= dix fb mi Xext miext os randr render
10SUBDIR+= present pseudoramiX 10SUBDIR+= present pseudoramiX
11SUBDIR+= Xi xkb xkbstubs dbe record xfixes 11SUBDIR+= Xi xkb xkbstubs dbe record xfixes
12SUBDIR+= damageext composite config .WAIT 12SUBDIR+= damageext composite config .WAIT
13SUBDIR+= hw 
14 13
15# XXX 14# XXX
16.if ${HAVE_DRI3:Uno} != "no" 15.if ${HAVE_DRI3:Uno} != "no"
17SUBDIR+= dri3 16SUBDIR+= dri3
18.endif 17.endif
19 18
20.if ${HAVE_XORG_GLAMOR} != "no" 19.if ${HAVE_XORG_GLAMOR} != "no"
21SUBDIR+= glamor 20SUBDIR+= glamor
22.endif 21.endif
23 22
 23# And finally, build the servers.
 24SUBDIR+= .WAIT hw
 25
24.PATH: ${X11SRCDIR.xorg-server} 26.PATH: ${X11SRCDIR.xorg-server}
25 27
26PKGCONFIG= xorg-server 28PKGCONFIG= xorg-server
27# Use -fvisibility=hidden for symbol_visibility? 29# Use -fvisibility=hidden for symbol_visibility?
28PKGCONFIG_SED_FLAGS= \ 30PKGCONFIG_SED_FLAGS= \
29 -e "s,@sysconfigdir@,${X11ETCDIR},; \ 31 -e "s,@sysconfigdir@,${X11ETCDIR},; \
30 s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \ 32 s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
31 s,@symbol_visibility@,," 33 s,@symbol_visibility@,,"
32 34
33.include <bsd.x11.mk> 35.include <bsd.x11.mk>
34.include <bsd.man.mk> 36.include <bsd.man.mk>
35.include <bsd.subdir.mk> 37.include <bsd.subdir.mk>