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.216
retrieving revision 1.227
diff -u -p -r1.216 -r1.227
--- src/Makefile	2003/07/20 13:08:43	1.216
+++ src/Makefile	2004/01/08 07:01:06	1.227
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.216 2003/07/20 13:08:43 lukem Exp $
+#	$NetBSD: Makefile,v 1.227 2004/01/08 07:01:06 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
@@ -68,14 +68,16 @@
 #   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-libgcc: builds and installs prerequisites from gnu/lib/libgcc
+#   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-obsolete:     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} == ""
@@ -160,6 +162,11 @@ postinstall-fix-obsolete: .NOTMAIN
 #
 # Targets (in order!) called by "make build".
 #
+.if ${USE_TOOLS_TOOLCHAIN} == "no"
+LIBGCC_EXT=3
+.else
+LIBGCC_EXT=
+.endif
 
 BUILDTARGETS+=	check-tools
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
@@ -179,9 +186,18 @@ BUILDTARGETS+=	includes
 .endif
 BUILDTARGETS+=	do-tools-compat
 .if ${MKGCC} != "no"
-BUILDTARGETS+=	do-gnu-lib-libgcc
+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-lib-csu do-lib-libc do-lib do-gnu-lib do-ld.so do-build
 BUILDTARGETS+=	do-obsolete
 
 #
@@ -206,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
@@ -224,7 +241,7 @@ distribution buildworld:
 	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution)
 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
-	${MAKE} postinstall-fix-obsolete
+	(cd ${.CURDIR} && ${MAKE} postinstall-fix-obsolete)
 	(cd ${.CURDIR}/distrib/sets && ${MAKE} checkflist)
 .endif
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
@@ -288,7 +305,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)
@@ -310,7 +327,7 @@ do-${targ}: ${targ}
 	@true
 .endfor
 
-.for dir in tools tools/compat lib/csu gnu/lib/libgcc lib/libc lib gnu/lib
+.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})
@@ -332,6 +349,9 @@ do-build:
 	(cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no)
 .endfor
 
+do-x11:
+	(cd ${.CURDIR}/x11 && ${MAKE} build)
+
 do-obsolete:
 	(cd ${.CURDIR}/etc && ${MAKE} install-obsolete-lists)