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.40
retrieving revision 1.52
diff -u -p -r1.40 -r1.52
--- src/Makefile	1997/05/26 03:55:19	1.40
+++ src/Makefile	1998/05/10 10:37:59	1.52
@@ -1,18 +1,18 @@
-#	$NetBSD: Makefile,v 1.40 1997/05/26 03:55:19 cjs Exp $
+#	$NetBSD: Makefile,v 1.52 1998/05/10 10:37:59 mycroft Exp $
 
 .include <bsd.own.mk>			# for configuration variables.
 
 # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
 
-SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share
+SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys
 
 .if exists(games)
 SUBDIR+= games
 .endif
 
 SUBDIR+= gnu
-
-SUBDIR+= sys
+# This is needed for libstdc++ and gen-params.
+includes-gnu: includes-include includes-sys
 
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
 SUBDIR+= domestic
@@ -29,6 +29,10 @@ regression-tests:
 .endif
 
 beforeinstall:
+.ifmake build
+	@echo -n "Build started at: "
+	@date
+.endif
 .ifndef DESTDIR
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
 .else
@@ -40,31 +44,54 @@ afterinstall:
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
 
-oldbuild:
+build: beforeinstall
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-	${MAKE} includes
+	(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
+.if exists(domestic) && !defined (EXPORTABLE_SYSTEM)
+.if exists(domestic/usr.bin/compile_et)
+	(cd ${.CURDIR}/domestic/usr.bin/compile_et && \
+	    ${MAKE} depend && ${MAKE} && \
+	    ${MAKE} install)
+.endif
+.if exists(domestic/usr.bin/make_cmds)
+	(cd ${.CURDIR}/domestic/usr.bin/make_cmds && \
+	    ${MAKE} depend && ${MAKE} && \
+	    ${MAKE} install)
+.endif
+.endif
 .if !defined(UPDATE)
 	${MAKE} cleandir
 .endif
+	${MAKE} includes
 	(cd ${.CURDIR}/lib/csu && ${MAKE} depend && ${MAKE} && ${MAKE} install)
 	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
 	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
+	(cd ${.CURDIR}/usr.bin/lex &&\
+	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
+	(cd ${.CURDIR}/usr.bin/yacc && \
+	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
+	(cd ${.CURDIR}/usr.bin/xlint && \
+	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
+# libtelnet depends on libdes and libkrb.  libkrb depends on
+# libcom_err.
+.if exists(domestic/lib/libdes)
+	(cd ${.CURDIR}/domestic/lib/libdes && \
+	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
+.endif
+.if exists(domestic/lib/libcom_err)
+	(cd ${.CURDIR}/domestic/lib/libcom_err && \
+	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
+.endif
+.if exists(domestic/lib/libkrb)
+	(cd ${.CURDIR}/domestic/lib/libkrb && \
+	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
+.endif
 	(cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE} && \
 	    ${MAKE} install)
 .endif
 	${MAKE} depend && ${MAKE} && ${MAKE} install
-
-build:
-	@# can't do domestic includes until crt0.o, etc. is built.
-	${MAKE} EXPORTABLE_SYSTEM=1 includes
-	(cd ${.CURDIR}/lib/csu && ${MAKE} depend && ${MAKE})
-	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE})
-	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE})
-.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
-	(cd ${.CURDIR}/domestic && ${MAKE} includes)
-	(cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE})
-.endif
-	${MAKE} depend && ${MAKE}
+	@echo -n "Build finished at: "
+	@date
 
 .include <bsd.subdir.mk>