More fixes to help fix race bags in "make -jN".

Submitted by:	BDE (Mostly)

5 files changed, 10 insertions, 15 deletions

diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc
index 7fed9c3..ba87657 100644
--- a/kerberosIV/Makefile.inc
+++ b/kerberosIV/Makefile.inc
@@ -72,13 +72,13 @@ CFLAGS+= -I${.CURDIR}/../../include -Wall -DHAVE_CONFIG_H \
 COMPILE_ET=     compile_et
 
 ${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.h: ${KRB4DIR}/lib/kadm/kadm_err.et          
-	test -e ${KADMOBJDIR}/kadm_err.et || ln -s ${.ALLSRC} ${KADMOBJDIR}
+	test -e ${KADMOBJDIR}/kadm_err.et || ln -sf ${.ALLSRC} ${KADMOBJDIR}
 	cd ${KADMOBJDIR}; ${COMPILE_ET} kadm_err.et
 
 CLEANFILES+=${KADMOBJDIR}/kadm_err.h ${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.et
 
 ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.h: ${KRB4DIR}/lib/krb/krb_err.et
-	test -e ${KRBOBJDIR}/krb_err.et || ln -s ${.ALLSRC} ${KRBOBJDIR}
+	test -e ${KRBOBJDIR}/krb_err.et || ln -sf ${.ALLSRC} ${KRBOBJDIR}
 	cd ${KRBOBJDIR}; ${COMPILE_ET} krb_err.et
 
 CLEANFILES+=${KRBOBJDIR}/krb_err.h ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.et
diff --git a/kerberosIV/lib/libkrb/Makefile b/kerberosIV/lib/libkrb/Makefile
index 8481240..6034f5c 100644
--- a/kerberosIV/lib/libkrb/Makefile
+++ b/kerberosIV/lib/libkrb/Makefile
@@ -23,7 +23,8 @@ SRCS=		cr_err_reply.c create_auth_reply.c create_ciph.c \
 	  	rw.c kdc_reply.c encrypt_ktext.c swab.c gettimeofday.c \
 	  	check_time.c krb_err.c et_list.c resolve.c unparse_name.c \
 	  	logging.c k_concat.c \
-		snprintf.c strdup.c strtok_r.c strcasecmp.c
+		snprintf.c strdup.c strtok_r.c strcasecmp.c \
+		${KRBOBJDIR}/krb_err.h
 MAN3=		${KRB4DIR}/man/kerberos.3 \
 		${KRB4DIR}/man/krb_realmofhost.3 \
 		${KRB4DIR}/man/krb_sendauth.3 \
@@ -62,5 +63,3 @@ INCLUDES=	${KRB4DIR}/lib/krb/krb.h ${KRB4DIR}/lib/krb/klog.h \
 
 .PATH:		${KRB4DIR}/lib/krb
 .PATH:		${KRB4DIR}/lib/roken
-
-beforedepend all: ${KRBOBJDIR}/krb_err.h
diff --git a/kerberosIV/usr.bin/kadmin/Makefile b/kerberosIV/usr.bin/kadmin/Makefile
index 455b035..2abaaeb 100644
--- a/kerberosIV/usr.bin/kadmin/Makefile
+++ b/kerberosIV/usr.bin/kadmin/Makefile
@@ -2,7 +2,8 @@
 
 PROG=		kadmin
 MAN8=		${KRB4DIR}/man/kadmin.8
-SRCS=		kadmin.c new_pwd.c
+SRCS=		kadmin.c new_pwd.c \
+		${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h
 CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/roken \
 		-I${KRB4DIR}/lib/sl \
@@ -25,5 +26,3 @@ DPADD=		${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
 .include <bsd.prog.mk>
 
 .PATH:	${KRB4DIR}/kadmin
-
-beforedepend all: ${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h
diff --git a/kerberosIV/usr.sbin/kadmind/Makefile b/kerberosIV/usr.sbin/kadmind/Makefile
index 1ee92b9..eb54cdc 100644
--- a/kerberosIV/usr.sbin/kadmind/Makefile
+++ b/kerberosIV/usr.sbin/kadmind/Makefile
@@ -3,7 +3,7 @@
 PROG=		kadmind
 MAN8=		${KRB4DIR}/man/kadmind.8
 SRCS=		kadm_server.c kadm_funcs.c admin_server.c kadm_ser_wrap.c \
-		pw_check.c
+		pw_check.c ${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h
 CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/roken \
 		-I${KRB4DIR}/lib/sl \
@@ -25,5 +25,3 @@ DPADD=		${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
 .include <bsd.prog.mk>
 
 .PATH:	${KRB4DIR}/kadmin
-
-beforedepend all: ${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h
diff --git a/kerberosIV/usr.sbin/ksrvutil/Makefile b/kerberosIV/usr.sbin/ksrvutil/Makefile
index b01a66a..f2a2487 100644
--- a/kerberosIV/usr.sbin/ksrvutil/Makefile
+++ b/kerberosIV/usr.sbin/ksrvutil/Makefile
@@ -1,8 +1,9 @@
-#	$Id: Makefile,v 1.2 1997/10/02 15:03:23 markm Exp $
+#	$Id$
 
 PROG=		ksrvutil
 MAN8=		${KRB4DIR}/man/ksrvutil.8
-SRCS=		ksrvutil.c ksrvutil_get.c
+SRCS=		ksrvutil.c ksrvutil_get.c \
+		${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h
 CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/roken \
 		-I${KRB4DIR}/lib/sl \
@@ -22,5 +23,3 @@ DPADD=		${LIBROKEN} ${LIBKADM} ${LIBKDB} ${LIBKRB} \
 .include <bsd.prog.mk>
 
 .PATH:	${KRB4DIR}/kadmin
-
-beforedepend all: ${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h