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

2 files changed, 9 insertions, 45 deletions

diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index 461d054..b9f7833 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -2,26 +2,18 @@
 
 PROG=	kstash
 
-SRCS=	\
-	kstash.c		\
-	${.OBJDIR}/hdb_err.h
-
-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}/kdc	\
-	-I${ASN1OBJDIR}		\
-	-I${HDBOBJDIR}		\
-	-I${.OBJDIR}		\
 	${LDAPCFLAGS}
 
 LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 
+LDFLAGS=${LDAPLDFLAGS}
+
 DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
 
 MAN=	kstash.8
 
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index 2f70adf..355d670 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -11,49 +11,21 @@ SRCS=		\
 		list.c				\
 		purge.c				\
 		remove.c			\
-		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 \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
+		rename.c
+
+CFLAGS+=	-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl \
-		-I${KRB5DIR}/lib/kadm5 \
-		-I${KRB5DIR}/admin \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
 
 LDADD=		-lkadm5clnt -lkrb5 -lroken ${LIBVERS} \
 		${LIBSL} -lasn1 -lcrypto -lcrypt -lcom_err \
-		-lreadline -lcurses
+		-lreadline -lncurses
 
 DPADD=		${LIBKADM5CLNT} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 		${LIBSL} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
-		${LIBREADLINE} ${LIBCURSES}
+		${LIBREADLINE} ${LIBNCURSES}
 
 MAN=		ktutil.8
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/admin
-
-${.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