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.202
retrieving revision 1.225
diff -u -p -r1.202 -r1.225
--- src/Makefile	2003/04/04 01:06:00	1.202
+++ src/Makefile	2004/01/04 13:30:09	1.225
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.202 2003/04/04 01:06:00 thorpej Exp $
+#	$NetBSD: Makefile,v 1.225 2004/01/04 13:30:09 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
@@ -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
@@ -52,22 +55,28 @@
 #	(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:
 #   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-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-libcrypt: builds and installs prerequisites from lib/libcrypt.
+#   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-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #
 
 .if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == ""
@@ -100,7 +109,7 @@ _SRC_TOP_OBJ_=
 .endif
 
 _SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin
-_SUBDIR+=	usr.sbin share rescue sys etc distrib regress
+_SUBDIR+=	usr.sbin share rescue sys etc .WAIT distrib regress
 
 #
 # Weed out directories that don't exist.
@@ -118,7 +127,7 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-.if defined(UNPRIVED)
+.if ${MKUNPRIVED} != "no"
 NOPOSTINSTALL=	# defined
 .endif
 
@@ -126,7 +135,7 @@ afterinstall:
 .if ${MKMAN} != "no"
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
-.if defined(UNPRIVED) && (${MKINFO} != "no")
+.if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
 	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
 .endif
 .if !defined(NOPOSTINSTALL)
@@ -135,21 +144,31 @@ afterinstall:
 
 postinstall-check:
 	@echo "   === Post installation checks ==="
-	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
+	${HOST_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 "   ================================"
+	${HOST_SH} ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
+	@echo "   ==============================="
+
+postinstall-fix-obsolete: .NOTMAIN
+	@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
 
 BUILDTARGETS+=	check-tools
-.if !defined(UPDATE) && !defined(NOCLEANDIR)
+.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
 BUILDTARGETS+=	cleandir
 .endif
 .if ${MKOBJDIRS} != "no"
@@ -165,7 +184,16 @@ BUILDTARGETS+=	do-distrib-dirs
 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
+.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
+.endif
+BUILDTARGETS+=	do-lib do-gnu-lib
+BUILDTARGETS+=	do-ld.so
+BUILDTARGETS+=	do-build
 BUILDTARGETS+=	do-obsolete
 
 #
@@ -190,6 +218,7 @@ build:
 .for tgt in ${BUILDTARGETS}
 	@(cd ${.CURDIR} && ${MAKE} ${tgt})
 .endfor
+	(cd ${.CURDIR}/etc && ${MAKE} install-release-info)
 	@echo   "Build started at:  ${START_TIME}"
 	@printf "Build finished at: " && date
 .endif
@@ -208,6 +237,7 @@ distribution buildworld:
 	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution)
 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
+	(cd ${.CURDIR} && ${MAKE} postinstall-fix-obsolete)
 	(cd ${.CURDIR}/distrib/sets && ${MAKE} checkflist)
 .endif
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
@@ -246,11 +276,13 @@ installworld:
 	@printf "make ${.TARGET} finished at: " && date
 
 #
-# Create sets from $DESTDIR into $RELEASEDIR
+# Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
 #
 
-sets:
-	(cd ${.CURDIR}/distrib/sets && ${MAKE} maketars)
+.for tgt in sets sourcesets
+${tgt}:
+	(cd ${.CURDIR}/distrib/sets && ${MAKE} $@)
+.endfor
 
 #
 # Build a release or snapshot (implies "make build").  Note that
@@ -269,7 +301,7 @@ release snapshot:
 #
 
 check-tools:
-.if ${TOOLCHAIN_MISSING} == "yes" && !defined(EXTERNAL_TOOLCHAIN)
+.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)
@@ -291,12 +323,8 @@ 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 dir in tools tools/compat lib/csu gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib
+do-${dir:S/\//-/g}:
 .for targ in dependall install
 	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})
 .endfor
@@ -341,9 +369,30 @@ install-${dir}:
 dependall-distrib depend-distrib all-distrib:
 	@true
 
+.include <bsd.sys.mk>
 .include <bsd.obj.mk>
+.include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>
 
 build-docs: ${.CURDIR}/BUILDING
 ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
-	groff -mdoc -Tascii -P-b -P-u -P-o $> >$@
+	${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