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.212
retrieving revision 1.261
diff -u -p -r1.212 -r1.261
--- src/Makefile	2003/07/17 07:46:11	1.212
+++ src/Makefile	2008/10/25 15:03:44	1.261
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.212 2003/07/17 07:46:11 lukem Exp $
+#	$NetBSD: Makefile,v 1.261 2008/10/25 15:03:44 apb 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
@@ -19,18 +19,21 @@
 #   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.
-#   UPDATE, if defined, will avoid a `make cleandir' at the start of
+#   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'.
 #   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, except for the
@@ -47,32 +50,56 @@
 #	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.
+#	Does a `make distribution', and then tars up the DESTDIR files
+#	into ${RELEASEDIR}/${RELEASEMACHINEDIR}, 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}
+#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
+#	from ${DESTDIR}
 #   sourcesets:
 #	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
+#   syspkgs:
+#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
+#	from ${DESTDIR}
+#   iso-image:
+#	Create CD-ROM image in RELEASEDIR/iso.
+#	RELEASEDIR must already have been populated by `make release'
+#	or equivalent.
+#   iso-image-source:
+#	Create CD-ROM image with source in RELEASEDIR/iso.
+#	RELEASEDIR must already have been populated by
+#	`make release sourcesets' or equivalent.
 #
 # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.
-#   obj:             creates object directories.
+#   do-top-obj:      creates the top level object directory.
+#   do-tools-obj:    creates object directories for the host toolchain.
 #   do-tools:        builds host toolchain.
+#   obj:             creates object directories.
 #   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-libgcc: builds and installs prerequisites from gnu/lib/libgcc
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.
+#   do-libgcc:       builds and installs prerequisites from
+#                    gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
+#                    gnu/lib/libgcc${LIBGCC_EXT}.
+#   do-libpcc:       builds and install prerequisites from
+#                    external/bsd/pcc/crtstuff and external/bsd/pcc/libpcc.
 #   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-external-lib: builds and installs prerequisites from external/lib.
+#   do-sys-rump-fs-lib:  builds and installs prerequisites from sys/rump/fs/lib
+#   do-sys-rump-net-lib: builds and installs prerequisites from sys/rump/net/lib
 #   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.
 #   do-build:        builds and installs the entire system.
-#   do-obsolete:     builds and installs the entire system.
+#   do-x11:          builds and installs X11; either
+#                    X11R7 from src/external/mit/xorg if ${MKXORG} != "no"
+#                    or X11R6 from src/x11 if ${MKX11} != "no"
+#   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #
 
 .if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == ""
@@ -104,69 +131,85 @@ _SRC_TOP_OBJ_=
 .endfor
 .endif
 
-_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.
+# _SUBDIR is used to set SUBDIR, after removing directories that have
+# BUILD_${dir}=no, or that have no ${dir}/Makefile.
 #
+_SUBDIR=	tools lib include gnu external bin games libexec sbin usr.bin
+_SUBDIR+=	usr.sbin share rescue sys etc tests .WAIT distrib regress
 
 .for dir in ${_SUBDIR}
-.if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
+.if "${dir}" == ".WAIT" \
+	|| (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile))
 SUBDIR+=	${dir}
 .endif
 .endfor
 
 .if exists(regress)
-regression-tests:
+regression-tests: .PHONY .MAKE
 	@echo Running regression tests...
-	@(cd ${.CURDIR}/regress && ${MAKE} regress)
+	${MAKEDIRTARGET} regress regress
 .endif
 
-.if defined(UNPRIVED)
+.if ${MKUNPRIVED} != "no"
 NOPOSTINSTALL=	# defined
 .endif
 
-afterinstall:
+afterinstall: .PHONY .MAKE
 .if ${MKMAN} != "no"
-	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
+	${MAKEDIRTARGET} share/man makedb
 .endif
-.if defined(UNPRIVED) && (${MKINFO} != "no")
-	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
+.if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
+	${MAKEDIRTARGET} gnu/usr.bin/texinfo/install-info infodir-meta
 .endif
 .if !defined(NOPOSTINSTALL)
-	(cd ${.CURDIR} && ${MAKE} postinstall-check)
+	${MAKEDIRTARGET} . postinstall-check
 .endif
 
-postinstall-check:
+_POSTINSTALL=	${.CURDIR}/usr.sbin/postinstall/postinstall
+
+postinstall-check: .PHONY
 	@echo "   === Post installation checks ==="
-	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
+	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
 	@echo "   ================================"
 
-postinstall-fix: .NOTMAIN
+postinstall-fix: .NOTMAIN .PHONY
 	@echo "   === Post installation fixes ==="
-	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
+	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix
 	@echo "   ==============================="
 
-postinstall-fix-obsolete: .NOTMAIN
+postinstall-fix-obsolete: .NOTMAIN .PHONY
 	@echo "   === Removing obsolete files ==="
-	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
+	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
 	@echo "   ==============================="
 
 
 #
 # Targets (in order!) called by "make build".
 #
+.if defined(HAVE_GCC)
+.if ${HAVE_GCC} == "3"
+LIBGCC_EXT=3
+.else
+LIBGCC_EXT=4
+.endif
+.endif
 
 BUILDTARGETS+=	check-tools
-.if !defined(UPDATE) && !defined(NOCLEANDIR)
+.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
 BUILDTARGETS+=	cleandir
 .endif
 .if ${MKOBJDIRS} != "no"
-BUILDTARGETS+=	obj
+BUILDTARGETS+=	do-top-obj
+.endif
+.if ${USETOOLS} == "yes"	# {
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	do-tools-obj
 .endif
-.if ${USETOOLS} == "yes"
 BUILDTARGETS+=	do-tools
+.endif # USETOOLS		# }
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	obj
 .endif
 .if !defined(NODISTRIBDIRS)
 BUILDTARGETS+=	do-distrib-dirs
@@ -175,10 +218,21 @@ BUILDTARGETS+=	do-distrib-dirs
 BUILDTARGETS+=	includes
 .endif
 BUILDTARGETS+=	do-tools-compat
+BUILDTARGETS+=	do-lib-csu
 .if ${MKGCC} != "no"
-BUILDTARGETS+=	do-gnu-lib-libgcc
+BUILDTARGETS+=	do-libgcc
+.endif
+.if ${MKPCC} != "no"
+BUILDTARGET+=	do-libpcc
+.endif
+BUILDTARGETS+=	do-lib-libc
+BUILDTARGETS+=	do-lib do-gnu-lib do-external-lib
+BUILDTARGETS+=	do-sys-rump-fs-lib do-sys-rump-net-lib
+BUILDTARGETS+=	do-ld.so
+BUILDTARGETS+=	do-build
+.if ${MKX11} != "no" || ${MKXORG} != "no"
+BUILDTARGETS+=	do-x11
 .endif
-BUILDTARGETS+=	do-lib-csu do-lib-libc do-lib do-gnu-lib do-ld.so do-build
 BUILDTARGETS+=	do-obsolete
 
 #
@@ -186,8 +240,8 @@ BUILDTARGETS+=	do-obsolete
 #
 
 .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.
@@ -195,14 +249,15 @@ includes-gnu:	includes-lib
 
 START_TIME!=	date
 
-build:
+build: .PHONY .MAKE
 .if defined(BUILD_DONE)
 	@echo "Build already installed into ${DESTDIR}"
 .else
 	@echo "Build started at: ${START_TIME}"
 .for tgt in ${BUILDTARGETS}
-	@(cd ${.CURDIR} && ${MAKE} ${tgt})
+	${MAKEDIRTARGET} . ${tgt}
 .endfor
+	${MAKEDIRTARGET} etc install-etc-release
 	@echo   "Build started at:  ${START_TIME}"
 	@printf "Build finished at: " && date
 .endif
@@ -212,17 +267,17 @@ build:
 # ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
 #
 
-distribution buildworld:
+distribution buildworld: .PHONY .MAKE
 .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)
+	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
+	${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
-	${MAKE} postinstall-fix-obsolete
-	(cd ${.CURDIR}/distrib/sets && ${MAKE} checkflist)
+	${MAKEDIRTARGET} . postinstall-fix-obsolete
+	${MAKEDIRTARGET} distrib/sets checkflist
 .endif
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
@@ -236,7 +291,7 @@ distribution buildworld:
 HOST_UNAME_S!=	uname -s
 HOST_UNAME_M!=	uname -m
 
-installworld:
+installworld: .PHONY .MAKE
 .if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
 	@echo "Can't make ${.TARGET} to DESTDIR=/"
 	@false
@@ -252,10 +307,9 @@ installworld:
 	@false
 .endif
 .endif
-	(cd ${.CURDIR}/distrib/sets && \
-	    ${MAKE} INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS= installsets)
-	(cd ${.CURDIR} && \
-	    ${MAKE} DESTDIR=${INSTALLWORLDDIR} postinstall-check)
+	${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
 
@@ -263,20 +317,36 @@ installworld:
 # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
 #
 
-.for tgt in sets sourcesets
-${tgt}:
-	(cd ${.CURDIR}/distrib/sets && ${MAKE} $@)
+.for tgt in sets sourcesets syspkgs
+${tgt}: .PHONY .MAKE
+	${MAKEDIRTARGET} distrib/sets ${tgt}
 .endfor
 
 #
-# Build a release or snapshot (implies "make build").  Note that
+# Build a release or snapshot (implies "make distribution").  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)
+release snapshot: .PHONY .MAKE
+	${MAKEDIRTARGET} . distribution
+	${MAKEDIRTARGET} etc release DISTRIBUTION_DONE=1
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create a CD-ROM image.
+#
+
+iso-image: .PHONY
+	${MAKEDIRTARGET} distrib iso_image
+	${MAKEDIRTARGET} etc iso-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+iso-image-source: .PHONY
+	${MAKEDIRTARGET} distrib iso_image CDSOURCE=true
+	${MAKEDIRTARGET} etc iso-image
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
 
@@ -284,8 +354,8 @@ release snapshot:
 # Special components of the "make build" process.
 #
 
-check-tools:
-.if ${TOOLCHAIN_MISSING} == "yes" && !defined(EXTERNAL_TOOLCHAIN)
+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)
@@ -295,42 +365,84 @@ check-tools:
 	@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
 .endif
 
-do-distrib-dirs:
+do-distrib-dirs: .PHONY .MAKE
 .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 targ in cleandir obj includes
-do-${targ}: ${targ}
+do-${targ}: .PHONY ${targ}
 	@true
 .endfor
 
-.for dir in tools tools/compat lib/csu gnu/lib/libgcc lib/libc lib gnu/lib
-do-${dir:S/\//-/g}:
+.if defined(HAVE_GCC)
+BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
+BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}
+.elif defined(HAVE_PCC)
+BUILD_CC_LIB+= external/bsd/pcc/crtstuff
+BUILD_CC_LIB+= external/bsd/pcc/libpcc
+.endif
+
+.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib sys/rump/fs/lib sys/rump/net/lib
+do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install
-	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})
+	${MAKEDIRTARGET} ${dir} ${targ}
 .endfor
 .endfor
 
-do-ld.so:
+do-top-obj: .PHONY .MAKE
+	${MAKEDIRTARGET} . obj NOSUBDIR=
+
+do-tools-obj: .PHONY .MAKE
+	${MAKEDIRTARGET} tools obj
+
+do-libgcc: .PHONY .MAKE
+.if defined(HAVE_GCC)
+.if ${MKGCC} != "no"
+.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
+	${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
+.endif
+	${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
+.endif
+.endif
+
+do-libpcc: .PHONY .MAKE
+.if defined(HAVE_PCC)
+.if ${MKPCC} != "no"
+	${MAKEDIRTARGET} . do-pcc-lib-crtstuff
+	${MAKEDIRTARGET} . do-pcc-lib-libpcc
+.endif
+.endif
+
+do-ld.so: .PHONY .MAKE
 .for targ in dependall install
 .if (${OBJECT_FMT} == "a.out")
-	(cd ${.CURDIR}/libexec/ld.aout_so && ${MAKE} ${targ})
+	${MAKEDIRTARGET} libexec/ld.aout_so ${targ}
 .endif
 .if (${OBJECT_FMT} == "ELF")
-	(cd ${.CURDIR}/libexec/ld.elf_so && ${MAKE} ${targ})
+	${MAKEDIRTARGET} libexec/ld.elf_so ${targ}
 .endif
 .endfor
 
-do-build:
+do-build: .PHONY .MAKE
 .for targ in dependall install
-	(cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no)
+	${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
 .endfor
 
-do-obsolete:
-	(cd ${.CURDIR}/etc && ${MAKE} install-obsolete-lists)
+do-x11: .PHONY .MAKE
+.if ${MKXORG} != "no"
+	${MAKEDIRTARGET} external/mit/xorg build
+.elif ${MKX11} != "no"
+	${MAKEDIRTARGET} x11 build
+.else
+	@echo "Neither MKX11 or MKXORG is enabled"
+	@false
+.endif
+
+do-obsolete: .PHONY .MAKE
+	${MAKEDIRTARGET} etc install-obsolete-lists
 
 #
 # Speedup stubs for some subtrees that don't need to run these rules.
@@ -338,11 +450,11 @@ do-obsolete:
 #
 
 .for dir in bin etc distrib games libexec regress sbin usr.sbin tools
-includes-${dir}:
+includes-${dir}: .PHONY
 	@true
 .endfor
 .for dir in etc distrib regress
-install-${dir}:
+install-${dir}: .PHONY
 	@true
 .endfor
 
@@ -350,7 +462,7 @@ install-${dir}:
 # 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:
+dependall-distrib depend-distrib all-distrib: .PHONY
 	@true
 
 .include <bsd.sys.mk>
@@ -358,24 +470,14 @@ dependall-distrib depend-distrib all-dis
 .include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>
 
-build-docs: ${.CURDIR}/BUILDING
+build-docs: .PHONY ${.CURDIR}/BUILDING
 ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
-	${TOOL_GROFF} -mdoc -Tascii -P-b -P-u -P-o $> >$@
+	${_MKMSG_CREATE} ${.TARGET}
+	${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@
 
 
 #
 # Display current make(1) parameters
 #
-params:
-.for var in	BSDSRCDIR BSDOBJDIR BUILDID DESTDIR EXTERNAL_TOOLCHAIN \
-		KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
-		MACHINE MACHINE_ARCH MAKECONF MAKEFLAGS \
-		MAKEOBJDIR MAKEOBJDIRPREFIX MKOBJDIRS \
-		RELEASEDIR TOOLCHAIN_MISSING TOOLDIR \
-		UNPRIVED UPDATE USETOOLS
-.if defined(${var})
-	@printf "%20s = '%-s'\n" ${var} ${${var}:Q}
-.else
-	@printf "%20s = (undefined)\n" ${var}
-.endif
-.endfor
+params: .PHONY .MAKE
+	${MAKEDIRTARGET} etc params