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.148
retrieving revision 1.234
diff -u -p -r1.148 -r1.234
--- src/Makefile	2001/11/01 15:48:39	1.148
+++ src/Makefile	2004/05/17 07:00:16	1.234
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.148 2001/11/01 15:48:39 jmc Exp $
+#	$NetBSD: Makefile,v 1.234 2004/05/17 07:00:16 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
+# information, see http://www.NetBSD.org/developers/releng/index.html
 #
 # Not everything you can set or do is documented in this makefile. In
 # particular, you should review the files in /usr/share/mk (especially
@@ -18,52 +19,85 @@
 #   DESTDIR is the target directory for installation of the compiled
 #	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 
+#   MKMAN, if `no', will prevent building of manual pages.
+#   MKOBJDIRS, if not `no', will build object directories at
 #	an appropriate point in a build.
-#   MKSHARE, if set to `no', will prevent building and installing
+#   MKSHARE, if `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.
+#   MKUPDATE, if not `no', will avoid a `make cleandir' at the start of
+#	`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'.
 #
+#   See mk.conf(5) for more details.
+#
+#
 # Targets:
 #   build:
-#	Builds a full release of NetBSD in DESTDIR.  If BUILD_DONE is
-#	set, this is an empty target.
+#	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, in release(7) format. (See etc/Makefile for
-#	more information on this.)
+#	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.
+#   sets:
+#	Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR}
+#   sourcesets:
+#	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
 #
 # 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-tools-compat: builds the "libnbcompat" library; needed for some
+#                    random host tool programs in the source tree.
+#   do-gnu-lib-libgcc3: builds and installs prerequisites from gnu/lib/libgcc3
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.
+#   do-lib-libc:     builds and installs prerequisites from lib/libc.
+#   do-lib-libdes:   builds and installs prerequisites from lib/libdes.
 #   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.
+#   do-x11:          builds and installs X11R6 from src/x11 if ${MKX11} != "no"
+#   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
+#
 
 .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_=
 
 .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}
@@ -75,43 +109,74 @@ MKOBJDIRS ?= no
 .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 .WAIT 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
 
 .if exists(regress)
-regression-tests:
+regression-tests: .PHONY
 	@echo Running regression tests...
-	@cd ${.CURDIR}/regress && ${MAKE} regress
+	${MAKEDIRTARGET} regress regress
 .endif
 
+.if ${MKUNPRIVED} != "no"
+NOPOSTINSTALL=	# defined
+.endif
+
+afterinstall: .PHONY
 .if ${MKMAN} != "no"
-afterinstall: whatis.db
-whatis.db:
-	cd ${.CURDIR}/share/man && ${MAKE} makedb
+	${MAKEDIRTARGET} share/man makedb
+.endif
+.if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
+	${MAKEDIRTARGET} gnu/usr.bin/texinfo/install-info infodir-meta
+.endif
+.if !defined(NOPOSTINSTALL)
+	${MAKEDIRTARGET} . postinstall-check
 .endif
 
-# Targets (in order!) called by "make build".
+postinstall-check: .PHONY
+	@echo "   === Post installation checks ==="
+	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
+	@echo "   ================================"
 
-.if ${MKOBJDIRS:Uno} != "no"
-BUILDTARGETS+=	obj
+postinstall-fix: .NOTMAIN .PHONY
+	@echo "   === Post installation fixes ==="
+	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
+	@echo "   ==============================="
+
+postinstall-fix-obsolete: .NOTMAIN .PHONY
+	@echo "   === Removing obsolete files ==="
+	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
+	@echo "   ==============================="
+
+
+#
+# Targets (in order!) called by "make build".
+#
+.if ${USE_TOOLS_TOOLCHAIN} == "no"
+LIBGCC_EXT=3
+.else
+LIBGCC_EXT=
 .endif
-.if !defined(UPDATE) && !defined(NOCLEANDIR)
+
+BUILDTARGETS+=	check-tools
+.if ${MKUPDATE} == "no" && !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
@@ -119,78 +184,211 @@ BUILDTARGETS+=	do-distrib-dirs
 .if !defined(NOINCLUDES)
 BUILDTARGETS+=	includes
 .endif
-BUILDTARGETS+=	do-lib-csu do-lib do-gnu-lib do-build
+BUILDTARGETS+=	do-tools-compat
+BUILDTARGETS+=	do-lib-csu
+.if ${MKGCC} != "no"
+BUILDTARGETS+=	do-gnu-lib-libgcc${LIBGCC_EXT}
+.endif
+BUILDTARGETS+=	do-lib-libc
+.if ${MKCRYPTO} != "no"
+BUILDTARGETS+=	do-lib-libdes
+.endif
+BUILDTARGETS+=	do-lib do-gnu-lib
+BUILDTARGETS+=	do-ld.so
+BUILDTARGETS+=	do-build
+.if ${MKX11} != "no"
+BUILDTARGETS+=	do-x11
+.endif
+BUILDTARGETS+=	do-obsolete
 
+#
 # Enforce proper ordering of some rules.
+#
 
 .ORDER:		${BUILDTARGETS}
-includes-lib:	includes-include includes-sys
-includes-gnu:	includes-lib
+includes-lib:	.PHONY includes-include includes-sys
+includes-gnu:	.PHONY includes-lib
 
+#
 # Build the system and install into DESTDIR.
+#
 
-build:
+START_TIME!=	date
+
+build: .PHONY
 .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}
+	${MAKEDIRTARGET} . ${tgt}
 .endfor
-	@echo -n "Build finished at: " && date
+	${MAKEDIRTARGET} etc install-etc-release
+	@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: .PHONY
+.if make(buildworld) && \
+    (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Won't make ${.TARGET} with DESTDIR=/"
+	@false
+.endif
+	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
+	${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
+.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
+	${MAKEDIRTARGET} . postinstall-fix-obsolete
+	${MAKEDIRTARGET} distrib/sets 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: .PHONY
+.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
+	${MAKEDIRTARGET} distrib/sets installsets \
+	    INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=
+	${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR}
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
+#
+
+.for tgt in sets sourcesets
+${tgt}: .PHONY
+	${MAKEDIRTARGET} distrib/sets ${tgt}
+.endfor
+
+#
+# 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: .PHONY
+	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
+	${MAKEDIRTARGET} etc release INSTALL_DONE=1
+	@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: .PHONY
+.if ${TOOLCHAIN_MISSING} != "no" && !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:
+do-distrib-dirs: .PHONY
 .if !defined(DESTDIR) || ${DESTDIR} == ""
-	cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs
+	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
 .else
-	cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs
+	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=${DESTDIR}
 .endif
 
-.for dir in lib/csu lib gnu/lib
-do-${dir:S/\//-/}:
+.for targ in cleandir obj includes
+do-${targ}: .PHONY ${targ}
+	@true
+.endfor
+
+.for dir in tools tools/compat lib/csu gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib
+do-${dir:S/\//-/g}: .PHONY
+.for targ in dependall install
+	${MAKEDIRTARGET} ${dir} ${targ}
+.endfor
+.endfor
+
+do-ld.so: .PHONY
 .for targ in dependall install
-	cd ${.CURDIR}/${dir} && \
-		${MAKE} ${_J} MKSHARE=no MKLINT=no ${targ}
+.if (${OBJECT_FMT} == "a.out")
+	${MAKEDIRTARGET} libexec/ld.aout_so ${targ}
+.endif
+.if (${OBJECT_FMT} == "ELF")
+	${MAKEDIRTARGET} libexec/ld.elf_so ${targ}
+.endif
 .endfor
+
+do-build: .PHONY
+.for targ in dependall install
+	${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
 .endfor
 
-do-build:
-	${MAKE} ${_J} dependall
-	${MAKE} ${_J} install
+do-x11: .PHONY
+	${MAKEDIRTARGET} x11 build
 
+do-obsolete: .PHONY
+	${MAKEDIRTARGET} etc install-obsolete-lists
+
+#
 # 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}: .PHONY
 	@true
+.endfor
+.for dir in etc distrib regress
+install-${dir}: .PHONY
+	@true
+.endfor
 
-.include <bsd.subdir.mk>
-
-# Rules for building the BUILDING.* documentation files.
+#
+# 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: .PHONY
+	@true
 
-build-docs: ${.CURDIR}/BUILDING.txt ${.CURDIR}/BUILDING.html
+.include <bsd.sys.mk>
+.include <bsd.obj.mk>
+.include <bsd.kernobj.mk>
+.include <bsd.subdir.mk>
 
-.SUFFIXES: .mdoc .html .txt
+build-docs: .PHONY ${.CURDIR}/BUILDING
+${.CURDIR}/BUILDING: doc/BUILDING.mdoc
+	${_MKMSG_CREATE} ${.TARGET}
+	${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@
 
-.mdoc.html: ${.CURDIR}/Makefile
-	groff -mdoc2html -Tlatin1 -P-b -P-u -P-o -ww -mtty-char $< >$@
 
-# 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}' >$@
+#
+# Display current make(1) parameters
+#
+params: .PHONY
+	${MAKEDIRTARGET} etc params