* Remove headers from SRCS that are not generated

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

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

kerberos5/lib/libgssapi_krb5/Makefile

@@ -38,8 +38,6 @@ SRCS=	8003.c \
 	get_mic.c \
 	gkrb5_err.c \
 	gkrb5_err.h \
-	gsskrb5-private.h \
-	gsskrb5_locl.h \
 	import_name.c \
 	import_sec_context.c \
 	indicate_mechs.c \

kerberos5/lib/libgssapi_ntlm/Makefile

@@ -21,8 +21,6 @@ SRCS=	accept_sec_context.c \
 	export_name.c \
 	export_sec_context.c \
 	external.c \
-	ntlm.h \
-	ntlm-private.h \
 	import_name.c \
 	import_sec_context.c \
 	indicate_mechs.c \

kerberos5/lib/libgssapi_spnego/Makefile

@@ -13,9 +13,6 @@ SRCS=	accept_sec_context.c \
 	external.c \
 	init_sec_context.c \
 	freebsd_compat.c \
-	spnego-private.h \
-	spnego_locl.h \
-	spnego_asn1.h \
 	${GEN:S/.x$/.c/:S/.hx$/.h/} \
 	gss_oid.c
 

kerberos5/lib/libhdb/Makefile

@@ -48,8 +48,6 @@ SRCS=	common.c \
 	hdb-sqlite.c \
 	hdb-keytab.c \
 	hdb-mitdb.c \
-	hdb_locl.h \
-	hdb-private.h \
 	keys.c \
 	keytab.c \
 	mkey.c \

kerberos5/lib/libheimbase/Makefile

@@ -9,12 +9,9 @@ INCS=	heimbase.h
 
 SRCS= \
 	array.c \
-	baselocl.h \
 	bool.c \
 	dict.c \
 	heimbase.c \
-	heimbasepriv.h \
-	heimqueue.h \
 	null.c \
 	number.c \
 	string.c

kerberos5/lib/libheimipcc/Makefile

@@ -5,8 +5,7 @@ INTERNALLIB=
 LDADD=	-lheimbase -lroken -lpthread
 DPADD=	${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD}
 
-SRCS=	hi_locl.h \
-	heim_ipc_types.h \
+SRCS=	\
 	client.c \
 	common.c
 

kerberos5/lib/libheimipcs/Makefile

@@ -6,8 +6,7 @@ LDADD=	-lheimbase -lroken
 LDFLAGS=	-pthread
 DPADD=	${LIBHEIMBASE} ${LIBROKEN}
 
-SRCS=	hi_locl.h \
-	heim_ipc_types.h \
+SRCS=	\
 	server.c \
 	common.c
 

kerberos5/lib/libhx509/Makefile

@@ -176,20 +176,14 @@ INCS=	hx509-private.h \
 
 SRCS=	ca.c \
 	cert.c \
-	char_map.h \
 	cms.c \
 	collector.c \
 	crypto.c \
 	doxygen.c \
 	error.c \
 	env.c \
 	file.c \
-	hx509-private.h \
-	hx509-protos.h \
-	hx509.h \
-	hx_locl.h \
 	sel.c \
-	sel.h \
 	sel-gram.y \
 	sel-lex.l \
 	keyset.c \
@@ -205,7 +199,6 @@ SRCS=	ca.c \
 	peer.c \
 	print.c \
 	softp11.c \
-	ref/pkcs11.h \
 	req.c \
 	revoke.c
 

kerberos5/lib/libkadm5clnt/Makefile

@@ -26,17 +26,14 @@ SRCS=	ad.c \
 	get_c.c \
 	get_princs_c.c \
 	init_c.c \
-	kadm5_locl.h \
 	kadm5_err.c \
 	kadm5_err.h \
 	marshall.c \
 	modify_c.c \
-	private.h \
 	privs_c.c \
 	randkey_c.c \
 	rename_c.c \
-	send_recv.c \
-	admin.h
+	send_recv.c
 
 CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
 

kerberos5/lib/libkadm5srv/Makefile

@@ -8,8 +8,6 @@ VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map
 MAN=	kadm5_pwcheck.3
 
 SRCS=	acl.c \
-	admin.h \
-	admin.h \
 	bump_pw_expire.c \
 	chpass_s.c \
 	common_glue.c \
@@ -26,13 +24,11 @@ SRCS=	acl.c \
 	init_s.c \
 	kadm5_err.c \
 	kadm5_err.h \
-	kadm5_locl.h \
 	keys.c \
 	log.c \
 	marshall.c \
 	modify_s.c \
 	password_quality.c \
-	private.h \
 	privs_s.c \
 	randkey_s.c \
 	rename_s.c \

kerberos5/lib/libkafs5/Makefile

@@ -26,10 +26,8 @@ MLINKS=	kafs5.3 k_afs_cell_of_file.3 \
 SRCS=	afssys.c afskrb5.c common.c krb5_err.h
 SRCS=	afssys.c \
 	afskrb5.c \
-	common.c \
-	kafs_locl.h \
-	afssysdefs.h \
-	roken_rename.h
+	common.c
+
 CFLAGS+=	-I${KRB5DIR}/lib/kafs \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${.OBJDIR}/../libkrb5/ \

kerberos5/lib/libkdc/Makefile

@@ -14,21 +14,18 @@ KRB5INCS=	windc_plugin.h
 KRB5INCSDIR=	${INCLUDEDIR}/krb5
 INCSGROUPS=	INCS KRB5INCS
 
-SRCS=	kdc-private.h \
-	kdc-protos.h \
+SRCS=	\
 	default_config.c \
 	set_dbinfo.c \
 	digest.c \
-	kdc_locl.h\
 	kerberos5.c \
 	krb5tgs.c \
 	pkinit.c \
 	log.c \
 	misc.c \
 	kx509.c \
 	process.c \
-	windc.c \
-	rx.h
+	windc.c
 
 CFLAGS+=	-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/krb5 \

kerberos5/lib/libkrb5/Makefile

@@ -531,7 +531,6 @@ SRCS=	acache.c \
 	crypto-pk.c \
 	crypto-rand.c \
 	crypto.c \
-	crypto.h \
 	data.c \
 	deprecated.c \
 	digest.c \
@@ -562,8 +561,6 @@ SRCS=	acache.c \
 	keytab_file.c \
 	keytab_keyfile.c \
 	keytab_memory.c \
-	krb5-v4compat.h \
-	krb5_locl.h \
 	krbhst.c \
 	kuserok.c \
 	log.c \

kerberos5/lib/libvers/Makefile

@@ -5,7 +5,7 @@ INTERNALLIB=
 SRCS=	print_version.c roken.h
 CFLAGS+=-I. -I${KRB5DIR}/lib/roken
 
-CLEANFILES= roken.h print_version.h
+CLEANFILES= roken.h
 
 MAKE_ROKEN=	make-roken
 

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

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 \

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 \

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

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} \

kerberos5/tools/asn1_compile/Makefile

@@ -6,28 +6,22 @@ LIBROKEN_A=	${.OBJDIR}/../../lib/libroken/libroken.a
 LDADD=	${LIBROKEN_A} ${LIBVERS}
 DPADD=	${LIBROKEN_A} ${LIBVERS}
 
-SRCS=	asn1_queue.h \
+SRCS=	\
 	asn1parse.y \
-	der.h \
 	gen.c \
 	gen_copy.c \
 	gen_decode.c \
 	gen_encode.c \
 	gen_free.c \
 	gen_glue.c \
 	gen_length.c \
-	gen_locl.h \
 	gen_seq.c \
 	gen_template.c \
 	hash.c \
-	hash.h \
 	lex.l \
-	lex.h \
 	main.c \
-	asn1-template.h \
 	roken.h \
-	symbol.c \
-	symbol.h
+	symbol.c
 
 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I.
 

kerberos5/usr.bin/hxtool/Makefile

@@ -10,9 +10,13 @@ DPADD=	${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LI
 LDADD=	-lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit
 SRCS=	hxtool.c hxtool-commands.c hxtool-commands.h
 
-hxtool-commands.c hxtool-commands.h: hxtool-commands.in
+hxtool-commands.h: hxtool-commands.in
 	slc ${.ALLSRC:M*.in}
 
+.for ext in c o
+hxtool-commands.${ext}: hxtool-commands.h
+.endfor
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/lib/hx509

kerberos5/usr.bin/kadmin/Makefile

@@ -38,8 +38,12 @@ LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
-kadmin-commands.c kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in
+kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in
 	slc ${.ALLSRC:M*.in}
 
+.for ext in o c
+kadmin-commands.${ext}: kadmin-commands.h
+.endfor
+
 .PATH: ${KRB5DIR}/kadmin
 

kerberos5/usr.bin/kcc/Makefile

@@ -19,9 +19,13 @@ SRCS=	kcc.c \
 	kswitch.c \
 	copy_cred_cache.c
 
-kcc-commands.c kcc-commands.h: kcc-commands.in
+kcc-commands.h: kcc-commands.in
 	slc ${.ALLSRC:M*.in}
 
+.for ext in c o
+kcc-commands.${ext}: kcc-commands.h
+.endfor
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kuser

kerberos5/usr.bin/kf/Makefile

@@ -2,7 +2,6 @@
 
 PROG=	kf
 MAN=	kf.1
-SRCS=	kf.c kf_locl.h
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \

kerberos5/usr.bin/string2key/Makefile

@@ -10,7 +10,6 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBCRYPT} ${LIBVERS}
 LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
-SRCS=	string2key.c headers.h
 
 .include <bsd.prog.mk>
 

kerberos5/usr.sbin/iprop-log/Makefile

@@ -13,9 +13,13 @@ DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \
 	${LIBVERS} -ledit
 
-iprop-commands.c iprop-commands.h: iprop-commands.in
+iprop-commands.h: iprop-commands.in
 	slc ${.ALLSRC:M*.in}
 
+.for ext in c o
+iprop-commands.${ext}: iprop-commands.h
+.endfor
+
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/lib/kadm5

kerberos5/usr.sbin/ktutil/Makefile

@@ -9,7 +9,6 @@ SRCS=	add.c \
 	destroy.c \
 	get.c \
 	ktutil.c \
-	ktutil_locl.h \
 	ktutil-commands.c \
 	ktutil-commands.h \
 	list.c \
@@ -25,7 +24,11 @@ LDADD=	-lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \
 
 .include <bsd.prog.mk>
 
-ktutil-commands.c ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in
+ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in
 	slc ${.ALLSRC:M*.in}
 
+.for ext in c o
+ktutil-commands.${ext}: ktutil-commands.h
+.endfor
+
 .PATH: ${KRB5DIR}/admin