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

6 files changed, 40 insertions, 33 deletions

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index 95b8fac24..1c7eafe17 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -253,12 +253,11 @@ depend::  et_lex.lex.c
 # the Makefile.in file
 #
 error_message.so error_message.po $(OUTPRE)error_message.$(OBJEXT): \
-  error_message.c $(BUILDTOP)/include/krb5/autoconf.h \
-  com_err.h error_table.h $(SRCTOP)/include/k5-thread.h \
-  $(SRCTOP)/include/k5-platform.h
+  error_message.c $(BUILDTOP)/include/autoconf.h com_err.h \
+  error_table.h $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/k5-platform.h
 et_name.so et_name.po $(OUTPRE)et_name.$(OBJEXT): et_name.c \
   com_err.h error_table.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(BUILDTOP)/include/autoconf.h
 com_err.so com_err.po $(OUTPRE)com_err.$(OBJEXT): com_err.c \
   com_err.h error_table.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(BUILDTOP)/include/autoconf.h
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index b06b5bb61..a80beb481 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -159,35 +159,35 @@ check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe
 #
 prof_tree.so prof_tree.po $(OUTPRE)prof_tree.$(OBJEXT): \
   prof_tree.c prof_int.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
 prof_file.so prof_file.po $(OUTPRE)prof_file.$(OBJEXT): \
   prof_file.c prof_int.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
 prof_parse.so prof_parse.po $(OUTPRE)prof_parse.$(OBJEXT): \
   prof_parse.c prof_int.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
 prof_get.so prof_get.po $(OUTPRE)prof_get.$(OBJEXT): \
   prof_get.c prof_int.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
 prof_set.so prof_set.po $(OUTPRE)prof_set.$(OBJEXT): \
   prof_set.c prof_int.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
 prof_err.so prof_err.po $(OUTPRE)prof_err.$(OBJEXT): \
   prof_err.c $(COM_ERR_DEPS)
 prof_init.so prof_init.po $(OUTPRE)prof_init.$(OBJEXT): \
   prof_init.c prof_int.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
 test_parse.so test_parse.po $(OUTPRE)test_parse.$(OBJEXT): \
   test_parse.c prof_int.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
 test_profile.so test_profile.po $(OUTPRE)test_profile.$(OBJEXT): \
   test_profile.c prof_int.h $(SRCTOP)/include/k5-thread.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+  $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h argv_parse.h
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 77868b199..dc9606851 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-11  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (autoconf.h): Note location change.
+
 2005-08-20  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Use K5_AC_INIT instead of AC_INIT.
diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index 0e8f394c8..fd43a4572 100644
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -79,7 +79,7 @@ includes:: libpty.h
 			$(BUILDTOP)/include/libpty.h) ; \
 	fi
 
-includes:: $(BUILDTOP)/include/krb5/autoconf.h
+includes:: $(BUILDTOP)/include/autoconf.h
 
 clean-unix::
 	$(RM) $(BUILDTOP)/include/libpty.h
@@ -103,8 +103,8 @@ pty_err.o: pty_err.c
 pty_err.h: pty_err.et
 pty_err.c: pty_err.et
 
-$(BUILDTOP)/include/krb5/autoconf.h: $(SRCTOP)/include/krb5/autoconf.h.in
-	(cd $(BUILDTOP)/include; $(MAKE) krb5/autoconf.h)
+$(BUILDTOP)/include/autoconf.h: $(SRCTOP)/include/autoconf.h.in
+	(cd $(BUILDTOP)/include; $(MAKE) autoconf.h)
 
 
 # @lib_frag@
@@ -119,39 +119,39 @@ pty_err.so pty_err.po $(OUTPRE)pty_err.$(OBJEXT): pty_err.c \
   $(COM_ERR_DEPS)
 cleanup.so cleanup.po $(OUTPRE)cleanup.$(OBJEXT): cleanup.c \
   $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(BUILDTOP)/include/autoconf.h
 getpty.so getpty.po $(OUTPRE)getpty.$(OBJEXT): getpty.c \
   $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(BUILDTOP)/include/autoconf.h
 init_slave.so init_slave.po $(OUTPRE)init_slave.$(OBJEXT): \
   init_slave.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
+  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h
 open_ctty.so open_ctty.po $(OUTPRE)open_ctty.$(OBJEXT): \
   open_ctty.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
+  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h
 open_slave.so open_slave.po $(OUTPRE)open_slave.$(OBJEXT): \
   open_slave.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
+  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h
 update_utmp.so update_utmp.po $(OUTPRE)update_utmp.$(OBJEXT): \
   update_utmp.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
+  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h
 update_wtmp.so update_wtmp.po $(OUTPRE)update_wtmp.$(OBJEXT): \
   update_wtmp.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
+  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h
 vhangup.so vhangup.po $(OUTPRE)vhangup.$(OBJEXT): vhangup.c \
   $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(BUILDTOP)/include/autoconf.h
 void_assoc.so void_assoc.po $(OUTPRE)void_assoc.$(OBJEXT): \
   void_assoc.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
+  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h
 logwtmp.so logwtmp.po $(OUTPRE)logwtmp.$(OBJEXT): logwtmp.c \
   $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(BUILDTOP)/include/autoconf.h
 init.so init.po $(OUTPRE)init.$(OBJEXT): init.c $(COM_ERR_DEPS) \
   libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(BUILDTOP)/include/autoconf.h
 sane_hostname.so sane_hostname.po $(OUTPRE)sane_hostname.$(OBJEXT): \
   sane_hostname.c $(COM_ERR_DEPS) pty-int.h pty_err.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \
   libpty.h $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \
   $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/fake-addrinfo.h
diff --git a/src/util/support/ChangeLog b/src/util/support/ChangeLog
index f46015e89..eb112f60d 100644
--- a/src/util/support/ChangeLog
+++ b/src/util/support/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-11  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (autoconf.h): Note location change.
+
 2006-03-08  Ken Raeburn  <raeburn@mit.edu>
 
 	* plugins.c: Only include dlfcn.h if USE_DLOPEN.
diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
index da71cad88..e6c75f525 100644
--- a/src/util/support/Makefile.in
+++ b/src/util/support/Makefile.in
@@ -62,8 +62,8 @@ install-unix:: install-libs
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 ##DOS##!if 0
-$(BUILDTOP)/include/krb5/autoconf.h: $(SRCTOP)/include/krb5/autoconf.h.in
-	(cd $(BUILDTOP)/include; $(MAKE) krb5/autoconf.h)
+$(BUILDTOP)/include/autoconf.h: $(SRCTOP)/include/autoconf.h.in
+	(cd $(BUILDTOP)/include; $(MAKE) autoconf.h)
 ##DOS##!endif
 
 # @lib_frag@
@@ -75,16 +75,16 @@ $(BUILDTOP)/include/krb5/autoconf.h: $(SRCTOP)/include/krb5/autoconf.h.in
 # the Makefile.in file
 #
 threads.so threads.po $(OUTPRE)threads.$(OBJEXT): threads.c \
-  $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/k5-platform.h cache-addrinfo.h $(SRCTOP)/include/port-sockets.h \
   $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/fake-addrinfo.h
 init-addrinfo.so init-addrinfo.po $(OUTPRE)init-addrinfo.$(OBJEXT): \
-  init-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \
+  init-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \
   $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/fake-addrinfo.h \
   cache-addrinfo.h
 fake-addrinfo.so fake-addrinfo.po $(OUTPRE)fake-addrinfo.$(OBJEXT): \
-  fake-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \
+  fake-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \
   $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/fake-addrinfo.h \
   cache-addrinfo.h