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.130
retrieving revision 1.202
diff -u -p -r1.130 -r1.202
--- src/Makefile	2001/09/22 05:37:17	1.130
+++ src/Makefile	2003/04/04 01:06:00	1.202
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.130 2001/09/22 05:37:17 tv Exp $
+#	$NetBSD: Makefile,v 1.202 2003/04/04 01:06:00 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
 # information, see http://www.netbsd.org/developers/releng/index.html
@@ -19,198 +20,330 @@
 #	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:
-#   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.)
-#   snapshot: a synonym for release.
-#
-# Sub targets of `make build,' in order:
-#   buildstartmsg: displays the start time of the build.
-#   beforeinstall: creates the distribution directories.
-#   do-force-domestic: check's that FORCE_DOMESTIC isn't set (deprecated.)
-#   do-cleandir: cleans the tree.
-#   do-make-obj: creates object directories if required.
-#   do-make-tools: builds host toolchain.
-#   do-make-includes: install include files.
-#   do-lib-csu: build & install startup object files.
-#   do-lib: build & install system libraries.
-#   do-gnu-lib: build & install gnu system libraries.
-#   do-dependall: builds & install the entire system.
-#   do-domestic: build & install the domestic tree (deprecated.)
-#   do-whatisdb: build & install the `whatis.db' man database.
-#   buildendmsg: displays the end time of the build.
+#   build:
+#	Builds a full release of NetBSD in DESTDIR, except for the
+#	/etc configuration files.
+#	If BUILD_DONE is set, this is an empty target.
+#   distribution:
+#	Builds a full release of NetBSD in DESTDIR, including the /etc
+#	configuration files.
+#   buildworld:
+#	As per `make distribution', except that it ensures that DESTDIR
+#	is not the root directory.
+#   installworld:
+#	Install the distribution from DESTDIR to INSTALLWORLDDIR (which
+#	defaults to the root directory).  Ensures that INSTALLWORLDDIR
+#	is the not root directory if cross compiling.
+#   release:
+#	Does a `make build', and then tars up the DESTDIR files
+#	into RELEASEDIR/${MACHINE}, 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:
+#   cleandir:        cleans the tree.
+#   obj:             creates object directories.
+#   do-tools:        builds host toolchain.
+#   do-tools-compat: builds the "libnbcompat" library; needed for some
+#                    random host tool programs in the source tree.
+#   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-libcrypt: builds and installs prerequisites from lib/libcrypt.
+#   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.
+#
 
-.include <bsd.own.mk>
+.if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == ""
+.MAKEFLAGS: -m ${.CURDIR}/share/mk
+.endif
 
-MKOBJDIRS ?= no
+#
+# 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_=
 
-.if defined(NBUILDJOBS)
-_J= -j${NBUILDJOBS}
-.endif
+.include <bsd.own.mk>
 
-# NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
+#
+# Sanity check: make sure that "make build" is not invoked simultaneously
+# with a standard recursive target.
+#
 
-SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
-.if make(cleandir) || make(obj)
-SUBDIR+= distrib
-.ifdef MAKEOBJDIRPREFIX
-SUBDIR+= etc
+.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
 
-includes-lib: includes-include includes-sys
-
-.if exists(games)
-SUBDIR+= games
-.endif
+_SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin
+_SUBDIR+=	usr.sbin share rescue sys etc distrib regress
 
-SUBDIR+= gnu
-# This is needed for libstdc++ and gen-params.
-includes-gnu: includes-include includes-sys
+#
+# Weed out directories that don't exist.
+#
 
-.if exists(regress)
-.ifmake !(install)
-SUBDIR+= regress
+.for dir in ${_SUBDIR}
+.if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
+SUBDIR+=	${dir}
 .endif
+.endfor
 
+.if exists(regress)
 regression-tests:
 	@echo Running regression tests...
-	@(cd ${.CURDIR}/regress && ${MAKE} ${_M} regress)
+	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-buildstartmsg:
-	@echo -n "Build started at: "
-	@date
-
-buildendmsg:
-	@echo -n "Build finished at: "
-	@date
+.if defined(UNPRIVED)
+NOPOSTINSTALL=	# defined
+.endif
 
-beforeinstall:
-.ifndef NODISTRIBDIRS
-.ifndef DESTDIR
-	(cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=/ distrib-dirs)
-.else
-	(cd ${.CURDIR}/etc && ${MAKE} ${_M} DESTDIR=${DESTDIR} distrib-dirs)
+afterinstall:
+.if ${MKMAN} != "no"
+	(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
 
-afterinstall:
-.if ${MKMAN} != "no" && !defined(_BUILD)
-	${MAKE} ${_M} whatis.db
+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".
+#
+
+BUILDTARGETS+=	check-tools
+.if !defined(UPDATE) && !defined(NOCLEANDIR)
+BUILDTARGETS+=	cleandir
+.endif
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	obj
 .endif
+.if ${USETOOLS} == "yes"
+BUILDTARGETS+=	do-tools
+.endif
+.if !defined(NODISTRIBDIRS)
+BUILDTARGETS+=	do-distrib-dirs
+.endif
+.if !defined(NOINCLUDES)
+BUILDTARGETS+=	includes
+.endif
+BUILDTARGETS+=	do-tools-compat
+BUILDTARGETS+=	do-lib-csu do-lib-libc do-lib-libcrypt do-lib do-gnu-lib do-ld.so do-build
+BUILDTARGETS+=	do-obsolete
 
-whatis.db:
-	(cd ${.CURDIR}/share/man && ${MAKE} ${_M} 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 the system and install into DESTDIR.
+#
+
+START_TIME!=	date
 
-.if defined(BUILD_DONE)
 build:
-	@echo "Build installed into ${DESTDIR}"
+.if defined(BUILD_DONE)
+	@echo "Build already installed into ${DESTDIR}"
 .else
-build:
-	@${MAKE} ${_M} buildstartmsg
-	@${MAKE} ${_M} beforeinstall
-	@${MAKE} ${_M} do-force-domestic
-	@${MAKE} ${_M} do-cleandir
-	@${MAKE} ${_M} do-make-obj
-	@${MAKE} ${_M} do-make-tools
-	@${MAKE} ${_M} do-make-includes
-	@${MAKE} ${_M} do-lib-csu
-	@${MAKE} ${_M} do-lib
-	@${MAKE} ${_M} do-gnu-lib
-	@${MAKE} ${_M} do-dependall
-	@${MAKE} ${_M} do-domestic
-	@${MAKE} ${_M} do-whatisdb
-	@${MAKE} ${_M} buildendmsg
-.endif
-
-do-force-domestic:
-.if defined(FORCE_DOMESTIC)
-	@echo '*** CAPUTE!'
-	@echo '    The FORCE_DOMESTIC flag is not compatible with "make build".'
-	@echo '    Please correct the problem and try again.'
-	@false
+	@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
 
-do-cleandir:
-.if !defined(UPDATE) && !defined(NOCLEANDIR)
-	${MAKE} ${_J} ${_M} cleandir
-.endif
+#
+# Build a full distribution, but not a release (i.e. no sets into
+# ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
+#
 
-do-make-obj:
-.if ${MKOBJDIRS} != "no"
-	${MAKE} ${_J} ${_M} obj
-	cd ${.CURDIR}/tools && ${MAKE} ${_M} obj
+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}.
+#
 
-do-make-tools:
-	cd ${.CURDIR}/tools && ${MAKE} ${_M} build
+HOST_UNAME_S!=	uname -s
+HOST_UNAME_M!=	uname -m
 
-do-make-includes:
-.if !defined(NOINCLUDES)
-	${MAKE} ${_M} includes
+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
 
-do-lib-csu:
-	(cd ${.CURDIR}/lib/csu && \
-	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
-	    ${MAKE} ${_M} MKSHARE=no install)
+#
+# Create sets from $DESTDIR into $RELEASEDIR
+#
 
-do-lib:
-	(cd ${.CURDIR}/lib && \
-	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
-	    ${MAKE} ${_M} MKSHARE=no install)
+sets:
+	(cd ${.CURDIR}/distrib/sets && ${MAKE} maketars)
 
-do-gnu-lib:
-	(cd ${.CURDIR}/gnu/lib && \
-	    ${MAKE} ${_M} ${_J} MKSHARE=no dependall && \
-	    ${MAKE} ${_M} MKSHARE=no install)
+#
+# 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.
+#
 
-do-dependall:
-	${MAKE} ${_M} ${_J} dependall && ${MAKE} ${_M} _BUILD= install
+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
 
-do-domestic:
-.if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM)
-	(cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_M} ${_J} _SLAVE_BUILD= build)
+#
+# Special components of the "make build" process.
+#
+
+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-whatisdb:
-	${MAKE} ${_M} whatis.db
+do-distrib-dirs:
+.if !defined(DESTDIR) || ${DESTDIR} == ""
+	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
+.else
+	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs)
+.endif
 
-release snapshot: build
-	(cd ${.CURDIR}/etc && ${MAKE} ${_M} INSTALL_DONE=1 release)
+.for targ in cleandir obj includes
+do-${targ}: ${targ}
+	@true
+.endfor
+
+<<<<<<< Makefile
+.for dir in tools tools/compat lib/csu lib/libc lib gnu/lib
+=======
+.for dir in tools lib/csu lib/libc lib/libcrypt lib gnu/lib
+>>>>>>> 1.201
+do-${dir:S/\//-/}:
+.for targ in dependall install
+	(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:
+.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
-includes-bin includes-games includes-libexec includes-regress \
-includes-sbin includes-usr.sbin:
-	@${TRUE}
+do-obsolete:
+	(cd ${.CURDIR}/etc && ${MAKE} install-obsolete-lists)
 
-.if !exists(${.CURDIR}/share/mk)
-.BEGIN:
-	@echo 'BUILD ABORTED: share/mk does not exist, cannot run make.'
-	@false
-.endif
+#
+# Speedup stubs for some subtrees that don't need to run these rules.
+# (Tells <bsd.subdir.mk> not to recurse for them.)
+#
+
+.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>
 
-_M:=	-m ${.CURDIR}/share/mk
+build-docs: ${.CURDIR}/BUILDING
+${.CURDIR}/BUILDING: doc/BUILDING.mdoc
+	groff -mdoc -Tascii -P-b -P-u -P-o $> >$@