Fix the header list for the kernel subset directory

ticket: 6909

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24923 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 38 insertions, 32 deletions

diff --git a/src/util/gss-kernel-lib/Makefile.in b/src/util/gss-kernel-lib/Makefile.in
index 17a68de913..1fc2807c63 100644
--- a/src/util/gss-kernel-lib/Makefile.in
+++ b/src/util/gss-kernel-lib/Makefile.in
@@ -69,6 +69,8 @@ HEADERS= \
 	autoconf.h \
 	port-sockets.h \
 	socket-utils.h \
+	krb5/krb5.h \
+	krb5/plugin.h \
 	krb5/preauth_plugin.h \
 	krb5/authdata_plugin.h
 
@@ -165,8 +167,8 @@ k5-plugin.h: $(INCLUDE)/k5-plugin.h
 	$(CP) $(INCLUDE)/k5-plugin.h $@
 k5-gmt_mktime.h: $(INCLUDE)/k5-gmt_mktime.h
 	$(CP) $(INCLUDE)/k5-gmt_mktime.h $@
-krb5.h: $(INCLUDE_BUILD)/krb5/krb5.h
-	$(CP) $(INCLUDE_BUILD)/krb5/krb5.h $@
+krb5.h: $(INCLUDE)/krb5.h
+	$(CP) $(INCLUDE)/krb5.h $@
 osconf.h: $(INCLUDE_BUILD)/osconf.h
 	$(CP) $(INCLUDE_BUILD)/osconf.h $@
 autoconf.h: $(INCLUDE_BUILD)/autoconf.h
@@ -175,10 +177,14 @@ port-sockets.h: $(INCLUDE)/port-sockets.h
 	$(CP) $(INCLUDE)/port-sockets.h $@
 socket-utils.h: $(INCLUDE)/socket-utils.h
 	$(CP) $(INCLUDE)/socket-utils.h $@
+krb5/krb5.h: krb5 $(INCLUDE_BUILD)/krb5/krb5.h
+	$(CP) $(INCLUDE_BUILD)/krb5/krb5.h $@
+krb5/plugin.h: krb5 $(INCLUDE)/krb5/plugin.h
+	$(CP) $(INCLUDE)/krb5/plugin.h $@
 krb5/preauth_plugin.h: krb5 $(INCLUDE)/krb5/preauth_plugin.h
-	$(CP) $(INCLUDE)/krb5/preauth_plugin.h krb5
+	$(CP) $(INCLUDE)/krb5/preauth_plugin.h $@
 krb5/authdata_plugin.h: krb5 $(INCLUDE)/krb5/authdata_plugin.h
-	$(CP) $(INCLUDE)/krb5/authdata_plugin.h krb5
+	$(CP) $(INCLUDE)/krb5/authdata_plugin.h $@
 
 krb5:
 	test -d krb5 || mkdir krb5
diff --git a/src/util/gss-kernel-lib/deps b/src/util/gss-kernel-lib/deps
index 08a5d8aebd..0773c93054 100644
--- a/src/util/gss-kernel-lib/deps
+++ b/src/util/gss-kernel-lib/deps
@@ -6,78 +6,78 @@ $(OUTPRE)kernel_gss.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h kernel_gss.c krb5.h \
-  krb5/authdata_plugin.h krb5/preauth_plugin.h osconf.h \
-  port-sockets.h socket-utils.h
+  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
+  osconf.h port-sockets.h socket-utils.h
 $(OUTPRE)k5seal.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h k5seal.c krb5.h \
-  krb5/authdata_plugin.h krb5/preauth_plugin.h osconf.h \
-  port-sockets.h socket-utils.h
+  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
+  osconf.h port-sockets.h socket-utils.h
 $(OUTPRE)k5sealiov.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h k5sealiov.c krb5.h \
-  krb5/authdata_plugin.h krb5/preauth_plugin.h osconf.h \
-  port-sockets.h socket-utils.h
+  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
+  osconf.h port-sockets.h socket-utils.h
 $(OUTPRE)k5unseal.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h k5unseal.c krb5.h \
-  krb5/authdata_plugin.h krb5/preauth_plugin.h osconf.h \
-  port-sockets.h socket-utils.h
+  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
+  osconf.h port-sockets.h socket-utils.h
 $(OUTPRE)k5unsealiov.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h k5unsealiov.c krb5.h \
-  krb5/authdata_plugin.h krb5/preauth_plugin.h osconf.h \
-  port-sockets.h socket-utils.h
+  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
+  osconf.h port-sockets.h socket-utils.h
 $(OUTPRE)k5sealv3.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h k5sealv3.c krb5.h \
-  krb5/authdata_plugin.h krb5/preauth_plugin.h osconf.h \
-  port-sockets.h socket-utils.h
+  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
+  osconf.h port-sockets.h socket-utils.h
 $(OUTPRE)k5sealv3iov.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h k5sealv3iov.c krb5.h \
-  krb5/authdata_plugin.h krb5/preauth_plugin.h osconf.h \
-  port-sockets.h socket-utils.h
+  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
+  osconf.h port-sockets.h socket-utils.h
 $(OUTPRE)util_cksum.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
-  krb5/preauth_plugin.h osconf.h port-sockets.h socket-utils.h \
-  util_cksum.c
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h util_cksum.c
 $(OUTPRE)util_crypt.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
-  krb5/preauth_plugin.h osconf.h port-sockets.h socket-utils.h \
-  util_crypt.c
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h util_crypt.c
 $(OUTPRE)util_seqnum.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
-  krb5/preauth_plugin.h osconf.h port-sockets.h socket-utils.h \
-  util_seqnum.c
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h util_seqnum.c
 $(OUTPRE)util_seed.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
   gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
-  krb5/preauth_plugin.h osconf.h port-sockets.h socket-utils.h \
-  util_seed.c
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h util_seed.c
 $(OUTPRE)util_token.$(OBJEXT): autoconf.h gssapiP_generic.h \
   gssapi_err_generic.h gssapi_ext.h gssapi_generic.h \
   k5-buf.h k5-platform.h k5-thread.h util_token.c
@@ -90,15 +90,15 @@ $(OUTPRE)util_ordering.$(OBJEXT): autoconf.h gssapiP_generic.h \
 $(OUTPRE)t_kgss_common.$(OBJEXT): autoconf.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
-  krb5/preauth_plugin.h osconf.h port-sockets.h socket-utils.h \
-  t_kgss_common.c
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h t_kgss_common.c
 $(OUTPRE)t_kgss_user.$(OBJEXT): autoconf.h k5-buf.h \
   k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
-  krb5/preauth_plugin.h osconf.h port-sockets.h socket-utils.h \
-  t_kgss_common.h t_kgss_user.c
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h t_kgss_common.h t_kgss_user.c
 $(OUTPRE)t_kgss_kernel.$(OBJEXT): autoconf.h gssapi_krb5.h \
   k5-buf.h k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h \
   k5-platform.h k5-plugin.h k5-thread.h k5-trace.h krb5.h \
-  krb5/authdata_plugin.h krb5/preauth_plugin.h osconf.h \
-  port-sockets.h socket-utils.h t_kgss_kernel.c
+  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
+  osconf.h port-sockets.h socket-utils.h t_kgss_kernel.c