diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2001-09-28 22:34:26 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2001-09-28 22:34:26 +0000 |
| commit | 7c47ef154e9be56ed88cd8fff35b90ee77a795e2 (patch) | |
| tree | 169ec00c708d85ece75136057f793e08be11e6fe /src | |
| parent | 4659f1b18d6e193ead76a471158de3517f888b73 (diff) | |
| download | krb5-7c47ef154e9be56ed88cd8fff35b90ee77a795e2.tar.gz krb5-7c47ef154e9be56ed88cd8fff35b90ee77a795e2.tar.xz krb5-7c47ef154e9be56ed88cd8fff35b90ee77a795e2.zip | |
avoid extra copy of krb_err.h in include; update dependencies
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13763 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ChangeLog | 7 | ||||
| -rw-r--r-- | src/include/Makefile.in | 6 | ||||
| -rw-r--r-- | src/lib/krb4/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb4/Makefile.in | 4 |
4 files changed, 16 insertions, 6 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index c7f210c61b..0cabd5c0db 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,10 @@ +2001-09-28 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (all-unix): Depend directly on kerberosIV/krb_err.h + instead of on krb_err.h. + (krb_err.h): Target and rule deleted. + (clean-unix): Don't delete krb_err.h. + 2001-09-06 Ken Raeburn <raeburn@mit.edu> * krb5.hin (TKT_FLG_TRANSIT_POLICY_CHECKED, diff --git a/src/include/Makefile.in b/src/include/Makefile.in index 9c02e8b962..6da862341e 100644 --- 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 krb_err.h +all-unix:: krb5.h adm_err.h kerberosIV/krb_err.h all-mac:: all-windows:: @@ -40,8 +40,6 @@ krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h \ adm_err.h asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h: rebuild-error-tables rebuild-error-tables: (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 .PHONY: force rebuild-error-tables @@ -55,7 +53,7 @@ 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 krb_err.h + asn1_err.h adm_err.h clean-mac:: diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 258383aab0..7f4f4a5b5c 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,8 @@ +2001-09-28 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LOCALINCLUDES): Renamed from DEFINES. Add + build-tree version of kerberosIV include directory. + 2001-07-08 Ezra Peisach <epeisach@mit.edu> * fgetst.c: Include krb4int.h. diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 4096d44997..5ff13e0e02 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -2,7 +2,7 @@ thisconfigdir=. myfulldir=lib/krb4 mydir=. BUILDTOP=$(REL)$(U)$(S)$(U) -DEFINES = -I$(srcdir)/../../include/kerberosIV +LOCALINCLUDES = -I$(BUILDTOP)/include/kerberosIV -I$(srcdir)/../../include/kerberosIV ##DOS##BUILDTOP = ..\.. ##DOS##LIBNAME=$(OUTPRE)krb4.lib @@ -266,7 +266,7 @@ g_pw_in_tkt.o: g_pw_in_tkt.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \ $(BUILDTOP)/include/com_err.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb_err.h $(SRCTOP)/include/kerberosIV/prot.h \ + $(BUILDTOP)/include/kerberosIV/krb_err.h $(SRCTOP)/include/kerberosIV/prot.h \ $(SRCTOP)/include/kerberosIV/krb_conf.h g_phost.o: g_phost.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/port-sockets.h |