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.145
retrieving revision 1.164
diff -u -p -r1.145 -r1.164
--- src/Makefile	2001/10/30 17:59:10	1.145
+++ src/Makefile	2002/03/01 06:02:41	1.164
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.145 2001/10/30 17:59:10 tv Exp $
+#	$NetBSD: Makefile,v 1.164 2002/03/01 06:02:41 jmc 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
@@ -44,9 +44,9 @@
 #	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.
+#   obj:             creates object directories.
+#   do-tools:        builds host toolchain.
 #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.
@@ -54,7 +54,17 @@
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
 #   do-build:        builds and installs the entire system.
 
-.include "${.CURDIR}/share/mk/bsd.own.mk"
+.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>
 
 # Sanity check: make sure that "make build" is not invoked simultaneously
 # with a standard recursive target.
@@ -70,19 +80,21 @@
 .endif
 
 .if defined(NBUILDJOBS)
-_J=		-j${NBUILDJOBS}
+.if !target(.BEGIN)
+.BEGIN:
+	@echo 'NBUILDJOBS is currently broken; see PR toolchain/14837.'
+	@false
 .endif
-
-.if ${USETOOLS} == "yes"
-_SUBDIR+=	tools
+#_J=		-j${NBUILDJOBS}
 .endif
-_SUBDIR+=	lib include gnu bin games libexec sbin usr.bin \
+
+_SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin \
 		usr.sbin share sys etc distrib regress
 
 # Weed out directories that don't exist.
 
 .for dir in ${_SUBDIR}
-.if exists(${dir}/Makefile)
+.if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
 SUBDIR+=	${dir}
 .endif
 .endfor
@@ -90,25 +102,34 @@ SUBDIR+=	${dir}
 .if exists(regress)
 regression-tests:
 	@echo Running regression tests...
-	@cd ${.CURDIR}/regress && ${MAKE} ${_M} regress
+	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-.if ${MKMAN} != "no"
-afterinstall: whatis.db
 whatis.db:
-	cd ${.CURDIR}/share/man && ${MAKE} ${_M} makedb
+.if ${MKMAN} != "no"
+	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
+.endif
+
+# Let install-info track this as it's the program creating/updating the
+# dir file
+infodir-meta:
+.if defined(UNPRIVED) && (${MKINFO} != "no")
+	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
 .endif
 
+afterinstall: whatis.db infodir-meta
+
 # Targets (in order!) called by "make build".
 
-.if ${MKOBJDIRS:Uno} != "no"
-BUILDTARGETS+=	obj
-.endif
+BUILDTARGETS+=	check-tools
 .if !defined(UPDATE) && !defined(NOCLEANDIR)
 BUILDTARGETS+=	cleandir
 .endif
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	obj
+.endif
 .if ${USETOOLS} == "yes"
-BUILDTARGETS+=	do-make-tools
+BUILDTARGETS+=	do-tools
 .endif
 .if !defined(NODISTRIBDIRS)
 BUILDTARGETS+=	do-distrib-dirs
@@ -132,60 +153,72 @@ build:
 .else
 	@echo -n "Build started at: " && date
 .for tgt in ${BUILDTARGETS}
-	${MAKE} ${_J} ${_M} ${tgt}
+	@(cd ${.CURDIR} && ${MAKE} ${_J} ${tgt})
 .endfor
 	@echo -n "Build finished at: " && date
 .endif
 
+# Build a full distribution, but not a release (i.e. no sets into
+# ${RELEASEDIR}).
+
+distribution: build
+	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution)
+
 # Build a release or snapshot (implies "make build").
 
 release snapshot: build
-	cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release
+	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release)
 
 # Special components of the "make build" process.
 
-do-make-tools:
-	cd ${.CURDIR}/tools && ${MAKE} ${_M} build
+check-tools:
+.if defined(USE_NEW_TOOLCHAIN) && (${USE_NEW_TOOLCHAIN} != "nowarn")
+	@echo '*** WARNING:  Building on MACHINE=${MACHINE} with USE_NEW_TOOLCHAIN.'
+	@echo '*** This platform is not yet verified to work with the new toolchain,'
+	@echo '*** and may result in a failed build or corrupt binaries!'
+.endif
 
 do-distrib-dirs:
-	cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=${DESTDIR} distrib-dirs
+.if !defined(DESTDIR) || ${DESTDIR} == ""
+	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
+.else
+	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs)
+.endif
 
-.for dir in lib/csu lib gnu/lib
+.for dir in tools lib/csu lib gnu/lib
 do-${dir:S/\//-/}:
 .for targ in dependall install
-	cd ${.CURDIR}/${dir} && \
-		${MAKE} ${_M} ${_J} MKSHARE=no MKLINT=no ${targ}
+	(cd ${.CURDIR}/${dir} && ${MAKE} ${_J} ${targ})
 .endfor
 .endfor
 
 do-build:
-	${MAKE} ${_M} ${_J} dependall
-	${MAKE} ${_M} ${_J} install
+.for targ in dependall install
+	(cd ${.CURDIR} && ${MAKE} ${_J} ${targ} BUILD_tools=no BUILD_lib=no)
+.endfor
 
 # 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:
+.for dir in bin etc distrib games libexec regress sbin usr.sbin tools
+includes-${dir}:
 	@true
+.endfor
+.for dir in etc distrib regress
+install-${dir}:
+	@true
+.endfor
 
-.include "${.CURDIR}/share/mk/bsd.subdir.mk"
-
-_M:=	-m ${.CURDIR}/share/mk
-
-# Rules for building the BUILDING.* documentation files.
-
-build-docs: ${.CURDIR}/BUILDING.txt ${.CURDIR}/BUILDING.html
+# XXX this needs to change when distrib Makefiles are recursion compliant
+dependall-distrib depend-distrib all-distrib:
+	@true
 
-.SUFFIXES: .mdoc .html .txt
+clean:
+	rm -f METALOG
 
-.mdoc.html: ${.CURDIR}/Makefile
-	groff -mdoc2html -Tlatin1 -P-b -P-u -P-o -ww -mtty-char $< >$@
+.include <bsd.obj.mk>
+.include <bsd.subdir.mk>
 
-# The awk expression changes line endings from LF to CR-LF to make
-# this readable on many more platforms than just Un*x.
-.mdoc.txt: ${.CURDIR}/Makefile
-	groff -mdoc -Tascii -P-b -P-u -P-o $< | \
-		awk 'BEGIN{ORS="\r\n"}{print}' >$@
+build-docs: ${.CURDIR}/BUILDING
+${.CURDIR}/BUILDING: BUILDING.mdoc
+	groff -mdoc -Tascii -P-b -P-u -P-o $> >$@