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, 9 insertions, 3 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index a32a89e..fdee6a0 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -698,8 +698,7 @@ _fortran= gnu/usr.bin/cc/f771
 
 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
     !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
-_libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
-    kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
+_kerberos5_tools= kerberos5/tools
 .endif
 
 .if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE)
@@ -713,7 +712,6 @@ build-tools:
     ${_rescue} \
     gnu/usr.bin/cc/cc_tools \
     ${_fortran} \
-    ${_libkrb5} \
     lib/libncurses \
     ${_share} \
     ${_aicasm} \
@@ -725,6 +723,14 @@ build-tools:
 		${MAKE} DIRPRFX=${_tool}/ obj; \
 		${MAKE} DIRPRFX=${_tool}/ build-tools
 .endfor
+.for _tool in \
+    ${_kerberos5_tools}
+	@${ECHODIR} "===> ${_tool}"; \
+		cd ${.CURDIR}/${_tool}; \
+		${MAKE} DIRPRFX=${_tool}/ obj; \
+		${MAKE} DIRPRFX=${_tool}/ depend; \
+		${MAKE} DIRPRFX=${_tool}/ all
+.endfor
 
 #
 # cross-tools: Build cross-building tools