diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-03-11 22:23:28 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-03-11 22:23:28 +0000 |
| commit | cee79e98488ba138d1ebadb7488df7da54be627b (patch) | |
| tree | fd329cef103b8a0f5bddccc360f15cb6ca8c9d41 /src/lib | |
| parent | 6b3217ad6ab98d4365f32d45948717e212684678 (diff) | |
| download | krb5-cee79e98488ba138d1ebadb7488df7da54be627b.tar.gz krb5-cee79e98488ba138d1ebadb7488df7da54be627b.tar.xz krb5-cee79e98488ba138d1ebadb7488df7da54be627b.zip | |
Instead of arbitrary division of headers into include and include/krb5, with
include directives sometimes using krb5/foo.h and sometimes using foo.h, and
-I options always given for both directories in both source and build trees,
push include/krb5/* up a level and drop the krb5 directory (except, for the
moment, the change log).
Updated #include directives, -I options, and dependencies accordingly, and
deleted one or two bits of old, unused code that was noticed in the process.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17730 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
63 files changed, 1116 insertions, 1120 deletions
diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in index 97c845f2b..9421d49c9 100644 --- a/src/lib/apputils/Makefile.in +++ b/src/lib/apputils/Makefile.in @@ -40,10 +40,10 @@ SRCS= $(srcdir)/daemon.c \ # the Makefile.in file # daemon.so daemon.po $(OUTPRE)daemon.$(OBJEXT): daemon.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h dummy.so dummy.po $(OUTPRE)dummy.$(OBJEXT): dummy.c diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 7080d0665..b24a67ddb 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -362,323 +362,323 @@ check-windows:: # the Makefile.in file # block_size.so block_size.po $(OUTPRE)block_size.$(OBJEXT): \ - block_size.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + block_size.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h checksum_length.so checksum_length.po $(OUTPRE)checksum_length.$(OBJEXT): \ - checksum_length.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + checksum_length.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h cksumtype_to_string.so cksumtype_to_string.po $(OUTPRE)cksumtype_to_string.$(OBJEXT): \ - cksumtype_to_string.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + cksumtype_to_string.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h cksumtypes.so cksumtypes.po $(OUTPRE)cksumtypes.$(OBJEXT): \ - cksumtypes.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + cksumtypes.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/hash_provider/hash_provider.h $(srcdir)/keyhash_provider/keyhash_provider.h \ cksumtypes.h coll_proof_cksum.so coll_proof_cksum.po $(OUTPRE)coll_proof_cksum.$(OBJEXT): \ - coll_proof_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + coll_proof_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h combine_keys.so combine_keys.po $(OUTPRE)combine_keys.$(OBJEXT): \ - combine_keys.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + combine_keys.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h $(srcdir)/dk/dk.h crypto_libinit.so crypto_libinit.po $(OUTPRE)crypto_libinit.$(OBJEXT): \ - crypto_libinit.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + crypto_libinit.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h default_state.so default_state.po $(OUTPRE)default_state.$(OBJEXT): \ - default_state.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + default_state.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h decrypt.so decrypt.po $(OUTPRE)decrypt.$(OBJEXT): decrypt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h encrypt.so encrypt.po $(OUTPRE)encrypt.$(OBJEXT): encrypt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h encrypt_length.so encrypt_length.po $(OUTPRE)encrypt_length.$(OBJEXT): \ - encrypt_length.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + encrypt_length.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h enctype_compare.so enctype_compare.po $(OUTPRE)enctype_compare.$(OBJEXT): \ - enctype_compare.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + enctype_compare.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h enctype_to_string.so enctype_to_string.po $(OUTPRE)enctype_to_string.$(OBJEXT): \ - enctype_to_string.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + enctype_to_string.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h etypes.so etypes.po $(OUTPRE)etypes.$(OBJEXT): etypes.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/enc_provider/enc_provider.h $(srcdir)/hash_provider/hash_provider.h \ etypes.h $(srcdir)/old/old.h $(srcdir)/raw/raw.h $(srcdir)/dk/dk.h \ $(srcdir)/arcfour/arcfour.h $(srcdir)/aes/aes_s2k.h hmac.so hmac.po $(OUTPRE)hmac.$(OBJEXT): hmac.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h keyblocks.so keyblocks.po $(OUTPRE)keyblocks.$(OBJEXT): \ - keyblocks.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + keyblocks.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h keyed_cksum.so keyed_cksum.po $(OUTPRE)keyed_cksum.$(OBJEXT): \ - keyed_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + keyed_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h keyed_checksum_types.so keyed_checksum_types.po $(OUTPRE)keyed_checksum_types.$(OBJEXT): \ - keyed_checksum_types.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + keyed_checksum_types.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h cksumtypes.h make_checksum.so make_checksum.po $(OUTPRE)make_checksum.$(OBJEXT): \ - make_checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + make_checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h etypes.h $(srcdir)/dk/dk.h make_random_key.so make_random_key.po $(OUTPRE)make_random_key.$(OBJEXT): \ - make_random_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + make_random_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h mandatory_sumtype.so mandatory_sumtype.po $(OUTPRE)mandatory_sumtype.$(OBJEXT): \ - mandatory_sumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + mandatory_sumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h nfold.so nfold.po $(OUTPRE)nfold.$(OBJEXT): nfold.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h old_api_glue.so old_api_glue.po $(OUTPRE)old_api_glue.$(OBJEXT): \ - old_api_glue.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + old_api_glue.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h pbkdf2.so pbkdf2.po $(OUTPRE)pbkdf2.$(OBJEXT): pbkdf2.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/hash_provider/hash_provider.h prf.so prf.po $(OUTPRE)prf.$(OBJEXT): prf.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h etypes.h prng.so prng.po $(OUTPRE)prng.$(OBJEXT): prng.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/enc_provider/enc_provider.h \ $(srcdir)/yarrow/yarrow.h $(srcdir)/yarrow/ytypes.h \ $(srcdir)/yarrow/yhash.h $(srcdir)/sha1/shs.h $(srcdir)/yarrow/ycipher.h state.so state.po $(OUTPRE)state.$(OBJEXT): state.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h string_to_cksumtype.so string_to_cksumtype.po $(OUTPRE)string_to_cksumtype.$(OBJEXT): \ - string_to_cksumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + string_to_cksumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h string_to_enctype.so string_to_enctype.po $(OUTPRE)string_to_enctype.$(OBJEXT): \ - string_to_enctype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + string_to_enctype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h string_to_key.so string_to_key.po $(OUTPRE)string_to_key.$(OBJEXT): \ - string_to_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + string_to_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h valid_cksumtype.so valid_cksumtype.po $(OUTPRE)valid_cksumtype.$(OBJEXT): \ - valid_cksumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + valid_cksumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h valid_enctype.so valid_enctype.po $(OUTPRE)valid_enctype.$(OBJEXT): \ - valid_enctype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + valid_enctype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h verify_checksum.so verify_checksum.po $(OUTPRE)verify_checksum.$(OBJEXT): \ - verify_checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + verify_checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h t_nfold.so t_nfold.po $(OUTPRE)t_nfold.$(OBJEXT): t_nfold.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_encrypt.so t_encrypt.po $(OUTPRE)t_encrypt.$(OBJEXT): \ - t_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + t_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h t_prf.so t_prf.po $(OUTPRE)t_prf.$(OBJEXT): t_prf.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_prng.so t_prng.po $(OUTPRE)t_prng.$(OBJEXT): t_prng.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_hmac.so t_hmac.po $(OUTPRE)t_hmac.$(OBJEXT): t_hmac.c \ $(srcdir)/hash_provider/hash_provider.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h t_pkcs5.so t_pkcs5.po $(OUTPRE)t_pkcs5.$(OBJEXT): t_pkcs5.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_cts.so t_cts.po $(OUTPRE)t_cts.$(OBJEXT): t_cts.c \ $(srcdir)/hash_provider/hash_provider.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h vectors.so vectors.po $(OUTPRE)vectors.$(OBJEXT): vectors.c \ $(srcdir)/hash_provider/hash_provider.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/crypto/aes/Makefile.in b/src/lib/crypto/aes/Makefile.in index 8ba5534a2..3fe224a1d 100644 --- a/src/lib/crypto/aes/Makefile.in +++ b/src/lib/crypto/aes/Makefile.in @@ -81,10 +81,10 @@ aestab.so aestab.po $(OUTPRE)aestab.$(OBJEXT): aestab.c \ aeskey.so aeskey.po $(OUTPRE)aeskey.$(OBJEXT): aeskey.c \ aesopt.h aes.h uitypes.h aes_s2k.so aes_s2k.po $(OUTPRE)aes_s2k.$(OBJEXT): aes_s2k.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../dk/dk.h aes_s2k.h diff --git a/src/lib/crypto/arcfour/Makefile.in b/src/lib/crypto/arcfour/Makefile.in index 11be8e940..f7e1fc7d7 100644 --- a/src/lib/crypto/arcfour/Makefile.in +++ b/src/lib/crypto/arcfour/Makefile.in @@ -43,18 +43,18 @@ clean-unix:: clean-libobjs # the Makefile.in file # arcfour.so arcfour.po $(OUTPRE)arcfour.$(OBJEXT): arcfour.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ arcfour-int.h arcfour.h arcfour_s2k.so arcfour_s2k.po $(OUTPRE)arcfour_s2k.$(OBJEXT): \ - arcfour_s2k.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + arcfour_s2k.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../md4/rsa-md4.h arcfour-int.h arcfour.h diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in index 1dc58fde1..25ee158ad 100644 --- a/src/lib/crypto/crc32/Makefile.in +++ b/src/lib/crypto/crc32/Makefile.in @@ -44,10 +44,10 @@ t_crc: t_crc.o crc32.o $(SUPPORT_DEPLIB) # the Makefile.in file # crc32.so crc32.po $(OUTPRE)crc32.$(OBJEXT): crc32.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ crc-32.h diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index 1ee3f5f47..325dd7d23 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -98,90 +98,90 @@ clean-unix:: clean-libobjs # the Makefile.in file # afsstring2key.so afsstring2key.po $(OUTPRE)afsstring2key.$(OBJEXT): \ - afsstring2key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + afsstring2key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h d3_cbc.so d3_cbc.po $(OUTPRE)d3_cbc.$(OBJEXT): d3_cbc.c \ - des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_tables.h d3_kysched.so d3_kysched.po $(OUTPRE)d3_kysched.$(OBJEXT): \ - d3_kysched.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + d3_kysched.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h f_cbc.so f_cbc.po $(OUTPRE)f_cbc.$(OBJEXT): f_cbc.c \ - des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_tables.h f_cksum.so f_cksum.po $(OUTPRE)f_cksum.$(OBJEXT): f_cksum.c \ - des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_tables.h f_parity.so f_parity.po $(OUTPRE)f_parity.$(OBJEXT): \ - f_parity.c des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + f_parity.c des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_sched.so f_sched.po $(OUTPRE)f_sched.$(OBJEXT): f_sched.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h f_tables.so f_tables.po $(OUTPRE)f_tables.$(OBJEXT): \ - f_tables.c des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + f_tables.c des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_tables.h key_sched.so key_sched.po $(OUTPRE)key_sched.$(OBJEXT): \ - key_sched.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + key_sched.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \ - weak_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + weak_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h string2key.so string2key.po $(OUTPRE)string2key.$(OBJEXT): \ - string2key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + string2key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in index 30880697e..7e8cff6b2 100644 --- a/src/lib/crypto/dk/Makefile.in +++ b/src/lib/crypto/dk/Makefile.in @@ -55,49 +55,49 @@ clean-unix:: clean-libobjs # the Makefile.in file # checksum.so checksum.po $(OUTPRE)checksum.$(OBJEXT): \ - checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../etypes.h dk.h dk_decrypt.so dk_decrypt.po $(OUTPRE)dk_decrypt.$(OBJEXT): \ - dk_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + dk_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ dk.h dk_encrypt.so dk_encrypt.po $(OUTPRE)dk_encrypt.$(OBJEXT): \ - dk_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + dk_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ dk.h dk_prf.so dk_prf.po $(OUTPRE)dk_prf.$(OBJEXT): dk_prf.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ dk.h derive.so derive.po $(OUTPRE)derive.$(OBJEXT): derive.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ dk.h stringtokey.so stringtokey.po $(OUTPRE)stringtokey.$(OBJEXT): \ - stringtokey.c dk.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + stringtokey.c dk.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in index 87c8cb234..425aaee73 100644 --- a/src/lib/crypto/enc_provider/Makefile.in +++ b/src/lib/crypto/enc_provider/Makefile.in @@ -45,34 +45,34 @@ clean-unix:: clean-libobjs # the Makefile.in file # des.so des.po $(OUTPRE)des.$(OBJEXT): des.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../des/des_int.h \ $(SRCTOP)/include/kerberosIV/des.h enc_provider.h des3.so des3.po $(OUTPRE)des3.$(OBJEXT): des3.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../des/des_int.h \ $(SRCTOP)/include/kerberosIV/des.h aes.so aes.po $(OUTPRE)aes.$(OBJEXT): aes.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h enc_provider.h $(srcdir)/../aes/aes.h \ $(srcdir)/../aes/uitypes.h rc4.so rc4.po $(OUTPRE)rc4.$(OBJEXT): rc4.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../arcfour/arcfour-int.h \ $(srcdir)/../arcfour/arcfour.h enc_provider.h diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in index b651fedc0..d9e3880b2 100644 --- a/src/lib/crypto/hash_provider/Makefile.in +++ b/src/lib/crypto/hash_provider/Makefile.in @@ -40,34 +40,34 @@ clean-unix:: clean-libobjs # the Makefile.in file # hash_crc32.so hash_crc32.po $(OUTPRE)hash_crc32.$(OBJEXT): \ - hash_crc32.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hash_crc32.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../crc32/crc-32.h hash_provider.h hash_md4.so hash_md4.po $(OUTPRE)hash_md4.$(OBJEXT): \ - hash_md4.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hash_md4.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../md4/rsa-md4.h hash_provider.h hash_md5.so hash_md5.po $(OUTPRE)hash_md5.$(OBJEXT): \ - hash_md5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hash_md5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../md5/rsa-md5.h hash_provider.h hash_sha1.so hash_sha1.po $(OUTPRE)hash_sha1.$(OBJEXT): \ - hash_sha1.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hash_sha1.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../sha1/shs.h hash_provider.h diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in index c323a69e1..4c4eb51b8 100644 --- a/src/lib/crypto/keyhash_provider/Makefile.in +++ b/src/lib/crypto/keyhash_provider/Makefile.in @@ -59,39 +59,39 @@ clean-unix:: clean-libobjs # the Makefile.in file # descbc.so descbc.po $(OUTPRE)descbc.$(OBJEXT): descbc.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../des/des_int.h $(SRCTOP)/include/kerberosIV/des.h \ keyhash_provider.h k5_md4des.so k5_md4des.po $(OUTPRE)k5_md4des.$(OBJEXT): \ - k5_md4des.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + k5_md4des.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../des/des_int.h $(SRCTOP)/include/kerberosIV/des.h \ $(srcdir)/../md4/rsa-md4.h keyhash_provider.h k5_md5des.so k5_md5des.po $(OUTPRE)k5_md5des.$(OBJEXT): \ - k5_md5des.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + k5_md5des.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../des/des_int.h $(SRCTOP)/include/kerberosIV/des.h \ $(srcdir)/../md5/rsa-md5.h keyhash_provider.h hmac_md5.so hmac_md5.po $(OUTPRE)hmac_md5.$(OBJEXT): \ - hmac_md5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hmac_md5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ keyhash_provider.h $(srcdir)/../arcfour/arcfour-int.h \ $(srcdir)/../arcfour/arcfour.h $(srcdir)/../md5/rsa-md5.h \ $(srcdir)/../hash_provider/hash_provider.h diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index a8c1110fa..c87ee787b 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -61,9 +61,9 @@ clean-unix:: clean-libobjs # the Makefile.in file # md4.so md4.po $(OUTPRE)md4.$(OBJEXT): md4.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h rsa-md4.h diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index 2b894ed63..ac72ac93b 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -51,9 +51,9 @@ clean-unix:: clean-libobjs # the Makefile.in file # md5.so md5.po $(OUTPRE)md5.$(OBJEXT): md5.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h rsa-md5.h diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in index 5a21d81ed..e263a0263 100644 --- a/src/lib/crypto/old/Makefile.in +++ b/src/lib/crypto/old/Makefile.in @@ -38,26 +38,26 @@ clean-unix:: clean-libobjs # the Makefile.in file # des_stringtokey.so des_stringtokey.po $(OUTPRE)des_stringtokey.$(OBJEXT): \ - des_stringtokey.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + des_stringtokey.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ old.h $(srcdir)/../des/des_int.h $(SRCTOP)/include/kerberosIV/des.h old_decrypt.so old_decrypt.po $(OUTPRE)old_decrypt.$(OBJEXT): \ - old_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + old_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ old.h old_encrypt.so old_encrypt.po $(OUTPRE)old_encrypt.$(OBJEXT): \ - old_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + old_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ old.h diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in index fcf53e413..88ebda1b9 100644 --- a/src/lib/crypto/raw/Makefile.in +++ b/src/lib/crypto/raw/Makefile.in @@ -36,18 +36,18 @@ clean-unix:: clean-libobjs # the Makefile.in file # raw_decrypt.so raw_decrypt.po $(OUTPRE)raw_decrypt.$(OBJEXT): \ - raw_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + raw_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ raw.h raw_encrypt.so raw_encrypt.po $(OUTPRE)raw_encrypt.$(OBJEXT): \ - raw_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + raw_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ raw.h diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in index f005fd35c..bacd69aa9 100644 --- a/src/lib/crypto/sha1/Makefile.in +++ b/src/lib/crypto/sha1/Makefile.in @@ -56,9 +56,9 @@ t_shs3: t_shs3.o shs.o $(SUPPORT_DEPLIB) # the Makefile.in file # shs.so shs.po $(OUTPRE)shs.$(OBJEXT): shs.c shs.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/crypto/yarrow/ChangeLog b/src/lib/crypto/yarrow/ChangeLog index 30eae99ed..1f9f68ae0 100644 --- a/src/lib/crypto/yarrow/ChangeLog +++ b/src/lib/crypto/yarrow/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * ytypes.h: Don't look for autoconf.h in krb5/. + 2005-05-01 Ken Raeburn <raeburn@mit.edu> * ytypes.h: Include autoconf.h. Include sys/types.h only if it diff --git a/src/lib/crypto/yarrow/Makefile.in b/src/lib/crypto/yarrow/Makefile.in index 06dc95cc6..ec2f4df62 100644 --- a/src/lib/crypto/yarrow/Makefile.in +++ b/src/lib/crypto/yarrow/Makefile.in @@ -42,20 +42,20 @@ clean-unix:: clean-libobjs # the Makefile.in file # yarrow.so yarrow.po $(OUTPRE)yarrow.$(OBJEXT): yarrow.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ yarrow.h ytypes.h yhash.h $(srcdir)/../sha1/shs.h ycipher.h \ ylock.h ystate.h yexcep.h ycipher.so ycipher.po $(OUTPRE)ycipher.$(OBJEXT): ycipher.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ yarrow.h ytypes.h yhash.h $(srcdir)/../sha1/shs.h ycipher.h \ $(srcdir)/../enc_provider/enc_provider.h diff --git a/src/lib/crypto/yarrow/ytypes.h b/src/lib/crypto/yarrow/ytypes.h index b7a30c76d..9265e5a84 100644 --- a/src/lib/crypto/yarrow/ytypes.h +++ b/src/lib/crypto/yarrow/ytypes.h @@ -5,7 +5,7 @@ #include <limits.h> #include <stddef.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 33e3ab2e7..ce841a2d5 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -118,113 +118,113 @@ install-unix:: install-libs # cksum.so cksum.po $(OUTPRE)cksum.$(OBJEXT): cksum.c \ $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h des.so des.po $(OUTPRE)des.$(OBJEXT): des.c $(srcdir)/../crypto/des/des_int.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h enc_dec.so enc_dec.po $(OUTPRE)enc_dec.$(OBJEXT): enc_dec.c \ $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h key_parity.so key_parity.po $(OUTPRE)key_parity.$(OBJEXT): \ key_parity.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h key_sched.so key_sched.po $(OUTPRE)key_sched.$(OBJEXT): \ key_sched.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h new_rnd_key.so new_rnd_key.po $(OUTPRE)new_rnd_key.$(OBJEXT): \ new_rnd_key.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h pcbc_encrypt.so pcbc_encrypt.po $(OUTPRE)pcbc_encrypt.$(OBJEXT): \ pcbc_encrypt.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h \ $(srcdir)/../crypto/des/f_tables.h quad_cksum.so quad_cksum.po $(OUTPRE)quad_cksum.$(OBJEXT): \ quad_cksum.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h random_key.so random_key.po $(OUTPRE)random_key.$(OBJEXT): \ random_key.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h read_passwd.so read_passwd.po $(OUTPRE)read_passwd.$(OBJEXT): \ read_passwd.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h str_to_key.so str_to_key.po $(OUTPRE)str_to_key.$(OBJEXT): \ str_to_key.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h unix_time.so unix_time.po $(OUTPRE)unix_time.$(OBJEXT): \ - unix_time.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + unix_time.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h util.so util.po $(OUTPRE)util.$(OBJEXT): util.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../crypto/des/des_int.h \ $(SRCTOP)/include/kerberosIV/des.h weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \ weak_key.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 8260ce847..91418b6c9 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -125,12 +125,12 @@ $(BUILDTOP)/include/gssapi/gssapi.h generic/gssapi.h krb5/gssapi_err_krb5.h gene gss_libinit.so gss_libinit.po $(OUTPRE)gss_libinit.$(OBJEXT): \ gss_libinit.c generic/gssapi_err_generic.h $(COM_ERR_DEPS) \ krb5/gssapi_err_krb5.h $(srcdir)/krb5/gssapiP_krb5.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/generic/gssapiP_generic.h $(srcdir)/generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h krb5/gssapi_krb5.h \ gss_libinit.h generic/gssapi.h diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 9d71b7b0e..b32fe92e6 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * gssapi.h: Use autoconf.h from include rather than include/krb5. + If sed fails, error out. + 2006-03-10 Ken Raeburn <raeburn@mit.edu> * Makefile.in (generate-files-mac): Depend on gssapi.h. diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index a2b9e9045..d7530e94c 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -39,14 +39,14 @@ gssapi_err_generic.c: gssapi_err_generic.et include_xom=@include_xom@ ##DOS##include_xom= -gssapi.h: gssapi.hin +gssapi.h: gssapi.hin $(BUILDTOP)/include/autoconf.h @echo "Creating gssapi.h" ; \ h=gss$$$$; $(RM) $$h; \ (echo "/* This is the gssapi.h prologue. */"; \ echo "/* It contains some choice pieces of autoconf.h */"; \ - sed -n "/SIZEOF/s//GSS_&/p" < $(BUILDTOP)/include/krb5/autoconf.h; \ - $(include_xom); \ - echo "/* End of gssapi.h prologue. */"; \ + sed -n "/SIZEOF/s//GSS_&/p" < $(BUILDTOP)/include/autoconf.h && \ + $(include_xom)&& \ + echo "/* End of gssapi.h prologue. */"&& \ cat $(srcdir)/gssapi.hin )> $$h && \ (set -x; $(MV) $$h $@) ; e=$$?; $(RM) $$h; exit $$e @@ -152,62 +152,51 @@ depend:: $(ETSRCS) # disp_com_err_status.so disp_com_err_status.po $(OUTPRE)disp_com_err_status.$(OBJEXT): \ disp_com_err_status.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h disp_major_status.so disp_major_status.po $(OUTPRE)disp_major_status.$(OBJEXT): \ disp_major_status.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h gssapi_generic.so gssapi_generic.po $(OUTPRE)gssapi_generic.$(OBJEXT): \ gssapi_generic.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h oid_ops.so oid_ops.po $(OUTPRE)oid_ops.$(OBJEXT): oid_ops.c \ - gssapiP_generic.h $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5/autoconf.h \ + gssapiP_generic.h $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/autoconf.h \ gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h rel_buffer.so rel_buffer.po $(OUTPRE)rel_buffer.$(OBJEXT): \ rel_buffer.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h rel_oid_set.so rel_oid_set.po $(OUTPRE)rel_oid_set.$(OBJEXT): \ rel_oid_set.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_buffer.so util_buffer.po $(OUTPRE)util_buffer.$(OBJEXT): \ util_buffer.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_oid.so util_oid.po $(OUTPRE)util_oid.$(OBJEXT): \ util_oid.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_ordering.so util_ordering.po $(OUTPRE)util_ordering.$(OBJEXT): \ util_ordering.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_set.so util_set.po $(OUTPRE)util_set.$(OBJEXT): \ util_set.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_token.so util_token.po $(OUTPRE)util_token.$(OBJEXT): \ util_token.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_validate.so util_validate.po $(OUTPRE)util_validate.$(OBJEXT): \ util_validate.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h gssapi_err_generic.so gssapi_err_generic.po $(OUTPRE)gssapi_err_generic.$(OBJEXT): \ gssapi_err_generic.c $(COM_ERR_DEPS) diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index 7e76561a1..46053b04f 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -242,445 +242,445 @@ install:: # the Makefile.in file # accept_sec_context.so accept_sec_context.po $(OUTPRE)accept_sec_context.$(OBJEXT): \ - accept_sec_context.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + accept_sec_context.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h acquire_cred.so acquire_cred.po $(OUTPRE)acquire_cred.$(OBJEXT): \ - acquire_cred.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + acquire_cred.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../gss_libinit.h ../generic/gssapi.h gssapiP_krb5.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h add_cred.so add_cred.po $(OUTPRE)add_cred.$(OBJEXT): \ add_cred.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h canon_name.so canon_name.po $(OUTPRE)canon_name.$(OBJEXT): \ canon_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h compare_name.so compare_name.po $(OUTPRE)compare_name.$(OBJEXT): \ compare_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h context_time.so context_time.po $(OUTPRE)context_time.$(OBJEXT): \ context_time.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h copy_ccache.so copy_ccache.po $(OUTPRE)copy_ccache.$(OBJEXT): \ copy_ccache.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h delete_sec_context.so delete_sec_context.po $(OUTPRE)delete_sec_context.$(OBJEXT): \ delete_sec_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h disp_name.so disp_name.po $(OUTPRE)disp_name.$(OBJEXT): \ disp_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h disp_status.so disp_status.po $(OUTPRE)disp_status.$(OBJEXT): \ disp_status.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h \ $(srcdir)/../gss_libinit.h ../generic/gssapi.h duplicate_name.so duplicate_name.po $(OUTPRE)duplicate_name.$(OBJEXT): \ duplicate_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h export_name.so export_name.po $(OUTPRE)export_name.$(OBJEXT): \ export_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h export_sec_context.so export_sec_context.po $(OUTPRE)export_sec_context.$(OBJEXT): \ export_sec_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h get_tkt_flags.so get_tkt_flags.po $(OUTPRE)get_tkt_flags.$(OBJEXT): \ get_tkt_flags.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h gssapi_krb5.so gssapi_krb5.po $(OUTPRE)gssapi_krb5.$(OBJEXT): \ - gssapi_krb5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapi_krb5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h import_name.so import_name.po $(OUTPRE)import_name.$(OBJEXT): \ import_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h import_sec_context.so import_sec_context.po $(OUTPRE)import_sec_context.$(OBJEXT): \ import_sec_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h indicate_mechs.so indicate_mechs.po $(OUTPRE)indicate_mechs.$(OBJEXT): \ indicate_mechs.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h init_sec_context.so init_sec_context.po $(OUTPRE)init_sec_context.$(OBJEXT): \ - init_sec_context.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + init_sec_context.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h inq_context.so inq_context.po $(OUTPRE)inq_context.$(OBJEXT): \ inq_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h inq_cred.so inq_cred.po $(OUTPRE)inq_cred.$(OBJEXT): \ inq_cred.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h inq_names.so inq_names.po $(OUTPRE)inq_names.$(OBJEXT): \ inq_names.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h k5seal.so k5seal.po $(OUTPRE)k5seal.$(OBJEXT): k5seal.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h k5sealv3.so k5sealv3.po $(OUTPRE)k5sealv3.$(OBJEXT): \ - k5sealv3.c $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + k5sealv3.c $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h k5unseal.so k5unseal.po $(OUTPRE)k5unseal.$(OBJEXT): \ k5unseal.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h krb5_gss_glue.so krb5_gss_glue.po $(OUTPRE)krb5_gss_glue.$(OBJEXT): \ krb5_gss_glue.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h lucid_context.so lucid_context.po $(OUTPRE)lucid_context.$(OBJEXT): \ lucid_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h process_context_token.so process_context_token.po $(OUTPRE)process_context_token.$(OBJEXT): \ process_context_token.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h rel_cred.so rel_cred.po $(OUTPRE)rel_cred.$(OBJEXT): \ rel_cred.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h rel_oid.so rel_oid.po $(OUTPRE)rel_oid.$(OBJEXT): rel_oid.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h rel_name.so rel_name.po $(OUTPRE)rel_name.$(OBJEXT): \ rel_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h seal.so seal.po $(OUTPRE)seal.$(OBJEXT): seal.c gssapiP_krb5.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h set_allowable_enctypes.so set_allowable_enctypes.po \ $(OUTPRE)set_allowable_enctypes.$(OBJEXT): set_allowable_enctypes.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h ser_sctx.so ser_sctx.po $(OUTPRE)ser_sctx.$(OBJEXT): \ - ser_sctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_sctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h set_ccache.so set_ccache.po $(OUTPRE)set_ccache.$(OBJEXT): \ set_ccache.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h sign.so sign.po $(OUTPRE)sign.$(OBJEXT): sign.c gssapiP_krb5.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h unseal.so unseal.po $(OUTPRE)unseal.$(OBJEXT): unseal.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h util_cksum.so util_cksum.po $(OUTPRE)util_cksum.$(OBJEXT): \ util_cksum.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h util_crypt.so util_crypt.po $(OUTPRE)util_crypt.$(OBJEXT): \ - util_crypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + util_crypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h util_seed.so util_seed.po $(OUTPRE)util_seed.$(OBJEXT): \ util_seed.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h util_seqnum.so util_seqnum.po $(OUTPRE)util_seqnum.$(OBJEXT): \ util_seqnum.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h val_cred.so val_cred.po $(OUTPRE)val_cred.$(OBJEXT): \ val_cred.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h verify.so verify.po $(OUTPRE)verify.$(OBJEXT): verify.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h wrap_size_limit.so wrap_size_limit.po $(OUTPRE)wrap_size_limit.$(OBJEXT): \ wrap_size_limit.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index 15bdaca53..ba9fe5a97 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * server_internal.h, adb.h: Don't look for kdb.h in krb5/. + 2005-11-17 Ken Raeburn <raeburn@mit.edu> * admin.h: Include kdb.h instead of k5-int.h. diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in index 71a2b418d..3ab0162eb 100644 --- a/src/lib/kadm5/Makefile.in +++ b/src/lib/kadm5/Makefile.in @@ -114,8 +114,8 @@ ovsec_glue.so ovsec_glue.po $(OUTPRE)ovsec_glue.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h misc_free.so misc_free.po $(OUTPRE)misc_free.$(OBJEXT): \ misc_free.c $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ @@ -125,8 +125,8 @@ misc_free.so misc_free.po $(OUTPRE)misc_free.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ server_internal.h admin_internal.h kadm_rpc_xdr.so kadm_rpc_xdr.po $(OUTPRE)kadm_rpc_xdr.$(OBJEXT): \ @@ -137,8 +137,8 @@ kadm_rpc_xdr.so kadm_rpc_xdr.po $(OUTPRE)kadm_rpc_xdr.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/kadm5/admin.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/kadm_rpc.h $(BUILDTOP)/include/kadm5/admin_xdr.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h @@ -150,17 +150,17 @@ chpass_util.so chpass_util.po $(OUTPRE)chpass_util.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ admin_internal.h alt_prof.so alt_prof.po $(OUTPRE)alt_prof.$(OBJEXT): \ - alt_prof.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + alt_prof.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \ $(BUILDTOP)/include/gssrpc/xdr.h $(BUILDTOP)/include/gssrpc/auth.h \ @@ -168,14 +168,14 @@ alt_prof.so alt_prof.po $(OUTPRE)alt_prof.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/kadm5/kadm_err.h \ - $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(SRCTOP)/include/krb5/adm_proto.h + $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(SRCTOP)/include/adm_proto.h str_conv.so str_conv.po $(OUTPRE)str_conv.$(OBJEXT): \ - str_conv.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + str_conv.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ admin_internal.h $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/gssrpc/rpc.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ @@ -184,12 +184,12 @@ str_conv.so str_conv.po $(OUTPRE)str_conv.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(SRCTOP)/include/krb5/adm_proto.h + $(SRCTOP)/include/adm_proto.h logger.so logger.po $(OUTPRE)logger.$(OBJEXT): logger.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/syslog.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/adm_proto.h $(SRCTOP)/include/syslog.h diff --git a/src/lib/kadm5/adb.h b/src/lib/kadm5/adb.h index 8b53b5501..66eadfc3b 100644 --- a/src/lib/kadm5/adb.h +++ b/src/lib/kadm5/adb.h @@ -13,7 +13,7 @@ #include <sys/types.h> #include <gssrpc/types.h> #include "k5-int.h" -#include <krb5/kdb.h> +#include <kdb.h> #include <db.h> #include <kadm5/admin.h> #include <kadm5/adb_err.h> diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index 578b4fcc6..552672635 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -90,8 +90,8 @@ clnt_policy.so clnt_policy.po $(OUTPRE)clnt_policy.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/kadm_rpc.h client_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h err_handle.h @@ -103,8 +103,8 @@ client_rpc.so client_rpc.po $(OUTPRE)client_rpc.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/kadm_rpc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/kadm5/admin.h $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(COM_ERR_DEPS) $(BUILDTOP)/include/kadm5/admin.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h client_principal.so client_principal.po $(OUTPRE)client_principal.$(OBJEXT): \ @@ -115,19 +115,19 @@ client_principal.so client_principal.po $(OUTPRE)client_principal.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/kadm5/admin.h \ - $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/kadm_rpc.h \ client_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h \ err_handle.h client_init.so client_init.po $(OUTPRE)client_init.$(OBJEXT): \ client_init.c $(COM_ERR_DEPS) $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/gssrpc/rpc.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ @@ -147,8 +147,8 @@ clnt_privs.so clnt_privs.po $(OUTPRE)clnt_privs.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/kadm_rpc.h client_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h err_handle.h @@ -162,8 +162,8 @@ clnt_chpass_util.so clnt_chpass_util.po $(OUTPRE)clnt_chpass_util.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/rpc_msg.h $(BUILDTOP)/include/gssrpc/auth_unix.h \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ - $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h client_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h diff --git a/src/lib/kadm5/server_internal.h b/src/lib/kadm5/server_internal.h index cf4755b6d..f26f131a5 100644 --- a/src/lib/kadm5/server_internal.h +++ b/src/lib/kadm5/server_internal.h @@ -18,7 +18,7 @@ #endif #include <stdlib.h> #include <errno.h> -#include <krb5/kdb.h> +#include <kdb.h> #include <kadm5/admin.h> #include "admin_internal.h" diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index 39fb06e3a..a2b3394d3 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * svr_principal.c, server_misc.c: Don't look for kdb.h in krb5/. + 2005-11-17 Ken Raeburn <raeburn@mit.edu> * server_init.c, svr_policy.c: Include errno.h. diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index 25fc772d0..156730a34 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -100,8 +100,8 @@ svr_policy.so svr_policy.po $(OUTPRE)svr_policy.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h svr_principal.so svr_principal.po $(OUTPRE)svr_principal.$(OBJEXT): \ @@ -112,18 +112,18 @@ svr_principal.so svr_principal.po $(OUTPRE)svr_principal.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h server_acl.so server_acl.po $(OUTPRE)server_acl.$(OBJEXT): \ server_acl.c $(SRCTOP)/include/syslog.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(BUILDTOP)/include/kadm5/server_internal.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \ @@ -132,15 +132,15 @@ server_acl.so server_acl.po $(OUTPRE)server_acl.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(BUILDTOP)/include/kadm5/admin_internal.h $(SRCTOP)/include/krb5/adm_proto.h \ + $(BUILDTOP)/include/kadm5/admin_internal.h $(SRCTOP)/include/adm_proto.h \ server_acl.h server_kdb.so server_kdb.po $(OUTPRE)server_kdb.$(OBJEXT): \ - server_kdb.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + server_kdb.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \ $(BUILDTOP)/include/gssrpc/xdr.h $(BUILDTOP)/include/gssrpc/auth.h \ @@ -151,12 +151,12 @@ server_kdb.so server_kdb.po $(OUTPRE)server_kdb.$(OBJEXT): \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/server_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h server_misc.so server_misc.po $(OUTPRE)server_misc.$(OBJEXT): \ - server_misc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + server_misc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/gssrpc/rpc.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ @@ -174,8 +174,8 @@ server_init.so server_init.po $(OUTPRE)server_init.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/rpc_msg.h $(BUILDTOP)/include/gssrpc/auth_unix.h \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ - $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/server_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h @@ -187,10 +187,10 @@ server_dict.so server_dict.po $(OUTPRE)server_dict.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/syslog.h \ + $(SRCTOP)/include/adm_proto.h $(SRCTOP)/include/syslog.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h svr_iters.so svr_iters.po $(OUTPRE)svr_iters.$(OBJEXT): \ svr_iters.c $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ @@ -200,8 +200,8 @@ svr_iters.so svr_iters.po $(OUTPRE)svr_iters.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h svr_chpass_util.so svr_chpass_util.po $(OUTPRE)svr_chpass_util.$(OBJEXT): \ @@ -212,8 +212,8 @@ svr_chpass_util.so svr_chpass_util.po $(OUTPRE)svr_chpass_util.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/rpc_msg.h $(BUILDTOP)/include/gssrpc/auth_unix.h \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ - $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/server_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h @@ -225,8 +225,8 @@ adb_xdr.so adb_xdr.po $(OUTPRE)adb_xdr.$(OBJEXT): adb_xdr.c \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/kadm5/server_internal.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/admin_internal.h \ $(BUILDTOP)/include/kadm5/admin_xdr.h $(BUILDTOP)/include/kadm5/kadm_rpc.h diff --git a/src/lib/kadm5/srv/server_misc.c b/src/lib/kadm5/srv/server_misc.c index 4f15fd3b2..f7bfd585c 100644 --- a/src/lib/kadm5/srv/server_misc.c +++ b/src/lib/kadm5/srv/server_misc.c @@ -9,7 +9,7 @@ static char *rcsid = "$Header$"; #endif #include "k5-int.h" -#include <krb5/kdb.h> +#include <kdb.h> #include <ctype.h> #include <pwd.h> diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 6cecbb5d2..18ab480bc 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -12,7 +12,7 @@ static char *rcsid = "$Header$"; #include <sys/time.h> #include <errno.h> #include <kadm5/admin.h> -#include <krb5/kdb.h> +#include <kdb.h> #include <stdio.h> #include <string.h> #include "server_internal.h" diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index f3bbd0afe..07bb4e4ea 100644 --- a/src/lib/kadm5/unit-test/ChangeLog +++ b/src/lib/kadm5/unit-test/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * lock-test.c: Don't look for kdb.h in krb5/. + 2005-11-17 Ken Raeburn <raeburn@mit.edu> * setkey-test.c: Include k5-int.h instead of krb5.h. diff --git a/src/lib/kadm5/unit-test/lock-test.c b/src/lib/kadm5/unit-test/lock-test.c index 4da6aead8..3b6edd6d8 100644 --- a/src/lib/kadm5/unit-test/lock-test.c +++ b/src/lib/kadm5/unit-test/lock-test.c @@ -6,7 +6,7 @@ #include <stdio.h> #include <krb5.h> #include <kadm5/admin.h> -#include <krb5/kdb.h> +#include <kdb.h> char *whoami; diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index ceb013e63..e40efe698 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -63,55 +63,55 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs # the Makefile.in file # kdb5.so kdb5.po $(OUTPRE)kdb5.$(OBJEXT): kdb5.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h kdb5.h err_handle.h adb_err.h encrypt_key.so encrypt_key.po $(OUTPRE)encrypt_key.$(OBJEXT): \ - encrypt_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + encrypt_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h decrypt_key.so decrypt_key.po $(OUTPRE)decrypt_key.$(OBJEXT): \ - decrypt_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + decrypt_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kdb_default.so kdb_default.po $(OUTPRE)kdb_default.$(OBJEXT): \ - kdb_default.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + kdb_default.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kdb_cpw.so kdb_cpw.po $(OUTPRE)kdb_cpw.$(OBJEXT): kdb_cpw.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h adb_err.so adb_err.po $(OUTPRE)adb_err.$(OBJEXT): adb_err.c \ $(COM_ERR_DEPS) err_handle.so err_handle.po $(OUTPRE)err_handle.$(OBJEXT): \ err_handle.c err_handle.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h keytab.so keytab.po $(OUTPRE)keytab.$(OBJEXT): keytab.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/krb5/kdb_kt.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb_kt.h diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index a7e3fbe43..78cbf0230 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,10 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * send_to_kdc.c, mk_preauth.c, memcache.c, recvauth.c, netread.c, + tkt_string.c, put_svc_key.c, klog.c, netwrite.c, gethostname.c, + log.c, kadm_net.c, kuserok.c, kparse.c, getst.c: Don't look for + autoconf.h in krb5/. + 2005-08-20 Ken Raeburn <raeburn@mit.edu> * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 077042a57..3856e6d22 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -275,24 +275,24 @@ change_password.so change_password.po $(OUTPRE)change_password.$(OBJEXT): \ change_password.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/kadm.h $(SRCTOP)/include/kerberosIV/prot.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h cr_auth_repl.so cr_auth_repl.po $(OUTPRE)cr_auth_repl.$(OBJEXT): \ cr_auth_repl.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h cr_ciph.so cr_ciph.po $(OUTPRE)cr_ciph.$(OBJEXT): cr_ciph.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h cr_tkt.so cr_tkt.po $(OUTPRE)cr_tkt.$(OBJEXT): cr_tkt.c \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/des.h \ $(SRCTOP)/include/kerberosIV/krb.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/prot.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/port-sockets.h debug.so debug.po $(OUTPRE)debug.$(OBJEXT): debug.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h @@ -300,26 +300,26 @@ decomp_tkt.so decomp_tkt.po $(OUTPRE)decomp_tkt.$(OBJEXT): \ decomp_tkt.c $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/kerberosIV/krb.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/krb54proto.h \ $(SRCTOP)/include/port-sockets.h g_ad_tkt.so g_ad_tkt.po $(OUTPRE)g_ad_tkt.$(OBJEXT): \ g_ad_tkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h g_pw_in_tkt.so g_pw_in_tkt.po $(OUTPRE)g_pw_in_tkt.$(OBJEXT): \ g_pw_in_tkt.c $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h g_phost.so g_phost.po $(OUTPRE)g_phost.$(OBJEXT): g_phost.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h g_pw_tkt.so g_pw_tkt.po $(OUTPRE)g_pw_tkt.$(OBJEXT): \ g_pw_tkt.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ @@ -327,21 +327,21 @@ g_pw_tkt.so g_pw_tkt.po $(OUTPRE)g_pw_tkt.$(OBJEXT): \ g_tkt_svc.so g_tkt_svc.po $(OUTPRE)g_tkt_svc.$(OBJEXT): \ g_tkt_svc.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h getst.so getst.po $(OUTPRE)getst.$(OBJEXT): getst.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h gethostname.so gethostname.po $(OUTPRE)gethostname.$(OBJEXT): \ gethostname.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h kadm_err.so kadm_err.po $(OUTPRE)kadm_err.$(OBJEXT): \ kadm_err.c $(COM_ERR_DEPS) kadm_net.so kadm_net.po $(OUTPRE)kadm_net.$(OBJEXT): \ - kadm_net.c $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h \ + kadm_net.c $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/krbports.h $(SRCTOP)/include/kerberosIV/kadm.h \ @@ -349,7 +349,7 @@ kadm_net.so kadm_net.po $(OUTPRE)kadm_net.$(OBJEXT): \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h kadm_stream.so kadm_stream.po $(OUTPRE)kadm_stream.$(OBJEXT): \ kadm_stream.c $(SRCTOP)/include/kerberosIV/kadm.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/kerberosIV/krb.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/kerberosIV/kadm_err.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ @@ -360,162 +360,162 @@ kname_parse.so kname_parse.po $(OUTPRE)kname_parse.$(OBJEXT): \ err_txt.so err_txt.po $(OUTPRE)err_txt.$(OBJEXT): err_txt.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h lifetime.so lifetime.po $(OUTPRE)lifetime.$(OBJEXT): \ lifetime.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h g_in_tkt.so g_in_tkt.po $(OUTPRE)g_in_tkt.$(OBJEXT): \ g_in_tkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h mk_auth.so mk_auth.po $(OUTPRE)mk_auth.$(OBJEXT): mk_auth.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h mk_err.so mk_err.po $(OUTPRE)mk_err.$(OBJEXT): mk_err.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h mk_priv.so mk_priv.po $(OUTPRE)mk_priv.$(OBJEXT): mk_priv.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/kerberosIV/lsb_addr_cmp.h $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/port-sockets.h mk_req.so mk_req.po $(OUTPRE)mk_req.$(OBJEXT): mk_req.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ krb4int.h $(SRCTOP)/include/port-sockets.h mk_safe.so mk_safe.po $(OUTPRE)mk_safe.$(OBJEXT): mk_safe.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/kerberosIV/lsb_addr_cmp.h $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/port-sockets.h month_sname.so month_sname.po $(OUTPRE)month_sname.$(OBJEXT): \ month_sname.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h password_to_key.so password_to_key.po $(OUTPRE)password_to_key.$(OBJEXT): \ password_to_key.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h pkt_cipher.so pkt_cipher.po $(OUTPRE)pkt_cipher.$(OBJEXT): \ pkt_cipher.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h pkt_clen.so pkt_clen.po $(OUTPRE)pkt_clen.$(OBJEXT): \ pkt_clen.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h prot_client.so prot_client.po $(OUTPRE)prot_client.$(OBJEXT): \ prot_client.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h prot_common.so prot_common.po $(OUTPRE)prot_common.$(OBJEXT): \ prot_common.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h prot_kdc.so prot_kdc.po $(OUTPRE)prot_kdc.$(OBJEXT): \ prot_kdc.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/port-sockets.h rd_err.so rd_err.po $(OUTPRE)rd_err.$(OBJEXT): rd_err.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h rd_priv.so rd_priv.po $(OUTPRE)rd_priv.$(OBJEXT): rd_priv.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/kerberosIV/lsb_addr_cmp.h $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/port-sockets.h rd_safe.so rd_safe.po $(OUTPRE)rd_safe.$(OBJEXT): rd_safe.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/kerberosIV/lsb_addr_cmp.h $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/port-sockets.h send_to_kdc.so send_to_kdc.po $(OUTPRE)send_to_kdc.$(OBJEXT): \ send_to_kdc.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/krbports.h $(SRCTOP)/include/kerberosIV/prot.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ krb4int.h stime.so stime.po $(OUTPRE)stime.$(OBJEXT): stime.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h strnlen.so strnlen.po $(OUTPRE)strnlen.$(OBJEXT): strnlen.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h rd_preauth.so rd_preauth.po $(OUTPRE)rd_preauth.$(OBJEXT): \ rd_preauth.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/krb_db.h $(SRCTOP)/include/kerberosIV/prot.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h krb4int.h $(SRCTOP)/include/port-sockets.h mk_preauth.so mk_preauth.po $(OUTPRE)mk_preauth.$(OBJEXT): \ mk_preauth.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h unix_time.so unix_time.po $(OUTPRE)unix_time.$(OBJEXT): \ unix_time.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h tf_util.so tf_util.po $(OUTPRE)tf_util.$(OBJEXT): tf_util.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krb4int.h dest_tkt.so dest_tkt.po $(OUTPRE)dest_tkt.$(OBJEXT): \ dest_tkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/autoconf.h in_tkt.so in_tkt.po $(OUTPRE)in_tkt.$(OBJEXT): in_tkt.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/autoconf.h tkt_string.so tkt_string.po $(OUTPRE)tkt_string.$(OBJEXT): \ tkt_string.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h g_tf_fname.so g_tf_fname.po $(OUTPRE)g_tf_fname.$(OBJEXT): \ g_tf_fname.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ @@ -530,22 +530,22 @@ g_cred.so g_cred.po $(OUTPRE)g_cred.$(OBJEXT): g_cred.c \ save_creds.so save_creds.po $(OUTPRE)save_creds.$(OBJEXT): \ save_creds.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h unix_glue.so unix_glue.po $(OUTPRE)unix_glue.$(OBJEXT): \ unix_glue.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h klog.so klog.po $(OUTPRE)klog.$(OBJEXT): klog.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/autoconf.h \ krb4int.h $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/klog.h kuserok.so kuserok.po $(OUTPRE)kuserok.$(OBJEXT): kuserok.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h log.so log.po $(OUTPRE)log.$(OBJEXT): log.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/autoconf.h \ krb4int.h $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/klog.h kntoln.so kntoln.po $(OUTPRE)kntoln.$(OBJEXT): kntoln.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h $(SRCTOP)/include/kerberosIV/krb.h \ @@ -555,85 +555,85 @@ fgetst.so fgetst.po $(OUTPRE)fgetst.$(OBJEXT): fgetst.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h rd_svc_key.so rd_svc_key.po $(OUTPRE)rd_svc_key.$(OBJEXT): \ rd_svc_key.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/krb54proto.h \ $(SRCTOP)/include/kerberosIV/prot.h cr_err_repl.so cr_err_repl.po $(OUTPRE)cr_err_repl.$(OBJEXT): \ cr_err_repl.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h rd_req.so rd_req.po $(OUTPRE)rd_req.$(OBJEXT): rd_req.c \ $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/kerberosIV/krb.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/krb54proto.h g_svc_in_tkt.so g_svc_in_tkt.po $(OUTPRE)g_svc_in_tkt.$(OBJEXT): \ g_svc_in_tkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ krb4int.h $(SRCTOP)/include/port-sockets.h recvauth.so recvauth.po $(OUTPRE)recvauth.$(OBJEXT): \ recvauth.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h ad_print.so ad_print.po $(OUTPRE)ad_print.$(OBJEXT): \ ad_print.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h cr_death_pkt.so cr_death_pkt.po $(OUTPRE)cr_death_pkt.$(OBJEXT): \ cr_death_pkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h kparse.so kparse.po $(OUTPRE)kparse.$(OBJEXT): kparse.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/kparse.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h put_svc_key.so put_svc_key.po $(OUTPRE)put_svc_key.$(OBJEXT): \ put_svc_key.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h sendauth.so sendauth.po $(OUTPRE)sendauth.$(OBJEXT): \ sendauth.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h netread.so netread.po $(OUTPRE)netread.$(OBJEXT): netread.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h netwrite.so netwrite.po $(OUTPRE)netwrite.$(OBJEXT): \ netwrite.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h g_cnffile.so g_cnffile.po $(OUTPRE)g_cnffile.$(OBJEXT): \ g_cnffile.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krb4int.h RealmsConfig-glue.so RealmsConfig-glue.po $(OUTPRE)RealmsConfig-glue.$(OBJEXT): \ RealmsConfig-glue.c $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) krb4int.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-int.h \ + $(BUILDTOP)/include/osconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/krb4/gethostname.c b/src/lib/krb4/gethostname.c index c09be7299..cc40dd078 100644 --- a/src/lib/krb4/gethostname.c +++ b/src/lib/krb4/gethostname.c @@ -10,7 +10,7 @@ #include "mit-copyright.h" #include "krb.h" #include "krb4int.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/lib/krb4/getst.c b/src/lib/krb4/getst.c index 252571eaf..336170d41 100644 --- a/src/lib/krb4/getst.c +++ b/src/lib/krb4/getst.c @@ -10,7 +10,7 @@ #include "mit-copyright.h" #include "krb.h" #include "krb4int.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/kadm_net.c b/src/lib/krb4/kadm_net.c index 4173af2b0..1838834c0 100644 --- a/src/lib/krb4/kadm_net.c +++ b/src/lib/krb4/kadm_net.c @@ -31,7 +31,7 @@ #include <signal.h> #include <string.h> #include <stdlib.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/klog.c b/src/lib/krb4/klog.c index f0b87631a..da48efeb2 100644 --- a/src/lib/krb4/klog.c +++ b/src/lib/krb4/klog.c @@ -25,7 +25,7 @@ */ #include "krb.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_TIME_H #include <time.h> #endif diff --git a/src/lib/krb4/kparse.c b/src/lib/krb4/kparse.c index 94e5b935e..190518ad9 100644 --- a/src/lib/krb4/kparse.c +++ b/src/lib/krb4/kparse.c @@ -38,7 +38,7 @@ #include <ctype.h> #include <kparse.h> #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif diff --git a/src/lib/krb4/kuserok.c b/src/lib/krb4/kuserok.c index e2f673001..32620db1a 100644 --- a/src/lib/krb4/kuserok.c +++ b/src/lib/krb4/kuserok.c @@ -37,7 +37,7 @@ #include <sys/stat.h> #include <sys/file.h> #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/log.c b/src/lib/krb4/log.c index d7447aebb..ada6fdfe0 100644 --- a/src/lib/krb4/log.c +++ b/src/lib/krb4/log.c @@ -31,7 +31,7 @@ #endif #include "krb.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_TIME_H #include <time.h> #endif diff --git a/src/lib/krb4/memcache.c b/src/lib/krb4/memcache.c index 6a7b48a70..47244dd95 100644 --- a/src/lib/krb4/memcache.c +++ b/src/lib/krb4/memcache.c @@ -14,7 +14,7 @@ #include "krb.h" #include "krb4int.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef _WIN32 #include <errno.h> diff --git a/src/lib/krb4/mk_preauth.c b/src/lib/krb4/mk_preauth.c index 342654ada..1215e1145 100644 --- a/src/lib/krb4/mk_preauth.c +++ b/src/lib/krb4/mk_preauth.c @@ -15,7 +15,7 @@ #include "krb.h" #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_STDLIB_H #include <stdlib.h> #else diff --git a/src/lib/krb4/netread.c b/src/lib/krb4/netread.c index 87ead207f..b366df3d2 100644 --- a/src/lib/krb4/netread.c +++ b/src/lib/krb4/netread.c @@ -26,7 +26,7 @@ #include <errno.h> #include "krb.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/netwrite.c b/src/lib/krb4/netwrite.c index 1447b7c3c..31832488d 100644 --- a/src/lib/krb4/netwrite.c +++ b/src/lib/krb4/netwrite.c @@ -26,7 +26,7 @@ #include <errno.h> #include "krb.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c index 80561cc4f..dda60163d 100644 --- a/src/lib/krb4/put_svc_key.c +++ b/src/lib/krb4/put_svc_key.c @@ -28,7 +28,7 @@ #include <string.h> #include <stdio.h> #include <fcntl.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c index bd2aca56a..c5f857e98 100644 --- a/src/lib/krb4/recvauth.c +++ b/src/lib/krb4/recvauth.c @@ -28,7 +28,7 @@ #include <errno.h> #include <stdio.h> #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c index 3a2544d57..3be677b6c 100644 --- a/src/lib/krb4/send_to_kdc.c +++ b/src/lib/krb4/send_to_kdc.c @@ -30,7 +30,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif diff --git a/src/lib/krb4/tkt_string.c b/src/lib/krb4/tkt_string.c index 97a62d174..123596ca2 100644 --- a/src/lib/krb4/tkt_string.c +++ b/src/lib/krb4/tkt_string.c @@ -28,7 +28,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #include "port-sockets.h" /* XXX this gets us MAXPATHLEN but we should find a better way */ diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 8bf48ba5d..ee1c890d2 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -135,12 +135,12 @@ install-unix:: install-libs # the Makefile.in file # krb5_libinit.so krb5_libinit.po $(OUTPRE)krb5_libinit.$(OBJEXT): \ - krb5_libinit.c $(BUILDTOP)/include/krb5/autoconf.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + krb5_libinit.c $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(BUILDTOP)/include/krb5_err.h \ $(BUILDTOP)/include/kv5m_err.h $(BUILDTOP)/include/asn1_err.h \ $(BUILDTOP)/include/kdb5_err.h krb5_libinit.h $(srcdir)/ccache/cc-int.h \ diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index ac51178ad..73f732904 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -60,83 +60,83 @@ clean-unix:: clean-libobjs # asn1_decode.so asn1_decode.po $(OUTPRE)asn1_decode.$(OBJEXT): \ asn1_decode.c asn1_decode.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h asn1buf.h asn1_get.h asn1_k_decode.so asn1_k_decode.po $(OUTPRE)asn1_k_decode.$(OBJEXT): \ asn1_k_decode.c asn1_k_decode.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h asn1buf.h asn1_decode.h \ asn1_get.h asn1_misc.h asn1_encode.so asn1_encode.po $(OUTPRE)asn1_encode.$(OBJEXT): \ asn1_encode.c asn1_encode.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h asn1buf.h asn1_make.h asn1_get.so asn1_get.po $(OUTPRE)asn1_get.$(OBJEXT): \ - asn1_get.c asn1_get.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + asn1_get.c asn1_get.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ krbasn1.h asn1buf.h asn1_make.so asn1_make.po $(OUTPRE)asn1_make.$(OBJEXT): \ asn1_make.c asn1_make.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h asn1buf.h asn1buf.so asn1buf.po $(OUTPRE)asn1buf.$(OBJEXT): asn1buf.c \ - asn1buf.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + asn1buf.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ krbasn1.h asn1_get.h krb5_decode.so krb5_decode.po $(OUTPRE)krb5_decode.$(OBJEXT): \ - krb5_decode.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + krb5_decode.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ krbasn1.h asn1_k_decode.h asn1buf.h asn1_decode.h asn1_get.h krb5_encode.so krb5_encode.po $(OUTPRE)krb5_encode.$(OBJEXT): \ - krb5_encode.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + krb5_encode.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ asn1_k_encode.h asn1buf.h krbasn1.h asn1_encode.h asn1_make.h asn1_k_encode.so asn1_k_encode.po $(OUTPRE)asn1_k_encode.$(OBJEXT): \ asn1_k_encode.c asn1_k_encode.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h asn1buf.h krbasn1.h asn1_make.h \ asn1_encode.h asn1_misc.so asn1_misc.po $(OUTPRE)asn1_misc.$(OBJEXT): \ asn1_misc.c asn1_misc.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index df41e2934..76859881b 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -101,68 +101,68 @@ clean-unix:: # the Makefile.in file # ccbase.so ccbase.po $(OUTPRE)ccbase.$(OBJEXT): ccbase.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ fcc.h cc-int.h cccopy.so cccopy.po $(OUTPRE)cccopy.$(OBJEXT): cccopy.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ccdefault.so ccdefault.po $(OUTPRE)ccdefault.$(OBJEXT): \ - ccdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ccdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ccdefops.so ccdefops.po $(OUTPRE)ccdefops.$(OBJEXT): \ - ccdefops.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ccdefops.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ fcc.h cc_retr.so cc_retr.po $(OUTPRE)cc_retr.$(OBJEXT): cc_retr.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cc-int.h cc_file.so cc_file.po $(OUTPRE)cc_file.$(OBJEXT): cc_file.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h cc_memory.so cc_memory.po $(OUTPRE)cc_memory.$(OBJEXT): \ - cc_memory.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + cc_memory.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ccfns.so ccfns.po $(OUTPRE)ccfns.$(OBJEXT): ccfns.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ser_cc.so ser_cc.po $(OUTPRE)ser_cc.$(OBJEXT): ser_cc.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index e84f292d3..6fe4ad4ae 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (EHDRDIR): Don't use krb5 subdirectory. + 2006-03-06 Ken Raeburn <raeburn@mit.edu> * krb5_err.et (KRB5_PLUGIN_NO_HANDLE): New error code. diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index cbcc3360d..e1eaf9900 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -8,7 +8,7 @@ BUILDTOP=$(REL)..$(S)..$(S).. ##DOS##OBJFILE=..\$(OUTPRE)err_tbls.lst THDRDIR=$(BUILDTOP)$(S)include -EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5 +EHDRDIR=$(BUILDTOP)$(S)include STLIBOBJS= asn1_err.o kdb5_err.o krb5_err.o \ kv5m_err.o krb524_err.o diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 59378d76c..481413495 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -62,66 +62,66 @@ clean-windows:: # the Makefile.in file # ktadd.so ktadd.po $(OUTPRE)ktadd.$(OBJEXT): ktadd.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktbase.so ktbase.po $(OUTPRE)ktbase.$(OBJEXT): ktbase.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ kt-int.h ktdefault.so ktdefault.po $(OUTPRE)ktdefault.$(OBJEXT): \ - ktdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ktdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktfr_entry.so ktfr_entry.po $(OUTPRE)ktfr_entry.$(OBJEXT): \ - ktfr_entry.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ktfr_entry.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktremove.so ktremove.po $(OUTPRE)ktremove.$(OBJEXT): \ - ktremove.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ktremove.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktfns.so ktfns.po $(OUTPRE)ktfns.$(OBJEXT): ktfns.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kt_file.so kt_file.po $(OUTPRE)kt_file.$(OBJEXT): kt_file.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kt_srvtab.so kt_srvtab.po $(OUTPRE)kt_srvtab.$(OBJEXT): \ - kt_srvtab.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + kt_srvtab.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h read_servi.so read_servi.po $(OUTPRE)read_servi.$(OBJEXT): \ - read_servi.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + read_servi.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 1a9a63b9a..186b591f3 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -365,657 +365,657 @@ clean:: # the Makefile.in file # addr_comp.so addr_comp.po $(OUTPRE)addr_comp.$(OBJEXT): \ - addr_comp.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + addr_comp.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h addr_order.so addr_order.po $(OUTPRE)addr_order.$(OBJEXT): \ - addr_order.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + addr_order.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h addr_srch.so addr_srch.po $(OUTPRE)addr_srch.$(OBJEXT): \ - addr_srch.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + addr_srch.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h appdefault.so appdefault.po $(OUTPRE)appdefault.$(OBJEXT): \ - appdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + appdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h auth_con.so auth_con.po $(OUTPRE)auth_con.$(OBJEXT): \ - auth_con.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + auth_con.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h bld_pr_ext.so bld_pr_ext.po $(OUTPRE)bld_pr_ext.$(OBJEXT): \ - bld_pr_ext.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + bld_pr_ext.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h bld_princ.so bld_princ.po $(OUTPRE)bld_princ.$(OBJEXT): \ - bld_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + bld_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h brand.so brand.po $(OUTPRE)brand.$(OBJEXT): brand.c \ $(SRCTOP)/patchlevel.h chk_trans.so chk_trans.po $(OUTPRE)chk_trans.$(OBJEXT): \ - chk_trans.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + chk_trans.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h chpw.so chpw.po $(OUTPRE)chpw.$(OBJEXT): chpw.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(BUILDTOP)/include/krb5_err.h \ auth_con.h conv_creds.so conv_creds.po $(OUTPRE)conv_creds.$(OBJEXT): \ - conv_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + conv_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) conv_princ.so conv_princ.po $(OUTPRE)conv_princ.$(OBJEXT): \ - conv_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + conv_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_addrs.so copy_addrs.po $(OUTPRE)copy_addrs.$(OBJEXT): \ - copy_addrs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_addrs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_auth.so copy_auth.po $(OUTPRE)copy_auth.$(OBJEXT): \ - copy_auth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_auth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_athctr.so copy_athctr.po $(OUTPRE)copy_athctr.$(OBJEXT): \ - copy_athctr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_athctr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_cksum.so copy_cksum.po $(OUTPRE)copy_cksum.$(OBJEXT): \ - copy_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_creds.so copy_creds.po $(OUTPRE)copy_creds.$(OBJEXT): \ - copy_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_data.so copy_data.po $(OUTPRE)copy_data.$(OBJEXT): \ - copy_data.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_data.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_key.so copy_key.po $(OUTPRE)copy_key.$(OBJEXT): \ - copy_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_princ.so copy_princ.po $(OUTPRE)copy_princ.$(OBJEXT): \ - copy_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_tick.so copy_tick.po $(OUTPRE)copy_tick.$(OBJEXT): \ - copy_tick.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_tick.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h cp_key_cnt.so cp_key_cnt.po $(OUTPRE)cp_key_cnt.$(OBJEXT): \ - cp_key_cnt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + cp_key_cnt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h decode_kdc.so decode_kdc.po $(OUTPRE)decode_kdc.$(OBJEXT): \ - decode_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + decode_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h decrypt_tk.so decrypt_tk.po $(OUTPRE)decrypt_tk.$(OBJEXT): \ - decrypt_tk.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + decrypt_tk.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h deltat.so deltat.po $(OUTPRE)deltat.$(OBJEXT): deltat.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h enc_helper.so enc_helper.po $(OUTPRE)enc_helper.$(OBJEXT): \ - enc_helper.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + enc_helper.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h encode_kdc.so encode_kdc.po $(OUTPRE)encode_kdc.$(OBJEXT): \ - encode_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + encode_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h encrypt_tk.so encrypt_tk.po $(OUTPRE)encrypt_tk.$(OBJEXT): \ - encrypt_tk.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + encrypt_tk.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h free_rtree.so free_rtree.po $(OUTPRE)free_rtree.$(OBJEXT): \ - free_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + free_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h fwd_tgt.so fwd_tgt.po $(OUTPRE)fwd_tgt.$(OBJEXT): fwd_tgt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gc_frm_kdc.so gc_frm_kdc.po $(OUTPRE)gc_frm_kdc.$(OBJEXT): \ - gc_frm_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gc_frm_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h gc_via_tkt.so gc_via_tkt.po $(OUTPRE)gc_via_tkt.$(OBJEXT): \ - gc_via_tkt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gc_via_tkt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h gen_seqnum.so gen_seqnum.po $(OUTPRE)gen_seqnum.$(OBJEXT): \ - gen_seqnum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gen_seqnum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gen_subkey.so gen_subkey.po $(OUTPRE)gen_subkey.$(OBJEXT): \ - gen_subkey.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gen_subkey.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h get_creds.so get_creds.po $(OUTPRE)get_creds.$(OBJEXT): \ - get_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + get_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h get_in_tkt.so get_in_tkt.po $(OUTPRE)get_in_tkt.$(OBJEXT): \ - get_in_tkt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + get_in_tkt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h $(srcdir)/../os/os-proto.h gic_keytab.so gic_keytab.po $(OUTPRE)gic_keytab.$(OBJEXT): \ - gic_keytab.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gic_keytab.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gic_opt.so gic_opt.po $(OUTPRE)gic_opt.$(OBJEXT): gic_opt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gic_pwd.so gic_pwd.po $(OUTPRE)gic_pwd.$(OBJEXT): gic_pwd.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h in_tkt_sky.so in_tkt_sky.po $(OUTPRE)in_tkt_sky.$(OBJEXT): \ - in_tkt_sky.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + in_tkt_sky.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h init_ctx.so init_ctx.po $(OUTPRE)init_ctx.$(OBJEXT): \ - init_ctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + init_ctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ brand.c $(SRCTOP)/patchlevel.h $(srcdir)/../krb5_libinit.h init_keyblock.so init_keyblock.po $(OUTPRE)init_keyblock.$(OBJEXT): \ - init_keyblock.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + init_keyblock.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kdc_rep_dc.so kdc_rep_dc.po $(OUTPRE)kdc_rep_dc.$(OBJEXT): \ - kdc_rep_dc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + kdc_rep_dc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kfree.so kfree.po $(OUTPRE)kfree.$(OBJEXT): kfree.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h mk_cred.so mk_cred.po $(OUTPRE)mk_cred.$(OBJEXT): mk_cred.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h mk_error.so mk_error.po $(OUTPRE)mk_error.$(OBJEXT): \ - mk_error.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + mk_error.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h mk_priv.so mk_priv.po $(OUTPRE)mk_priv.$(OBJEXT): mk_priv.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h mk_rep.so mk_rep.po $(OUTPRE)mk_rep.$(OBJEXT): mk_rep.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h mk_req.so mk_req.po $(OUTPRE)mk_req.$(OBJEXT): mk_req.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h mk_req_ext.so mk_req_ext.po $(OUTPRE)mk_req_ext.$(OBJEXT): \ - mk_req_ext.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + mk_req_ext.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h mk_safe.so mk_safe.po $(OUTPRE)mk_safe.$(OBJEXT): mk_safe.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h parse.so parse.po $(OUTPRE)parse.$(OBJEXT): parse.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h pr_to_salt.so pr_to_salt.po $(OUTPRE)pr_to_salt.$(OBJEXT): \ - pr_to_salt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + pr_to_salt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h preauth.so preauth.po $(OUTPRE)preauth.$(OBJEXT): preauth.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h preauth2.so preauth2.po $(OUTPRE)preauth2.$(OBJEXT): \ - preauth2.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + preauth2.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h princ_comp.so princ_comp.po $(OUTPRE)princ_comp.$(OBJEXT): \ - princ_comp.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + princ_comp.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h rd_cred.so rd_cred.po $(OUTPRE)rd_cred.$(OBJEXT): rd_cred.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h rd_error.so rd_error.po $(OUTPRE)rd_error.$(OBJEXT): \ - rd_error.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rd_error.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h rd_priv.so rd_priv.po $(OUTPRE)rd_priv.$(OBJEXT): rd_priv.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h rd_rep.so rd_rep.po $(OUTPRE)rd_rep.$(OBJEXT): rd_rep.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h rd_req.so rd_req.po $(OUTPRE)rd_req.$(OBJEXT): rd_req.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h rd_req_dec.so rd_req_dec.po $(OUTPRE)rd_req_dec.$(OBJEXT): \ - rd_req_dec.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rd_req_dec.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h rd_safe.so rd_safe.po $(OUTPRE)rd_safe.$(OBJEXT): rd_safe.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h recvauth.so recvauth.po $(OUTPRE)recvauth.$(OBJEXT): \ - recvauth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + recvauth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h sendauth.so sendauth.po $(OUTPRE)sendauth.$(OBJEXT): \ - sendauth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + sendauth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h send_tgs.so send_tgs.po $(OUTPRE)send_tgs.$(OBJEXT): \ - send_tgs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + send_tgs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ser_actx.so ser_actx.po $(OUTPRE)ser_actx.$(OBJEXT): \ - ser_actx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_actx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h auth_con.h ser_adata.so ser_adata.po $(OUTPRE)ser_adata.$(OBJEXT): \ - ser_adata.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_adata.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_addr.so ser_addr.po $(OUTPRE)ser_addr.$(OBJEXT): \ - ser_addr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_addr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_auth.so ser_auth.po $(OUTPRE)ser_auth.$(OBJEXT): \ - ser_auth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_auth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_cksum.so ser_cksum.po $(OUTPRE)ser_cksum.$(OBJEXT): \ - ser_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_ctx.so ser_ctx.po $(OUTPRE)ser_ctx.$(OBJEXT): ser_ctx.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ser_key.so ser_key.po $(OUTPRE)ser_key.$(OBJEXT): ser_key.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_princ.so ser_princ.po $(OUTPRE)ser_princ.$(OBJEXT): \ - ser_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h serialize.so serialize.po $(OUTPRE)serialize.$(OBJEXT): \ - serialize.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + serialize.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h set_realm.so set_realm.po $(OUTPRE)set_realm.$(OBJEXT): \ - set_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + set_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h srv_rcache.so srv_rcache.po $(OUTPRE)srv_rcache.$(OBJEXT): \ - srv_rcache.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + srv_rcache.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h str_conv.so str_conv.po $(OUTPRE)str_conv.$(OBJEXT): \ - str_conv.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + str_conv.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h tgtname.so tgtname.po $(OUTPRE)tgtname.$(OBJEXT): tgtname.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h unparse.so unparse.po $(OUTPRE)unparse.$(OBJEXT): unparse.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h v4lifetime.so v4lifetime.po $(OUTPRE)v4lifetime.$(OBJEXT): \ - v4lifetime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + v4lifetime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h valid_times.so valid_times.po $(OUTPRE)valid_times.$(OBJEXT): \ - valid_times.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + valid_times.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h vfy_increds.so vfy_increds.po $(OUTPRE)vfy_increds.$(OBJEXT): \ - vfy_increds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + vfy_increds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h vic_opt.so vic_opt.po $(OUTPRE)vic_opt.$(OBJEXT): vic_opt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h walk_rtree.so walk_rtree.po $(OUTPRE)walk_rtree.$(OBJEXT): \ - walk_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + walk_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h t_walk_rtree.so t_walk_rtree.po $(OUTPRE)t_walk_rtree.$(OBJEXT): \ - t_walk_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + t_walk_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_kerb.so t_kerb.po $(OUTPRE)t_kerb.$(OBJEXT): t_kerb.c \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h t_ser.so t_ser.po $(OUTPRE)t_ser.$(OBJEXT): t_ser.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h t_deltat.so t_deltat.po $(OUTPRE)t_deltat.$(OBJEXT): \ - t_deltat.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + t_deltat.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_expand.so t_expand.po $(OUTPRE)t_expand.$(OBJEXT): \ - t_expand.c chk_trans.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + t_expand.c chk_trans.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index 0726e9c80..0a94fc29a 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -253,352 +253,352 @@ clean:: # the Makefile.in file # accessor.so accessor.po $(OUTPRE)accessor.$(OBJEXT): \ - accessor.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + accessor.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h an_to_ln.so an_to_ln.po $(OUTPRE)an_to_ln.$(OBJEXT): \ - an_to_ln.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + an_to_ln.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h c_ustime.so c_ustime.po $(OUTPRE)c_ustime.$(OBJEXT): \ - c_ustime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + c_ustime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h def_realm.so def_realm.po $(OUTPRE)def_realm.$(OBJEXT): \ - def_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + def_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h ccdefname.so ccdefname.po $(OUTPRE)ccdefname.$(OBJEXT): \ - ccdefname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ccdefname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h changepw.so changepw.po $(OUTPRE)changepw.$(OBJEXT): \ changepw.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h dnsglue.so dnsglue.po $(OUTPRE)dnsglue.$(OBJEXT): dnsglue.c \ - dnsglue.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + dnsglue.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h dnssrv.so dnssrv.po $(OUTPRE)dnssrv.$(OBJEXT): dnssrv.c \ - dnsglue.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + dnsglue.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h free_krbhs.so free_krbhs.po $(OUTPRE)free_krbhs.$(OBJEXT): \ - free_krbhs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + free_krbhs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h free_hstrl.so free_hstrl.po $(OUTPRE)free_hstrl.$(OBJEXT): \ - free_hstrl.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + free_hstrl.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h full_ipadr.so full_ipadr.po $(OUTPRE)full_ipadr.$(OBJEXT): \ - full_ipadr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + full_ipadr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h get_krbhst.so get_krbhst.po $(OUTPRE)get_krbhst.$(OBJEXT): \ - get_krbhst.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + get_krbhst.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gen_port.so gen_port.po $(OUTPRE)gen_port.$(OBJEXT): \ - gen_port.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gen_port.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h genaddrs.so genaddrs.po $(OUTPRE)genaddrs.$(OBJEXT): \ - genaddrs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + genaddrs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h gen_rname.so gen_rname.po $(OUTPRE)gen_rname.$(OBJEXT): \ - gen_rname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gen_rname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h gmt_mktime.so gmt_mktime.po $(OUTPRE)gmt_mktime.$(OBJEXT): \ - gmt_mktime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gmt_mktime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h hostaddr.so hostaddr.po $(OUTPRE)hostaddr.$(OBJEXT): \ - hostaddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hostaddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/fake-addrinfo.h hst_realm.so hst_realm.po $(OUTPRE)hst_realm.$(OBJEXT): \ - hst_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hst_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h $(SRCTOP)/include/fake-addrinfo.h dnsglue.h init_os_ctx.so init_os_ctx.po $(OUTPRE)init_os_ctx.$(OBJEXT): \ - init_os_ctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + init_os_ctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h krbfileio.so krbfileio.po $(OUTPRE)krbfileio.$(OBJEXT): \ - krbfileio.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + krbfileio.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktdefname.so ktdefname.po $(OUTPRE)ktdefname.$(OBJEXT): \ - ktdefname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ktdefname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kuserok.so kuserok.po $(OUTPRE)kuserok.$(OBJEXT): kuserok.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h mk_faddr.so mk_faddr.po $(OUTPRE)mk_faddr.$(OBJEXT): \ - mk_faddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + mk_faddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h localaddr.so localaddr.po $(OUTPRE)localaddr.$(OBJEXT): \ - localaddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + localaddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/foreachaddr.h locate_kdc.so locate_kdc.po $(OUTPRE)locate_kdc.$(OBJEXT): \ locate_kdc.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h lock_file.so lock_file.po $(OUTPRE)lock_file.$(OBJEXT): \ - lock_file.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + lock_file.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h net_read.so net_read.po $(OUTPRE)net_read.$(OBJEXT): \ - net_read.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + net_read.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h net_write.so net_write.po $(OUTPRE)net_write.$(OBJEXT): \ - net_write.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + net_write.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h osconfig.so osconfig.po $(OUTPRE)osconfig.$(OBJEXT): \ - osconfig.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + osconfig.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h prompter.so prompter.po $(OUTPRE)prompter.$(OBJEXT): \ - prompter.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + prompter.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h read_msg.so read_msg.po $(OUTPRE)read_msg.$(OBJEXT): \ - read_msg.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + read_msg.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h read_pwd.so read_pwd.po $(OUTPRE)read_pwd.$(OBJEXT): \ - read_pwd.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + read_pwd.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h realm_dom.so realm_dom.po $(OUTPRE)realm_dom.$(OBJEXT): \ - realm_dom.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + realm_dom.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h realm_iter.so realm_iter.po $(OUTPRE)realm_iter.$(OBJEXT): \ - realm_iter.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + realm_iter.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h port2ip.so port2ip.po $(OUTPRE)port2ip.$(OBJEXT): port2ip.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h send524.so send524.po $(OUTPRE)send524.$(OBJEXT): send524.c \ $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h sendto_kdc.so sendto_kdc.po $(OUTPRE)sendto_kdc.$(OBJEXT): \ sendto_kdc.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h $(SRCTOP)/include/cm.h sn2princ.so sn2princ.po $(OUTPRE)sn2princ.$(OBJEXT): \ - sn2princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + sn2princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/fake-addrinfo.h thread_safe.so thread_safe.po $(OUTPRE)thread_safe.$(OBJEXT): \ - thread_safe.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + thread_safe.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h timeofday.so timeofday.po $(OUTPRE)timeofday.$(OBJEXT): \ - timeofday.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + timeofday.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h toffset.so toffset.po $(OUTPRE)toffset.$(OBJEXT): toffset.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h unlck_file.so unlck_file.po $(OUTPRE)unlck_file.$(OBJEXT): \ - unlck_file.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + unlck_file.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ustime.so ustime.po $(OUTPRE)ustime.$(OBJEXT): ustime.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h write_msg.so write_msg.po $(OUTPRE)write_msg.$(OBJEXT): \ - write_msg.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + write_msg.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_an_to_ln.so t_an_to_ln.po $(OUTPRE)t_an_to_ln.$(OBJEXT): \ t_an_to_ln.c $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) t_gifconf.so t_gifconf.po $(OUTPRE)t_gifconf.$(OBJEXT): \ t_gifconf.c t_locate_kdc.so t_locate_kdc.po $(OUTPRE)t_locate_kdc.$(OBJEXT): \ - t_locate_kdc.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + t_locate_kdc.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(COM_ERR_DEPS) dnsglue.c dnsglue.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/osconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h dnssrv.c locate_kdc.c \ $(SRCTOP)/include/fake-addrinfo.h t_realm_iter.so t_realm_iter.po $(OUTPRE)t_realm_iter.$(OBJEXT): \ t_realm_iter.c $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) t_std_conf.so t_std_conf.po $(OUTPRE)t_std_conf.$(OBJEXT): \ t_std_conf.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index d9d646006..903757459 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -50,65 +50,65 @@ clean-unix:: clean-libobjs # the Makefile.in file # rc_base.so rc_base.po $(OUTPRE)rc_base.$(OBJEXT): rc_base.c \ - rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h rc_dfl.so rc_dfl.po $(OUTPRE)rc_dfl.$(OBJEXT): rc_dfl.c \ - rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc_dfl.h rc_io.h rc-int.h rc_io.so rc_io.po $(OUTPRE)rc_io.$(OBJEXT): rc_io.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc_base.h rc_dfl.h rc_io.h rcdef.so rcdef.po $(OUTPRE)rcdef.$(OBJEXT): rcdef.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h rc_dfl.h rc_none.so rc_none.po $(OUTPRE)rc_none.$(OBJEXT): rc_none.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h rc_conv.so rc_conv.po $(OUTPRE)rc_conv.$(OBJEXT): rc_conv.c \ - rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ser_rc.so ser_rc.po $(OUTPRE)ser_rc.$(OBJEXT): ser_rc.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h rcfns.so rcfns.po $(OUTPRE)rcfns.$(OBJEXT): rcfns.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index f97c77fc5..5da06fe52 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * server.c (krb5_kt_default_name): Deleted unused function. + 2005-08-20 Ken Raeburn <raeburn@mit.edu> * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/lib/rpc/unit-test/server.c b/src/lib/rpc/unit-test/server.c index df8f4c993..e831a0d34 100644 --- a/src/lib/rpc/unit-test/server.c +++ b/src/lib/rpc/unit-test/server.c @@ -258,32 +258,3 @@ void log_badauth_display_status_1(OM_uint32 code, int type, int rec) break; } } - - -#if 0 - -/* this hack is no longer necessary, since the library supports it - internally */ - -/* This is a hack to change the default keytab name */ - -#include <krb5/krb5.h> -extern char *krb5_defkeyname; - -krb5_error_code -krb5_kt_default_name(char *name, int namesize) -{ - char *ktname; - - if ((ktname = getenv("KRB5KTNAME")) == NULL) - ktname = krb5_defkeyname; - - if (namesize < strlen(ktname)+1) - return(KRB5_CONFIG_NOTENUFSPACE); - - strcpy(name, ktname); - - return(0); -} - -#endif |