[src/trunk]: src Reorganise the way xorg is build. Move build of makestrs int...

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

details:   https://anonhg.NetBSD.org/src/rev/4d7d4191d02e
branches:  trunk
changeset: 805602:4d7d4191d02e
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Jan 07 20:42:01 2015 +0000

description:
Reorganise the way xorg is build. Move build of makestrs into src/tools
as it is needed for the "includes" phase. Make it symlink all necessary
headers in obj to decouple it from "includes" itself, breaking the
dependency cycle. Move the do-x11 target between do-lib and do-build, so
that libraries can get the benefit of build_install (correct .WAIT
behavior) and everything else like "includes" uses the plain SUBDIR
entry in external/mit.

diffstat:

 Makefile                                  |   7 ++++---
 external/mit/Makefile                     |   8 +++++++-
 external/mit/xorg/lib/Makefile            |   3 ++-
 external/mit/xorg/tools/Makefile          |   3 ++-
 external/mit/xorg/tools/makestrs/Makefile |  22 +++++++++++++++-------
 tools/Makefile                            |   6 +++++-
 6 files changed, 35 insertions(+), 14 deletions(-)

diffs (133 lines):

diff -r 984cf32e168d -r 4d7d4191d02e Makefile
--- a/Makefile  Wed Jan 07 18:50:18 2015 +0000
+++ b/Makefile  Wed Jan 07 20:42:01 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.311 2014/11/05 08:19:17 snj Exp $
+#      $NetBSD: Makefile,v 1.312 2015/01/07 20:42:01 joerg Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -231,10 +231,10 @@
 .endif
 BUILDTARGETS+= do-lib
 BUILDTARGETS+= do-compat-lib
-BUILDTARGETS+= do-build
 .if ${MKX11} != "no"
 BUILDTARGETS+= do-x11
 .endif
+BUILDTARGETS+= do-build
 .if ${MKEXTSRC} != "no"
 BUILDTARGETS+= do-extsrc
 .endif
@@ -479,7 +479,8 @@
 do-x11: .PHONY .MAKE
 .if ${MKX11} != "no"
 .if ${X11FLAVOUR} == "Xorg"
-       ${MAKEDIRTARGET} external/mit/xorg build
+       ${MAKEDIRTARGET} external/mit/xorg/tools all
+       ${MAKEDIRTARGET} external/mit/xorg/lib build_install
 .else
        ${MAKEDIRTARGET} x11 build
 .endif
diff -r 984cf32e168d -r 4d7d4191d02e external/mit/Makefile
--- a/external/mit/Makefile     Wed Jan 07 18:50:18 2015 +0000
+++ b/external/mit/Makefile     Wed Jan 07 20:42:01 2015 +0000
@@ -1,5 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2012/02/29 20:07:55 tron Exp $
+#      $NetBSD: Makefile,v 1.3 2015/01/07 20:42:01 joerg Exp $
+
+.include <bsd.own.mk>
 
 SUBDIR+=       expat lua
 
+.if ${MKX11} != "no" && ${X11FLAVOUR} == "Xorg"
+SUBDIR+=       xorg
+.endif
+
 .include <bsd.subdir.mk>
diff -r 984cf32e168d -r 4d7d4191d02e external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile    Wed Jan 07 18:50:18 2015 +0000
+++ b/external/mit/xorg/lib/Makefile    Wed Jan 07 20:42:01 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.31 2015/01/05 03:45:31 mrg Exp $
+#      $NetBSD: Makefile,v 1.32 2015/01/07 20:42:01 joerg Exp $
 
 # build libraries for xorg
 
@@ -35,4 +35,5 @@
        libXdmGreet \
        xcb-util
 
+.include <bsd.buildinstall.mk>
 .include <bsd.subdir.mk>
diff -r 984cf32e168d -r 4d7d4191d02e external/mit/xorg/tools/Makefile
--- a/external/mit/xorg/tools/Makefile  Wed Jan 07 18:50:18 2015 +0000
+++ b/external/mit/xorg/tools/Makefile  Wed Jan 07 20:42:01 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2014/07/09 20:22:56 riastradh Exp $
+#      $NetBSD: Makefile,v 1.5 2015/01/07 20:42:01 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -14,4 +14,5 @@
 SUBDIR+=bdftopcf fc-cache ucs2any
 SUBDIR+=makekeys mkfontscale .WAIT xkbcomp
 
+.include <bsd.buildinstall.mk>
 .include <bsd.subdir.mk>
diff -r 984cf32e168d -r 4d7d4191d02e external/mit/xorg/tools/makestrs/Makefile
--- a/external/mit/xorg/tools/makestrs/Makefile Wed Jan 07 18:50:18 2015 +0000
+++ b/external/mit/xorg/tools/makestrs/Makefile Wed Jan 07 20:42:01 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2015/01/07 20:42:02 joerg Exp $
 
 NOMAN= 1
 
@@ -7,12 +7,20 @@
 .PATH: ${X11SRCDIR.Xt}/util
 
 HOSTPROG=      makestrs
-HOST_CPPFLAGS+=        -I. -I${DESTDIR}${X11INCDIR}
+HOST_CPPFLAGS+=        -I.
+
+.for header in Xos.h Xosdefs.h Xarch.h
+realdepend realall: X11/${header}
 
-#      Can't use -I${DESTDIR}${X11INCDIR} since pswrap is needed
-#      to create some header files.
-#
-BUILDSYMLINKS= ${X11SRCDIR.Xt}/include/X11 X11
-DPSRCS+=       X11
+X11/${header}:
+       mkdir -p X11
+       rm -f ${header}
+       ln -s ${X11SRCDIR.xproto}/${header} X11/${header}
+.endfor
+
+clean_headers: .PHONY
+       rm -rf X11
+
+cleandir: clean_headers
 
 .include <bsd.hostprog.mk>
diff -r 984cf32e168d -r 4d7d4191d02e tools/Makefile
--- a/tools/Makefile    Wed Jan 07 18:50:18 2015 +0000
+++ b/tools/Makefile    Wed Jan 07 20:42:01 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.179 2014/12/05 01:50:47 pooka Exp $
+#      $NetBSD: Makefile,v 1.180 2015/01/07 20:42:02 joerg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -211,6 +211,10 @@
 SUBDIR+=       mkubootimage
 .endif
 
+.if ${MKX11} != "no" && ${X11FLAVOUR} == "Xorg"
+SUBDIR+=       ../external/mit/xorg/tools/makestrs
+.endif
+
 .endif # TOOLCHAIN_BUILDRUMP
 
 check_MKTOOLS: .PHONY .NOTMAIN