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.196
retrieving revision 1.202
diff -u -p -r1.196 -r1.202
--- src/Makefile	2003/01/03 15:34:30	1.196
+++ src/Makefile	2003/04/04 01:06:00	1.202
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.196 2003/01/03 15:34:30 lukem Exp $
+#	$NetBSD: Makefile,v 1.202 2003/04/04 01:06:00 thorpej Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -57,10 +57,13 @@
 #   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-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:          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.
@@ -161,7 +164,9 @@ 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
+BUILDTARGETS+=	do-lib-csu do-lib-libc do-lib-libcrypt do-lib do-gnu-lib do-ld.so do-build
+BUILDTARGETS+=	do-obsolete
 
 #
 # Enforce proper ordering of some rules.
@@ -241,6 +246,13 @@ installworld:
 	@printf "make ${.TARGET} finished at: " && date
 
 #
+# Create sets from $DESTDIR into $RELEASEDIR
+#
+
+sets:
+	(cd ${.CURDIR}/distrib/sets && ${MAKE} maketars)
+
+#
 # 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.
@@ -279,7 +291,11 @@ do-${targ}: ${targ}
 	@true
 .endfor
 
-.for dir in tools lib/csu lib/libc lib gnu/lib
+<<<<<<< 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 targ in dependall install
 	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})
@@ -301,6 +317,9 @@ do-build:
 	(cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no)
 .endfor
 
+do-obsolete:
+	(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.)
@@ -322,31 +341,9 @@ install-${dir}:
 dependall-distrib depend-distrib all-distrib:
 	@true
 
-#
-# we don't want the obj target in etc invoked as part of the normal
-# course of events because that makes it too early.  therefore, define
-# a neutral version of the target that bsd.subdir.mk would create.
-#
-obj-etc:
-	@true
-
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
 
-#
-# now, make a "real" target that will recurse into etc to enact the
-# obj target, and .USE it onto the end of the obj handling for the
-# current directory.  note that this is only done if we already have
-# commands for the obj target (we won't if we're not making objdirs),
-# and only if etc is a target subdirectory.
-#
-.if commands(obj) && (${SUBDIR:Metc} == "etc")
-real-obj-etc: .USE
-	@(echo "obj ===> etc"; \
-		cd ${.CURDIR}/etc && ${MAKE} obj)
-obj: real-obj-etc
-.endif
-
 build-docs: ${.CURDIR}/BUILDING
 ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
 	groff -mdoc -Tascii -P-b -P-u -P-o $> >$@