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.112
retrieving revision 1.135
diff -u -p -r1.112 -r1.135
--- src/Makefile	2000/04/10 14:47:22	1.112
+++ src/Makefile	2001/10/10 17:20:15	1.135
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.112 2000/04/10 14:47:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.135 2001/10/10 17:20:15 jwise 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
@@ -24,9 +24,14 @@
 #   MKSHARE, if set to `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 will avoid a `make cleandir' at the start of `make build',
-#	as well as having the effects listed in /usr/share/mk/bsd.README.
+#	`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.
+#   NOCLEANDIR, if defined, will avoid a `make cleandir' at the start
+#     of the `make build'.
+#   NOINCLUDES will avoid the `make includes' usually done by `make build'.
+
 #
 # Targets:
 #   build: builds a full release of netbsd in DESTDIR. If BUILD_DONE is
@@ -35,30 +40,42 @@
 #	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.
+#   do-make-tools: builds host toolchain.
+#   do-distrib-dirs: creates the distribution directories.
+#   do-force-domestic: check's that FORCE_DOMESTIC isn't set (deprecated.)
+#   do-cleandir: cleans the tree.
+#   do-make-obj: creates object directories if required.
+#   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.
 
-SRCTOP=.
-.include <bsd.crypto.mk>		# for configuration variables.
-
-.if defined(CRYPTOPATH)
-.sinclude "${CRYPTOPATH}/Makefile.frag"
-.endif
+.include "${.CURDIR}/share/mk/bsd.own.mk"
 
 MKOBJDIRS ?= no
-HAVE_GCC28!=	${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 
 .if defined(NBUILDJOBS)
 _J= -j${NBUILDJOBS}
 .endif
 
-.if defined(DESTDIR)
-_M=-m ${DESTDIR}/usr/share/mk
-.endif
-
 # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
 
 SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
-.if make(obj)
+.if make(cleandir) || make(obj)
 SUBDIR+= distrib
+.if ${USETOOLS} != "no"
+SUBDIR+= tools
+.endif
+.ifdef MAKEOBJDIRPREFIX
+SUBDIR+= etc
+.endif
 .endif
 
 includes-lib: includes-include includes-sys
@@ -81,18 +98,13 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} ${_M} regress)
 .endif
 
-buildmsg:
+buildstartmsg:
 	@echo -n "Build started at: "
 	@date
 
-beforeinstall:
-.ifndef NODISTRIBDIRS
-.ifndef DESTDIR
-	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
-.else
-	(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
-.endif
-.endif
+buildendmsg:
+	@echo -n "Build finished at: "
+	@date
 
 afterinstall:
 .if ${MKMAN} != "no" && !defined(_BUILD)
@@ -109,59 +121,103 @@ whatis.db:
 build:
 	@echo "Build installed into ${DESTDIR}"
 .else
-build: buildmsg beforeinstall
+build:
+	@${MAKE} ${_M} buildstartmsg
+	@${MAKE} ${_M} do-make-tools
+	@${MAKE} ${_M} do-distrib-dirs
+	@${MAKE} ${_M} do-force-domestic
+	@${MAKE} ${_M} do-cleandir
+	@${MAKE} ${_M} do-make-obj
+	@${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-make-tools:
+.if ${USETOOLS} != "no"
+.if ${MKOBJDIRS} != "no"
+	cd ${.CURDIR}/tools && ${MAKE} ${_M} obj
+.endif
+	cd ${.CURDIR}/tools && ${MAKE} ${_M} build
+.endif
+
+do-distrib-dirs:
+.ifndef NODISTRIBDIRS
+.ifndef DESTDIR
+	(cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=/ distrib-dirs)
+.else
+	(cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=${DESTDIR} distrib-dirs)
+.endif
+.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.'
 	@false
 .endif
-.if ${MKSHARE} != "no"
-	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-.endif
+
+do-cleandir:
 .if !defined(UPDATE) && !defined(NOCLEANDIR)
-	${MAKE} ${_M} cleandir
+	${MAKE} ${_J} ${_M} cleandir
 .endif
+
+do-make-obj:
 .if ${MKOBJDIRS} != "no"
-	${MAKE} obj
-.endif
-.if empty(HAVE_GCC28)
-.if defined(DESTDIR)
-	@echo "*** CAPUTE!"
-	@echo "    You attempted to compile the world without egcs.  You must"
-	@echo "    first install a native egcs compiler."
-	@false
-.else
-	(cd ${.CURDIR}/gnu/usr.bin/egcs && \
-	    ${MAKE} ${_M} ${_J} dependall MKMAN=no && \
-	    ${MAKE} ${_M} MKMAN=no install && ${MAKE} ${_M} cleandir)
-.endif
+	${MAKE} ${_J} ${_M} obj
 .endif
+
+do-make-includes:
 .if !defined(NOINCLUDES)
 	${MAKE} ${_M} includes
 .endif
+
+do-lib-csu:
 	(cd ${.CURDIR}/lib/csu && \
-	    ${MAKE} ${_M} ${_J} MKMAN=no dependall && \
-	    ${MAKE} ${_M} MKMAN=no install)
+	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
+	    ${MAKE} ${_M} MKSHARE=no install)
+
+do-lib:
 	(cd ${.CURDIR}/lib && \
-	    ${MAKE} ${_M} ${_J} MKMAN=no MKINFO=no dependall && \
-	    ${MAKE} ${_M} MKMAN=no MKINFO=no install)
+	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
+	    ${MAKE} ${_M} MKSHARE=no install)
+
+do-gnu-lib:
 	(cd ${.CURDIR}/gnu/lib && \
-	    ${MAKE} ${_M} ${_J} MKMAN=no MKINFO=no dependall && \
-	    ${MAKE} ${_M} MKMAN=no MKINFO=no install)
-.if target(cryptobuild)
-	${MAKE} ${_M} ${_J} cryptobuild
-.endif
+	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
+	    ${MAKE} ${_M} MKSHARE=no install)
+
+do-dependall:
 	${MAKE} ${_M} ${_J} dependall && ${MAKE} ${_M} _BUILD= install
+
+do-domestic:
 .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM)
 	(cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_M} ${_J} _SLAVE_BUILD= build)
 .endif
+
+do-whatisdb:
 	${MAKE} ${_M} whatis.db
-	@echo -n "Build finished at: "
-	@date
-.endif
 
 release snapshot: build
 	(cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release)
 
-.include <bsd.subdir.mk>
+# Speedup stubs for some subtrees that don't need to run these rules
+includes-bin includes-games includes-libexec includes-regress \
+includes-sbin includes-usr.sbin:
+	@${TRUE}
+
+.if !exists(${.CURDIR}/share/mk)
+.BEGIN:
+	@echo 'BUILD ABORTED: share/mk does not exist, cannot run make.'
+	@false
+.endif
+
+.include "${.CURDIR}/share/mk/bsd.subdir.mk"
+
+_M:=	-m ${.CURDIR}/share/mk