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, 196 insertions, 134 deletions

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