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.151
retrieving revision 1.157
diff -u -p -r1.151 -r1.157
--- src/Makefile	2001/11/11 22:40:42	1.151
+++ src/Makefile	2001/11/20 15:20:28	1.157
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.151 2001/11/11 22:40:42 tv Exp $
+#	$NetBSD: Makefile,v 1.157 2001/11/20 15:20:28 thorpej 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.
@@ -77,13 +77,22 @@
 _J=		-j${NBUILDJOBS}
 .endif
 
-_SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin \
-		usr.sbin share sys etc distrib regress
+# NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW.  Also note that
+# distrib does not belong here, either, as it is a very special case.
+_SUBDIR+=	tools lib include gnu bin games libexec sbin usr.bin \
+		usr.sbin share sys regress
+
+.if make(cleandir) || make(clean) || make(obj)
+_SUBDIR+= distrib
+.ifdef MAKEOBJDIRPREFIX
+_SUBDIR+= etc
+.endif
+.endif  
 
 # 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
@@ -91,25 +100,26 @@ SUBDIR+=	${dir}
 .if exists(regress)
 regression-tests:
 	@echo Running regression tests...
-	@cd ${.CURDIR}/regress && ${MAKE} regress
+	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
 .if ${MKMAN} != "no"
 afterinstall: whatis.db
 whatis.db:
-	cd ${.CURDIR}/share/man && ${MAKE} makedb
+	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
 
 # Targets (in order!) called by "make build".
 
-.if ${MKOBJDIRS} != "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
@@ -133,7 +143,7 @@ build:
 .else
 	@echo -n "Build started at: " && date
 .for tgt in ${BUILDTARGETS}
-	${MAKE} ${_J} ${tgt}
+	@(cd ${.CURDIR} && ${MAKE} ${_J} ${tgt})
 .endfor
 	@echo -n "Build finished at: " && date
 .endif
@@ -141,39 +151,50 @@ build:
 # Build a release or snapshot (implies "make build").
 
 release snapshot: build
-	cd ${.CURDIR}/etc && ${MAKE} 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} 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:
 .if !defined(DESTDIR) || ${DESTDIR} == ""
-	cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs
+	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
 .else
-	cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs
+	(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} ${_J} MKSHARE=no MKLINT=no ${targ}
+	(cd ${.CURDIR}/${dir} && ${MAKE} ${_J} ${targ})
 .endfor
 .endfor
 
 do-build:
-	${MAKE} ${_J} dependall
-	${MAKE} ${_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
+
+# XXX this needs to change when distrib Makefiles are recursion compliant
+dependall-distrib depend-distrib all-distrib:
 	@true
 
 .include <bsd.obj.mk>