diff --git a/Makefile b/Makefile
index 6896df87d4fc..d0ebcc0272d2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 #
-#	$Id: Makefile,v 1.147 1997/09/28 09:26:05 markm Exp $
+#	$Id: Makefile,v 1.109.2.19 1997/09/28 16:33:05 mckay Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
-#	-DMAKE_KERBEROS4 to build KerberosIV
+#	-DMAKE_EBONES to build eBones (KerberosIV)
 #	-DALLLANG to build documentation for all languages
 #	  (where available -- see share/doc/Makefile)
 #
@@ -17,7 +17,6 @@
 #	-DNOGAMES do not go into games subdir
 #	-DNOSHARE do not go into share subdir
 #	-DNOINFO do not make or install info files
-#	-DNOLIBC_R do not build libc_r.
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 
 #
@@ -40,14 +39,7 @@
 # Put initial settings here.
 SUBDIR=
 
-# We must do share/info early so that installation of info `dir'
-# entries works correctly.  Do it first since it is less likely to
-# grow dependencies on include and lib than vice versa.
-.if exists(share/info)
-SUBDIR+= share/info
-.endif
-
-# We must do include and lib early so that the perl *.ph generation
+# We must do include and lib first so that the perl *.ph generation
 # works correctly as it uses the header files installed by this.
 .if exists(include)
 SUBDIR+= include
@@ -65,8 +57,8 @@ SUBDIR+= games
 .if exists(gnu)
 SUBDIR+= gnu
 .endif
-.if exists(kerberosIV) && !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
-SUBDIR+= kerberosIV
+.if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
+SUBDIR+= eBones
 .endif
 .if exists(libexec)
 SUBDIR+= libexec
@@ -154,7 +146,7 @@ world:
 	cd ${.CURDIR} && ${MAKE} pre-world
 .endif
 	cd ${.CURDIR} && ${MAKE} buildworld
-	cd ${.CURDIR} && ${MAKE} installworld
+	cd ${.CURDIR} && ${MAKE} -B installworld
 .if target(post-world)
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -223,10 +215,10 @@ buildworld:
 	@echo "--------------------------------------------------------------"
 	mkdir -p ${WORLDTMP}/usr/bin
 	cd ${.CURDIR}/usr.bin/make && \
-		${IBMAKE} -I${.CURDIR}/share/mk \
-			${CLEANDIR} ${OBJDIR} depend && \
+		${IBMAKE} -I${.CURDIR}/share/mk -B ${CLEANDIR} ${OBJDIR} depend && \
+		${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} all && \
 		${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} \
-			all install clean cleandepend
+			-B all install clean cleandepend
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo " Making hierarchy"
@@ -237,14 +229,14 @@ buildworld:
 	@echo "--------------------------------------------------------------"
 	@echo " Cleaning up the obj tree"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${BMAKE} ${CLEANDIR}
+	cd ${.CURDIR} && ${BMAKE} par-${CLEANDIR}
 .endif
 .if !defined(NOOBJDIR)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo " Rebuilding the obj tree"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${BMAKE} obj
+	cd ${.CURDIR} && ${BMAKE} par-obj
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -280,7 +272,7 @@ buildworld:
 	@echo "--------------------------------------------------------------"
 	@echo " Rebuilding dependencies"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${XMAKE} depend
+	cd ${.CURDIR} && ${XMAKE} ${.MAKEFLAGS} par-depend
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo " Building everything.."
@@ -341,7 +333,7 @@ update:
 	@echo "--------------------------------------------------------------"
 	@echo "Updating /usr/src from cvs repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && cvs -q update -P -d
+	cd ${.CURDIR} && cvs -q update -P -d -r RELENG_2_2
 .endif
 
 #
@@ -353,19 +345,19 @@ most:
 	@echo "--------------------------------------------------------------"
 	@echo " Building programs only"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}/bin	&&	${MAKE} all
-	cd ${.CURDIR}/sbin	&&	${MAKE} all
-	cd ${.CURDIR}/libexec	&&	${MAKE} all
-	cd ${.CURDIR}/usr.bin	&&	${MAKE} all
-	cd ${.CURDIR}/usr.sbin	&&	${MAKE} all
-	cd ${.CURDIR}/gnu/libexec &&	${MAKE} all
-	cd ${.CURDIR}/gnu/usr.bin &&	${MAKE} all
-	cd ${.CURDIR}/gnu/usr.sbin &&	${MAKE} all
-#.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT)
-#	cd ${.CURDIR}/kerberosIV	&&	${MAKE} most
+	cd ${.CURDIR}/bin	&&	${MAKE} ${.MAKEFLAGS} all
+	cd ${.CURDIR}/sbin	&&	${MAKE} ${.MAKEFLAGS} all
+	cd ${.CURDIR}/libexec	&&	${MAKE} ${.MAKEFLAGS} all
+	cd ${.CURDIR}/usr.bin	&&	${MAKE} ${.MAKEFLAGS} all
+	cd ${.CURDIR}/usr.sbin	&&	${MAKE} ${.MAKEFLAGS} all
+	cd ${.CURDIR}/gnu/libexec &&	${MAKE} ${.MAKEFLAGS} all
+	cd ${.CURDIR}/gnu/usr.bin &&	${MAKE} ${.MAKEFLAGS} all
+	cd ${.CURDIR}/gnu/usr.sbin &&	${MAKE} ${.MAKEFLAGS} all
+#.if defined(MAKE_EBONES) && !defined(NOCRYPT)
+#	cd ${.CURDIR}/eBones	&&	${MAKE} ${.MAKEFLAGS} most
 #.endif
 #.if !defined(NOSECURE) && !defined(NOCRYPT)
-#	cd ${.CURDIR}/secure	&&	${MAKE} most
+#	cd ${.CURDIR}/secure	&&	${MAKE} ${.MAKEFLAGS} most
 #.endif
 
 #
@@ -378,19 +370,19 @@ installmost:
 	@echo "--------------------------------------------------------------"
 	@echo " Installing programs only"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}/bin	&&	${MAKE} install
-	cd ${.CURDIR}/sbin	&&	${MAKE} install
-	cd ${.CURDIR}/libexec	&&	${MAKE} install
-	cd ${.CURDIR}/usr.bin	&&	${MAKE} install
-	cd ${.CURDIR}/usr.sbin	&&	${MAKE} install
-	cd ${.CURDIR}/gnu/libexec &&	${MAKE} install
-	cd ${.CURDIR}/gnu/usr.bin &&	${MAKE} install
-	cd ${.CURDIR}/gnu/usr.sbin &&	${MAKE} install
-#.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT)
-#	cd ${.CURDIR}/kerberosIV &&	${MAKE} installmost
+	cd ${.CURDIR}/bin	&&	${MAKE} ${.MAKEFLAGS} install
+	cd ${.CURDIR}/sbin	&&	${MAKE} ${.MAKEFLAGS} install
+	cd ${.CURDIR}/libexec	&&	${MAKE} ${.MAKEFLAGS} install
+	cd ${.CURDIR}/usr.bin	&&	${MAKE} ${.MAKEFLAGS} install
+	cd ${.CURDIR}/usr.sbin	&&	${MAKE} ${.MAKEFLAGS} install
+	cd ${.CURDIR}/gnu/libexec &&	${MAKE} ${.MAKEFLAGS} install
+	cd ${.CURDIR}/gnu/usr.bin &&	${MAKE} ${.MAKEFLAGS} install
+	cd ${.CURDIR}/gnu/usr.sbin &&	${MAKE} ${.MAKEFLAGS} install
+#.if defined(MAKE_EBONES) && !defined(NOCRYPT)
+#	cd ${.CURDIR}/eBones	&&	${MAKE} ${.MAKEFLAGS} installmost
 #.endif
 #.if !defined(NOSECURE) && !defined(NOCRYPT)
-#	cd ${.CURDIR}/secure	&&	${MAKE} installmost
+#	cd ${.CURDIR}/secure	&&	${MAKE} ${.MAKEFLAGS} installmost
 #.endif
 
 #
@@ -423,11 +415,14 @@ bootstrap:
 	cd ${.CURDIR}/include && make symlinks
 .endif
 	cd ${.CURDIR}/usr.bin/make && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/usr.bin/xinstall && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/usr.bin/lex && ${MAKE} bootstrap && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} -DNOLIB all install ${CLEANDIR}
+		${MAKE} ${MK_FLAGS} -DNOLIB && \
+		${MAKE} ${MK_FLAGS} -DNOLIB -B install ${CLEANDIR}
 .if !defined(NOOBJDIR)
 	cd ${.CURDIR}/usr.bin/lex && ${MAKE} obj
 .endif
@@ -441,8 +436,9 @@ bootstrap:
 # on cleaned away headers in ${WORLDTMP}.
 #
 include-tools:
-	cd ${.CURDIR}/usr.bin/rpcgen && ${MAKE} cleandepend depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+	cd ${.CURDIR}/usr.bin/rpcgen && ${MAKE} -B cleandepend depend && \
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 
 #
 # includes - possibly generate and install the include files.
@@ -453,34 +449,22 @@ includes:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
 .endif
-	cd ${.CURDIR}/include &&		${MAKE} all install
+	cd ${.CURDIR}/include &&		${MAKE} -B all install
 	cd ${.CURDIR}/gnu/include &&		${MAKE} install
-	cd ${.CURDIR}/gnu/lib/libmp &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libobjc &&	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libreadline &&	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libregex &&	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libstdc++ &&	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libg++ &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libdialog &&	${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libgmp &&		${MAKE} beforeinstall
-.if exists(secure) && !defined(NOCRYPT)
-	cd ${.CURDIR}/secure/lib/libdes &&	${MAKE} beforeinstall
-.endif
-.if exists(kerberosIV) && !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
-	cd ${.CURDIR}/kerberosIV/lib/libacl &&	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libkadm &&	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libkafs &&	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libkdb &&	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libkrb &&	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libtelnet && ${MAKE} beforeinstall
-.else
-	cd ${.CURDIR}/lib/libtelnet &&		${MAKE} beforeinstall
+.if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
+	cd ${.CURDIR}/eBones/include &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/eBones/lib/libkrb &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/eBones/lib/libkadm &&	${MAKE} beforeinstall
 .endif
 	cd ${.CURDIR}/lib/csu/i386 &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libalias &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libc &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcurses &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libdisk &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libedit &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libftpio &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmd &&		${MAKE} beforeinstall
@@ -489,23 +473,15 @@ includes:
 .if !defined(WANT_CSRG_LIBM)
 	cd ${.CURDIR}/lib/msun &&		${MAKE} beforeinstall
 .endif
-	cd ${.CURDIR}/lib/libopie &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libpcap &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/librpcsvc &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libskey &&		${MAKE} beforeinstall
-.if !defined(NOTCL) && exists (${.CURDIR}/contrib/tcl) && \
-	exists(${.CURDIR}/usr.bin/tclsh) && exists (${.CURDIR}/lib/libtcl)
-	cd ${.CURDIR}/lib/libtcl &&		${MAKE} installhdrs
-.endif
 	cd ${.CURDIR}/lib/libtermcap &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcom_err &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libss &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libscsi &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libutil &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libvgl &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libz &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/usr.bin/f2c &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/usr.bin/lex &&		${MAKE} beforeinstall
 
 #
 # lib-tools - build tools to compile and install the libraries.
@@ -528,7 +504,8 @@ lib-tools:
 		usr.bin/ranlib		\
 		usr.bin/uudecode
 	cd ${.CURDIR}/$d && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endfor
 
 #
@@ -537,43 +514,53 @@ lib-tools:
 libraries:
 .if exists(lib/csu/i386)
 	cd ${.CURDIR}/lib/csu/i386 && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(lib/libcompat)
 	cd ${.CURDIR}/lib/libcompat && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(lib/libncurses)
 	cd ${.CURDIR}/lib/libncurses && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(lib/libtermcap)
 	cd ${.CURDIR}/lib/libtermcap && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(gnu)
 	cd ${.CURDIR}/gnu/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
 	cd ${.CURDIR}/secure/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(lib)
 	cd ${.CURDIR}/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(usr.bin/lex/lib)
 	cd ${.CURDIR}/usr.bin/lex/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
-.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
-	cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+.if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
+	cd ${.CURDIR}/eBones/lib && ${MAKE} depend && \
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(usr.sbin/pcvt/keycap)
 	cd ${.CURDIR}/usr.sbin/pcvt/keycap && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 
 #
@@ -644,7 +631,25 @@ build-tools:
 		usr.sbin/mtree		\
 		usr.sbin/zic
 	cd ${.CURDIR}/$d && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
+.endfor
+
+.for __target in clean cleandir obj depend
+.for entry in ${SUBDIR}
+${entry}.${__target}__D: .PHONY
+	if test -d ${.CURDIR}/${entry}.${MACHINE}; then \
+		${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE}"; \
+		edir=${entry}.${MACHINE}; \
+		cd ${.CURDIR}/$${edir}; \
+	else \
+		${ECHODIR} "===> ${DIRPRFX}${entry}"; \
+		edir=${entry}; \
+		cd ${.CURDIR}/$${edir}; \
+	fi; \
+	${MAKE} ${__target} DIRPRFX=${DIRPRFX}$${edir}/
+.endfor
+par-${__target}: ${SUBDIR:S/$/.${__target}__D/}
 .endfor
 
 .include <bsd.subdir.mk>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 341cdeea6b39..fe0d02e4c419 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
-#	$Id: Makefile,v 1.21 1997/05/21 03:23:23 steve Exp $
+#	$Id: Makefile,v 1.22 1997/08/25 19:50:01 bde Exp $
 
 PROG=	sh
 SHSRCS=	alias.c cd.c echo.c error.c eval.c exec.c expand.c \
@@ -7,7 +7,8 @@ SHSRCS=	alias.c cd.c echo.c error.c eval.c exec.c expand.c \
 	mystring.c options.c output.c parser.c printf.c redir.c show.c \
 	trap.c var.c
 GENSRCS= arith.c arith_lex.c builtins.c init.c nodes.c syntax.c
-SRCS=	${SHSRCS} ${GENSRCS}
+GENHDRS= builtins.h nodes.h syntax.h token.h
+SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS}
 
 DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
 LDADD+= -ll -ledit -ltermcap
@@ -19,13 +20,13 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR}
 
 .PATH:	${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf
 
-CLEANFILES+= builtins.h mkinit mkinit.o mknodes mknodes.o \
+CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \
 	mksyntax mksyntax.o \
-	nodes.h syntax.h token.h y.tab.h
-CLEANFILES+= ${GENSRCS}
+	y.tab.h
+CLEANFILES+= ${GENSRCS} ${GENHDRS}
 
-beforedepend: builtins.h nodes.h syntax.h token.h
 
+.ORDER: builtins.c builtins.h
 builtins.c builtins.h: mkbuiltins builtins.def
 	cd ${.CURDIR}; sh mkbuiltins ${.OBJDIR}
 
@@ -45,9 +46,11 @@ mknodes.o: mknodes.c		# XXX and many headers
 mksyntax: mksyntax.o
 mksyntax.o: mksyntax.c		# XXX and many headers
 
+.ORDER: nodes.c nodes.h
 nodes.c nodes.h: mknodes nodetypes nodes.c.pat
 	./mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat
 
+.ORDER: syntax.c syntax.h
 syntax.c syntax.h: mksyntax
 	./mksyntax
 
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index da9dbcbbb5be..90b569625e4e 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.27 1997/05/01 16:24:37 pst Exp $
+#	$Id: Makefile,v 1.28 1997/05/02 11:22:51 gj Exp $
 
 PROG = gdb
 
@@ -39,7 +39,8 @@ CFLAGS+= -DNO_MMALLOC
 #CFLAGS+= -g
 
 CLEANFILES+=	c-exp.c f-exp.c m2-exp.c init.c y.tab.h init.c-tmp
-beforedepend:	c-exp.c f-exp.c m2-exp.c init.c
+#beforedepend:	c-exp.c f-exp.c m2-exp.c init.c
+.ORDER:	c-exp.c f-exp.c m2-exp.c
 
 .if exists(${.OBJDIR}/../bfd)
 LDADD+=   -L${.OBJDIR}/../bfd -lbfd
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 1ea687047e3f..51435074f2c9 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,12 +1,12 @@
 #
-# $Id: Makefile,v 1.11 1997/02/22 15:44:56 peter Exp $
+# $Id: Makefile,v 1.12 1997/06/29 06:03:27 pst Exp $
 #
 
 #First, so that we get cp/tree.c and cp/expr.c instead of the C version
 .PATH:	${.CURDIR}/../../../../contrib/gcc/cp
 
 PROG =	cc1plus
-SRCS =	parse.c \
+SRCS =	parse.c parse.h \
 	call.c class.c cvt.c decl.c decl2.c edsel.c errfn.c \
 	error.c except.c expr.c gc.c init.c lex.c method.c pt.c \
 	ptree.c repo.c search.c sig.c spew.c tree.c typeck.c typeck2.c xref.c
@@ -17,6 +17,7 @@ DPADD+=	${LIBCC_INT}
 LDADD+=	${LIBCC_INT}
 CFLAGS+= -I.	# I mean it.
 
+.ORDER: parse.c parse.h
 parse.c parse.h: parse.y
 	${BISON} -d ${GCCDIR}/cp/parse.y -o parse.c 
 	grep '^#define[   ]*YYEMPTY' parse.c >>parse.h
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 6b0c8623c4e8..93d9038b0d20 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 15:44:58 peter Exp $
 #
 
 #
@@ -26,8 +26,9 @@ SRCS+= bc-$i.h
 
 .endfor
 
+.ORDER: bi-parser.c bi-parser.h
 bi-parser.c bi-parser.h:	bi-parser.y
-	${BISON} ${BISONFLAGS} -d ${.ALLSRC} -o ${.TARGET}
+	${BISON} ${BISONFLAGS} -d ${.ALLSRC} -o bi-parser.c
 
 SRCS+= bi-parser.c bi-parser.h
 
@@ -82,6 +83,7 @@ SRCS+=	hash.h
 
 #-----------------------------------------------------------------------
 # C parser
+.ORDER: c-parse.c c-parse.h
 c-parse.c c-parse.h: c-parse.in
 	sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \
 	    -e "/^ifc$$/d" -e "/^end ifc$$/d" \
@@ -94,6 +96,7 @@ CLEANFILES+= c-parse.y		# insurance
 
 #-----------------------------------------------------------------------
 # objc parser
+.ORDER: objc-parse.c objc-parse.h
 objc-parse.c objc-parse.h: c-parse.in
 	sed -e "/^ifc$$/,/^end ifc$$/d" \
 	    -e "/^ifobjc$$/d" -e "/^end ifobjc$$/d" \
@@ -115,6 +118,12 @@ CLEANFILES+=	${SRCS}
 #-----------------------------------------------------------------------
 all:		${BINFORMAT} ${SRCS}
 
+#-----------------------------------------------------------------------
+# Make 'depend' in compat mode
+.if make(depend)
+.SINGLESHELL:
+.endif
+
 beforedepend:	${BINFORMAT}
 
 #-----------------------------------------------------------------------
diff --git a/gnu/usr.bin/cc/cccp/Makefile b/gnu/usr.bin/cc/cccp/Makefile
index 8419dea21eeb..f2fcf23e0ab5 100644
--- a/gnu/usr.bin/cc/cccp/Makefile
+++ b/gnu/usr.bin/cc/cccp/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.9 1997/02/22 15:44:59 peter Exp $
 #
 
 PROG =	cpp
@@ -9,6 +9,7 @@ SRCS+=	obstack.c version.c
 MAN1=	cccp.1
 MLINKS=	cccp.1 cpp.1
 
+.ORDER: cexp.c cexp.h
 cexp.c cexp.h: cexp.y
 	${BISON} -d ${GCCDIR}/cexp.y -o cexp.c
 
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index 8419dea21eeb..f2fcf23e0ab5 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.9 1997/02/22 15:44:59 peter Exp $
 #
 
 PROG =	cpp
@@ -9,6 +9,7 @@ SRCS+=	obstack.c version.c
 MAN1=	cccp.1
 MLINKS=	cccp.1 cpp.1
 
+.ORDER: cexp.c cexp.h
 cexp.c cexp.h: cexp.y
 	${BISON} -d ${GCCDIR}/cexp.y -o cexp.c
 
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index da9dbcbbb5be..90b569625e4e 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.27 1997/05/01 16:24:37 pst Exp $
+#	$Id: Makefile,v 1.28 1997/05/02 11:22:51 gj Exp $
 
 PROG = gdb
 
@@ -39,7 +39,8 @@ CFLAGS+= -DNO_MMALLOC
 #CFLAGS+= -g
 
 CLEANFILES+=	c-exp.c f-exp.c m2-exp.c init.c y.tab.h init.c-tmp
-beforedepend:	c-exp.c f-exp.c m2-exp.c init.c
+#beforedepend:	c-exp.c f-exp.c m2-exp.c init.c
+.ORDER:	c-exp.c f-exp.c m2-exp.c
 
 .if exists(${.OBJDIR}/../bfd)
 LDADD+=   -L${.OBJDIR}/../bfd -lbfd
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 9256d62d95a2..8eeec153bd32 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libpcap
-# $Id: Makefile,v 1.15 1997/02/22 15:07:50 peter Exp $
+# $Id: Makefile,v 1.16 1997/05/27 00:08:01 fenner Exp $
 
 LIB=    pcap
 SRCS=	grammar.c tokdefs.h pcap-bpf.c \
@@ -32,6 +32,7 @@ beforeinstall:
 		${DESTDIR}/usr/include
 .endfor
 
+.ORDER: grammar.c tokdefs.h
 tokdefs.h grammar.c: grammar.y
 	${YACC} ${YACCFLAGS} -d ${PCAP_DISTDIR}/grammar.y
 	mv y.tab.c grammar.c
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index 21e0ca5c7e05..5902c077870b 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 /*
@@ -126,7 +126,7 @@ pw_tmp()
 	int fd;
 	char *p;
 
-	if (p = strrchr(path, '/'))
+	if ((p = strrchr(path, '/')))
 		++p;
 	else
 		p = path;
@@ -172,7 +172,7 @@ pw_edit(notsetuid)
 
 	if (!(editor = getenv("EDITOR")))
 		editor = _PATH_VI;
-	if (p = strrchr(editor, '/'))
+	if ((p = strrchr(editor, '/')))
 		++p;
 	else
 		p = editor;
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 49e98d508309..7a5796d0a739 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,11 +1,12 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
-#	$Id: Makefile,v 1.21 1997/04/26 12:12:10 davidn Exp $
+#	$Id: Makefile,v 1.22 1997/04/29 12:42:07 davidn Exp $
 
 PROG=	ftpd
 MAN8=	ftpd.8
 SRCS=	ftpd.c ftpcmd.c logwtmp.c popen.c skey-stuff.c
 
-CFLAGS+=-DSETPROCTITLE -DSKEY -DLOGIN_CAP -DVIRTUAL_HOSTING -Wall
+CFLAGS+=-DSETPROCTITLE -DSKEY -DLOGIN_CAP -DVIRTUAL_HOSTING -Wall \
+	-I${.CURDIR}/../../contrib-crypto/telnet
 
 LDADD=	-lskey -lmd -lcrypt -lutil
 DPADD=	${LIBSKEY} ${LIBMD} ${LIBCRYPT} ${LIBUTIL}
@@ -19,7 +20,7 @@ SRCS+=	ls.c cmp.c print.c stat_flags.c util.c
 CFLAGS+=-DINTERNAL_LS -Dmain=ls_main -I${.CURDIR}/${LSDIR}
 .endif
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES)
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
 .PATH:  ${.CURDIR}/../../usr.bin/login
 SRCS+=	klogin.c
 LDADD+=	-lkrb -ldes
diff --git a/secure/Makefile b/secure/Makefile
index e91781f463c4..7d23aa160cc2 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.11 1997/02/22 14:40:11 peter Exp $
 
 # lib must be first, or it will not work.  This is because we reference
 # the lib's in the directory where they are built from the binaries we
@@ -12,9 +12,9 @@ CODAI=	${MAKE} ${MFLAGS} cleandir; \
 	${MAKE} ${MFLAGS} obj; \
 	${MAKE} ${MFLAGS} depend all install
 
-CODAD=	${MAKE} ${MFLAGS} MAKE_EBONES=yes cleandir; \
-	${MAKE} ${MFLAGS} MAKE_EBONES=yes obj; \
-	${MAKE} ${MFLAGS} MAKE_EBONES=yes depend all distribute
+CODAD=	${MAKE} ${MFLAGS} cleandir; \
+	${MAKE} ${MFLAGS} obj; \
+	${MAKE} ${MFLAGS} depend all distribute
 
 # These are the programs which depend on secure libs
 sprog:
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 257d3bfbcc0a..a63d79e14b2d 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.dep.mk,v 1.13 1997/06/18 03:39:34 asami Exp $
+#	$Id: bsd.dep.mk,v 1.14 1997/08/26 16:54:33 bde Exp $
 #
 # The include file <bsd.dep.mk> handles Makefile dependencies.
 #
@@ -33,8 +33,8 @@ DEPENDFILE?=	.depend
 
 # some of the rules involve .h sources, so remove them from mkdep line
 .if !target(depend)
-depend: beforedepend ${DEPENDFILE} afterdepend _SUBDIR
 .if defined(SRCS)
+depend: beforedepend ${DEPENDFILE} afterdepend _SUBDIR
 
 # .if defined ${SRCS:M*.[sS]} does not work
 __depend_s=	${SRCS:M*.[sS]}
@@ -60,11 +60,15 @@ ${DEPENDFILE}: ${SRCS}
 	cd ${.CURDIR}; ${MAKE} _EXTRADEPEND
 .endif
 
+.ORDER: ${DEPENDFILE} afterdepend
 .else
-${DEPENDFILE}: _SUBDIR
+depend: beforedepend afterdepend _SUBDIR
 .endif
 .if !target(beforedepend)
 beforedepend:
+.else
+.ORDER: beforedepend ${DEPENDFILE}
+.ORDER: beforedepend afterdepend
 .endif
 .if !target(afterdepend)
 afterdepend:
diff --git a/sys/i386/boot/netboot/Makefile b/sys/i386/boot/netboot/Makefile
index 15c433aa22b0..c7a9cf0a9f29 100644
--- a/sys/i386/boot/netboot/Makefile
+++ b/sys/i386/boot/netboot/Makefile
@@ -72,16 +72,18 @@ nb3c509.rom:	makerom start2.ro ${SRCS:N*.h:R:S/$/.o/g} 3c509.o
 	${.OBJDIR}/makerom ${.TARGET}
 
 nb8390.com:	makerom start2.ro ${SRCS:N*.h:R:S/$/.o/g} ns8390.o
-	${LD} ${LDFLAGS} -o netboot.com ${OBJS} ns8390.o
-	strip netboot.com
-	size netboot.com
-	dd ibs=32 skip=1 if=netboot.com of=${.TARGET}
+	${LD} ${LDFLAGS} -o ${.TARGET}.tmp ${OBJS} ns8390.o
+	strip ${.TARGET}.tmp
+	size ${.TARGET}.tmp
+	dd ibs=32 skip=1 if=${.TARGET}.tmp of=${.TARGET}
+	rm -f ${.TARGET}.tmp
 
 nb3c509.com:	start2.o ${SRCS:N*.h:R:S/$/.o/g} 3c509.o
-	${LD} ${LDFLAGS} -o netboot.com ${OBJS} 3c509.o
-	strip netboot.com
-	size netboot.com
-	dd ibs=32 skip=1 if=netboot.com of=${.TARGET}
+	${LD} ${LDFLAGS} -o ${.TARGET}.tmp ${OBJS} 3c509.o
+	strip ${.TARGET}.tmp
+	size ${.TARGET}.tmp
+	dd ibs=32 skip=1 if=${.TARGET}.tmp of=${.TARGET}
+	rm -f ${.TARGET}.tmp
 
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index 4bb9dc0cc2d6..acf31c159814 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,10 +1,11 @@
-#	$Id$
+#	$Id: Makefile,v 1.6 1997/06/25 08:56:33 msmith Exp $
 #	$NetBSD: Makefile,v 1.11 1997/03/24 21:59:36 christos Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
 
 PROG=	ftp
 SRCS=	cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \
 	util.c
+CFLAGS+=-I${.CURDIR}/../../contrib-crypto/telnet
 
 LDADD+=	-ledit -ltermcap
 DPADD+=	${LIBEDIT} ${LIBTERMCAP}
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 63f36e93c212..a63599f46bb9 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.10 1997/02/22 19:55:34 peter Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -15,6 +15,7 @@ LINKS+=	${BINDIR}/lex ${BINDIR}/flex
 LINKS+=	${BINDIR}/lex ${BINDIR}/flex++
 
 SRCS=		scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.c \
+		parse.h \
 		skel.c sym.c tblcmp.c yylex.c
 LFLAGS+=	-is
 CFLAGS+=	-I. -I${.CURDIR}
@@ -34,6 +35,7 @@ beforeinstall:
 		${.CURDIR}/FlexLexer.h ${DESTDIR}/usr/include/g++
 
 
+.ORDER:	parse.c parse.h
 parse.c parse.h: parse.y
 	$(YACC) -d $(.CURDIR)/parse.y
 	mv -f y.tab.c parse.c
@@ -46,7 +48,6 @@ bootstrap: initscan.c
 		cp -f ${.CURDIR}/initscan.c scan.c ; \
 	}
 
-beforedepend: parse.h
 scan.o:	parse.h
 
 test: check
diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
index f0e4f39304a4..c55a2a9587c0 100644
--- a/usr.sbin/amd/fsinfo/Makefile
+++ b/usr.sbin/amd/fsinfo/Makefile
@@ -1,9 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/28/93
-# 	$Id$
+# 	$Id: Makefile,v 1.5 1997/02/22 16:03:14 peter Exp $
 
 PROG=	fsinfo
 MAN8=	fsinfo.8
-SRCS=	fsinfo.c fsi_gram.c fsi_lex.c \
+SRCS=	fsinfo.c fsi_gram.c fsi_gram.h fsi_lex.c \
 	fsi_util.c fsi_analyze.c fsi_dict.c \
 	wr_atab.c wr_bparam.c wr_dumpset.c \
 	wr_exportfs.c wr_fstab.c
@@ -16,6 +16,7 @@ CFLAGS+=-I${.CURDIR}/../config
 CFLAGS+=-DOS_HDR=\"os-bsd44.h\"
 
 fsi_lex.o fsinfo.o: fsi_gram.h
+.ORDER: fsi_gram.c fsi_gram.h
 fsi_gram.c fsi_gram.h: ../fsinfo/fsi_gram.y
 	@echo "# expect 2 shift/reduce conflicts"
 	${YACC} -d ${.CURDIR}/fsi_gram.y
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index fa51a768bb96..ed8dbc6ed197 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -22,8 +22,8 @@ DBMDEF=	-DNEWDB
 NIS=	-DNIS
 
 # If you want tcp wrapper support, uncomment the following two lines
-#TCPWRAPPERSBASEDIR=	/usr/local
-#TCPWRAPPERS=		-DTCPWRAPPERS -I${TCPWRAPPERSBASEDIR}/include
+TCPWRAPPERSBASEDIR=	/usr/local
+TCPWRAPPERS=		-DTCPWRAPPERS -I${TCPWRAPPERSBASEDIR}/include
 
 CFLAGS+=-I${.CURDIR} ${DBMDEF} ${NIS} ${TCPWRAPPERS} #-DNETISO
 
diff --git a/usr.sbin/vipw/pw_util.c b/usr.sbin/vipw/pw_util.c
index 21e0ca5c7e05..5902c077870b 100644
--- a/usr.sbin/vipw/pw_util.c
+++ b/usr.sbin/vipw/pw_util.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 /*
@@ -126,7 +126,7 @@ pw_tmp()
 	int fd;
 	char *p;
 
-	if (p = strrchr(path, '/'))
+	if ((p = strrchr(path, '/')))
 		++p;
 	else
 		p = path;
@@ -172,7 +172,7 @@ pw_edit(notsetuid)
 
 	if (!(editor = getenv("EDITOR")))
 		editor = _PATH_VI;
-	if (p = strrchr(editor, '/'))
+	if ((p = strrchr(editor, '/')))
 		++p;
 	else
 		p = editor;