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.85
retrieving revision 1.142
diff -u -p -r1.85 -r1.142
--- src/Makefile	1999/02/11 17:56:46	1.85
+++ src/Makefile	2001/10/24 02:45:34	1.142
@@ -1,117 +1,169 @@
-#	$NetBSD: Makefile,v 1.85 1999/02/11 17:56:46 tv Exp $
+#	$NetBSD: Makefile,v 1.142 2001/10/24 02:45:34 tv Exp $
 
-.include <bsd.own.mk>			# for configuration variables.
-
-# 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
-# NOMAN: if set to 1, don't build and install man pages
-# NOSHARE: if set to 1, 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).
-
-HAVE_GCC28!=	${CXX} --version | egrep "^(2\.8|egcs)" ; echo
+# 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.)
+#   regression-tests:
+#	Runs the regression tests in "regress" on this host.
+#
+# Targets invoked by `make build,' in order:
+#   obj:             creates object directories.
+#   cleandir:        cleans the tree.
+#   do-make-tools:   builds host toolchain.
+#   do-distrib-dirs: creates the distribution directories.
+#   includes:        installs include files.
+#   do-build:        builds and installs the entire system.
+
+.include "${.CURDIR}/share/mk/bsd.own.mk"
+
+# Sanity check: make sure that "make build" is not invoked simultaneously
+# with a standard recursive target.
+
+.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}
+_J=		-j${NBUILDJOBS}
 .endif
 
-# NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
-
-SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
-
-.if exists(games)
-SUBDIR+= games
+.if ${USETOOLS} == "yes"
+_SUBDIR+=	tools
 .endif
+_SUBDIR+=	lib include gnu bin games libexec sbin usr.bin \
+		usr.sbin share sys etc distrib regress
 
-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.
+# Weed out directories that don't exist.
 
-.if exists(domestic) && \
-    (make(clean) || make(cleandir) || make(obj) || \
-    ((make(includes) || make(install)) && \
-    !(defined(EXPORTABLE_SYSTEM) || defined(_BUILD))))
-SUBDIR+= domestic
+.for dir in ${_SUBDIR}
+.if exists(${dir}/Makefile)
+SUBDIR+=	${dir}
 .endif
+.endfor
 
 .if exists(regress)
-.ifmake !(install)
-SUBDIR+= regress
-.endif
-
 regression-tests:
 	@echo Running regression tests...
-	@(cd ${.CURDIR}/regress && ${MAKE} regress)
+	@cd ${.CURDIR}/regress && ${MAKE} ${_M} regress
 .endif
 
-beforeinstall:
-.ifmake build
-	@echo -n "Build started at: "
-	@date
-.endif
-.ifndef DESTDIR
-	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
-.else
-	(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
+.if ${MKMAN} != "no"
+afterinstall: whatis.db
+whatis.db:
+	cd ${.CURDIR}/share/man && ${MAKE} ${_M} makedb
 .endif
 
-afterinstall:
-.if !defined(NOMAN) && !defined(NOSHARE) && !defined(_BUILD)
-	${MAKE} whatis.db
+# Targets (in order!) called by "make build".
+
+.if ${MKOBJDIRS:Uno} != "no"
+BUILDTARGETS+=	obj
+.endif
+.if !defined(UPDATE) && !defined(NOCLEANDIR)
+BUILDTARGETS+=	cleandir
+.endif
+.if ${USETOOLS} == "yes"
+BUILDTARGETS+=	do-make-tools
 .endif
+.if !defined(NODISTRIBDIRS)
+BUILDTARGETS+=	do-distrib-dirs
+.endif
+.if !defined(NOINCLUDES)
+BUILDTARGETS+=	includes
+.endif
+BUILDTARGETS+=	do-build
 
-whatis.db:
-	(cd ${.CURDIR}/share/man && ${MAKE} 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:	includes-include includes-sys
+includes-gnu:	includes-lib
 
-build: beforeinstall
-.if !defined(NOSHARE)
-	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
-.endif
-.if !defined(UPDATE)
-	${MAKE} 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
+# Build the system and install into DESTDIR.
+
+build:
+.if defined(BUILD_DONE)
+	@echo "Build already installed into ${DESTDIR}"
 .else
-	(cd ${.CURDIR}/gnu/usr.bin/egcs && \
-	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && \
-	    ${MAKE} NOMAN= install && ${MAKE} cleandir)
-.endif
-.endif
-	${MAKE} _BUILD= includes
-	(cd ${.CURDIR}/lib/csu && \
-	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
-	(cd ${.CURDIR}/lib && \
-	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
-	(cd ${.CURDIR}/gnu/lib && \
-	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
-.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
-	(cd ${.CURDIR}/domestic/lib && \
-	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
-.endif
-	${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install
-.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
-	(cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build)
-.endif
-	${MAKE} whatis.db
-	@echo -n "Build finished at: "
-	@date
+	@echo -n "Build started at: " && date
+	@${MAKE} ${_J} ${_M} ${BUILDTARGETS}
+	@echo -n "Build finished at: " && date
+.endif
+
+# Build a release or snapshot (implies "make build").
+
+release snapshot: build
+	cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release
+
+# Special components of the "make build" process.
+
+do-make-tools:
+	cd ${.CURDIR}/tools && ${MAKE} ${_M} build
+
+do-distrib-dirs:
+	cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=${DESTDIR} distrib-dirs
+
+do-build:
+.for dir in lib/csu lib gnu/lib
+.for targ in dependall install
+	cd ${.CURDIR}/${dir} && \
+		${MAKE} ${_M} ${_J} MKSHARE=no MKLINT=no ${targ}
+.endfor
+.endfor
+	${MAKE} ${_M} ${_J} dependall
+	${MAKE} ${_M} ${_J} install
+
+# Speedup stubs for some subtrees that don't need to run these rules.
+# (Tells <bsd.subdir.mk> not to recurse for them.)
+
+includes-bin includes-games includes-libexec includes-regress \
+includes-sbin includes-usr.sbin includes-tools \
+dependall-tools depend-tools all-tools install-tools install-regress \
+dependall-distrib depend-distrib all-distrib install-distrib includes-distrib:
+	@true
+
+.include "${.CURDIR}/share/mk/bsd.subdir.mk"
 
-.include <bsd.subdir.mk>
+_M:=	-m ${.CURDIR}/share/mk