diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/Makefile.in | 23 | ||||
| -rw-r--r-- | src/include/k5-int.h | 2 | ||||
| -rw-r--r-- | src/include/krb5.h | 7 | ||||
| -rw-r--r-- | src/include/krb5/krb5.hin (renamed from src/include/krb5.hin) | 0 | ||||
| -rw-r--r-- | src/include/krb5/locate.h (renamed from src/include/k5-locate.h) | 2 |
5 files changed, 23 insertions, 11 deletions
diff --git a/src/include/Makefile.in b/src/include/Makefile.in index e13fca61f..7e0c3a1ec 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -7,11 +7,11 @@ KRB5RCTMPDIR= @KRB5_RCTMPDIR@ ##DOSBUILDTOP = .. NO_OUTPRE=1 -all-unix:: krb5.h +all-unix:: krb5/krb5.h all-unix:: maybe-make-db.h-@DB_HEADER_VERSION@ -generate-files-mac: krb5.h +generate-files-mac: krb5/krb5.h maybe-make-db.h-k5: : db.h will be installed by util/db2 @@ -71,10 +71,14 @@ osconf.h: $(OSCONFSRC) Makefile ##DOS##!endif ############################################################################### -krb5.h: $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h asn1_err.h - echo "/* This file is generated, please don't edit it directly. */" > krb5.h - cat $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \ - asn1_err.h >> krb5.h +krb5/krb5.h: $(srcdir)/krb5/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h asn1_err.h + 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; \ + else :; fi + echo "/* This file is generated, please don't edit it directly. */" > 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 # # Build the error table include files: @@ -95,7 +99,7 @@ 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.h krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \ + $(RM) krb5/krb5.h krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \ asn1_err.h $(RM) $(ET_HEADERS) autoconf.stamp @@ -109,6 +113,7 @@ clean-windows:: clean:: $(RM) osconf.new $(BUILT_HEADERS) -install-headers-unix install:: krb5.h profile.h - $(INSTALL_DATA) krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h +install-headers-unix install:: krb5/krb5.h profile.h + $(INSTALL_DATA) $(srcdir)/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h + $(INSTALL_DATA) krb5/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)krb5.h $(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h diff --git a/src/include/k5-int.h b/src/include/k5-int.h index da7c3ae09..da5d8b5eb 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -538,7 +538,7 @@ extern int krb5int_grow_addrlist (struct addrlist *, int); extern int krb5int_add_host_to_list (struct addrlist *, const char *, int, int, int, int); -#include "k5-locate.h" +#include <krb5/locate.h> krb5_error_code krb5int_locate_server (krb5_context, const krb5_data *realm, struct addrlist *, enum locate_service_type svc, diff --git a/src/include/krb5.h b/src/include/krb5.h new file mode 100644 index 000000000..d68965155 --- /dev/null +++ b/src/include/krb5.h @@ -0,0 +1,7 @@ +/* The MIT Kerberos header file krb5.h used to live here. + + As of the 1.5 release, we're installing multiple Kerberos headers, + so they're all moving to a krb5/ subdirectory. This file is + present just to keep old software still compiling. Please update + your code to use the new path for the header. */ +#include <krb5/krb5.h> diff --git a/src/include/krb5.hin b/src/include/krb5/krb5.hin index d786e6770..d786e6770 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5/krb5.hin diff --git a/src/include/k5-locate.h b/src/include/krb5/locate.h index a49c79ad2..552369ca2 100644 --- a/src/include/k5-locate.h +++ b/src/include/krb5/locate.h @@ -1,6 +1,6 @@ #ifndef K5_PLUGIN_H_INCLUDED #define K5_PLUGIN_H_INCLUDED -#include "krb5.h" +#include <krb5/krb5.h> enum locate_service_type { locate_service_kdc = 1, |