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, 4 insertions, 10 deletions

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