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, 17 insertions, 74 deletions

diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 91856d3..a837dab 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -6,8 +6,8 @@ INCS=	\
 	hdb-private.h	\
 	hdb-protos.h	\
 	hdb.h		\
-	${.OBJDIR}/hdb_asn1.h	\
-	${.OBJDIR}/hdb_err.h
+	hdb_asn1.h	\
+	hdb_err.h
 
 SRCS=	\
 	common.c			\
@@ -20,21 +20,14 @@ SRCS=	\
 	ndbm.c				\
 	print.c				\
 	hdb_err.c			\
-	${.OBJDIR}/hdb_err.h		\
-	${.OBJDIR}/hdb_asn1.h		\
-	${.OBJDIR}/k524_err.h		\
-	${.OBJDIR}/krb5_err.h		\
-	${.OBJDIR}/heim_err.h		\
-	${GEN:S/.x/.c/g}
+	hdb_err.h			\
+	hdb_asn1.h			\
+	${GEN:S/.x$/.c/}
 
-CFLAGS+=-I${KRB5DIR}/include		\
-	-I${INCLUDEOBJDIR}		\
-	-I${KRB5DIR}/lib/krb5		\
-	-I${KRB5DIR}/lib/hdb		\
+CFLAGS+=-I${KRB5DIR}/lib/hdb		\
 	-I${KRB5DIR}/lib/asn1		\
 	-I${KRB5DIR}/lib/roken		\
-	-I${.OBJDIR}			\
-	-I${ASN1OBJDIR}			\
+	-I.				\
 	${LDAPCFLAGS}
 
 GEN=					\
@@ -45,70 +38,20 @@ GEN=					\
 	asn1_hdb_entry.x		\
 	asn1_Salt.x
 
-.include <bsd.lib.mk>
+CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} hdb_asn1.h asn1_files
 
-.PATH:	${KRB5DIR}/lib/hdb
-.PATH:	${KRB5DIR}/lib/asn1
-.PATH:	${KRB5DIR}/lib/vers
-.PATH:	${KRB5DIR}/lib/roken
+.ORDER: ${GEN} hdb_asn1.h
+${GEN} hdb_asn1.h: hdb.asn1 ../../tools/asn1_compile/asn1_compile
+	../../tools/asn1_compile/asn1_compile ${.ALLSRC:M*.asn1} hdb_asn1
 
-build-tools:	make-print-version asn1_compile
+../../tools/asn1_compile/asn1_compile:
+	cd ${.CURDIR}/../../tools/asn1_compile && ${MAKE}
 
 .for I in ${GEN}
-${I:S/.x/.c/}:  ${I}
-	cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
+${I:R}.c: ${I}
+	cat ${.ALLSRC} > ${.TARGET}
 .endfor
 
-CLEANFILES+=	${GEN:S/.x/.c/g} hdb_asn1.h asn1_files
-
-${GEN} ${.OBJDIR}/hdb_asn1.h:	asn1_compile hdb.asn1
-	./asn1_compile ${KRB5DIR}/lib/hdb/hdb.asn1 hdb_asn1
-
-asn1_compile:					\
-	gen.c					\
-	gen_copy.c				\
-	gen_decode.c				\
-	gen_encode.c				\
-	gen_free.c				\
-	gen_glue.c				\
-	gen_length.c				\
-	hash.c					\
-	emalloc.c				\
-	main.c					\
-	symbol.c				\
-	getarg.c				\
-	warnerr.c				\
-	${.OBJDIR}/lex.o			\
-	${.OBJDIR}/parse.o			\
-	${.OBJDIR}/print_version.o		\
-	get_window_size.c			\
-	strupr.c
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.OODATE} ${LDADD}
-
-.ORDER: ${.OBJDIR}/roken.h ${.OBJDIR}/parse.c ${.OBJDIR}/parse.h ${.OBJDIR}/lex.c
-
-${.OBJDIR}/parse.o:	${.OBJDIR}/parse.c ${.OBJDIR}/roken.h
-
-${.OBJDIR}/lex.o:	${.OBJDIR}/lex.c ${.OBJDIR}/parse.h ${.OBJDIR}/roken.h
-
-${.OBJDIR}/parse.h ${.OBJDIR}/parse.c:	parse.y
-	${YACC}	-d ${.OODATE}
-	cp y.tab.c parse.c
-	cp y.tab.h parse.h
-
-${.OBJDIR}/lex.c:	lex.l
-	${LEX} -t ${LFLAGS} ${.OODATE} > ${.TARGET}
-
-${.OBJDIR}/print_version.o: ${.OBJDIR}/print_version.h print_version.c \
-				${.OBJDIR}/roken.h
-	${CC} ${CFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/vers/print_version.c
-
-${.OBJDIR}/print_version.h: make-print-version
-	./make-print-version print_version.h
-
-make-print-version: make-print-version.c
-	${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE}
+.include <bsd.lib.mk>
 
-CLEANFILES+=	${GEN} asn1_compile lex.o parse.o parse.c parse.h \
-		hdb_asn1.h make-print-version print_version.h print_version.o \
-		y.tab.c y.tab.h
+.PATH:	${KRB5DIR}/lib/hdb