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.224
retrieving revision 1.252.2.1
diff -u -p -r1.224 -r1.252.2.1
--- src/Makefile	2004/01/04 00:27:15	1.224
+++ src/Makefile	2008/06/04 02:02:56	1.252.2.1
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.224 2004/01/04 00:27:15 lukem Exp $
+#	$NetBSD: Makefile,v 1.252.2.1 2008/06/04 02:02:56 yamt Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -50,15 +50,27 @@
 #	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.
@@ -68,14 +80,17 @@
 #   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-libgcc:       builds and installs prerequisites from
+#                    gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
+#                    gnu/lib/libgcc${LIBGCC_EXT}.
 #   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-external-lib: builds and installs prerequisites from external/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).
 #
 
@@ -108,63 +123,65 @@ _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
+_SUBDIR=	tools lib include gnu external bin games libexec sbin usr.bin
+_SUBDIR+=	usr.sbin share rescue sys etc tests .WAIT distrib regress
 
 #
 # Weed out directories that don't exist.
 #
 
 .for dir in ${_SUBDIR}
-.if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
+.if ("${dir}" == ".WAIT") || exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
 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 ${MKUNPRIVED} != "no"
 NOPOSTINSTALL=	# defined
 .endif
 
-afterinstall:
+afterinstall: .PHONY .MAKE
 .if ${MKMAN} != "no"
-	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
+	${MAKEDIRTARGET} share/man makedb
 .endif
 .if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
-	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
+	${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 ${USE_TOOLS_TOOLCHAIN} == "no"
+.if ${HAVE_GCC} == "3"
 LIBGCC_EXT=3
 .else
-LIBGCC_EXT=
+LIBGCC_EXT=4
 .endif
 
 BUILDTARGETS+=	check-tools
@@ -184,16 +201,17 @@ BUILDTARGETS+=	do-distrib-dirs
 BUILDTARGETS+=	includes
 .endif
 BUILDTARGETS+=	do-tools-compat
+BUILDTARGETS+=	do-lib-csu
 .if ${MKGCC} != "no"
-BUILDTARGETS+=	do-gnu-lib-libgcc${LIBGCC_EXT}
-.endif
-BUILDTARGETS+=	do-lib-csu do-lib-libc
-.if ${MKCRYPTO} != "no"
-BUILDTARGETS+=	do-lib-libdes
+BUILDTARGETS+=	do-libgcc
 .endif
-BUILDTARGETS+=	do-lib do-gnu-lib
+BUILDTARGETS+=	do-lib-libc
+BUILDTARGETS+=	do-lib do-gnu-lib do-external-lib
 BUILDTARGETS+=	do-ld.so
 BUILDTARGETS+=	do-build
+.if ${MKX11} != "no"
+BUILDTARGETS+=	do-x11
+.endif
 BUILDTARGETS+=	do-obsolete
 
 #
@@ -201,8 +219,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.
@@ -210,14 +228,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
@@ -227,17 +246,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} != "/"
-	(cd ${.CURDIR} && ${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
@@ -251,7 +270,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
@@ -267,10 +286,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
 
@@ -278,20 +296,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
 
@@ -299,7 +333,7 @@ release snapshot:
 # Special components of the "make build" process.
 #
 
-check-tools:
+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!'
@@ -310,42 +344,53 @@ 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${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib
-do-${dir:S/\//-/g}:
+.for dir in tools tools/compat lib/csu gnu/lib/crtstuff${LIBGCC_EXT} gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib external/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-libgcc: .PHONY .MAKE
+.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
+
+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
+	${MAKEDIRTARGET} x11 build
+
+do-obsolete: .PHONY .MAKE
+	${MAKEDIRTARGET} etc install-obsolete-lists
 
 #
 # Speedup stubs for some subtrees that don't need to run these rules.
@@ -353,11 +398,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
 
@@ -365,7 +410,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>
@@ -373,25 +418,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
+	${_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 MKUNPRIVED MKUPDATE \
-		RELEASEDIR TOOLCHAIN_MISSING TOOLDIR \
-		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