diff options
| -rw-r--r-- | src/include/ChangeLog | 12 | ||||
| -rw-r--r-- | src/include/Makefile.in | 23 |
2 files changed, 24 insertions, 11 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 498eaa080..d5264771b 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,15 @@ +Fri Sep 29 15:17:30 1995 Theodore Y. Ts'o <tytso@dcl> + + * Makefile.in: If krb5/autoconf.h doesn't exist, cd to krb5 and + make it. + + Don't make krb5-pro.h; this confuses things under Windows, + since Windows attempts to build krb5-pro.h and then + rebuildes krb5.h, when it shouldn't do that. Fold in the + krb5-pro.h rules as part of the rules for krb5.h. This + way, they don't get executed under DOS, since krb5.h + already exists under DOS. + Fri Sep 29 13:35:08 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> * Makefile.in (clean-unix): Remove krb5-pro.h diff --git a/src/include/Makefile.in b/src/include/Makefile.in index c6b0c4041..f73ce811e 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -15,18 +15,19 @@ all-windows:: -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) cd .. -krb5-pro.h: krb5/autoconf.h - echo "/* This is the prologue to krb5.h */" > krb5-pro.h - echo "/* Unfortunately some of these defines are compiler dependent */" >> krb5-pro.h - grep SIZEOF krb5/autoconf.h >> krb5-pro.h - grep HAVE_STDARG_H krb5/autoconf.h >> krb5-pro.h - grep HAVE_SYS_TYPES_H krb5/autoconf.h >> krb5-pro.h - echo "/* End of prologue section */" >> krb5-pro.h +krb5/autoconf.h: + (cd krb5; $(MAKE) autoconf.h) -krb5.h: krb5-pro.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h \ +krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h \ asn1_err.h - cat krb5-pro.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h \ - asn1_err.h > krb5.h + echo "/* This is the prologue to krb5.h */" > krb5.h + echo "/* Unfortunately some of these defines are compiler dependent */" >> krb5.h + grep SIZEOF krb5/autoconf.h >> krb5.h + grep HAVE_STDARG_H krb5/autoconf.h >> krb5.h + grep HAVE_SYS_TYPES_H krb5/autoconf.h >> krb5.h + echo "/* End of prologue section */" >> krb5.h + cat $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h \ + asn1_err.h >> krb5.h # # Build the error table include files: @@ -53,7 +54,7 @@ kv5m_err.h: $(SRCTOP)/lib/krb5/error_tables/kv5m_err.et $(SRCTOP)/lib/krb5/error_tables/kv5m_err.et clean-unix:: - $(RM) krb5.h krb5-pro.h krb5_err.h kdb5_err.h kv5m_err.h \ + $(RM) krb5.h krb5_err.h kdb5_err.h kv5m_err.h \ asn1_err.h adm_err.h clean-mac:: |