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

2 files changed, 32 insertions, 38 deletions

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)