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.

7 files changed, 178 insertions, 128 deletions

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