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.98
retrieving revision 1.106
diff -u -p -r1.98 -r1.106
--- src/Makefile	1999/07/12 21:53:52	1.98
+++ src/Makefile	2000/02/19 17:49:49	1.106
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.98 1999/07/12 21:53:52 thorpej Exp $
+#	$NetBSD: Makefile,v 1.106 2000/02/19 17:49:49 aidan 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
@@ -15,16 +15,18 @@
 # (lowest priority).
 #
 # Variables:
-#   NBUILDJOBS is the number of jobs to start in parallel during a
-#	'make build'. It defaults to 1.
+#   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 
+#	an appropriate point in a build.
 #   MKSHARE, if set to `no', will prevent building and installing
 #	anything in /usr/share.
+#   NBUILDJOBS is the number of jobs to start in parallel during a
+#	'make build'. It defaults to 1.
 #   UPDATE will avoid a `make cleandir' at the start of `make build',
 #	as well as having the effects listed in /usr/share/mk/bsd.README.
-#   DESTDIR is the target directory for installation of the compiled
-#	software. It defaults to /. Note that programs are built against
-#	libraries installed in DESTDIR.
 #
 # Targets:
 #   build: builds a full release of netbsd in DESTDIR.
@@ -33,9 +35,14 @@
 #	more information on this.)
 #   snapshot: a synonym for release.
 
-.include <bsd.own.mk>			# for configuration variables.
+SRCTOP=.
+.include <bsd.crypto.mk>		# for configuration variables.
 
+.if defined(CRYPTOPATH)
+.sinclude "${CRYPTOPATH}/Makefile.frag"
+.endif
 
+MKOBJDIRS ?= no
 HAVE_GCC28!=	${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 
 .if defined(NBUILDJOBS)
@@ -46,6 +53,8 @@ _J= -j${NBUILDJOBS}
 
 SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
 
+includes-lib: includes-include includes-sys
+
 .if exists(games)
 SUBDIR+= games
 .endif
@@ -95,11 +104,14 @@ build: beforeinstall
 .endif
 .if ${MKSHARE} != "no"
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
 .endif
 .if !defined(UPDATE)
 	${MAKE} cleandir
 .endif
+.if ${MKOBJDIRS} != "no"
+	${MAKE} obj
+	(cd ${.CURDIR}/distrib && ${MAKE} obj)
+.endif
 .if empty(HAVE_GCC28)
 .if defined(DESTDIR)
 	@echo "*** CAPUTE!"
@@ -108,21 +120,27 @@ build: beforeinstall
 	@false
 .else
 	(cd ${.CURDIR}/gnu/usr.bin/egcs && \
-	    ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
+	    ${MAKE} ${_J} dependall MKMAN=no && \
 	    ${MAKE} MKMAN=no install && ${MAKE} cleandir)
 .endif
 .endif
 	${MAKE} includes
 	(cd ${.CURDIR}/lib/csu && \
-	    ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
+	    ${MAKE} ${_J} dependall MKMAN=no && \
 	    ${MAKE} MKMAN=no install)
 	(cd ${.CURDIR}/lib && \
-	    ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
+	    ${MAKE} ${_J} dependall MKMAN=no && \
 	    ${MAKE} MKMAN=no install)
 	(cd ${.CURDIR}/gnu/lib && \
-	    ${MAKE} depend && ${MAKE} ${_J} MKMAN=no MKINFO=no && \
+	    ${MAKE} ${_J} dependall MKMAN=no MKINFO=no && \
 	    ${MAKE} MKMAN=no MKINFO=no install)
-	${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install
+.if ${MKSHARE} != "no"
+	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
+.endif
+.if target(cryptobuild)
+	${MAKE} ${_J} cryptobuild
+.endif
+	${MAKE} ${_J} dependall && ${MAKE} _BUILD= install
 .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM)
 	(cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_J} _SLAVE_BUILD= build)
 .endif