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.103
retrieving revision 1.109
diff -u -p -r1.103 -r1.109
--- src/Makefile	1999/12/04 03:52:28	1.103
+++ src/Makefile	2000/03/08 00:50:05	1.109
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.103 1999/12/04 03:52:28 simonb Exp $
+#	$NetBSD: Makefile,v 1.109 2000/03/08 00:50:05 cjs 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
@@ -35,7 +35,12 @@
 #	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
@@ -47,6 +52,11 @@ _J= -j${NBUILDJOBS}
 # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
 
 SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
+.if make(obj)
+SUBDIR+= distrib
+.endif
+
+includes-lib: includes-include includes-sys
 
 .if exists(games)
 SUBDIR+= games
@@ -66,11 +76,11 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-beforeinstall:
-.ifmake build
+buildmsg:
 	@echo -n "Build started at: "
 	@date
-.endif
+
+beforeinstall:
 .ifndef DESTDIR
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
 .else
@@ -88,7 +98,7 @@ whatis.db:
 # wrt info/dir below:  It's safe to move this over top of /usr/share/info/dir,
 # as the build will automatically remove/replace the non-pkg entries there.
 
-build: beforeinstall
+build: buildmsg beforeinstall
 .if defined(FORCE_DOMESTIC)
 	@echo '*** CAPUTE!'
 	@echo '    The FORCE_DOMESTIC flag is not compatible with "make build".'
@@ -118,16 +128,16 @@ build: beforeinstall
 .endif
 	${MAKE} includes
 	(cd ${.CURDIR}/lib/csu && \
-	    ${MAKE} ${_J} dependall MKMAN=no && \
+	    ${MAKE} ${_J} MKMAN=no dependall && \
 	    ${MAKE} MKMAN=no install)
 	(cd ${.CURDIR}/lib && \
-	    ${MAKE} ${_J} dependall MKMAN=no && \
+	    ${MAKE} ${_J} MKMAN=no dependall && \
 	    ${MAKE} MKMAN=no install)
 	(cd ${.CURDIR}/gnu/lib && \
-	    ${MAKE} ${_J} dependall MKMAN=no MKINFO=no && \
+	    ${MAKE} ${_J} MKMAN=no MKINFO=no dependall && \
 	    ${MAKE} MKMAN=no MKINFO=no install)
-.if ${MKSHARE} != "no"
-	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
+.if target(cryptobuild)
+	${MAKE} ${_J} cryptobuild
 .endif
 	${MAKE} ${_J} dependall && ${MAKE} _BUILD= install
 .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM)