Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.128
retrieving revision 1.319
diff -u -p -r1.128 -r1.319
--- src/Makefile	2001/08/17 15:05:50	1.128
+++ src/Makefile	2017/10/04 23:54:33	1.319
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.128 2001/08/17 15:05:50 thorpej Exp $
+#	$NetBSD: Makefile,v 1.319 2017/10/04 23:54:33 christos Exp $
 
+#
 # This is the top-level makefile for building NetBSD. For an outline of
 # how to build a snapshot or release, as well as other release engineering
-# information, see http://www.netbsd.org/developers/releng/index.html
+# information, see http://www.NetBSD.org/developers/releng/index.html
 #
 # Not everything you can set or do is documented in this makefile. In
 # particular, you should review the files in /usr/share/mk (especially
@@ -18,214 +19,512 @@
 #   DESTDIR is the target directory for installation of the compiled
 #	software. It defaults to /. Note that programs are built against
 #	libraries installed in DESTDIR.
-#   MKMAN, if set to `no', will prevent building of manual pages.
-#   MKOBJDIRS, if not set to `no', will build object directories at 
+#   MKMAN, if `no', will prevent building of manual pages.
+#   MKOBJDIRS, if not `no', will build object directories at
 #	an appropriate point in a build.
-#   MKSHARE, if set to `no', will prevent building and installing
+#   MKSHARE, if `no', will prevent building and installing
 #	anything in /usr/share.
-#   NBUILDJOBS is the number of jobs to start in parallel during a
-#	`make build'. It defaults to 1.
-#   UPDATE, if defined, will avoid a `make cleandir' at the start of
-#     `make build', as well as having the effects listed in
-#     /usr/share/mk/bsd.README.
+#   MKUPDATE, if not `no', will avoid a `make cleandir' at the start of
+#	`make build', as well as having the effects listed in
+#	/usr/share/mk/bsd.README.
 #   NOCLEANDIR, if defined, will avoid a `make cleandir' at the start
-#     of the `make build'.
+#	of the `make build'.
 #   NOINCLUDES will avoid the `make includes' usually done by `make build'.
-
+#   NOBINARIES will not build binaries, only includes and libraries
+#
+#   See mk.conf(5) for more details.
+#
 #
 # Targets:
-#   build: builds a full release of netbsd in DESTDIR. If BUILD_DONE is
-#	set, this is an empty target.
-#   release: does a `make build,' and then tars up the DESTDIR files
-#	into RELEASEDIR, in release(7) format. (See etc/Makefile for
-#	more information on this.)
-#   snapshot: a synonym for release.
-#
-# Sub targets of `make build,' in order:
-#   buildstartmsg: displays the start time of the build.
-#   beforeinstall: creates the distribution directories.
-#   do-force-domestic: check's that FORCE_DOMESTIC isn't set (deprecated.)
-#   do-share-mk: installs /usr/share/mk files.
-#   do-cleandir: cleans the tree.
-#   do-make-obj: creates object directories if required.
-#   do-make-tools: builds host toolchain.
-#   do-make-includes: install include files.
-#   do-lib-csu: build & install startup object files.
-#   do-lib: build & install system libraries.
-#   do-gnu-lib: build & install gnu system libraries.
-#   do-dependall: builds & install the entire system.
-#   do-domestic: build & install the domestic tree (deprecated.)
-#   do-whatisdb: build & install the `whatis.db' man database.
-#   buildendmsg: displays the end time of the build.
+#   build:
+#	Builds a full release of NetBSD in DESTDIR, except for the
+#	/etc configuration files.
+#	If BUILD_DONE is set, this is an empty target.
+#   distribution:
+#	Builds a full release of NetBSD in DESTDIR, including the /etc
+#	configuration files.
+#   buildworld:
+#	As per `make distribution', except that it ensures that DESTDIR
+#	is not the root directory.
+#   installworld:
+#	Install the distribution from DESTDIR to INSTALLWORLDDIR (which
+#	defaults to the root directory).  Ensures that INSTALLWORLDDIR
+#	is not the root directory if cross compiling.
+#   release:
+#	Does a `make distribution', and then tars up the DESTDIR files
+#	into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format.
+#	(See etc/Makefile for more information on this.)
+#   regression-tests:
+#	Runs the regression tests in "regress" on this host.
+#   sets:
+#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
+#	from ${DESTDIR}
+#   sourcesets:
+#	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
+#   syspkgs:
+#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
+#	from ${DESTDIR}
+#   iso-image:
+#	Create CD-ROM image in RELEASEDIR/images.
+#	RELEASEDIR must already have been populated by `make release'
+#	or equivalent.
+#   iso-image-source:
+#	Create CD-ROM image with source in RELEASEDIR/images.
+#	RELEASEDIR must already have been populated by
+#	`make release sourcesets' or equivalent.
+#   live-image:
+#	Create bootable live image for emulators or USB stick etc.
+#	in RELEASEDIR/liveimage.
+#	RELEASEDIR must already have been populated by `make release'
+#	or equivalent.
+#   install-image:
+#	Create bootable installation image for USB stick etc.
+#	in RELEASEDIR/installimage.
+#	RELEASEDIR must already have been populated by `make release'
+#	or equivalent.
+#
+# Targets invoked by `make build,' in order:
+#   cleandir:        cleans the tree.
+#   do-top-obj:      creates the top level object directory.
+#   do-tools-obj:    creates object directories for the host toolchain.
+#   do-tools:        builds host toolchain.
+#   params:          record the values of variables that might affect the
+#                    build.
+#   obj:             creates object directories.
+#   do-distrib-dirs: creates the distribution directories.
+#   includes:        installs include files.
+#   do-lib:          builds and installs prerequisites from lib
+#                    if ${MKCOMPAT} != "no".
+#   do-compat-lib:   builds and installs prerequisites from compat/lib
+#                    if ${MKCOMPAT} != "no".
+#   do-build:        builds and installs the entire system.
+#   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
+#                    X11R7 from src/external/mit/xorg 
+#   do-extsrc:       builds and installs extsrc if ${MKEXTSRC} != "no".
+#   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
+#
+
+.if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == ""
+.MAKEFLAGS: -m ${.CURDIR}/share/mk
+.endif
+
+#
+# If _SRC_TOP_OBJ_ gets set here, we will end up with a directory that may
+# not be the top level objdir, because "make obj" can happen in the *middle*
+# of "make build" (long after <bsd.own.mk> is calculated it).  So, pre-set
+# _SRC_TOP_OBJ_ here so it will not be added to ${.MAKEOVERRIDES}.
+#
+_SRC_TOP_OBJ_=
 
 .include <bsd.own.mk>
 
-.if defined(USE_NEW_TOOLCHAIN)
-.include "${.CURDIR}/tools/Makefile.tools"
-.endif
+#
+# Sanity check: make sure that "make build" is not invoked simultaneously
+# with a standard recursive target.
+#
 
-MKOBJDIRS ?= no
+.if make(build) || make(release) || make(snapshot)
+.for targ in ${TARGETS:Nobj:Ncleandir}
+.if make(${targ}) && !target(.BEGIN)
+.BEGIN:
+	@echo 'BUILD ABORTED: "make build" and "make ${targ}" are mutually exclusive.'
+	@false
+.endif
+.endfor
+.endif
 
-.if defined(NBUILDJOBS)
-_J= -j${NBUILDJOBS}
+#
+# _SUBDIR is used to set SUBDIR, after removing directories that have
+# BUILD_${dir}=no, or that have no ${dir}/Makefile.
+#
+_SUBDIR=	tools lib include external crypto/external bin games
+_SUBDIR+=	libexec sbin usr.bin
+_SUBDIR+=	usr.sbin share sys etc tests compat
+_SUBDIR+=	.WAIT rescue .WAIT distrib regress
+
+.for dir in ${_SUBDIR}
+.if "${dir}" == ".WAIT" \
+	|| (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile))
+SUBDIR+=	${dir}
 .endif
+.endfor
 
-.if defined(DESTDIR)
-_M=-m ${DESTDIR}/usr/share/mk
+.if exists(regress)
+regression-tests: .PHONY .MAKE
+	@echo Running regression tests...
+	${MAKEDIRTARGET} regress regress
 .endif
 
-# NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
+.if ${MKUNPRIVED} != "no"
+NOPOSTINSTALL=	# defined
+.endif
 
-SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
-.if make(cleandir) || make(obj)
-SUBDIR+= distrib
-.ifdef MAKEOBJDIRPREFIX
-SUBDIR+= etc
+afterinstall: .PHONY .MAKE
+.if ${MKMAN} != "no"
+	${MAKEDIRTARGET} share/man makedb
+.endif
+.if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
+	${MAKEDIRTARGET} external/gpl2/texinfo/bin/install-info infodir-meta
 .endif
+.if !defined(NOPOSTINSTALL)
+	${MAKEDIRTARGET} . postinstall-check
 .endif
 
-includes-lib: includes-include includes-sys
+_POSTINSTALL=	${.CURDIR}/usr.sbin/postinstall/postinstall \
+		-m ${MACHINE} -a ${MACHINE_ARCH}
+_POSTINSTALL_ENV= \
+	AWK=${TOOL_AWK:Q}		\
+	DB=${TOOL_DB:Q}			\
+	HOST_SH=${HOST_SH:Q}		\
+	MAKE=${MAKE:Q}			\
+	PWD_MKDB=${TOOL_PWD_MKDB:Q}	\
+	SED=${TOOL_SED:Q}		\
+	STAT=${TOOL_STAT:Q}
 
-.if exists(games)
-SUBDIR+= games
+.if ${MKX11} != "no"
+_POSTINSTALL_X11=-x ${X11SRCDIR:Q}
 .endif
 
-SUBDIR+= gnu
-# This is needed for libstdc++ and gen-params.
-includes-gnu: includes-include includes-sys
+postinstall-check: .PHONY
+	@echo "   === Post installation checks ==="
+	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
+	@echo "   ================================"
 
-.if exists(regress)
-.ifmake !(install)
-SUBDIR+= regress
-.endif
+postinstall-fix: .NOTMAIN .PHONY
+	@echo "   === Post installation fixes ==="
+	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix
+	@echo "   ==============================="
 
-regression-tests:
-	@echo Running regression tests...
-	@(cd ${.CURDIR}/regress && ${MAKE} ${_M} regress)
-.endif
+postinstall-fix-obsolete: .NOTMAIN .PHONY
+	@echo "   === Removing obsolete files ==="
+	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete
+	@echo "   ==============================="
 
-buildstartmsg:
-	@echo -n "Build started at: "
-	@date
-
-buildendmsg:
-	@echo -n "Build finished at: "
-	@date
-
-# If sharesrc is around, use its share/mk files to bootstrap until the
-# mk files are installed (first step of make build).  If installing to
-# DESTDIR, don't bother, since the build will fail later on anyway.
-
-beforeinstall:
-.ifndef NODISTRIBDIRS
-.ifndef DESTDIR
-.if exists(share/mk)
-	(cd ${.CURDIR}/etc && \
-	    ${MAKE} -m ${.CURDIR}/share/mk DESTDIR=/ distrib-dirs)
-.else
-	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
+postinstall-fix-obsolete_stand: .NOTMAIN .PHONY
+	@echo "   === Removing obsolete files ==="
+	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete_stand
+	@echo "   ==============================="
+
+
+#
+# Targets (in order!) called by "make build".
+#
+BUILDTARGETS+=	check-tools
+.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
+BUILDTARGETS+=	cleandir
 .endif
-.else
-	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs)
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	do-top-obj
+.endif
+.if ${USETOOLS} == "yes"	# {
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	do-tools-obj
+.endif
+BUILDTARGETS+=	do-tools
+.endif # USETOOLS		# }
+BUILDTARGETS+=	params
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	obj
 .endif
+BUILDTARGETS+=	clean_METALOG
+.if !defined(NODISTRIBDIRS)
+BUILDTARGETS+=	do-distrib-dirs
 .endif
-
-afterinstall:
-.if ${MKMAN} != "no" && !defined(_BUILD)
-	${MAKE} ${_M} whatis.db
+.if !defined(NOINCLUDES)
+BUILDTARGETS+=	includes
+.endif
+BUILDTARGETS+=	do-lib
+BUILDTARGETS+=	do-compat-lib
+.if !defined(NOBINARIES)
+.if ${MKX11} != "no"
+BUILDTARGETS+=	do-x11
+.endif
+BUILDTARGETS+=	do-build
+.if ${MKEXTSRC} != "no"
+BUILDTARGETS+=	do-extsrc
+.endif
+BUILDTARGETS+=	do-obsolete
 .endif
 
-whatis.db:
-	(cd ${.CURDIR}/share/man && ${MAKE} ${_M} makedb)
+#
+# Enforce proper ordering of some rules.
+#
 
-# wrt info/dir below:  It's safe to move this over top of /usr/share/info/dir,
-# as the build will automatically remove/replace the non-pkg entries there.
+.ORDER:		${BUILDTARGETS}
+includes-lib:	.PHONY includes-include includes-sys
 
+#
+# Record the values of variables that might affect the build.
+# If no values have changed, avoid updating the timestamp
+# of the params file.
+#
+# This is referenced by _NETBSD_VERSION_DEPENDS in <bsd.own.mk>.
+#
+.include "${NETBSDSRCDIR}/etc/Makefile.params"
+CLEANDIRFILES+= params
+params: .EXEC
+	${_MKMSG_CREATE} params
+	@${PRINT_PARAMS} >${.TARGET}.new
+	@if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \
+		: "params is unchanged" ; \
+		rm ${.TARGET}.new ; \
+	else \
+		: "params has changed or is new" ; \
+		mv ${.TARGET}.new ${.TARGET} ; \
+	fi
+
+#
+# Display current make(1) parameters
+#
+show-params: .PHONY .MAKE
+	@${PRINT_PARAMS}
+
+#
+# Build the system and install into DESTDIR.
+#
+
+START_TIME!=	date
+
+build: .PHONY .MAKE
 .if defined(BUILD_DONE)
-build:
-	@echo "Build installed into ${DESTDIR}"
+	@echo "Build already installed into ${DESTDIR}"
 .else
-build:
-	@${MAKE} ${_M} buildstartmsg
-	@${MAKE} ${_M} beforeinstall
-	@${MAKE} ${_M} do-force-domestic
-	@${MAKE} ${_M} do-share-mk
-	@${MAKE} ${_M} do-cleandir
-	@${MAKE} ${_M} do-make-obj
-	@${MAKE} ${_M} do-make-tools
-	@${MAKE} ${_M} do-make-includes
-	@${MAKE} ${_M} do-lib-csu
-	@${MAKE} ${_M} do-lib
-	@${MAKE} ${_M} do-gnu-lib
-	@${MAKE} ${_M} do-dependall
-	@${MAKE} ${_M} do-domestic
-	@${MAKE} ${_M} do-whatisdb
-	@${MAKE} ${_M} buildendmsg
-.endif
-
-do-force-domestic:
-.if defined(FORCE_DOMESTIC)
-	@echo '*** CAPUTE!'
-	@echo '    The FORCE_DOMESTIC flag is not compatible with "make build".'
-	@echo '    Please correct the problem and try again.'
+	@echo "Build started at: ${START_TIME}"
+.for tgt in ${BUILDTARGETS}
+	${MAKEDIRTARGET} . ${tgt}
+.endfor
+	${MAKEDIRTARGET} etc install-etc-release
+	@echo   "Build started at:  ${START_TIME}"
+	@printf "Build finished at: " && date
+.endif
+
+#
+# Build a full distribution, but not a release (i.e. no sets into
+# ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
+#
+
+distribution buildworld: .PHONY .MAKE
+.if make(buildworld) && \
+    (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Won't make ${.TARGET} with DESTDIR=/"
 	@false
 .endif
+	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
+	${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
+.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
+	${MAKEDIRTARGET} . postinstall-fix-obsolete
+	${MAKEDIRTARGET} . postinstall-fix-obsolete_stand
+	${MAKEDIRTARGET} distrib/sets checkflist
+.endif
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
 
-do-share-mk:
-.if ${MKSHARE} != "no"
-	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-.endif
-
-do-cleandir:
-.if !defined(UPDATE) && !defined(NOCLEANDIR)
-	${MAKE} ${_J} ${_M} cleandir
+#
+# Install the distribution from $DESTDIR to $INSTALLWORLDDIR (defaults to `/')
+# If installing to /, ensures that the host's operating system is NetBSD and
+# the host's `uname -m` == ${MACHINE}.
+#
+
+HOST_UNAME_S!=	uname -s
+HOST_UNAME_M!=	uname -m
+
+installworld: .PHONY .MAKE
+.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Can't make ${.TARGET} to DESTDIR=/"
+	@false
+.endif
+.if !defined(INSTALLWORLDDIR) || \
+    ${INSTALLWORLDDIR} == "" || ${INSTALLWORLDDIR} == "/"
+.if (${HOST_UNAME_S} != "NetBSD")
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to NetBSD with INSTALLWORLDDIR=/"
+	@false
+.endif
+.if (${HOST_UNAME_M} != ${MACHINE})
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLWORLDDIR=/"
+	@false
 .endif
+.endif
+	${MAKEDIRTARGET} distrib/sets installsets \
+		INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=${INSTALLSETS:Q}
+	${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR}
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
 
-do-make-obj:
-.if ${MKOBJDIRS} != "no"
-	${MAKE} ${_J} ${_M} obj
-.if defined(USE_NEW_TOOLCHAIN)
-	cd ${.CURDIR}/tools && ${MAKE} ${_M} obj
+#
+# Install modules from $DESTDIR to $INSTALLMODULESDIR
+#
+installmodules: .PHONY .MAKE
+.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Can't make ${.TARGET} to DESTDIR=/"
+	@false
+.endif
+.if !defined(INSTALLMODULESDIR) || \
+    ${INSTALLMODULESDIR} == "" || ${INSTALLMODULESDIR} == "/"
+.if (${HOST_UNAME_S} != "NetBSD")
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to NetBSD with INSTALLMODULESDIR=/"
+	@false
+.endif
+.if (${HOST_UNAME_M} != ${MACHINE})
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLMODULESDIR=/"
+	@false
+.endif
+.endif
+	${MAKEDIRTARGET} sys/modules install DESTDIR=${INSTALLMODULESDIR:U/}
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
+#
+
+.for tgt in sets sourcesets syspkgs
+${tgt}: .PHONY .MAKE
+	${MAKEDIRTARGET} distrib/sets ${tgt}
+.endfor
+
+#
+# Build a release or snapshot (implies "make distribution").  Note that
+# in this case, the set lists will be checked before the tar files
+# are made.
+#
+
+release snapshot: .PHONY .MAKE
+	${MAKEDIRTARGET} . distribution
+	${MAKEDIRTARGET} etc release DISTRIBUTION_DONE=1
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create a CD-ROM image.
+#
+
+iso-image: .PHONY
+	${MAKEDIRTARGET} distrib iso_image
+	${MAKEDIRTARGET} etc iso-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+iso-image-source: .PHONY
+	${MAKEDIRTARGET} distrib iso_image CDSOURCE=true
+	${MAKEDIRTARGET} etc iso-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create bootable live images.
+#
+
+live-image: .PHONY
+	${MAKEDIRTARGET} etc live-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create bootable installation images.
+#
+
+install-image: .PHONY
+	${MAKEDIRTARGET} etc install-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Special components of the "make build" process.
+#
+
+check-tools: .PHONY
+.if ${TOOLCHAIN_MISSING} != "no" && !defined(EXTERNAL_TOOLCHAIN)
+	@echo '*** WARNING:  Building on MACHINE=${MACHINE} with missing toolchain.'
+	@echo '*** May result in a failed build or corrupt binaries!'
+.elif defined(EXTERNAL_TOOLCHAIN)
+	@echo '*** Using external toolchain rooted at ${EXTERNAL_TOOLCHAIN}.'
 .endif
+.if defined(NBUILDJOBS)
+	@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
 .endif
 
-do-make-tools:
-.if defined(USE_NEW_TOOLCHAIN)
-	cd ${.CURDIR}/tools && ${MAKE} ${_M} build
+# Delete or sanitise a leftover METALOG from a previous build.
+clean_METALOG: .PHONY .MAKE
+.if ${MKUPDATE} != "no"
+	${MAKEDIRTARGET} distrib/sets clean_METALOG
 .endif
 
-do-make-includes:
-.if !defined(NOINCLUDES)
-	${MAKE} ${_M} includes
+do-distrib-dirs: .PHONY .MAKE
+.if !defined(DESTDIR) || ${DESTDIR} == ""
+	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
+.else
+	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=${DESTDIR}
 .endif
 
-do-lib-csu:
-	(cd ${.CURDIR}/lib/csu && \
-	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
-	    ${MAKE} ${_M} MKSHARE=no install)
+.for targ in cleandir obj includes
+do-${targ}: .PHONY ${targ}
+	@true
+.endfor
+
+do-tools: .PHONY .MAKE
+	${MAKEDIRTARGET} tools build_install
 
-do-lib:
-	(cd ${.CURDIR}/lib && \
-	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
-	    ${MAKE} ${_M} MKSHARE=no install)
+do-lib: .PHONY .MAKE
+	${MAKEDIRTARGET} lib build_install
 
-do-gnu-lib:
-	(cd ${.CURDIR}/gnu/lib && \
-	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
-	    ${MAKE} ${_M} MKSHARE=no install)
+do-compat-lib: .PHONY .MAKE
+	${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib"
 
-do-dependall:
-	${MAKE} ${_M} ${_J} dependall && ${MAKE} ${_M} _BUILD= install
+do-top-obj: .PHONY .MAKE
+	${MAKEDIRTARGET} . obj NOSUBDIR=
 
-do-domestic:
-.if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM)
-	(cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_M} ${_J} _SLAVE_BUILD= build)
+do-tools-obj: .PHONY .MAKE
+	${MAKEDIRTARGET} tools obj
+
+do-build: .PHONY .MAKE
+.for targ in dependall install
+	${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
+.endfor
+
+do-x11: .PHONY .MAKE
+.if ${MKX11} != "no"
+	${MAKEDIRTARGET} external/mit/xorg/tools all
+	${MAKEDIRTARGET} external/mit/xorg/lib build_install
+.if ${MKCOMPATX11} != "no"
+	${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
+.endif
+.else
+	@echo "MKX11 is not enabled"
+	@false
 .endif
 
-do-whatisdb:
-	${MAKE} ${_M} whatis.db
+do-extsrc: .PHONY .MAKE
+.if ${MKEXTSRC} != "no"
+	${MAKEDIRTARGET} extsrc build
+.else
+	@echo "MKEXTSRC is not enabled"
+	@false
+.endif
 
-release snapshot: build
-	(cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release)
+do-obsolete: .PHONY .MAKE
+	${MAKEDIRTARGET} etc install-obsolete-lists
+
+#
+# Speedup stubs for some subtrees that don't need to run these rules.
+# (Tells <bsd.subdir.mk> not to recurse for them.)
+#
+
+.for dir in bin etc distrib games libexec regress sbin usr.bin usr.sbin tools
+includes-${dir}: .PHONY
+	@true
+.endfor
+.for dir in etc distrib regress
+install-${dir}: .PHONY
+	@true
+.endfor
+
+#
+# XXX this needs to change when distrib Makefiles are recursion compliant
+# XXX many distrib subdirs need "cd etc && make snap_pre snap_kern" first...
+#
+dependall-distrib depend-distrib all-distrib: .PHONY
+	@true
 
+.include <bsd.obj.mk>
+.include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>