From cee79e98488ba138d1ebadb7488df7da54be627b Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 11 Mar 2006 22:23:28 +0000 Subject: 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 --- src/lib/krb5/keytab/Makefile.in | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/lib/krb5/keytab') diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 59378d76c1..481413495c 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 -- cgit