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/kdc/Makefile.in | |
parent | 6b3217ad6ab98d4365f32d45948717e212684678 (diff) | |
download | krb5-cee79e98488ba138d1ebadb7488df7da54be627b.zip krb5-cee79e98488ba138d1ebadb7488df7da54be627b.tar.gz krb5-cee79e98488ba138d1ebadb7488df7da54be627b.tar.bz2 |
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/kdc/Makefile.in')
-rw-r--r-- | src/kdc/Makefile.in | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index bfa6de4..e4b085e 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -101,102 +101,102 @@ clean:: # $(OUTPRE)kdc5_err.$(OBJEXT): kdc5_err.c $(COM_ERR_DEPS) $(OUTPRE)dispatch.$(OBJEXT): dispatch.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 $(SRCTOP)/include/syslog.h \ - kdc_util.h extern.h $(SRCTOP)/include/krb5/adm_proto.h + kdc_util.h extern.h $(SRCTOP)/include/adm_proto.h $(OUTPRE)do_as_req.$(OBJEXT): do_as_req.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 $(SRCTOP)/include/syslog.h \ - kdc_util.h policy.h $(SRCTOP)/include/krb5/adm.h $(SRCTOP)/include/krb5/adm_proto.h \ + kdc_util.h policy.h $(SRCTOP)/include/adm.h $(SRCTOP)/include/adm_proto.h \ extern.h $(OUTPRE)do_tgs_req.$(OBJEXT): do_tgs_req.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 $(SRCTOP)/include/syslog.h \ - kdc_util.h policy.h extern.h $(SRCTOP)/include/krb5/adm_proto.h + kdc_util.h policy.h extern.h $(SRCTOP)/include/adm_proto.h $(OUTPRE)kdc_util.$(OBJEXT): kdc_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 kdc_util.h extern.h $(SRCTOP)/include/syslog.h \ - $(SRCTOP)/include/krb5/adm.h $(SRCTOP)/include/krb5/adm_proto.h + $(SRCTOP)/include/adm.h $(SRCTOP)/include/adm_proto.h $(OUTPRE)kdc_preauth.$(OBJEXT): kdc_preauth.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-plugin.h kdc_util.h extern.h $(SRCTOP)/include/krb5/adm_proto.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-plugin.h kdc_util.h extern.h $(SRCTOP)/include/adm_proto.h \ $(SRCTOP)/include/syslog.h $(OUTPRE)logger.$(OBJEXT): $(SRCTOP)/lib/kadm5/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 $(OUTPRE)main.$(OBJEXT): main.c $(SRCTOP)/include/syslog.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/krb5/adm.h $(SRCTOP)/include/krb5/adm_proto.h \ - kdc_util.h extern.h kdc5_err.h $(SRCTOP)/include/krb5/kdb_kt.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/adm.h $(SRCTOP)/include/adm_proto.h \ + kdc_util.h extern.h kdc5_err.h $(SRCTOP)/include/kdb_kt.h \ $(SRCTOP)/include/kerberosIV/des.h $(OUTPRE)network.$(OBJEXT): network.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 kdc_util.h extern.h kdc5_err.h \ - $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/syslog.h \ + $(SRCTOP)/include/adm_proto.h $(SRCTOP)/include/syslog.h \ $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/cm.h \ $(SRCTOP)/include/foreachaddr.h $(OUTPRE)policy.$(OBJEXT): policy.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 kdc_util.h $(OUTPRE)extern.$(OBJEXT): extern.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 extern.h $(OUTPRE)replay.$(OBJEXT): replay.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 kdc_util.h extern.h -$(OUTPRE)kerberos_v4.$(OBJEXT): kerberos_v4.c $(BUILDTOP)/include/krb5/autoconf.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ +$(OUTPRE)kerberos_v4.$(OBJEXT): kerberos_v4.c $(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 $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.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 kdc_util.h $(SRCTOP)/include/krb5/adm_proto.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-plugin.h kdc_util.h $(SRCTOP)/include/adm_proto.h \ $(SRCTOP)/include/syslog.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(SRCTOP)/include/kerberosIV/klog.h $(SRCTOP)/include/kerberosIV/prot.h \ |