* Remove headers from SRCS that are not generated

  (and are in /usr/src/crypto/heimdal/).

* Avoid race conditions with 'make -j<N>'.

5 files changed, 6 insertions, 7 deletions

diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 421d5a2..ac1dffa 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	hprop
 MAN=	hprop.8
-SRCS=	hprop.c mit_dump.c hprop.h
+SRCS=	hprop.c mit_dump.c
 CFLAGS+=-I${KRB5DIR}/lib/roken
 CFLAGS+=-I${KRB5DIR}/lib/krb5
 CFLAGS+=-I${KRB5DIR}/lib/asn1
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 418fbdd..f88ac2f 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -5,7 +5,6 @@ MAN=	kadmind.8
 SRCS=	rpc.c \
 	server.c \
 	kadmind.c \
-	kadmin_locl.h \
 	kadm_conn.c
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile
index 233cf8a..2643b83 100644
--- a/kerberos5/libexec/kcm/Makefile
+++ b/kerberos5/libexec/kcm/Makefile
@@ -11,9 +11,6 @@ SRCS=	acl.c \
 	connect.c \
 	events.c \
 	glue.c \
-	headers.h \
-	kcm_locl.h \
-	kcm-protos.h \
 	log.c \
 	main.c \
 	protocol.c \
diff --git a/kerberos5/libexec/kdigest/Makefile b/kerberos5/libexec/kdigest/Makefile
index 208b021..b4d7d55 100644
--- a/kerberos5/libexec/kdigest/Makefile
+++ b/kerberos5/libexec/kdigest/Makefile
@@ -13,9 +13,13 @@ SRCS=	kdigest.c \
 	kdigest-commands.c \
 	kdigest-commands.h
 
-kdigest-commands.c kdigest-commands.h: kdigest-commands.in
+kdigest-commands.h: kdigest-commands.in
 	slc ${.ALLSRC:M*.in}
 
+.for ext in c o
+kdigest-commands.${ext}: kdigest-commands.h
+.endfor
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/libexec/kfd/Makefile b/kerberos5/libexec/kfd/Makefile
index da9c709..f5081f1 100644
--- a/kerberos5/libexec/kfd/Makefile
+++ b/kerberos5/libexec/kfd/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	kfd
 MAN=	kfd.8
-SRCS=	kfd.c kf_locl.h
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \