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

5 files changed, 71 insertions, 0 deletions

diff --git a/kerberos5/tools/Makefile b/kerberos5/tools/Makefile
new file mode 100644
index 0000000..9d3700e
--- /dev/null
+++ b/kerberos5/tools/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=	make-print-version asn1_compile make-roken
+
+.include <bsd.subdir.mk>
diff --git a/kerberos5/tools/Makefile.inc b/kerberos5/tools/Makefile.inc
new file mode 100644
index 0000000..c0703a9
--- /dev/null
+++ b/kerberos5/tools/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+realinstall:
+
+.include "../Makefile.inc"
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
new file mode 100644
index 0000000..c90a201
--- /dev/null
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -0,0 +1,42 @@
+# $FreeBSD$
+
+PROG=	asn1_compile
+NOMAN=
+
+SRCS=	\
+	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 \
+	lex.l \
+	parse.y \
+	print_version.c \
+	print_version.h \
+	get_window_size.c \
+	strupr.c
+
+CFLAGS+= -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I.
+
+print_version.h: ../make-print-version/make-print-version
+	../make-print-version/make-print-version ${.TARGET}
+
+../make-print-version/make-print-version:
+	cd ${.CURDIR}/../make-print-version && ${MAKE}
+
+CLEANFILES= print_version.h
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/lib/roken ${KRB5DIR}/lib/asn1 ${KRB5DIR}/lib/vers
+
+# There are two print_version.c's, select the right one.
+print_version.o: ${KRB5DIR}/lib/vers/print_version.c
diff --git a/kerberos5/tools/make-print-version/Makefile b/kerberos5/tools/make-print-version/Makefile
new file mode 100644
index 0000000..144c4dc
--- /dev/null
+++ b/kerberos5/tools/make-print-version/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG=	make-print-version
+NOMAN=
+
+.include <bsd.prog.mk>
+
+.PATH: ${KRB5DIR}/lib/vers
diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile
new file mode 100644
index 0000000..473b83e
--- /dev/null
+++ b/kerberos5/tools/make-roken/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PROG=	make-roken
+NOMAN=
+
+CLEANFILES= make-roken.c
+
+.include <bsd.prog.mk>
+
+make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in
+	awk -f ${.ALLSRC} > ${.TARGET}