Some style issues, make stuff neded before depend be built by beforedepend.

Also make them prereq in the case of make includes

4 files changed, 29 insertions, 13 deletions

diff --git a/include/Makefile b/include/Makefile
index 67a6e3e9406..23e7cc9234a 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.61 1999/03/02 21:47:33 niklas Exp $
+#	$OpenBSD: Makefile,v 1.62 1999/03/09 00:01:41 niklas Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -40,6 +40,9 @@ RDIRS=	../lib/libc_r ../lib/libcom_err ../lib/libcompat ../lib/libcurses \
 	../lib/libpcap ../lib/libutil ../lib/libwrap ../lib/libz \
 	../sys/arch/${MACHINE}
 
+# Places using Makefile that needs a prerequisite target met before includes
+PRDIRS=
+
 # Directories with an includes target that use Makefile.bsd-wrapper
 WDIRS=	../lib/libssl ../gnu/lib/libg++/libg++ ../gnu/lib/libg++/libio \
 	../gnu/lib/libg++/librx ../gnu/lib/libg++/libstdc++ \
@@ -56,9 +59,14 @@ NOOBJ=	noobj
 SYS_INCLUDE?=	copies
 .if (${KERBEROS} == "yes")
 RDIRS+=	../kerberosIV/include ../kerberosIV/kadm ../kerberosIV/krb
+PRDIRS+=../kerberosIV/kadm ../kerberosIV/krb
 .endif
 
 prereq:
+	@-for i in ${PRDIRS}; do \
+		echo preparing in ${.CURDIR}/$$i; \
+		(cd ${.CURDIR}/$$i; ${MAKE} prereq) \
+	done
 	@-for i in ${PWDIRS}; do \
 		echo preparing in ${.CURDIR}/$$i; \
 		(cd ${.CURDIR}/$$i; ${MAKE} -f Makefile.bsd-wrapper prereq) \
diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile
index c1829ab1048..3580da09d17 100644
--- a/kerberosIV/Makefile
+++ b/kerberosIV/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 1998/09/07 00:47:12 niklas Exp $
+#	$OpenBSD: Makefile,v 1.26 1999/03/09 00:01:42 niklas Exp $
 #	from @(#)Makefile	5.1 (Berkeley) 6/25/90
 
 SUBDIR=
@@ -15,6 +15,8 @@ SUBDIR+=ext_srvtab kadmin kadmind kdb_destroy kdb_init kdb_edit \
 
 SUBDIR+=man doc
 
+LIBDIRS=acl krb kadm kafs kdb
+
 .include <bsd.own.mk> # for AFS
 
 .if (${AFS} == "yes")
@@ -22,14 +24,12 @@ SUBDIR+=afslog
 .endif
 
 build:
-	(cd ${.CURDIR}/include && ${SUDO} ${MAKE} includes)
 	${MAKE} cleandir
+	${MAKE} depend
 	${SUDO} ${MAKE} includes
-	(cd ${.CURDIR}/acl && ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install)
-	(cd ${.CURDIR}/krb && ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install)
-	(cd ${.CURDIR}/kadm && ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install)
-	(cd ${.CURDIR}/kafs && ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install)
-	(cd ${.CURDIR}/kdb && ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install)
+	for dir in ${LIBDIRS}; do \
+		(cd ${.CURDIR}/$$dir && ${MAKE} && ${SUDO} ${MAKE} install) \
+	done
 
 .include <bsd.dep.mk>
 .include <bsd.subdir.mk>
diff --git a/kerberosIV/kadm/Makefile b/kerberosIV/kadm/Makefile
index 1ef16f76440..d15b991a9bf 100644
--- a/kerberosIV/kadm/Makefile
+++ b/kerberosIV/kadm/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 1998/05/15 06:22:16 art Exp $
+#	$OpenBSD: Makefile,v 1.9 1999/03/09 00:01:42 niklas Exp $
 
 .include <bsd.obj.mk>
 
@@ -18,8 +18,12 @@ kadm_err.c kadm_err.h: kadm_err.et
 	compile_et kadm_err.et
 	-test -h kadm_err.et && rm kadm_err.et
 
+beforedepend prereq: kadm_err.h
+
 includes: kadm_err.h
-	-cd ${.OBJDIR}; cmp -s kadm_err.h ${DESTDIR}/usr/include/kerberosIV/kadm_err.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 kadm_err.h ${DESTDIR}/usr/include/kerberosIV
+	-cd ${.OBJDIR}; cmp -s kadm_err.h \
+	    ${DESTDIR}/usr/include/kerberosIV/kadm_err.h || \
+	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 kadm_err.h \
+	    ${DESTDIR}/usr/include/kerberosIV
 
 .include <bsd.lib.mk>
diff --git a/kerberosIV/krb/Makefile b/kerberosIV/krb/Makefile
index 4d9f9cfb875..61916d62cbf 100644
--- a/kerberosIV/krb/Makefile
+++ b/kerberosIV/krb/Makefile
@@ -100,8 +100,12 @@ krb_err.c krb_err.h: krb_err.et
 	compile_et krb_err.et
 	-test -h krb_err.et && rm krb_err.et
 
+beforedepend prereq: krb_err.h
+
 includes: krb_err.h
-	-cd ${.OBJDIR}; cmp -s krb_err.h ${DESTDIR}/usr/include/kerberosIV/krb_err.h || \
-	    ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 krb_err.h ${DESTDIR}/usr/include/kerberosIV
+	-cd ${.OBJDIR}; cmp -s krb_err.h \
+	    ${DESTDIR}/usr/include/kerberosIV/krb_err.h || \
+	    ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    krb_err.h ${DESTDIR}/usr/include/kerberosIV
 
 .include <bsd.lib.mk>