Overhaul of kerberos5/ makefiles. Most significant changes are:

- Dropped support for standalone builds, this was only partially
  supported anyway, and required so much magic in makefiles that
  made life dangerous (e.g., by using the custom yacc rules).

- Got rid of .OBJDIR in makefiles -- makes building of individual
  files possible again.

- Made the .x.c transformations -j safe.

- Reprogrammed LDADD to fix static build of some utilities that
  was broken.

- Fixed LDFLAGS and DPADD in the WITH_OPENLDAP case -- positively
  affects the contents of .depend files.

- Removed redundant .h's from SRCS, only kept those that are
  generated.

- libkrb5/ INCS were bogusly installed again with libgssapi/.

- Made build-tools real tools with their own makefiles in
  separate directories.  This allows us to properly track
  their dependencies, etc.

- Faster build, 21% less of makefile code!

Approved by:	nectar
Reviewed by:	markm
Silence on:	arch

7 files changed, 36 insertions, 127 deletions

diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index dea9124..6acfded 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -5,27 +5,17 @@ PROG=	hprop
 SRCS=	\
 	hprop.c			\
 	mit_dump.c		\
-	v4_dump.c		\
-	hprop.h			\
-	kadb.h			\
-	${.OBJDIR}/hdb_err.h
+	v4_dump.c
 
-CFLAGS+=-I${KRB5DIR}/include	\
-	-I${KRB5DIR}/kdc	\
+CFLAGS+=-I${KRB5DIR}/lib/roken	\
 	-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} \
+	-I${KRB5DIR}/lib/asn1
+
+LDADD=	-lkrb5 -lhdb -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 
-DPADD=	${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+DPADD=	${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 
 MAN=	hprop.8
 
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 6bcfa65..408a507 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -2,28 +2,18 @@
 
 PROG=	hpropd
 
-SRCS=	\
-	hpropd.c		\
-	hprop.h			\
-	${.OBJDIR}/hdb_err.h
-
-CFLAGS+=-I${KRB5DIR}/include	\
-	-I${KRB5DIR}/kdc	\
+CFLAGS+=-I${KRB5DIR}/lib/roken	\
 	-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}
+		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
+
+LDFLAGS=	${LDAPLDFLAGS}
 
 MAN=		hpropd.8
 
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 4c9e583..acc3a0c 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -4,28 +4,21 @@ PROG=	ipropd-master
 
 SRCS=	\
 	ipropd_master.c		\
-	iprop.h			\
-	kadm5_locl.h		\
-	${.OBJDIR}/kadm5_err.h	\
-	${.OBJDIR}/hdb_err.h
+	kadm5_err.h
 
-CFLAGS+=-I${KRB5DIR}/include	\
-	-I${KRB5DIR}/lib/kadm5	\
+CFLAGS+=-I${KRB5DIR}/lib/roken	\
 	-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}		\
+	-I.			\
 	${LDAPCFLAGS}
 
 LDADD=	-lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 
+LDFLAGS=${LDAPLDFLAGS}
+
 DPADD=	${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 
 NOMAN=	yes
 
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index f5c0921..c363ab5 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -4,28 +4,21 @@ PROG=	ipropd-slave
 
 SRCS=	\
 	ipropd_slave.c		\
-	iprop.h			\
-	kadm5_locl.h		\
-	${.OBJDIR}/kadm5_err.h	\
-	${.OBJDIR}/hdb_err.h
+	kadm5_err.h
 
-CFLAGS+=-I${KRB5DIR}/include	\
-	-I${KRB5DIR}/lib/kadm5	\
+CFLAGS+=-I${KRB5DIR}/lib/roken	\
 	-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}		\
+	-I.			\
 	${LDAPCFLAGS}
 
 LDADD=	-lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 
+LDFLAGS=${LDAPLDFLAGS}
+
 DPADD=	${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 
 NOMAN=	yes
 
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 33b598c..93f995e 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -4,47 +4,23 @@ PROG=	kadmind
 
 SRCS=	kadmind.c			\
 	server.c			\
-	kadm_conn.c			\
-	${.OBJDIR}/kadm5/private.h	\
-	${.OBJDIR}/kadm5/admin.h	\
-	${.OBJDIR}/kadm5/kadm5_err.h
+	kadm_conn.c
 
-CFLAGS+=-I${KRB5DIR}/include		\
-	-I${KRB5DIR}/lib/roken		\
+CFLAGS+=-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}
 
+LDFLAGS=${LDAPLDFLAGS}
+
 DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 
 MAN=	kadmind.8
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/kadmin
-
-${.OBJDIR}/kadm5/private.h:	${.OBJDIR}/kadm5
-	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
-
-${.OBJDIR}/kadm5/admin.h:	${.OBJDIR}/kadm5
-	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
-
-${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h
-	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
-
-${.OBJDIR}/kadm5:
-	mkdir ${.TARGET}
-
-CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+=	kadm5
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 7c17cf5..8e27546 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -6,30 +6,24 @@ SRCS=	\
 	524.c			\
 	config.c		\
 	connect.c		\
-	kdc_locl.h		\
 	kerberos4.c		\
 	kerberos5.c		\
 	log.c			\
 	main.c			\
 	misc.c
 
-CFLAGS+=-I${KRB5DIR}/include	\
-	-I${KRB5DIR}/kdc	\
+CFLAGS+=-I${KRB5DIR}/lib/roken	\
 	-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}
 
+LDFLAGS=${LDAPLDFLAGS}
+
 DPADD=	${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 
 MAN=	kdc.8
 
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 2d35a7c..884107c 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -2,46 +2,19 @@
 
 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}			\
+CFLAGS+=-I${KRB5DIR}/lib/roken		\
 	${LDAPCFLAGS}
 
 LDADD=	-lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 
+LDFLAGS=${LDAPLDFLAGS}
+
 DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 
 MAN=	kpasswdd.8
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/kpasswd
-
-${.OBJDIR}/kadm5/admin.h:	${.OBJDIR}/kadm5
-	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
-
-${.OBJDIR}/kadm5/private.h: ${.OBJDIR}/kadm5
-	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
-
-${.OBJDIR}/kadm5:
-	mkdir ${.TARGET}
-
-CLEANFILES+=	kadm5/admin.h kadm5/private.h
-CLEANDIRS+=	kadm5