summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2015-01-07 20:42:01 +0000
committerjoerg <joerg@NetBSD.org>2015-01-07 20:42:01 +0000
commit3711cbc0b879efdbe2d0bd8438b7e91a7e061a50 (patch)
tree819c27cda631f0922ea9a0bcbe9ea746946bc093 /Makefile
parent6a02788874e7a0c245c13b0f873d2c83b66674ca (diff)
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 (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 230e6886ecb..ad7b7999e17 100644
--- a/Makefile
+++ b/Makefile
@@ -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 @@ BUILDTARGETS+= includes
.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-build: .PHONY .MAKE
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