revise error table header rules - don't explicitly invoke awk here

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13182 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 6d02de85732a58f0d4c1cc15224db26f759ce824..1159f3dfdc4d36a179f91ebb168f267f1a2f29ff 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,5 +1,13 @@
 2001-04-13  Ken Raeburn  <raeburn@mit.edu>
 
+       * Makefile.in (adm_err.h, asn1_err.h, krb5_err.h, kv5m_err.h):
+       Depend on corresponding error tables.  Run "make includes" in krb5
+       library code to rebuild instead of invoking awk here.
+       (all-unix): Depend on krb_err.h.
+       (krb_err.h): Depend on kerberosIV/krb_err.h; copy that file.
+       (kerberosIV/krb_err.h): Depend on all-recurse.
+       (clean-unix): Delete krb_err.h.
+
        * k5-int.h: Always include stdlib.h and string.h; don't bother
        testing the HAVE_ macros.
 

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index e77a99168aa9317e3b8908c8bcc867a0394537a3..3e432a4718f9107dbc43d679431dbbdba22472d7 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -6,7 +6,7 @@ BUILDTOP=$(REL)$(U)
 ##DOSBUILDTOP = ..
 NO_OUTPRE=1
 
-all-unix:: krb5.h adm_err.h
+all-unix:: krb5.h adm_err.h krb_err.h
 all-mac::
 
 all-windows::
@@ -33,29 +33,24 @@ krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h \
 # Build the error table include files:
 # adm_err.h asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h
 
-adm_err.h: $(SRCTOP)/lib/krb5/error_tables/adm_err.et
-       $(AWK) -f $(SRCTOP)/util/et/et_h.awk outfile=adm_err.h  \
-               $(SRCTOP)/lib/krb5/error_tables/adm_err.et
+adm_err.h asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h: force
+       (cd ../lib/krb5/error_tables && $(MAKE) includes)
+krb_err.h: kerberosIV/krb_err.h
+       $(RM) krb_err.h ; $(CP) kerberosIV/krb_err.h krb_err.h
+kerberosIV/krb_err.h: all-recurse
 
-asn1_err.h: $(SRCTOP)/lib/krb5/error_tables/asn1_err.et
-       $(AWK) -f $(SRCTOP)/util/et/et_h.awk outfile=asn1_err.h \
-               $(SRCTOP)/lib/krb5/error_tables/asn1_err.et
+.PHONY: force
+force:
 
+adm_err.h: $(SRCTOP)/lib/krb5/error_tables/adm_err.et
+asn1_err.h: $(SRCTOP)/lib/krb5/error_tables/asn1_err.et
 kdb5_err.h: $(SRCTOP)/lib/krb5/error_tables/kdb5_err.et
-       $(AWK) -f $(SRCTOP)/util/et/et_h.awk outfile=kdb5_err.h \
-               $(SRCTOP)/lib/krb5/error_tables/kdb5_err.et
-
-krb5_err.h: $(SRCTOP)/lib/krb5/error_tables/krb5_err.et
-       $(AWK) -f $(SRCTOP)/util/et/et_h.awk outfile=krb5_err.h \
-                $(SRCTOP)/lib/krb5/error_tables/krb5_err.et
-
+krb5_err.h: $(SRCTOP)/lib/krb5/error_tables/krb5_err.et        
 kv5m_err.h: $(SRCTOP)/lib/krb5/error_tables/kv5m_err.et
-       $(AWK) -f $(SRCTOP)/util/et/et_h.awk outfile=kv5m_err.h \
-               $(SRCTOP)/lib/krb5/error_tables/kv5m_err.et
 
 clean-unix::
        $(RM) krb5.h krb5_err.h kdb5_err.h kv5m_err.h \
-               asn1_err.h adm_err.h
+               asn1_err.h adm_err.h krb_err.h
 
 clean-mac::