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.90
retrieving revision 1.127
diff -u -p -r1.90 -r1.127
--- src/Makefile	1999/02/18 14:49:59	1.90
+++ src/Makefile	2001/08/14 14:04:35	1.127
@@ -1,26 +1,90 @@
-#	$NetBSD: Makefile,v 1.90 1999/02/18 14:49:59 mellon Exp $
+#	$NetBSD: Makefile,v 1.127 2001/08/14 14:04:35 tv Exp $
 
-.include <bsd.own.mk>			# for configuration variables.
+# 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
+#
+# Not everything you can set or do is documented in this makefile. In
+# particular, you should review the files in /usr/share/mk (especially
+# bsd.README) for general information on building programs and writing
+# Makefiles within this structure, and see the comments in src/etc/Makefile
+# for further information on installation and release set options.
+#
+# Variables listed below can be set on the make command line (highest
+# priority), in /etc/mk.conf (middle priority), or in the environment
+# (lowest priority).
+#
+# Variables:
+#   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 
+#	an appropriate point in a build.
+#   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, 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
+#	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.
 
-# Configurations variables (can be set either in /etc/mk.conf or
-# as environement variable
-# NBUILDJOBS:	the number of jobs to start in parallel in a 'make build'.
-#		defaults to 1
-# MKMAN:	if set to no, don't build and install man pages
-# MKSHARE:	if set to no, don't build or install /usr/share stuffs
-# UPDATE:	if set to 1, don't do a 'make cleandir' before compile
-# DESTDIR:	The target directory for installation (default to '/',
-#		which mean the current system is updated).
+.include <bsd.own.mk>
 
-HAVE_GCC28!=	${CXX} --version | egrep "^(2\.8|egcs)" ; echo
+.if defined(USE_NEW_TOOLCHAIN)
+.include "${.CURDIR}/tools/Makefile.tools"
+.endif
+
+MKOBJDIRS ?= no
 
 .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(cleandir) || make(obj)
+SUBDIR+= distrib
+.ifdef MAKEOBJDIRPREFIX
+SUBDIR+= etc
+.endif
+.endif
+
+includes-lib: includes-include includes-sys
 
 .if exists(games)
 SUBDIR+= games
@@ -30,19 +94,6 @@ SUBDIR+= gnu
 # This is needed for libstdc++ and gen-params.
 includes-gnu: includes-include includes-sys
 
-# Descend into the domestic tree if it exists AND
-#  1) the target is clean, cleandir, or obj, OR
-#  2) the the target is install or includes AND NOT
-#    a) compiling only "exportable" code OR
-#    b) doing it as part of build.
-
-.if exists(domestic) && \
-    (make(clean) || make(cleandir) || make(obj) || \
-    ((make(includes) || make(install)) && \
-    !(defined(EXPORTABLE_SYSTEM) || defined(_BUILD))))
-SUBDIR+= domestic
-.endif
-
 .if exists(regress)
 .ifmake !(install)
 SUBDIR+= regress
@@ -50,73 +101,131 @@ SUBDIR+= regress
 
 regression-tests:
 	@echo Running regression tests...
-	@(cd ${.CURDIR}/regress && ${MAKE} regress)
+	@(cd ${.CURDIR}/regress && ${MAKE} ${_M} regress)
 .endif
 
-beforeinstall:
-.ifmake build
+buildstartmsg:
 	@echo -n "Build started at: "
 	@date
-.endif
+
+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)
+.endif
 .else
 	(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
 .endif
+.endif
 
 afterinstall:
 .if ${MKMAN} != "no" && !defined(_BUILD)
-	${MAKE} whatis.db
+	${MAKE} ${_M} whatis.db
 .endif
 
 whatis.db:
-	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
+	(cd ${.CURDIR}/share/man && ${MAKE} ${_M} makedb)
 
 # 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.
 
-build: beforeinstall
+.if defined(BUILD_DONE)
+build:
+	@echo "Build 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.'
+	@false
+.endif
+
+do-share-mk:
 .if ${MKSHARE} != "no"
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
 .endif
-.if !defined(UPDATE)
-	${MAKE} cleandir
+
+do-cleandir:
+.if !defined(UPDATE) && !defined(NOCLEANDIR)
+	${MAKE} ${_J} ${_M} cleandir
 .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} depend && ${MAKE} ${_J} MKMAN=no && \
-	    ${MAKE} MKMAN=no install && ${MAKE} cleandir)
+
+do-make-obj:
+.if ${MKOBJDIRS} != "no"
+	${MAKE} ${_J} ${_M} obj
+.if defined(USE_NEW_TOOLCHAIN)
+	cd ${.CURDIR}/tools && ${MAKE} ${_M} obj
 .endif
 .endif
-	${MAKE} _BUILD= includes
+
+do-make-tools:
+.if defined(USE_NEW_TOOLCHAIN)
+	cd ${.CURDIR}/tools && ${MAKE} ${_M} build
+.endif
+
+do-make-includes:
+.if !defined(NOINCLUDES)
+	${MAKE} ${_M} includes
+.endif
+
+do-lib-csu:
 	(cd ${.CURDIR}/lib/csu && \
-	    ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
-	    ${MAKE} MKMAN=no install)
+	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
+	    ${MAKE} ${_M} MKSHARE=no install)
+
+do-lib:
 	(cd ${.CURDIR}/lib && \
-	    ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
-	    ${MAKE} MKMAN=no install)
+	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
+	    ${MAKE} ${_M} MKSHARE=no install)
+
+do-gnu-lib:
 	(cd ${.CURDIR}/gnu/lib && \
-	    ${MAKE} depend && ${MAKE} ${_J} MKMAN=no MKINFO=no && \
-	    ${MAKE} MKMAN=no MKINFO=no install)
-	(cd ${.CURDIR}/gnu/usr.bin/texinfo && \
-	    ${MAKE} depend && ${MAKE} ${_J} MKMAN=no MKINFO=no && \
-	    ${MAKE} MKMAN=no MKINFO=no install)
-	${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install
-.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
-	(cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build)
+	    ${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
-	${MAKE} whatis.db
-	@echo -n "Build finished at: "
-	@date
+
+do-whatisdb:
+	${MAKE} ${_M} whatis.db
 
 release snapshot: build
-	(cd ${.CURDIR}/etc && make INSTALL_DONE=1 release)
+	(cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release)
 
 .include <bsd.subdir.mk>