Added regen target to pregenerate files to get rid of dependency on

up-to-date asn1_compile and compile_et.

on hin@

5 files changed, 62 insertions, 62 deletions

diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile
index 0ee365dd102..7452a80470d 100644
--- a/lib/libkrb5/Makefile
+++ b/lib/libkrb5/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2003/05/17 05:20:18 mho Exp $
+# $OpenBSD: Makefile,v 1.7 2003/05/17 20:07:23 mho Exp $
 
 KRB5DIR=	${.CURDIR}/../../kerberosV
+GENDIR=		${.CURDIR}/generated
 .include "Makefile.common.inc"
 
 LIB	= krb5
 
 .PATH:	${KRB5SRC}/lib
+.PATH:	${GENDIR}
 
 .include "Makefile.asn1.inc"
 .include "Makefile.hdb.inc"
@@ -13,6 +15,7 @@ LIB	= krb5
 .include "Makefile.roken.inc"
 .include "Makefile.krb5.inc"
 
+
 includes:
 	@test -d ${DESTDIR}/usr/include/kerberosV || \
 		mkdir ${DESTDIR}/usr/include/kerberosV
@@ -32,7 +35,7 @@ includes:
 			-o ${BINOWN} -g $(BINGRP) $$i \
 			${DESTDIR}/usr/include/kerberosV; done; \
 		echo
-	@echo -n ${DIRKAFS}:; \
+	@echo -n ${DIR_KAFS}:; \
 	cd ${DIR_KAFS}; for i in ${HDR_KAFS}; do \
 		echo -n " $$i"; \
 		cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
@@ -56,8 +59,8 @@ includes:
 			-o ${BINOWN} -g $(BINGRP) $$i \
 			${DESTDIR}/usr/include/kerberosV; done; \
 		echo
-	@echo -n ${.OBJDIR}:; \
-	cd ${.OBJDIR}; for i in ${HDR_OBJ}; do \
+	@echo -n ${GENDIR}:; \
+	cd ${GENDIR}; for i in ${HDR_GEN}; do \
 		echo -n " $$i"; \
 		cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \
 			${INSTALL} ${INSTALL_COPY} -m 444 \
diff --git a/lib/libkrb5/Makefile.asn1.inc b/lib/libkrb5/Makefile.asn1.inc
index d7492c07289..c29be24daa7 100644
--- a/lib/libkrb5/Makefile.asn1.inc
+++ b/lib/libkrb5/Makefile.asn1.inc
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile.asn1.inc,v 1.2 2003/05/17 05:20:18 mho Exp $
+# $OpenBSD: Makefile.asn1.inc,v 1.3 2003/05/17 20:07:23 mho Exp $
 
 .PATH:	${KRB5SRC}/lib/asn1
 
 DIR_ASN1=	${KRB5SRC}/lib/asn1
 HDR_ASN1=	der.h #asn1-common.h
-HDR_OBJ+=	krb5_asn1.h asn1_err.h
-
-includes:	krb5_asn1.h asn1_err.h
+HDR_GEN+=	krb5_asn1.h asn1_err.h
 
 .PATH:	${KRB5SRC}/lib/asn1
 
@@ -64,10 +62,7 @@ gen_files= \
 	asn1_TransitedEncoding.c	\
 	asn1_UNSIGNED.c
 
-CLEANFILES+=	${gen_files} asn1_err.[ch] asn1_files
-
-BUILT_SOURCES= \
-	${gen_files} \
+gen_files+=\
 	asn1_err.h \
 	asn1_err.c
 
@@ -76,15 +71,13 @@ SRCS+=	der_get.c \
 	der_free.c \
 	der_length.c \
 	der_copy.c \
-	${BUILT_SOURCES}
+	${gen_files}
 
 CFLAGS+=	-I${KRB5SRC}/lib/asn1
 
-asn1_err.h asn1_err.c:	${KRB5SRC}/lib/asn1/asn1_err.et
-	compile_et ${KRB5SRC}/lib/asn1/asn1_err.et
-
-$(gen_files):
-	asn1_compile ${KRB5SRC}/lib/asn1/k5.asn1 krb5_asn1
-	for f in *.x; do mv $$f `echo $$f | sed s,.x$$,.c,g`; done
-
+regen_asn1:
+	cd ${GENDIR}; compile_et ${KRB5SRC}/lib/asn1/asn1_err.et
+	cd ${GENDIR}; asn1_compile ${KRB5SRC}/lib/asn1/k5.asn1 krb5_asn1; \
+		for f in *.x; do mv $$f `echo $$f | sed s,.x$$,.c,g`; done
 
+regen: regen_asn1
diff --git a/lib/libkrb5/Makefile.hdb.inc b/lib/libkrb5/Makefile.hdb.inc
index 32fc292315e..7e3642c71a4 100644
--- a/lib/libkrb5/Makefile.hdb.inc
+++ b/lib/libkrb5/Makefile.hdb.inc
@@ -1,36 +1,38 @@
-# $OpenBSD: Makefile.hdb.inc,v 1.2 2003/05/17 05:20:18 mho Exp $
+# $OpenBSD: Makefile.hdb.inc,v 1.3 2003/05/17 20:07:23 mho Exp $
 
 DIR_HDB=	${KRB5SRC}/lib/hdb
 HDR_HDB=	hdb.h hdb-protos.h hdb-private.h
-HDR_OBJ+=	hdb_err.h hdb_asn1.h
+HDR_GEN+=	hdb_err.h hdb_asn1.h
 
-includes:	hdb_err.h hdb_asn1.h
+.PATH:	${KRB5SRC}/lib/hdb
+
+gen_files= \
+	hdb_asn1.h \
+	asn1_Key.c \
+	asn1_Event.c \
+	asn1_HDBFlags.c \
+	asn1_hdb_entry.c \
+        asn1_Salt.c \
+	asn1_GENERATION.c
 
-ASN1_SRC = asn1_Key.c asn1_Event.c asn1_HDBFlags.c asn1_hdb_entry.c \
-        asn1_Salt.c hdb_asn1.h asn1_GENERATION.c
+gen_files+=\
+	hdb_err.h \
+	hdb_err.c
 
-SRCS+=	${ASN1_SRC} \
-	keytab.c \
+SRCS+=	keytab.c \
 	hdb.c \
 	common.c \
 	db.c \
 	mkey.c \
 	ndbm.c \
 	print.c \
-	hdb_err.c \
-	hdb_err.h
-
-${ASN1_SRC}:
-	asn1_compile ${KRB5SRC}/lib/hdb/hdb.asn1 hdb_asn1
-	for f in *.x; do mv $$f `echo $$f | sed s,.x$$,.c,g`; done
+	${gen_files}
 
-CLEANFILES+=	hdb_err.[ch] ${ASN1_SRC} \
-		hdb_asn1.[ch] ans1_files asn1.h asn1_files
-
-CFLAGS+=-I${KRB5SRC}/lib/hdb -I${KRB5SRC}/lib/asn1
-
-.PATH:	${KRB5SRC}/lib/hdb
+CFLAGS+=	-I${KRB5SRC}/lib/hdb -I${KRB5SRC}/lib/asn1
 
-hdb_err.c hdb_err.h: ${KRB5SRC}/lib/hdb/hdb_err.et
-	compile_et ${KRB5SRC}/lib/hdb/hdb_err.et
+regen_hdb:
+	cd ${GENDIR}; compile_et ${KRB5SRC}/lib/hdb/hdb_err.et
+	cd ${GENDIR}; asn1_compile ${KRB5SRC}/lib/hdb/hdb.asn1 hdb_asn1; \
+		for f in *.x; do mv $$f `echo $$f | sed s,.x$$,.c,g`; done
 
+regen:		regen_hdb
diff --git a/lib/libkrb5/Makefile.kafs.inc b/lib/libkrb5/Makefile.kafs.inc
index 0d32d3ba8e9..1bf0ac2a900 100644
--- a/lib/libkrb5/Makefile.kafs.inc
+++ b/lib/libkrb5/Makefile.kafs.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.kafs.inc,v 1.3 2003/05/17 05:20:18 mho Exp $
+# $OpenBSD: Makefile.kafs.inc,v 1.4 2003/05/17 20:07:23 mho Exp $
 
 DIR_KAFS=	${KRB5SRC}/lib/kafs
 HDR_KAFS=	kafs.h
@@ -24,4 +24,4 @@ MLINKS+=kafs.3 k_hasafs.3 \
 
 kafs_common.c:	${KRB5SRC}/lib/kafs/common.c
 	ln -sf ${KRB5SRC}/lib/kafs/common.c kafs_common.c
-
+CLEANFILES+=kafs_common.c
diff --git a/lib/libkrb5/Makefile.krb5.inc b/lib/libkrb5/Makefile.krb5.inc
index 0d2baaf8f7b..dad0a83a211 100644
--- a/lib/libkrb5/Makefile.krb5.inc
+++ b/lib/libkrb5/Makefile.krb5.inc
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile.krb5.inc,v 1.3 2003/05/17 05:20:18 mho Exp $
+# $OpenBSD: Makefile.krb5.inc,v 1.4 2003/05/17 20:07:23 mho Exp $
 
-DIR_KRB5INC=${.CURDIR}/../../kerberosV/include
-DIR_KRB5LIB=${KRB5SRC}/lib/krb5
+DIR_KRB5INC=	${.CURDIR}/../../kerberosV/include
+DIR_KRB5LIB=	${KRB5SRC}/lib/krb5
 HDR_KRB5INC=	krb5-types.h
 HDR_KRB5LIB=	krb5.h krb5-protos.h krb5-private.h
-HDR_OBJ+=	krb5_err.h heim_err.h k524_err.h
-
-includes:	krb5_err.h heim_err.h k524_err.h
+HDR_GEN+=	krb5_err.h heim_err.h k524_err.h
 
 MAN+=	krb5.conf.5
 
@@ -134,6 +132,16 @@ MAN+=	krb5_unparse_name.3
 MAN+=	krb5_verify_user.3
 MLINKS+=krb5_verify_user.3 krb5_verify_user_lrealm.3
 
+.PATH:	${KRB5SRC}/lib/krb5
+
+gen_files= \
+	heim_err.h \
+	k524_err.h \
+	krb5_err.h \
+	heim_err.c \
+	k524_err.c \
+	krb5_err.c
+
 SRCS+=	add_et_list.c \
 	addr_families.c \
 	aname_to_localname.c \
@@ -226,24 +234,19 @@ SRCS+=	add_et_list.c \
 	write_message.c \
 	krb5_err.c \
 	heim_err.c \
-	k524_err.c
-
-CLEANFILES+=	krb5_err.[ch] heim_err.[ch] k524_err.[ch]
-
-.PATH:	${KRB5SRC}/lib/krb5
+	k524_err.c \
+	${gen_files}
 
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/ \
 	-I${KRB5SRC}/lib/asn1 -I../asn1 -I. \
 	-DSHA1_CTX=SHA_CTX
 
-krb5_err.c krb5_err.h:	${KRB5SRC}/lib/krb5/krb5_err.et
-	compile_et ${KRB5SRC}/lib/krb5/krb5_err.et
+regen_krb5:
+	cd ${GENDIR}; compile_et ${KRB5SRC}/lib/krb5/heim_err.et
+	cd ${GENDIR}; compile_et ${KRB5SRC}/lib/krb5/k524_err.et
+	cd ${GENDIR}; compile_et ${KRB5SRC}/lib/krb5/krb5_err.et
 
-heim_err.c heim_err.h:	${KRB5SRC}/lib/krb5/heim_err.et
-	compile_et ${KRB5SRC}/lib/krb5/heim_err.et
-
-k524_err.c k524_err.h:	${KRB5SRC}/lib/krb5/k524_err.et
-	compile_et ${KRB5SRC}/lib/krb5/k524_err.et
+regen:	regen_krb5
 
 # There is a warn.c both in lib/roken and lib/krb5.
 krb5_warn.c:
@@ -260,4 +263,3 @@ krb5_keytab.c:       ${KRB5SRC}/lib/krb5/keytab.c
 	ln -sf ${KRB5SRC}/lib/krb5/keytab.c krb5_keytab.c
 
 CLEANFILES+=krb5_net_{read,write}.c krb5_keytab.c
-