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.238.2.3
retrieving revision 1.249
diff -u -p -r1.238.2.3 -r1.249
--- src/Makefile	2005/08/30 05:56:05	1.238.2.3
+++ src/Makefile	2007/09/07 04:20:44	1.249
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.238.2.3 2005/08/30 05:56:05 tron Exp $
+#	$NetBSD: Makefile,v 1.249 2007/09/07 04:20:44 lukem Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -50,7 +50,7 @@
 #	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
+#	Does a `make distribution', and then tars up the DESTDIR files
 #	into RELEASEDIR/${MACHINE}, in release(7) format.
 #	(See etc/Makefile for more information on this.)
 #   regression-tests:
@@ -59,6 +59,16 @@
 #	Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR}
 #   sourcesets:
 #	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
+#   syspkgs:
+#	Populate ${RELEASEDIR}/${MACHINE}/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.
@@ -69,9 +79,9 @@
 #   do-tools-compat: builds the "libnbcompat" library; needed for some
 #                    random host tool programs in the source tree.
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.
-#   do-gnu-lib-crtstuff3: builds and installs prerequisites from
-#			  gnu/lib/crtstuff3
-#   do-gnu-lib-libgcc3: builds and installs prerequisites from gnu/lib/libgcc3
+#   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:          builds and installs prerequisites from lib.
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
@@ -118,13 +128,13 @@ _SUBDIR+=	usr.sbin share rescue sys etc 
 #
 
 .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: .PHONY
+regression-tests: .PHONY .MAKE
 	@echo Running regression tests...
 	${MAKEDIRTARGET} regress regress
 .endif
@@ -133,7 +143,7 @@ regression-tests: .PHONY
 NOPOSTINSTALL=	# defined
 .endif
 
-afterinstall: .PHONY
+afterinstall: .PHONY .MAKE
 .if ${MKMAN} != "no"
 	${MAKEDIRTARGET} share/man makedb
 .endif
@@ -165,10 +175,10 @@ postinstall-fix-obsolete: .NOTMAIN .PHON
 #
 # 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
@@ -190,10 +200,7 @@ BUILDTARGETS+=	includes
 BUILDTARGETS+=	do-tools-compat
 BUILDTARGETS+=	do-lib-csu
 .if ${MKGCC} != "no"
-.if ${HAVE_GCC3} != "no"
-BUILDTARGETS+=	do-gnu-lib-crtstuff${LIBGCC_EXT}
-.endif
-BUILDTARGETS+=	do-gnu-lib-libgcc${LIBGCC_EXT}
+BUILDTARGETS+=	do-libgcc
 .endif
 BUILDTARGETS+=	do-lib-libc
 BUILDTARGETS+=	do-lib do-gnu-lib
@@ -218,7 +225,7 @@ includes-gnu:	.PHONY includes-lib
 
 START_TIME!=	date
 
-build: .PHONY
+build: .PHONY .MAKE
 .if defined(BUILD_DONE)
 	@echo "Build already installed into ${DESTDIR}"
 .else
@@ -236,7 +243,7 @@ build: .PHONY
 # ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
 #
 
-distribution buildworld: .PHONY
+distribution buildworld: .PHONY .MAKE
 .if make(buildworld) && \
     (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
 	@echo "Won't make ${.TARGET} with DESTDIR=/"
@@ -260,7 +267,7 @@ distribution buildworld: .PHONY
 HOST_UNAME_S!=	uname -s
 HOST_UNAME_M!=	uname -m
 
-installworld: .PHONY
+installworld: .PHONY .MAKE
 .if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
 	@echo "Can't make ${.TARGET} to DESTDIR=/"
 	@false
@@ -286,20 +293,36 @@ installworld: .PHONY
 # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
 #
 
-.for tgt in sets sourcesets
-${tgt}: .PHONY
+.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: .PHONY
-	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
-	${MAKEDIRTARGET} etc release INSTALL_DONE=1
+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
 
@@ -318,7 +341,7 @@ check-tools: .PHONY
 	@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
 .endif
 
-do-distrib-dirs: .PHONY
+do-distrib-dirs: .PHONY .MAKE
 .if !defined(DESTDIR) || ${DESTDIR} == ""
 	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
 .else
@@ -331,13 +354,21 @@ do-${targ}: .PHONY ${targ}
 .endfor
 
 .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
-do-${dir:S/\//-/g}: .PHONY
+do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} ${dir} ${targ}
 .endfor
 .endfor
 
-do-ld.so: .PHONY
+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")
 	${MAKEDIRTARGET} libexec/ld.aout_so ${targ}
@@ -347,15 +378,15 @@ do-ld.so: .PHONY
 .endif
 .endfor
 
-do-build: .PHONY
+do-build: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
 .endfor
 
-do-x11: .PHONY
+do-x11: .PHONY .MAKE
 	${MAKEDIRTARGET} x11 build
 
-do-obsolete: .PHONY
+do-obsolete: .PHONY .MAKE
 	${MAKEDIRTARGET} etc install-obsolete-lists
 
 #
@@ -393,5 +424,5 @@ ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
 #
 # Display current make(1) parameters
 #
-params: .PHONY
+params: .PHONY .MAKE
 	${MAKEDIRTARGET} etc params