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.194
diff -u -p -r1.151 -r1.194
--- src/Makefile	2001/11/11 22:40:42	1.151
+++ src/Makefile	2002/12/26 12:01:48	1.194
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.151 2001/11/11 22:40:42 tv Exp $
+#	$NetBSD: Makefile,v 1.194 2002/12/26 12:01:48 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
 # information, see http://www.netbsd.org/developers/releng/index.html
@@ -19,17 +20,15 @@
 #	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 
+#   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.
+#	`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'.
+#	of the `make build'.
 #   NOINCLUDES will avoid the `make includes' usually done by `make build'.
 #
 # Targets:
@@ -44,24 +43,37 @@
 #	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.
+#   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.so:        builds and installs prerequisites from libexec/ld.*_so.
 #   do-build:        builds and installs the entire system.
+#
 
 .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.
+#
 
 .if make(build) || make(release) || make(snapshot)
 .for targ in ${TARGETS:Nobj:Ncleandir}
@@ -73,17 +85,15 @@
 .endfor
 .endif
 
-.if defined(NBUILDJOBS)
-_J=		-j${NBUILDJOBS}
-.endif
-
-_SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin \
-		usr.sbin share sys etc distrib regress
+_SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin
+_SUBDIR+=	usr.sbin share rescue 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
@@ -91,25 +101,48 @@ SUBDIR+=	${dir}
 .if exists(regress)
 regression-tests:
 	@echo Running regression tests...
-	@cd ${.CURDIR}/regress && ${MAKE} regress
+	@(cd ${.CURDIR}/regress && ${MAKE} regress)
+.endif
+
+.if defined(UNPRIVED)
+NOPOSTINSTALL=	# defined
 .endif
 
+afterinstall:
 .if ${MKMAN} != "no"
-afterinstall: whatis.db
-whatis.db:
-	cd ${.CURDIR}/share/man && ${MAKE} makedb
+	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
+.endif
+.if defined(UNPRIVED) && (${MKINFO} != "no")
+	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
+.endif
+.if !defined(NOPOSTINSTALL)
+	(cd ${.CURDIR} && ${MAKE} postinstall-check)
 .endif
 
+postinstall-check:
+	@echo "   === Post installation checks ==="
+	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
+	@echo "   ================================"
+
+postinstall-fix: .NOTMAIN
+	@echo "   === Post installation fixes ==="
+	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
+	@echo "   ================================"
+
+
+#
 # 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
@@ -117,68 +150,170 @@ BUILDTARGETS+=	do-distrib-dirs
 .if !defined(NOINCLUDES)
 BUILDTARGETS+=	includes
 .endif
-BUILDTARGETS+=	do-lib-csu do-lib do-gnu-lib 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.
+#
 
 .ORDER:		${BUILDTARGETS}
 includes-lib:	includes-include includes-sys
 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
-	@echo -n "Build started at: " && date
+	@echo "Build started at: ${START_TIME}"
 .for tgt in ${BUILDTARGETS}
-	${MAKE} ${_J} ${tgt}
+	@(cd ${.CURDIR} && ${MAKE} ${tgt})
 .endfor
-	@echo -n "Build finished at: " && date
+	@echo   "Build started at:  ${START_TIME}"
+	@printf "Build finished at: " && date
 .endif
 
-# Build a release or snapshot (implies "make build").
+#
+# Build a full distribution, but not a release (i.e. no sets into
+# ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
+#
 
-release snapshot: build
-	cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release
+distribution buildworld:
+.if make(buildworld) && \
+    (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Won't make ${.TARGET} with DESTDIR=/"
+	@false
+.endif
+	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
+	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 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
 
+#
+# Install the distribution from $DESTDIR to $INSTALLWORLDDIR (defaults to `/')
+# If installing to /, ensures that the host's operating system is NetBSD and
+# the host's `uname -m` == ${MACHINE}.
+#
+
+HOST_UNAME_S!=	uname -s
+HOST_UNAME_M!=	uname -m
+
+installworld:
+.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Can't make ${.TARGET} to DESTDIR=/"
+	@false
+.endif
+.if !defined(INSTALLWORLDDIR) || \
+    ${INSTALLWORLDDIR} == "" || ${INSTALLWORLDDIR} == "/"
+.if (${HOST_UNAME_S} != "NetBSD")
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to NetBSD with INSTALLWORLDDIR=/"
+	@false
+.endif
+.if (${HOST_UNAME_M} != ${MACHINE})
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLWORLDDIR=/"
+	@false
+.endif
+.endif
+	(cd ${.CURDIR}/distrib/sets && \
+	    ${MAKE} INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS= installsets)
+	(cd ${.CURDIR} && \
+	    ${MAKE} DESTDIR=${INSTALLWORLDDIR} postinstall-check)
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Build a release or snapshot (implies "make build").  Note that
+# in this case, the set lists will be checked before the tar files
+# are made.
+#
+
+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.
+#
 
-do-make-tools:
-	cd ${.CURDIR}/tools && ${MAKE} build
+check-tools:
+.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!'
+.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 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
-	cd ${.CURDIR}/${dir} && \
-		${MAKE} ${_J} MKSHARE=no MKLINT=no ${targ}
+	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})
 .endfor
 .endfor
 
+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:
-	${MAKE} ${_J} dependall
-	${MAKE} ${_J} install
+.for targ in dependall install
+	(cd ${.CURDIR} && ${MAKE} ${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
+# XXX many distrib subdirs need "cd etc && make snap_pre snap_kern" first...
+#
+dependall-distrib depend-distrib all-distrib:
 	@true
 
 .include <bsd.obj.mk>
 .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 $> >$@