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.186
retrieving revision 1.192
diff -u -p -r1.186 -r1.192
--- src/Makefile	2002/09/14 16:46:24	1.186
+++ src/Makefile	2002/12/02 08:27:03	1.192
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.186 2002/09/14 16:46:24 thorpej Exp $
+#	$NetBSD: Makefile,v 1.192 2002/12/02 08:27:03 lukem 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
@@ -51,7 +51,7 @@
 #   do-lib-libc:     builds and installs prerequisites from lib/libc.
 #   do-lib:          builds and installs prerequisites from lib.
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
-#   do-ld.elf_so:    builds and installs prerequisites from libexec/ld.elf_so
+#   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.
 #   do-build:        builds and installs the entire system.
 
 .if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == ""
@@ -140,7 +140,7 @@ BUILDTARGETS+=	do-distrib-dirs
 .if !defined(NOINCLUDES)
 BUILDTARGETS+=	includes
 .endif
-BUILDTARGETS+=	do-lib-csu do-lib-libc do-lib do-gnu-lib do-ld.elf_so do-build
+BUILDTARGETS+=	do-lib-csu do-lib-libc do-lib do-gnu-lib do-ld.so do-build
 
 # Enforce proper ordering of some rules.
 
@@ -150,14 +150,17 @@ includes-gnu:	includes-lib
 
 # Build the system and install into DESTDIR.
 
+START_TIME!=	date
+
 build:
 .if defined(BUILD_DONE)
 	@echo "Build already installed into ${DESTDIR}"
 .else
-	@printf "Build started at: " && date
+	@echo "Build started at: ${START_TIME}"
 .for tgt in ${BUILDTARGETS}
 	@(cd ${.CURDIR} && ${MAKE} ${tgt})
 .endfor
+	@echo   "Build started at:  ${START_TIME}"
 	@printf "Build finished at: " && date
 .endif
 
@@ -170,6 +173,7 @@ distribution:
 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
 	(cd ${.CURDIR}/distrib/sets && ${MAKE} checkflist)
 .endif
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
 
 # Build a release or snapshot (implies "make build").  Note that
@@ -179,15 +183,17 @@ distribution:
 release snapshot:
 	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release)
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
 
 # Special components of the "make build" process.
 
 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!'
+.if ${TOOLCHAIN_MISSING} == "yes" && !defined(EXTERNAL_TOOLCHAIN)
+	@echo '*** WARNING:  Building on MACHINE=${MACHINE} with missing toolchain.'
+	@echo '*** May result in a failed build or corrupt binaries!'
+.elif defined(EXTERNAL_TOOLCHAIN)
+	@echo '*** Using external toolchain rooted at ${EXTERNAL_TOOLCHAIN}.'
 .endif
 .if defined(NBUILDJOBS)
 	@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
@@ -200,6 +206,11 @@ do-distrib-dirs:
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs)
 .endif
 
+.for targ in cleandir obj includes
+do-${targ}: ${targ}
+	@true
+.endfor
+
 .for dir in tools lib/csu lib/libc lib gnu/lib
 do-${dir:S/\//-/}:
 .for targ in dependall install
@@ -207,9 +218,14 @@ do-${dir:S/\//-/}:
 .endfor
 .endfor
 
-do-ld.elf_so:
+do-ld.so:
 .for targ in dependall install
+.if (${OBJECT_FMT} == "a.out")
+	(cd ${.CURDIR}/libexec/ld.aout_so && ${MAKE} ${targ})
+.endif
+.if (${OBJECT_FMT} == "ELF")
 	(cd ${.CURDIR}/libexec/ld.elf_so && ${MAKE} ${targ})
+.endif
 .endfor
 
 do-build:
@@ -237,5 +253,5 @@ dependall-distrib depend-distrib all-dis
 .include <bsd.subdir.mk>
 
 build-docs: ${.CURDIR}/BUILDING
-${.CURDIR}/BUILDING: BUILDING.mdoc
+${.CURDIR}/BUILDING: doc/BUILDING.mdoc
 	groff -mdoc -Tascii -P-b -P-u -P-o $> >$@