diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2007-01-20 18:42:06 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2007-01-20 18:42:06 +0000 |
| commit | 0155829aeaf2c01cad16c937270d721c92a4a6a7 (patch) | |
| tree | 5e32742922b712d582aa311d6b0035ed517e87b5 /src/include | |
| parent | ad9320435795ba7a06288024cb1a6cb8f63f4d72 (diff) | |
Build krb5.h using the _err.h files from the error_tables directory, not
additional copies of them.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19095 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/Makefile.in | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/include/Makefile.in b/src/include/Makefile.in index aaf852847..e5293dba9 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -21,6 +21,12 @@ maybe-make-db.h-redirect: test -r db.h || echo '#include <@DB_HEADER@>' > db.h ET_HEADERS = adm_err.h asn1_err.h kdb5_err.h krb5_err.h +K5_ET_HEADERS = \ + ../lib/krb5/error_tables/krb5_err.h \ + ../lib/krb5/error_tables/kdb5_err.h \ + ../lib/krb5/error_tables/kv5m_err.h \ + ../lib/krb5/error_tables/krb524_err.h \ + ../lib/krb5/error_tables/asn1_err.h BUILT_HEADERS = osconf.h all-unix:: autoconf.h $(BUILT_HEADERS) @@ -71,7 +77,7 @@ osconf.h: $(OSCONFSRC) Makefile ##DOS##!endif ############################################################################### -krb5/krb5.h: $(srcdir)/krb5/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h asn1_err.h +krb5/krb5.h: $(srcdir)/krb5/krb5.hin $(K5_ET_HEADERS) test -d krb5 || mkdir krb5 if test -r krb5.h; then \ if cmp -s krb5.h $(srcdir)/krb5.h; then :; else rm -f krb5.h; fi; \ @@ -79,8 +85,7 @@ krb5/krb5.h: $(srcdir)/krb5/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err echo "/* This file is generated, please don't edit it directly. */" > krb5/krb5.h echo "#ifndef KRB5_KRB5_H_INCLUDED" >> krb5/krb5.h echo "#define KRB5_KRB5_H_INCLUDED" >> krb5/krb5.h - cat $(srcdir)/krb5/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \ - asn1_err.h >> krb5/krb5.h + cat $(srcdir)/krb5/krb5.hin $(K5_ET_HEADERS) >> krb5/krb5.h echo "#endif /* KRB5_KRB5_H_INCLUDED */" >> krb5/krb5.h verify-calling-conventions-krb5: private-and-public-decls @@ -92,7 +97,7 @@ private-and-public-decls: krb5/krb5.h $(srcdir)/k5-int.h # Build the error table include files: # asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h krb524_err.h -asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h krb524_err.h: rebuild-error-tables +$(K5_ET_HEADERS): rebuild-error-tables : $@ rebuild-error-tables: (cd ../lib/krb5/error_tables && $(MAKE) includes) @@ -100,12 +105,6 @@ rebuild-error-tables: .PHONY: force rebuild-error-tables force: -asn1_err.h: $(SRCTOP)/lib/krb5/error_tables/asn1_err.et -kdb5_err.h: $(SRCTOP)/lib/krb5/error_tables/kdb5_err.et -krb5_err.h: $(SRCTOP)/lib/krb5/error_tables/krb5_err.et -kv5m_err.h: $(SRCTOP)/lib/krb5/error_tables/kv5m_err.et -krb524_err.h: $(SRCTOP)/lib/krb5/error_tables/krb524_err.et - clean-unix:: $(RM) krb5/krb5.h krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \ asn1_err.h private-and-public-decls |