Big fixup of the makefiles. Sort out the dependancies so that "make"

without "make depend" works, "make -j N" works, and lists of source
files are made vertical to reduce future diffs.

26 files changed, 835 insertions, 675 deletions

diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index d4e46cb..c553e85 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -63,51 +63,51 @@ LIBSL=		${.CURDIR}/../../lib/libsl/libsl.a
 
 COMPILE_ET=     compile_et
 
-.ORDER: asn1_err.c asn1_err.h
-asn1_err.c asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et
+.ORDER: asn1_err.c ${.OBJDIR}/asn1_err.h
+asn1_err.c ${.OBJDIR}/asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et
 	test -e ${.OBJDIR}/asn1_err.et || ln -sf ${.ALLSRC}
 	${COMPILE_ET} asn1_err.et
 
 CLEANFILES+=asn1_err.h asn1_err.c asn1_err.et
 
-.ORDER: hdb_err.c hdb_err.h
-hdb_err.c hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et
+.ORDER: hdb_err.c ${.OBJDIR}/hdb_err.h
+hdb_err.c ${.OBJDIR}/hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et
 	test -e ${.OBJDIR}/hdb_err.et || ln -sf ${.ALLSRC}
 	${COMPILE_ET} hdb_err.et
 
 CLEANFILES+=hdb_err.h hdb_err.c hdb_err.et
 
-.ORDER: heim_err.c heim_err.h
-heim_err.c heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et
+.ORDER: heim_err.c ${.OBJDIR}/heim_err.h
+heim_err.c ${.OBJDIR}/heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et
 	test -e ${.OBJDIR}/heim_err.et || ln -sf ${.ALLSRC}
 	${COMPILE_ET} heim_err.et
 
 CLEANFILES+=heim_err.h heim_err.c heim_err.et
 
-.ORDER: krb5_err.c krb5_err.h
-krb5_err.c krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et
+.ORDER: krb5_err.c ${.OBJDIR}/krb5_err.h
+krb5_err.c ${.OBJDIR}/krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et
 	test -e ${.OBJDIR}/krb5_err.et || ln -sf ${.ALLSRC}
 	${COMPILE_ET} krb5_err.et
 
 CLEANFILES+=krb5_err.h krb5_err.c krb5_err.et
 
-.ORDER: kadm5_err.c kadm5_err.h
-kadm5_err.c kadm5_err.h: \
+.ORDER: kadm5_err.c ${.OBJDIR}/kadm5_err.h
+kadm5_err.c ${.OBJDIR}/kadm5_err.h: \
 	${KRB5DIR}/lib/kadm5/kadm5_err.et
 	test -e ${.OBJDIR}/kadm5_err.et || ln -sf ${.ALLSRC}
 	${COMPILE_ET} kadm5_err.et
 
 CLEANFILES+=kadm5_err.h kadm5_err.c kadm5_err.et
 
-.ORDER: k524_err.c k524_err.h
-k524_err.c k524_err.h: \
+.ORDER: k524_err.c ${.OBJDIR}/k524_err.h
+k524_err.c ${.OBJDIR}/k524_err.h: \
 	${KRB5DIR}/lib/krb5/k524_err.et
 	test -e ${.OBJDIR}/k524_err.et || ln -sf ${.ALLSRC}
 	${COMPILE_ET} k524_err.et
 
 CLEANFILES+=k524_err.h k524_err.c k524_err.et
 
-roken.h: make-roken
+${.OBJDIR}/roken.h: make-roken
 	./make-roken > tmp.h ;\
 	if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \
 	else rm -f roken.h; mv tmp.h roken.h; fi
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index eafe58d..5945327 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -1,15 +1,26 @@
 # $FreeBSD$
 
 LIB=	asn1
-CFLAGS+=-I${KRB5DIR}/include \
-	-I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/lib/roken \
-	-I${INCLUDEOBJDIR} \
-	-I${.OBJDIR}
-SRCS=	der_get.c der_put.c der_free.c der_length.c der_copy.c \
-	timegm.c asn1_err.c asn1_err.h krb5_asn1.h roken.h \
+
+SRCS=	\
+	der_get.c				\
+	der_put.c				\
+	der_free.c				\
+	der_length.c				\
+	der_copy.c				\
+	timegm.c				\
+	asn1_err.c				\
+	${.OBJDIR}/asn1_err.h			\
+	${.OBJDIR}/krb5_asn1.h			\
+	${.OBJDIR}/roken.h			\
 	${GEN:S/.x/.c/g}
 
+CFLAGS+=-I${KRB5DIR}/include			\
+	-I${KRB5DIR}/lib/asn1			\
+	-I${KRB5DIR}/lib/roken			\
+	-I${INCLUDEOBJDIR}			\
+	-I${.OBJDIR}
+
 GEN=						\
 	asn1_APOptions.x			\
 	asn1_AP_REP.x				\
@@ -63,7 +74,7 @@ GEN=						\
 	asn1_TransitedEncoding.x		\
 	asn1_UNSIGNED.x
 
-INCS=	krb5_asn1.h asn1_err.h 
+INCS=	${.OBJDIR}/krb5_asn1.h ${.OBJDIR}/asn1_err.h 
 
 .include <bsd.lib.mk>
 
@@ -71,7 +82,7 @@ INCS=	krb5_asn1.h asn1_err.h
 .PATH:		${KRB5DIR}/lib/vers
 .PATH:		${KRB5DIR}/lib/roken
 
-beforedepend all: roken.h
+beforedepend all: ${.OBJDIR}/roken.h
 
 .for I in ${GEN}
 ${I:S/.x/.c/}:	${I}
@@ -80,7 +91,7 @@ ${I:S/.x/.c/}:	${I}
 
 CLEANFILES+=	${GEN:S/.x/.c/g} krb5_asn1.h asn1_files
 
-${GEN} krb5_asn1.h:		asn1_compile k5.asn1
+${GEN} ${.OBJDIR}/krb5_asn1.h:		asn1_compile k5.asn1
 	./asn1_compile ${KRB5DIR}/lib/asn1/k5.asn1 krb5_asn1
 
 build-tools:	make-print-version make-roken asn1_compile
@@ -101,25 +112,26 @@ asn1_compile:					\
 	symbol.c				\
 	getarg.c				\
 	warnerr.c				\
-	print_version.o				\
+	${.OBJDIR}/print_version.o		\
 	get_window_size.c			\
 	strupr.c
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.OODATE} ${LDADD}
 
-parse.o:	parse.c roken.h
+${.OBJDIR}/parse.o:	${.OBJDIR}/parse.c ${.OBJDIR}/roken.h
 
-.ORDER: parse.c parse.h
-parse.h parse.c:	parse.y
+.ORDER: ${.OBJDIR}/parse.c ${.OBJDIR}/parse.h
+${.OBJDIR}/parse.h ${.OBJDIR}/parse.c:	parse.y
 	${YACC}	-d ${.OODATE}
 	cp y.tab.c parse.c
 	cp y.tab.h parse.h
 
-lex.o:		lex.l parse.h roken.h
+lex.o:		lex.l ${.OBJDIR}/parse.h ${.OBJDIR}/roken.h
 
-print_version.o: print_version.h print_version.c roken.h
+${.OBJDIR}/print_version.o: ${.OBJDIR}/print_version.h print_version.c \
+				${.OBJDIR}/roken.h
 	${CC} ${CFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/vers/print_version.c
 
-print_version.h: make-print-version
+${.OBJDIR}/print_version.h: make-print-version
 	./make-print-version print_version.h
 
 make-print-version: make-print-version.c
diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile
index 0492756..94fde0e 100644
--- a/kerberos5/lib/libgssapi/Makefile
+++ b/kerberos5/lib/libgssapi/Makefile
@@ -1,56 +1,63 @@
 # $FreeBSD$
 
 LIB=	gssapi
-CFLAGS+=-I${KRB5DIR}/lib/gssapi	\
-	-I${KRB5DIR}/lib/krb5   \
-	-I${KRB5DIR}/lib/asn1	\
-	-I${KRB5DIR}/lib/roken  \
-	-I${KRB5DIR}/lib/des	\
-	-I${KRB5DIR}/include	\
-	-I${ASN1OBJDIR}		\
-	-I${.OBJDIR}
 
-SRCS=				\
-	8003.c			\
-	accept_sec_context.c	\
-	acquire_cred.c		\
-	add_oid_set_member.c	\
-	canonicalize_name.c	\
-	compare_name.c		\
-	context_time.c		\
-	copy_ccache.c		\
-	create_emtpy_oid_set.c	\
-	decapsulate.c		\
-	delete_sec_context.c	\
-	display_name.c		\
-	display_status.c	\
-	duplicate_name.c	\
-	encapsulate.c		\
-	export_sec_context.c	\
-	export_name.c		\
-	external.c		\
-	get_mic.c		\
-	gssapi.h		\
-	gssapi_locl.h		\
-	import_name.c		\
-	import_sec_context.c	\
-	indicate_mechs.c	\
-	init.c			\
-	init_sec_context.c	\
-	inquire_context.c	\
-	inquire_cred.c		\
-	release_buffer.c	\
-	release_cred.c		\
-	release_name.c		\
-	release_oid_set.c	\
-	test_oid_set_member.c	\
-	unwrap.c		\
-	v1.c			\
-	verify_mic.c		\
-        wrap.c                  \
-        address_to_krb5addr.c
+SRCS=	\
+	8003.c				\
+	accept_sec_context.c		\
+	acquire_cred.c			\
+	add_oid_set_member.c		\
+	canonicalize_name.c		\
+	compare_name.c			\
+	context_time.c			\
+	copy_ccache.c			\
+	create_emtpy_oid_set.c		\
+	decapsulate.c			\
+	delete_sec_context.c		\
+	display_name.c			\
+	display_status.c		\
+	duplicate_name.c		\
+	encapsulate.c			\
+	export_sec_context.c		\
+	export_name.c			\
+	external.c			\
+	get_mic.c			\
+	gssapi.h			\
+	gssapi_locl.h			\
+	import_name.c			\
+	import_sec_context.c		\
+	indicate_mechs.c		\
+	init.c				\
+	init_sec_context.c		\
+	inquire_context.c		\
+	inquire_cred.c			\
+	release_buffer.c		\
+	release_cred.c			\
+	release_name.c			\
+	release_oid_set.c		\
+	test_oid_set_member.c		\
+	unwrap.c			\
+	v1.c				\
+	verify_mic.c			\
+        wrap.c				\
+        address_to_krb5addr.c		\
+	${.OBJDIR}/heim_err.h		\
+	${.OBJDIR}/krb5_err.h		\
+	${.OBJDIR}/k524_err.h
+
+CFLAGS+=-I${KRB5DIR}/lib/gssapi		\
+	-I${KRB5DIR}/lib/krb5		\
+	-I${KRB5DIR}/lib/asn1		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${KRB5DIR}/lib/des		\
+	-I${KRB5DIR}/include		\
+	-I${ASN1OBJDIR}			\
+	-I${.OBJDIR}
 
-INCS=	gssapi.h heim_err.h krb5_err.h k524_err.h
+INCS=	gssapi.h			\
+	${.OBJDIR}/heim_err.h		\
+	${.OBJDIR}/krb5_err.h		\
+	${.OBJDIR}/k524_err.h
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index e6c5513..7bea020 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -1,40 +1,41 @@
 # $FreeBSD$
 
 LIB=	hdb
-CFLAGS+=-I${KRB5DIR}/include \
-	-I${INCLUDEOBJDIR} \
-	-I${KRB5DIR}/lib/krb5 \
-	-I${KRB5DIR}/lib/hdb \
-	-I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/lib/roken \
-	-I${.OBJDIR} \
-	-I${ASN1OBJDIR} \
-	${LDAPCFLAGS}
 
 SRCS=	\
-	common.c				\
-	db.c					\
-	db3.c					\
-	hdb-ldap.c				\
-	hdb.c					\
-	keytab.c				\
-	mkey.c					\
-	ndbm.c					\
-	print.c					\
-	hdb_err.c				\
-	hdb_err.h				\
-	hdb_asn1.h				\
-	k524_err.h				\
-	krb5_err.h				\
-	heim_err.h				\
+	common.c			\
+	db.c				\
+	db3.c				\
+	hdb-ldap.c			\
+	hdb.c				\
+	keytab.c			\
+	mkey.c				\
+	ndbm.c				\
+	print.c				\
+	hdb_err.c			\
+	${.OBJDIR}/hdb_err.h		\
+	${.OBJDIR}/hdb_asn1.h		\
+	${.OBJDIR}/k524_err.h		\
+	${.OBJDIR}/krb5_err.h		\
+	${.OBJDIR}/heim_err.h		\
 	${GEN:S/.x/.c/g}
 
-GEN=						\
-	asn1_Key.x				\
-	asn1_GENERATION.x			\
-	asn1_Event.x				\
-	asn1_HDBFlags.x				\
-	asn1_hdb_entry.x			\
+CFLAGS+=-I${KRB5DIR}/include		\
+	-I${INCLUDEOBJDIR}		\
+	-I${KRB5DIR}/lib/krb5		\
+	-I${KRB5DIR}/lib/hdb		\
+	-I${KRB5DIR}/lib/asn1		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${.OBJDIR}			\
+	-I${ASN1OBJDIR}			\
+	${LDAPCFLAGS}
+
+GEN=					\
+	asn1_Key.x			\
+	asn1_GENERATION.x		\
+	asn1_Event.x			\
+	asn1_HDBFlags.x			\
+	asn1_hdb_entry.x		\
 	asn1_Salt.x
 
 .include <bsd.lib.mk>
@@ -53,7 +54,7 @@ ${I:S/.x/.c/}:  ${I}
 
 CLEANFILES+=	${GEN:S/.x/.c/g} hdb_asn1.h asn1_files
 
-${GEN} hdb_asn1.h:	asn1_compile hdb.asn1
+${GEN} ${.OBJDIR}/hdb_asn1.h:	asn1_compile hdb.asn1
 	./asn1_compile ${KRB5DIR}/lib/hdb/hdb.asn1 hdb_asn1
 
 asn1_compile:	parse.o lex.o main.c hash.c symbol.c emalloc.c gen.c \
diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile
index ec238a4..5edc4e3 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -1,39 +1,40 @@
 # $FreeBSD$
 
 LIB=	kadm5clnt
-CFLAGS+=-I${KRB5DIR}/include \
-	-I${KRB5DIR}/lib/krb5 \
-	-I${KRB5DIR}/lib/kadm5 \
-	-I${KRB5DIR}/lib/hdb \
-	-I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/lib/roken \
-	-I${ASN1OBJDIR} \
-	-I${HDBOBJDIR} \
-	-I${.OBJDIR}
 
 SRCS=	\
-	admin.h					\
-	chpass_c.c				\
-	common_glue.c				\
-	create_c.c				\
-	delete_c.c				\
-	destroy_c.c				\
-	flush_c.c				\
-	free.c					\
-	get_c.c					\
-	get_princs_c.c				\
-	init_c.c				\
-	kadm5_err.c				\
-	kadm5_err.h				\
-	kadm5_locl.h				\
-	marshall.c				\
-	modify_c.c				\
-	private.h				\
-	privs_c.c				\
-	randkey_c.c				\
-	rename_c.c				\
-	send_recv.c				\
-	client_glue.c
+	chpass_c.c			\
+	common_glue.c			\
+	create_c.c			\
+	delete_c.c			\
+	destroy_c.c			\
+	flush_c.c			\
+	free.c				\
+	get_c.c				\
+	get_princs_c.c			\
+	init_c.c			\
+	kadm5_err.c			\
+	marshall.c			\
+	modify_c.c			\
+	privs_c.c			\
+	randkey_c.c			\
+	rename_c.c			\
+	send_recv.c			\
+	client_glue.c			\
+	admin.h				\
+	private.h			\
+	kadm5_locl.h			\
+	${.OBJDIR}/kadm5_err.h
+
+CFLAGS+=-I${KRB5DIR}/include		\
+	-I${KRB5DIR}/lib/krb5		\
+	-I${KRB5DIR}/lib/kadm5		\
+	-I${KRB5DIR}/lib/hdb		\
+	-I${KRB5DIR}/lib/asn1		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${ASN1OBJDIR}			\
+	-I${HDBOBJDIR}			\
+	-I${.OBJDIR}
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index 8be9b94..e5942ee 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -1,48 +1,49 @@
 # $FreeBSD$
 
 LIB=	kadm5srv
-CFLAGS+=-I${KRB5DIR}/include \
-	-I${KRB5DIR}/lib/krb5 \
-	-I${KRB5DIR}/lib/kadm5 \
-	-I${KRB5DIR}/lib/hdb \
-	-I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/lib/roken \
-	-I${ASN1OBJDIR} \
-	-I${HDBOBJDIR} \
-	-I${.OBJDIR}
 
 SRCS=	\
-	acl.c					\
-	admin.h					\
-	bump_pw_expire.c			\
-	chpass_s.c				\
-	common_glue.c				\
-	context_s.c				\
-	create_s.c				\
-	delete_s.c				\
-	destroy_s.c				\
-	ent_setup.c				\
-	error.c					\
-	flush_s.c				\
-	free.c					\
-	get_princs_s.c				\
-	get_s.c					\
-	init_s.c				\
-	kadm5_err.c				\
-	kadm5_err.h				\
-	kadm5_locl.h				\
-	keys.c					\
-	log.c					\
-	marshall.c				\
-	modify_s.c				\
-	private.h				\
-	privs_s.c				\
-	randkey_s.c				\
-	rename_s.c				\
-	set_keys.c				\
-	set_modifier.c				\
-	password_quality.c			\
-	server_glue.c
+	acl.c				\
+	bump_pw_expire.c		\
+	chpass_s.c			\
+	common_glue.c			\
+	context_s.c			\
+	create_s.c			\
+	delete_s.c			\
+	destroy_s.c			\
+	ent_setup.c			\
+	error.c				\
+	flush_s.c			\
+	free.c				\
+	get_princs_s.c			\
+	get_s.c				\
+	init_s.c			\
+	kadm5_err.c			\
+	keys.c				\
+	log.c				\
+	marshall.c			\
+	modify_s.c			\
+	privs_s.c			\
+	randkey_s.c			\
+	rename_s.c			\
+	set_keys.c			\
+	set_modifier.c			\
+	password_quality.c		\
+	server_glue.c			\
+	admin.h				\
+	kadm5_locl.h			\
+	private.h			\
+	${.OBJDIR}/kadm5_err.h
+
+CFLAGS+=-I${KRB5DIR}/include		\
+	-I${KRB5DIR}/lib/krb5		\
+	-I${KRB5DIR}/lib/kadm5		\
+	-I${KRB5DIR}/lib/hdb		\
+	-I${KRB5DIR}/lib/asn1		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${ASN1OBJDIR}			\
+	-I${HDBOBJDIR}			\
+	-I${.OBJDIR}
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 63b62c0..e081309 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -1,148 +1,154 @@
 # $FreeBSD$
 
 LIB=	krb5
-CFLAGS+=-I${KRB5DIR}/lib/krb5 \
-	-I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/lib/des \
-	-I${KRB5DIR}/lib/roken \
-	-I${KRB5DIR}/include \
-	-I${KRB5OBJDIR} \
-	-I${ASN1OBJDIR}
+
 SRCS=	\
-	acl.c \
-	add_et_list.c \
-	addr_families.c \
-	aname_to_localname.c \
-	appdefault.c \
-	asn1_glue.c \
-	auth_context.c \
-	build_ap_req.c \
-	build_auth.c \
-	cache.c \
-	changepw.c \
-	codec.c \
-	config_file.c \
-	config_file_netinfo.c \
-	convert_creds.c \
-	constants.c \
-	context.c \
-	copy_host_realm.c \
-	crc.c \
-	creds.c \
-	crypto.c \
-	data.c \
-	eai_to_heim_errno.c \
-	error_string.c \
-	expand_hostname.c \
-	fcache.c \
-	free.c \
-	free_host_realm.c \
-	generate_seq_number.c \
-	generate_subkey.c \
-	get_addrs.c \
-	get_cred.c \
-	get_default_principal.c \
-	get_default_realm.c \
-	get_for_creds.c \
-	get_host_realm.c \
-	get_in_tkt.c \
-	get_in_tkt_pw.c \
-	get_in_tkt_with_keytab.c \
-	get_in_tkt_with_skey.c \
-	get_port.c \
-	init_creds.c \
-	init_creds_pw.c \
-	keyblock.c \
-	keytab.c \
-	keytab_any.c \
-	keytab_file.c \
-	keytab_memory.c \
-	keytab_keyfile.c \
-	keytab_krb4.c \
-	krbhst.c \
-	kuserok.c \
-	log.c \
-	mcache.c \
-	misc.c \
-	mk_error.c \
-	mk_priv.c \
-	mk_rep.c \
-	mk_req.c \
-	mk_req_ext.c \
-	mk_safe.c \
-	net_read.c \
-	net_write.c \
-	n-fold.c \
-	padata.c \
-	principal.c \
-	prog_setup.c \
-	prompter_posix.c \
-	rd_cred.c \
-	rd_error.c \
-	rd_priv.c \
-	rd_rep.c \
-	rd_req.c \
-	rd_safe.c \
-	read_message.c \
-	recvauth.c \
-	replay.c \
-	send_to_kdc.c \
-	sendauth.c \
-	set_default_realm.c \
-	sock_principal.c \
-	store.c \
-	store_emem.c \
-	store_fd.c \
-	store_mem.c \
-	ticket.c \
-	time.c \
-	transited.c \
-	verify_init.c \
-	verify_user.c \
-	version.c \
-	warn.c \
-	write_message.c \
-	krb5_err.c \
-	k524_err.c \
-	k524_err.h \
-	heim_err.c \
-	heim_err.h
+	acl.c				\
+	add_et_list.c			\
+	addr_families.c			\
+	aname_to_localname.c		\
+	appdefault.c			\
+	asn1_glue.c			\
+	auth_context.c			\
+	build_ap_req.c			\
+	build_auth.c			\
+	cache.c				\
+	changepw.c			\
+	codec.c				\
+	config_file.c			\
+	config_file_netinfo.c		\
+	convert_creds.c			\
+	constants.c			\
+	context.c			\
+	copy_host_realm.c		\
+	crc.c				\
+	creds.c				\
+	crypto.c			\
+	data.c				\
+	eai_to_heim_errno.c		\
+	error_string.c			\
+	expand_hostname.c		\
+	fcache.c			\
+	free.c				\
+	free_host_realm.c		\
+	generate_seq_number.c		\
+	generate_subkey.c		\
+	get_addrs.c			\
+	get_cred.c			\
+	get_default_principal.c		\
+	get_default_realm.c		\
+	get_for_creds.c			\
+	get_host_realm.c		\
+	get_in_tkt.c			\
+	get_in_tkt_pw.c			\
+	get_in_tkt_with_keytab.c	\
+	get_in_tkt_with_skey.c		\
+	get_port.c			\
+	init_creds.c			\
+	init_creds_pw.c			\
+	keyblock.c			\
+	keytab.c			\
+	keytab_any.c			\
+	keytab_file.c			\
+	keytab_memory.c			\
+	keytab_keyfile.c		\
+	keytab_krb4.c			\
+	krbhst.c			\
+	kuserok.c			\
+	log.c				\
+	mcache.c			\
+	misc.c				\
+	mk_error.c			\
+	mk_priv.c			\
+	mk_rep.c			\
+	mk_req.c			\
+	mk_req_ext.c			\
+	mk_safe.c			\
+	net_read.c			\
+	net_write.c			\
+	n-fold.c			\
+	padata.c			\
+	principal.c			\
+	prog_setup.c			\
+	prompter_posix.c		\
+	rd_cred.c			\
+	rd_error.c			\
+	rd_priv.c			\
+	rd_rep.c			\
+	rd_req.c			\
+	rd_safe.c			\
+	read_message.c			\
+	recvauth.c			\
+	replay.c			\
+	send_to_kdc.c			\
+	sendauth.c			\
+	set_default_realm.c		\
+	sock_principal.c		\
+	store.c				\
+	store_emem.c			\
+	store_fd.c			\
+	store_mem.c			\
+	ticket.c			\
+	time.c				\
+	transited.c			\
+	verify_init.c			\
+	verify_user.c			\
+	version.c			\
+	warn.c				\
+	write_message.c			\
+	krb5_err.c			\
+	k524_err.c			\
+	heim_err.c			\
+	${.OBJDIR}/k524_err.h		\
+	${.OBJDIR}/heim_err.h
+
+CFLAGS+=-I${KRB5DIR}/lib/krb5		\
+	-I${KRB5DIR}/lib/asn1		\
+	-I${KRB5DIR}/lib/des		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${KRB5DIR}/include		\
+	-I${KRB5OBJDIR}			\
+	-I${ASN1OBJDIR}
 
-INCS=	krb5.h ${.CURDIR}/../../include/krb5-types.h \
-	krb5-protos.h heim_err.h krb5_err.h k524_err.h
+INCS=	krb5.h				\
+	krb5-protos.h			\
+	${.CURDIR}/../../include/krb5-types.h \
+	${.OBJDIR}/heim_err.h		\
+	${.OBJDIR}/krb5_err.h		\
+	${.OBJDIR}/k524_err.h
 
-MAN=						\
-	krb5.3					\
-	krb5_425_conv_principal.3		\
-	krb5_appdefault.3			\
-	krb5_auth_context.3			\
-	krb5_build_principal.3			\
-	krb5_config.3				\
-	krb5_context.3				\
-	krb5_create_checksum.3			\
-	krb5_crypto_init.3			\
-	krb5_encrypt.3				\
-	krb5_free_addresses.3			\
-	krb5_free_principal.3			\
-	krb5_get_all_client_addrs.3		\
-	krb5_get_krbhst.3			\
-	krb5_init_context.3			\
-	krb5_keytab.3				\
-	krb5_krbhst_init.3			\
-	krb5_openlog.3				\
-	krb5_parse_name.3			\
-	krb5_principal_get_realm.3		\
-	krb5_sname_to_principal.3		\
-	krb5_timeofday.3			\
-	krb5_unparse_name.3			\
-	krb5_verify_user.3			\
+MAN=	\
+	krb5.3				\
+	krb5_425_conv_principal.3	\
+	krb5_appdefault.3		\
+	krb5_auth_context.3		\
+	krb5_build_principal.3		\
+	krb5_config.3			\
+	krb5_context.3			\
+	krb5_create_checksum.3		\
+	krb5_crypto_init.3		\
+	krb5_encrypt.3			\
+	krb5_free_addresses.3		\
+	krb5_free_principal.3		\
+	krb5_get_all_client_addrs.3	\
+	krb5_get_krbhst.3		\
+	krb5_init_context.3		\
+	krb5_keytab.3			\
+	krb5_krbhst_init.3		\
+	krb5_openlog.3			\
+	krb5_parse_name.3		\
+	krb5_principal_get_realm.3	\
+	krb5_sname_to_principal.3	\
+	krb5_timeofday.3		\
+	krb5_unparse_name.3		\
+	krb5_verify_user.3		\
 	krb5_warn.3
 
-MAN+=						\
+MAN+=	\
 	krb5.conf.5
 
-MAN+=						\
-	kerberos.8				\
+MAN+=	\
+	kerberos.8			\
 	verify_krb5_conf.8
 
 .include <bsd.lib.mk>
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index ec68d8c..5572a3c 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -1,65 +1,67 @@
 # $FreeBSD$
 
-LIB=		roken
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${INCLUDEOBJDIR} \
-		-I${KRB5DIR}/lib/roken \
-		-I${.OBJDIR}
+LIB=	roken
 
-SRCS=		\
-	base64.c		\
-	bswap.c			\
-	concat.c		\
-	ecalloc.c		\
-	emalloc.c		\
-	environment.c		\
-	eread.c			\
-	erealloc.c		\
-	esetenv.c		\
-	estrdup.c		\
-	ewrite.c		\
-	getaddrinfo_hostspec.c	\
-	get_default_username.c	\
-	get_window_size.c	\
-	getarg.c		\
-	getnameinfo_verified.c	\
-	hostent_find_fqdn.c	\
-	issuid.c		\
-	k_getpwnam.c		\
-	k_getpwuid.c		\
-	mini_inetd.c		\
-	ndbm_wrap.c		\
-	net_read.c		\
-	net_write.c		\
-	parse_bytes.c		\
-	parse_time.c		\
-	parse_units.c		\
-	resolve.c		\
-	roken_gethostby.c	\
-	rtbl.c			\
-	rtbl.h			\
-	signal.c		\
-	simple_exec.c		\
-	snprintf.c		\
-	socket.c		\
-	strcollect.c		\
-	timeval.c		\
-	tm2time.c		\
-	unvis.c			\
-	verify.c		\
-	vis.c			\
-	warnerr.c		\
-	write_pid.c		\
-	xdbm.h			\
-	copyhostent.c		\
-	strlwr.c		\
-	strndup.c		\
-	strnlen.c		\
-	strsep_copy.c		\
-	strupr.c		\
-	roken.h
+SRCS=	\
+	base64.c			\
+	bswap.c				\
+	concat.c			\
+	ecalloc.c			\
+	emalloc.c			\
+	environment.c			\
+	eread.c				\
+	erealloc.c			\
+	esetenv.c			\
+	estrdup.c			\
+	ewrite.c			\
+	getaddrinfo_hostspec.c		\
+	get_default_username.c		\
+	get_window_size.c		\
+	getarg.c			\
+	getnameinfo_verified.c		\
+	hostent_find_fqdn.c		\
+	issuid.c			\
+	k_getpwnam.c			\
+	k_getpwuid.c			\
+	mini_inetd.c			\
+	ndbm_wrap.c			\
+	net_read.c			\
+	net_write.c			\
+	parse_bytes.c			\
+	parse_time.c			\
+	parse_units.c			\
+	resolve.c			\
+	roken_gethostby.c		\
+	rtbl.c				\
+	rtbl.h				\
+	signal.c			\
+	simple_exec.c			\
+	snprintf.c			\
+	socket.c			\
+	strcollect.c			\
+	timeval.c			\
+	tm2time.c			\
+	unvis.c				\
+	verify.c			\
+	vis.c				\
+	warnerr.c			\
+	write_pid.c			\
+	xdbm.h				\
+	copyhostent.c			\
+	strlwr.c			\
+	strndup.c			\
+	strnlen.c			\
+	strsep_copy.c			\
+	strupr.c			\
+	${.OBJDIR}/roken.h
 
-INCS=	roken.h ${KRB5DIR}/lib/roken/roken-common.h
+CFLAGS+=-I${KRB5DIR}/include		\
+	-I${INCLUDEOBJDIR}		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${.OBJDIR}
+
+INCS=	${.OBJDIR}/roken.h		\
+	${KRB5DIR}/lib/roken/roken-common.h
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile
index 45b2ecc..e192f10 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -1,11 +1,15 @@
 # $FreeBSD$
 
 LIB=	sl
-CFLAGS+=-I${KRB5DIR}/lib/sl \
-	-I${KRB5DIR}/lib/roken \
-	-I${KRB5DIR}/include \
+
+SRCS=	\
+	sl.c			 	\
+	${.OBJDIR}/roken.h
+
+CFLAGS+=-I${KRB5DIR}/lib/sl		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${KRB5DIR}/include		\
 	-I${.OBJDIR}
-SRCS=	sl.c roken.h
 
 INTERNALLIB= yes
 
diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile
index 02e2717..46d9623 100644
--- a/kerberos5/lib/libvers/Makefile
+++ b/kerberos5/lib/libvers/Makefile
@@ -1,16 +1,17 @@
 # $FreeBSD$
 
-LIB=		vers
-INTERNALLIB=	YES
+LIB=	vers
+
+SRCS=	\
+	print_version.c			\
+	${.OBJDIR}/print_version.h
 
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${ROKENOBJDIR} \
-		-I${KRB5DIR}/lib/roken \
-		-I${.OBJDIR}
+CFLAGS+=-I${KRB5DIR}/include		\
+	-I${ROKENOBJDIR}		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${.OBJDIR}
 
-SRCS=		\
-		print_version.c	\
-		print_version.h
+INTERNALLIB=	YES
 
 .include <bsd.lib.mk>
 
@@ -18,7 +19,7 @@ SRCS=		\
 
 build-tools:	make-print-version
 
-print_version.h: make-print-version
+${.OBJDIR}/print_version.h: make-print-version
 	./make-print-version print_version.h
 
 make-print-version: make-print-version.c
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 0c6e4b3..148e797 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -1,22 +1,33 @@
 # $FreeBSD$
 
-PROG=		hprop
-SRCS=		hprop.c mit_dump.c v4_dump.c hprop.h kadb.h hdb_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/kdc \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR}
-LDADD=		-lkrb5 -lkafs5 -lhdb -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-MAN=		hprop.8
+PROG=	hprop
+
+SRCS=	\
+	hprop.c			\
+	mit_dump.c		\
+	v4_dump.c		\
+	hprop.h			\
+	kadb.h			\
+	${.OBJDIR}/hdb_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/kdc	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/lib/hdb	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${HDBOBJDIR}		\
+	-I${.OBJDIR}
+
+LDADD=	-lkrb5 -lkafs5 -lhdb -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
+
+DPADD=	${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+
+MAN=	hprop.8
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 4940c2a..6bcfa65 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -1,22 +1,30 @@
 # $FreeBSD$
 
-PROG=		hpropd
-SRCS=		hpropd.c hprop.h hdb_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/kdc \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR} \
-		${LDAPCFLAGS}
+PROG=	hpropd
+
+SRCS=	\
+	hpropd.c		\
+	hprop.h			\
+	${.OBJDIR}/hdb_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/kdc	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/lib/hdb	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${HDBOBJDIR}		\
+	-I${.OBJDIR}		\
+	${LDAPCFLAGS}
+
 LDADD=		-lkrb5 -lhdb -lroken ${LIBVERS} \
 		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+
 DPADD=		${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+
 MAN=		hpropd.8
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 429cafd..4c9e583 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -1,23 +1,33 @@
 # $FreeBSD$
 
-PROG=		ipropd-master
-SRCS=		ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/kadm5 \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR} \
-		${LDAPCFLAGS}
-LDADD=		-lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-DPADD=		${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
-NOMAN=		yes
+PROG=	ipropd-master
+
+SRCS=	\
+	ipropd_master.c		\
+	iprop.h			\
+	kadm5_locl.h		\
+	${.OBJDIR}/kadm5_err.h	\
+	${.OBJDIR}/hdb_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/lib/kadm5	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/lib/hdb	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${HDBOBJDIR}		\
+	-I${.OBJDIR}		\
+	${LDAPCFLAGS}
+
+LDADD=	-lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+
+DPADD=	${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+
+NOMAN=	yes
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index b0880f3..f5c0921 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -1,23 +1,33 @@
 # $FreeBSD$
 
-PROG=		ipropd-slave
-SRCS=		ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/kadm5 \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR} \
-		${LDAPCFLAGS}
-LDADD=		-lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-DPADD=		${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
-NOMAN=		yes
+PROG=	ipropd-slave
+
+SRCS=	\
+	ipropd_slave.c		\
+	iprop.h			\
+	kadm5_locl.h		\
+	${.OBJDIR}/kadm5_err.h	\
+	${.OBJDIR}/hdb_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/lib/kadm5	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/lib/hdb	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${HDBOBJDIR}		\
+	-I${.OBJDIR}		\
+	${LDAPCFLAGS}
+
+LDADD=	-lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+
+DPADD=	${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+
+NOMAN=	yes
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 41354cf..a4db8293 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -1,40 +1,49 @@
 # $FreeBSD$
 
-PROG=		kadmind
-SRCS=		kadmind.c server.c kadm_conn.c \
-		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/sl \
-		-I${KRB5DIR}/lib/kadm5 \
-		-I${KRB5DIR}/kadmin \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR} \
-		${LDAPCFLAGS}
-LDADD=		-lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
-		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-DPADD=		${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
-NOMAN=		yes
+PROG=	kadmind
+
+SRCS=	kadmind.c			\
+	server.c			\
+	kadm_conn.c			\
+	${.OBJDIR}/kadm5/private.h	\
+	${.OBJDIR}/kadm5/admin.h	\
+	${.OBJDIR}/kadm5/kadm5_err.h
+
+CFLAGS+=-I${KRB5DIR}/include		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${KRB5DIR}/lib/krb5		\
+	-I${KRB5DIR}/lib/asn1		\
+	-I${KRB5DIR}/lib/hdb		\
+	-I${KRB5DIR}/lib/sl		\
+	-I${KRB5DIR}/lib/kadm5		\
+	-I${KRB5DIR}/kadmin		\
+	-I${ASN1OBJDIR}			\
+	-I${HDBOBJDIR}			\
+	-I${.OBJDIR}			\
+	${LDAPCFLAGS}
+
+LDADD=	-lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+
+NOMAN=	yes
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/kadmin
 
-kadm5/private.h:	kadm5
+${.OBJDIR}/kadm5/private.h:	${.OBJDIR}/kadm5
 	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
-kadm5/admin.h:	kadm5
+${.OBJDIR}/kadm5/admin.h:	${.OBJDIR}/kadm5
 	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
+${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h
 	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
 
-kadm5:
+${.OBJDIR}/kadm5:
 	mkdir ${.TARGET}
 
 CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 365841d..16ea41e 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -1,31 +1,35 @@
 # $FreeBSD$
 
 PROG=	kdc
+
 SRCS=	\
-	config.c	\
-	connect.c	\
-	kdc_locl.h	\
-	kerberos5.c	\
-	log.c		\
-	main.c		\
+	config.c		\
+	connect.c		\
+	kdc_locl.h		\
+	kerberos5.c		\
+	log.c			\
+	main.c			\
 	misc.c
 
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/kdc \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR} \
-		${LDAPCFLAGS}
-LDADD=		-lkrb5 -lhdb -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-DPADD=		${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
-MAN=		kdc.8
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/kdc	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/lib/hdb	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${HDBOBJDIR}		\
+	-I${.OBJDIR}		\
+	${LDAPCFLAGS}
+
+LDADD=	-lkrb5 -lhdb -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+
+DPADD=	${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+
+MAN=	kdc.8
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 8a0881d..2d35a7c 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -1,36 +1,46 @@
 # $FreeBSD$
 
-PROG=		kpasswdd
-SRCS=		kpasswdd.c krb5_err.h heim_err.h hdb_err.h \
-		kadm5/admin.h kadm5/private.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/kadm5 \
-		-I${KRB5DIR}/kpasswd \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR} \
-		${LDAPCFLAGS}
-LDADD=		-lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
-		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-DPADD=		${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
-MAN=		kpasswdd.8
+PROG=	kpasswdd
+
+SRCS=	\
+	kpasswdd.c			\
+	${.OBJDIR}/krb5_err.h		\
+	${.OBJDIR}/heim_err.h		\
+	${.OBJDIR}/hdb_err.h		\
+	${.OBJDIR}/kadm5/admin.h	\
+	${.OBJDIR}/kadm5/private.h
+
+CFLAGS+=-I${KRB5DIR}/include		\
+	-I${KRB5DIR}/lib/asn1		\
+	-I${KRB5DIR}/lib/hdb		\
+	-I${KRB5DIR}/lib/krb5		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${KRB5DIR}/lib/kadm5		\
+	-I${KRB5DIR}/kpasswd		\
+	-I${ASN1OBJDIR}			\
+	-I${HDBOBJDIR}			\
+	-I${.OBJDIR}			\
+	${LDAPCFLAGS}
+
+LDADD=	-lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+
+MAN=	kpasswdd.8
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/kpasswd
 
-kadm5/admin.h:	kadm5
+${.OBJDIR}/kadm5/admin.h:	${.OBJDIR}/kadm5
 	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
-kadm5/private.h: kadm5
+${.OBJDIR}/kadm5/private.h: ${.OBJDIR}/kadm5
 	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
-kadm5:
+${.OBJDIR}/kadm5:
 	mkdir ${.TARGET}
 
 CLEANFILES+=	kadm5/admin.h kadm5/private.h
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 64f5bc3..8e9c568 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -1,63 +1,69 @@
 # $FreeBSD$
 
 PROG=	kadmin
+
 SRCS=	\
-	ank.c					\
-	cpw.c					\
-	del.c					\
-	del_enctype.c				\
-	dump.c					\
-	ext.c					\
-	get.c					\
-	init.c					\
-	kadmin.c				\
-	load.c					\
-	mod.c					\
-	rename.c				\
-	util.c					\
-	random_password.c			\
-	kadmin_locl.h				\
-	krb5_err.h heim_err.h hdb_err.h		\
-	kadm5/private.h				\
-	kadm5/admin.h				\
-	kadm5/kadm5_err.h
+	ank.c				\
+	cpw.c				\
+	del.c				\
+	del_enctype.c			\
+	dump.c				\
+	ext.c				\
+	get.c				\
+	init.c				\
+	kadmin.c			\
+	load.c				\
+	mod.c				\
+	rename.c			\
+	util.c				\
+	random_password.c		\
+	kadmin_locl.h			\
+	${.OBJDIR}/krb5_err.h		\
+	${.OBJDIR}/heim_err.h		\
+	${.OBJDIR}/hdb_err.h		\
+	${.OBJDIR}/kadm5/private.h	\
+	${.OBJDIR}/kadm5/admin.h	\
+	${.OBJDIR}/kadm5/kadm5_err.h
+
+CFLAGS+=-I${KRB5DIR}/include		\
+	-I${KRB5DIR}/lib/roken		\
+	-I${KRB5DIR}/lib/krb5		\
+	-I${KRB5DIR}/lib/asn1		\
+	-I${KRB5DIR}/lib/hdb		\
+	-I${KRB5DIR}/lib/sl		\
+	-I${KRB5DIR}/lib/kadm5		\
+	-I${KRB5DIR}/kadmin		\
+	-I${ASN1OBJDIR}			\
+	-I${HDBOBJDIR}			\
+	-I${.OBJDIR}			\
+	${LDAPCFLAGS}
+
+LDADD=	-lkadm5clnt -lkadm5srv -lkrb5 -lroken	\
+	${LIBVERS} -lhdb -lasn1			\
+	-lcrypto -lcrypt -lcom_err		\
+	${LIBSL} -lreadline -lcurses ${LDAPLDADD}
+
+DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBKRB5} ${LIBROKEN}	\
+	${LIBVERS} ${LIBHDB} ${LIBASN1}				\
+	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}			\
+	${LIBSL} ${LIBREADLINE} ${LIBCURSES} ${LDAPLIBS}
 
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/sl \
-		-I${KRB5DIR}/lib/kadm5 \
-		-I${KRB5DIR}/kadmin \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR} \
-		${LDAPCFLAGS}
-LDADD=		-lkadm5clnt -lkadm5srv -lkrb5 -lroken \
-		${LIBVERS} -lhdb -lasn1 \
-		-lcrypto -lcrypt -lcom_err \
-		${LIBSL} -lreadline -lcurses ${LDAPLDADD}
-DPADD=		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBKRB5} ${LIBROKEN} \
-		${LIBVERS} ${LIBHDB} ${LIBASN1} \
-		${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
-		${LIBSL} ${LIBREADLINE} ${LIBCURSES} ${LDAPLIBS}
-MAN=		kadmin.8
+MAN=	kadmin.8
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/kadmin
 
-kadm5/private.h:	kadm5
+${.OBJDIR}/kadm5/private.h:	${.OBJDIR}/kadm5
 	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
-kadm5/admin.h:	kadm5
+${.OBJDIR}/kadm5/admin.h:	${.OBJDIR}/kadm5
 	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
+${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h
 	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
 
-kadm5:
+${.OBJDIR}/kadm5:
 	mkdir ${.TARGET}
 
 CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 12a7bb7..aad0db7 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -1,19 +1,27 @@
 # $FreeBSD$
 
-PROG=		kdestroy
-SRCS=		kdestroy.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/kafs \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-LDADD=		-lkrb5 -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+PROG=	kdestroy
+
+SRCS=	\
+	kdestroy.c		\
+	${.OBJDIR}/krb5_err.h	\
+	${.OBJDIR}/heim_err.h	\
+	${.OBJDIR}/k524_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/lib/kafs	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${.OBJDIR}
+
+LDADD=	-lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
+
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 2550bd5..5d4432a 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -1,20 +1,27 @@
 # $FreeBSD$
 
-PROG=		kinit
-SRCS=		kinit.c asn1_err.h krb5_err.h heim_err.h \
-       		k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/kafs \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-LDADD=		-lkrb5 -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+PROG=	kinit
+
+SRCS=	kinit.c			\
+	${.OBJDIR}/asn1_err.h	\
+	${.OBJDIR}/krb5_err.h	\
+	${.OBJDIR}/heim_err.h	\
+	${.OBJDIR}/k524_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/lib/kafs	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${.OBJDIR}
+
+LDADD=	-lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
+
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index ed1eb74..34c44fd 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -1,19 +1,27 @@
 # $FreeBSD$
 
-PROG=		klist
-SRCS=		klist.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/kafs \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-LDADD=		-lkrb5 -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+PROG=	klist
+
+SRCS=	\
+	klist.c			\
+	${.OBJDIR}/krb5_err.h	\
+	${.OBJDIR}/heim_err.h	\
+	${.OBJDIR}/k524_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/lib/kafs	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${.OBJDIR}
+
+LDADD=	-lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
+
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index 5d3a32f..32e7a83 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -1,18 +1,26 @@
 # $FreeBSD$
 
-PROG=		kpasswd
-SRCS=		kpasswd.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/kpasswd \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-LDADD=		-lkrb5 -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+PROG=	kpasswd
+
+SRCS=	\
+	kpasswd.c		\
+	${.OBJDIR}/krb5_err.h	\
+	${.OBJDIR}/heim_err.h	\
+	${.OBJDIR}/k524_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/kpasswd	\
+	-I${ASN1OBJDIR}		\
+	-I${.OBJDIR}
+
+LDADD=	-lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
+
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile
index 3e0911f..dc124e9 100644
--- a/kerberos5/usr.bin/krb5-config/Makefile
+++ b/kerberos5/usr.bin/krb5-config/Makefile
@@ -1,21 +1,23 @@
 # $FreeBSD$
 
-SCRIPTS=	krb5-config
-MAN=		krb5-config.1
+SCRIPTS=krb5-config
+
+MAN=	krb5-config.1
+
 CLEANFILES=	krb5-config
 
 krb5-config: krb5-config.in
-	sed	-e "s,@PACKAGE\@,FreeBSD heimdal,g" \
-		-e "s,@VERSION\@,0.5.1,g" \
-		-e "s,@prefix\@,/usr,g" \
-		-e "s,@exec_prefix\@,/usr,g" \
-		-e "s,@libdir\@,${LIBDIR},g" \
-		-e "s,@includedir\@,${INCLUDEDIR},g" \
-		-e "s,@LIB_crypt\@,-lcrypt,g" \
-		-e "s,@LIB_dbopen\@,,g" \
-		-e "s,@LIB_des_appl\@,-lcrypto,g" \
-		-e "s,@LIBS\@,-lcom_err,g" \
-		-e "s,@INCLUDE_des@,,g" \
+	sed	-e "s,@PACKAGE\@,FreeBSD heimdal,g"	\
+		-e "s,@VERSION\@,0.5.1,g"		\
+		-e "s,@prefix\@,/usr,g"			\
+		-e "s,@exec_prefix\@,/usr,g"		\
+		-e "s,@libdir\@,${LIBDIR},g"		\
+		-e "s,@includedir\@,${INCLUDEDIR},g"	\
+		-e "s,@LIB_crypt\@,-lcrypt,g"		\
+		-e "s,@LIB_dbopen\@,,g"			\
+		-e "s,@LIB_des_appl\@,-lcrypto,g"	\
+		-e "s,@LIBS\@,-lcom_err,g"		\
+		-e "s,@INCLUDE_des@,,g"			\
 		${.ALLSRC} > ${.TARGET}
 	chmod +x ${.TARGET}
 
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index 540d596..f3e6d74 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -1,20 +1,31 @@
 # $FreeBSD$
 
-PROG=		ksu
-SRCS=		su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/kafs \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-NOMAN=		true
-LDADD=		-lkrb5 -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+PROG=	ksu
+
+SRCS=	\
+	su.c			\
+	${.OBJDIR}/asn1_err.h	\
+	${.OBJDIR}/krb5_err.h	\
+	${.OBJDIR}/heim_err.h	\
+	${.OBJDIR}/k524_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/lib/kafs	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/kuser	\
+	-I${ASN1OBJDIR}		\
+	-I${.OBJDIR}
+
+LDADD=	-lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
+
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+
+NOMAN=	true
+
 .if defined(ENABLE_SUID_K5SU)
 BINMODE=4555
 .endif
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index 557e48f..461d054 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -1,22 +1,29 @@
 # $FreeBSD$
 
-PROG=		kstash
-SRCS=		kstash.c hdb_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/kdc \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR} \
-		${LDAPCFLAGS}
-LDADD=		-lhdb -lkrb5 -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-DPADD=		${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
-MAN=		kstash.8
+PROG=	kstash
+
+SRCS=	\
+	kstash.c		\
+	${.OBJDIR}/hdb_err.h
+
+CFLAGS+=-I${KRB5DIR}/include	\
+	-I${KRB5DIR}/lib/roken	\
+	-I${KRB5DIR}/lib/krb5	\
+	-I${KRB5DIR}/lib/asn1	\
+	-I${KRB5DIR}/lib/hdb	\
+	-I${KRB5DIR}/kdc	\
+	-I${ASN1OBJDIR}		\
+	-I${HDBOBJDIR}		\
+	-I${.OBJDIR}		\
+	${LDAPCFLAGS}
+
+LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+
+MAN=	kstash.8
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index 5f2e5ee..2f70adf 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=		ktutil
+
 SRCS=		\
 		add.c				\
 		change.c			\
@@ -10,11 +11,13 @@ SRCS=		\
 		list.c				\
 		purge.c				\
 		remove.c			\
-		rename.c \
-		kadm5/private.h \
-		kadm5/admin.h \
-		kadm5/kadm5_err.h \
-		krb5_err.h heim_err.h k524_err.h
+		rename.c			\
+		${.OBJDIR}/kadm5/private.h	\
+		${.OBJDIR}/kadm5/admin.h	\
+		${.OBJDIR}/kadm5/kadm5_err.h	\
+		${.OBJDIR}/krb5_err.h		\
+		${.OBJDIR}/heim_err.h		\
+		${.OBJDIR}/k524_err.h
 
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
@@ -25,28 +28,31 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/admin \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
+
 LDADD=		-lkadm5clnt -lkrb5 -lroken ${LIBVERS} \
 		${LIBSL} -lasn1 -lcrypto -lcrypt -lcom_err \
 		-lreadline -lcurses
+
 DPADD=		${LIBKADM5CLNT} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 		${LIBSL} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
 		${LIBREADLINE} ${LIBCURSES}
+
 MAN=		ktutil.8
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/admin
 
-kadm5/private.h:	kadm5
+${.OBJDIR}/kadm5/private.h:	${.OBJDIR}/kadm5
 	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
-kadm5/admin.h:	kadm5
+${.OBJDIR}/kadm5/admin.h:	${.OBJDIR}/kadm5
 	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
+${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h
 	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
 
-kadm5:
+${.OBJDIR}/kadm5:
 	mkdir ${.TARGET}
 
 CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h