summaryrefslogtreecommitdiffstats
path: root/src/kadmin/ktutil
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2006-03-11 22:23:28 +0000
committerKen Raeburn <raeburn@mit.edu>2006-03-11 22:23:28 +0000
commitcee79e98488ba138d1ebadb7488df7da54be627b (patch)
treefd329cef103b8a0f5bddccc360f15cb6ca8c9d41 /src/kadmin/ktutil
parent6b3217ad6ab98d4365f32d45948717e212684678 (diff)
downloadkrb5-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/kadmin/ktutil')
-rw-r--r--src/kadmin/ktutil/Makefile.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index 6917735df..71c002a10 100644
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -43,20 +43,20 @@ clean::
# the Makefile.in file
#
$(OUTPRE)ktutil.$(OBJEXT): ktutil.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 ktutil.h $(SRCTOP)/include/krb5/adm_proto.h \
+ $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \
+ $(SRCTOP)/include/k5-plugin.h ktutil.h $(SRCTOP)/include/adm_proto.h \
$(SS_DEPS)
$(OUTPRE)ktutil_ct.$(OBJEXT): ktutil_ct.c $(SS_DEPS) \
$(COM_ERR_DEPS)
$(OUTPRE)ktutil_funcs.$(OBJEXT): ktutil_funcs.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 ktutil.h $(SRCTOP)/include/kerberosIV/krb.h \
$(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP)