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.198
retrieving revision 1.230
diff -u -p -r1.198 -r1.230
--- src/Makefile	2003/01/06 17:40:18	1.198
+++ src/Makefile	2004/02/06 23:12:56	1.230
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.198 2003/01/06 17:40:18 lukem Exp $
+#	$NetBSD: Makefile,v 1.230 2004/02/06 23:12:56 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,6 +55,10 @@
 #	(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.
@@ -59,12 +66,18 @@
 #   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} == ""
@@ -97,7 +110,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.
@@ -110,43 +123,53 @@ SUBDIR+=	${dir}
 .endfor
 
 .if exists(regress)
-regression-tests:
+regression-tests: .PHONY
 	@echo Running regression tests...
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-.if defined(UNPRIVED)
+.if ${MKUNPRIVED} != "no"
 NOPOSTINSTALL=	# defined
 .endif
 
-afterinstall:
+afterinstall: .PHONY
 .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)
 	(cd ${.CURDIR} && ${MAKE} postinstall-check)
 .endif
 
-postinstall-check:
+postinstall-check: .PHONY
 	@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
+postinstall-fix: .NOTMAIN .PHONY
 	@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 .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
 
 BUILDTARGETS+=	check-tools
-.if !defined(UPDATE) && !defined(NOCLEANDIR)
+.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
 BUILDTARGETS+=	cleandir
 .endif
 .if ${MKOBJDIRS} != "no"
@@ -161,15 +184,29 @@ BUILDTARGETS+=	do-distrib-dirs
 .if !defined(NOINCLUDES)
 BUILDTARGETS+=	includes
 .endif
-BUILDTARGETS+=	do-lib-csu do-lib-libc do-lib do-gnu-lib do-ld.so do-build
+BUILDTARGETS+=	do-tools-compat
+.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
+.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.
@@ -177,7 +214,7 @@ includes-gnu:	includes-lib
 
 START_TIME!=	date
 
-build:
+build: .PHONY
 .if defined(BUILD_DONE)
 	@echo "Build already installed into ${DESTDIR}"
 .else
@@ -185,6 +222,7 @@ build:
 .for tgt in ${BUILDTARGETS}
 	@(cd ${.CURDIR} && ${MAKE} ${tgt})
 .endfor
+	(cd ${.CURDIR}/etc && ${MAKE} install-etc-release)
 	@echo   "Build started at:  ${START_TIME}"
 	@printf "Build finished at: " && date
 .endif
@@ -194,7 +232,7 @@ build:
 # ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
 #
 
-distribution buildworld:
+distribution buildworld: .PHONY
 .if make(buildworld) && \
     (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
 	@echo "Won't make ${.TARGET} with DESTDIR=/"
@@ -203,6 +241,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}"
@@ -217,7 +256,7 @@ distribution buildworld:
 HOST_UNAME_S!=	uname -s
 HOST_UNAME_M!=	uname -m
 
-installworld:
+installworld: .PHONY
 .if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
 	@echo "Can't make ${.TARGET} to DESTDIR=/"
 	@false
@@ -241,12 +280,21 @@ installworld:
 	@printf "make ${.TARGET} finished at: " && date
 
 #
+# Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
+#
+
+.for tgt in sets sourcesets
+${tgt}: .PHONY
+	(cd ${.CURDIR}/distrib/sets && ${MAKE} $@)
+.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:
+release snapshot: .PHONY
 	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release)
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
@@ -256,8 +304,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)
@@ -267,7 +315,7 @@ check-tools:
 	@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)
 .else
@@ -275,18 +323,18 @@ do-distrib-dirs:
 .endif
 
 .for targ in cleandir obj includes
-do-${targ}: ${targ}
+do-${targ}: .PHONY ${targ}
 	@true
 .endfor
 
-.for dir in tools lib/csu lib/libc lib gnu/lib
-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}: .PHONY
 .for targ in dependall install
 	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})
 .endfor
 .endfor
 
-do-ld.so:
+do-ld.so: .PHONY
 .for targ in dependall install
 .if (${OBJECT_FMT} == "a.out")
 	(cd ${.CURDIR}/libexec/ld.aout_so && ${MAKE} ${targ})
@@ -296,22 +344,28 @@ do-ld.so:
 .endif
 .endfor
 
-do-build:
+do-build: .PHONY
 .for targ in dependall install
 	(cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no)
 .endfor
 
+do-x11: .PHONY
+	(cd ${.CURDIR}/x11 && ${MAKE} build)
+
+do-obsolete: .PHONY
+	(cd ${.CURDIR}/etc && ${MAKE} 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.)
 #
 
 .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
 
@@ -319,12 +373,22 @@ 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>
 .include <bsd.obj.mk>
+.include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>
 
-build-docs: ${.CURDIR}/BUILDING
+build-docs: .PHONY ${.CURDIR}/BUILDING
 ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
-	groff -mdoc -Tascii -P-b -P-u -P-o $> >$@
+	${_MKMSG_CREATE} ${.TARGET}
+	${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@
+
+
+#
+# Display current make(1) parameters
+#
+params: .PHONY
+	(cd ${.CURDIR}/etc && ${MAKE} params)