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, 8 insertions, 11 deletions

diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 8c58d45..7f3fc59 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -99,23 +99,20 @@ SRCS=	\
 	krb5_err.c			\
 	k524_err.c			\
 	heim_err.c			\
-	${.OBJDIR}/k524_err.h		\
-	${.OBJDIR}/heim_err.h
+	k524_err.h			\
+	heim_err.h
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5		\
 	-I${KRB5DIR}/lib/asn1		\
-	-I${KRB5DIR}/lib/des		\
 	-I${KRB5DIR}/lib/roken		\
-	-I${KRB5DIR}/include		\
-	-I${KRB5OBJDIR}			\
-	-I${ASN1OBJDIR}
+	-I.
 
 INCS=	krb5.h				\
 	krb5-protos.h			\
-	${.CURDIR}/../../include/krb5-types.h \
-	${.OBJDIR}/heim_err.h		\
-	${.OBJDIR}/krb5_err.h		\
-	${.OBJDIR}/k524_err.h
+	krb5-types.h			\
+	heim_err.h			\
+	krb5_err.h			\
+	k524_err.h
 
 MAN=	\
 	krb5.3				\
@@ -323,4 +320,4 @@ MLINKS=	\
 .include <bsd.lib.mk>
 
 .PATH:		${KRB5DIR}/lib/krb5
-.PATH:		${KRB5DIR}/lib/des
+.PATH:		${.CURDIR}/../../include