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

1 files changed, 6 insertions, 33 deletions

diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 8e9c568..68532c5 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -16,55 +16,28 @@ SRCS=	\
 	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
+	random_password.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=	-lkadm5clnt -lkadm5srv -lkrb5 -lroken	\
 	${LIBVERS} -lhdb -lasn1			\
 	-lcrypto -lcrypt -lcom_err		\
-	${LIBSL} -lreadline -lcurses ${LDAPLDADD}
+	${LIBSL} -lreadline -lncurses ${LDAPLDADD}
+
+LDFLAGS=${LDAPLDFLAGS}
 
 DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBKRB5} ${LIBROKEN}	\
 	${LIBVERS} ${LIBHDB} ${LIBASN1}				\
 	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}			\
-	${LIBSL} ${LIBREADLINE} ${LIBCURSES} ${LDAPLIBS}
+	${LIBSL} ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD}
 
 MAN=	kadmin.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