Get "make depend" to work in an unbuilt source tree, since bad deps

files can make it difficult to build the tree.  To do this, make the
depends target depend on generated header files and on header file
copies or links into the main include directory.

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

12 files changed, 18 insertions, 5 deletions

diff --git a/src/appl/libpty/Makefile.in b/src/appl/libpty/Makefile.in
index 924ef1b9b..080d82e27 100644
--- a/src/appl/libpty/Makefile.in
+++ b/src/appl/libpty/Makefile.in
@@ -65,7 +65,7 @@ clean-unix::
 	$(RM) libpty.a $(BUILDTOP)/include/libpty.h pty_err.c pty_err.h
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
-depend::  pty_err.h
+depend:: includes pty_err.h
 
 #install:: libpty.h
 #	$(INSTALL_DATA) $(srcdir)/libpty.h  $(DESTDIR)$(KRB5_INCDIR)/libpty.h
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 2b7cc0877..4c8ca59d4 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -137,3 +137,5 @@ install-headers-unix install:: krb5/krb5.h profile.h
 	$(INSTALL_DATA) $(srcdir)/krb5/locate_plugin.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)locate_plugin.h
 	$(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h
 	$(INSTALL_DATA) $(srcdir)/gssapi.h $(DESTDIR)$(KRB5_INCDIR)$(S)gssapi.h
+
+depend:: krb5/krb5.h $(BUILT_HEADERS)
diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index e88d8b323..d6eac78a8 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -34,3 +34,4 @@ install::
 clean::
 	$(RM) $(PROG) $(OBJS) import_err.c import_err.h
 
+depend:: import_err.h
diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in
index e6469c85d..19854c96b 100644
--- a/src/kadmin/passwd/Makefile.in
+++ b/src/kadmin/passwd/Makefile.in
@@ -24,3 +24,5 @@ $(PROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
 
 clean::
 	$(RM) kpasswd_strings.c kpasswd_strings.h $(PROG) $(OBJS)
+
+depend:: kpasswd_strings.h
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 0d37fe1a1..d6371de57 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -54,7 +54,7 @@ RT_OBJS= rtest.o \
 	policy.o \
 	extern.o
 
-depend:: kdc5_err.c
+depend:: kdc5_err.c kdc5_err.h
 
 kdc5_err.c: kdc5_err.et
 
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index c35bd1abb..42b403083 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -167,7 +167,7 @@ install-headers-unix install:: gssapi.h
 		$(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \
 	done
 
-depend:: $(ETSRCS)
+depend:: $(ETSRCS) $(ETHDRS) $(HDRS) errmap.h maptest.h
 
 @libobj_frag@
 
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 530d527c2..2ee9e1d9c 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -263,7 +263,7 @@ install-headers-unix install::
 		$(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \
 	done
 
-depend:: $(ETSRCS)
+depend:: $(ETSRCS) $(ETHDRS) $(GSSAPI_KRB5_HDR) error_map.h
 
 includes::  gssapi_krb5.h
 
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index 4644937fe..175231e73 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -103,5 +103,7 @@ install-headers-unix install:: $(BUILD_HDRS)
 	$(INSTALL_DATA) chpass_util_strings.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)chpass_util_strings.h
 	$(INSTALL_DATA) kadm_err.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)kadm_err.h
 
+depend:: includes
+
 @libobj_frag@
 
diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index acc7cfef9..a92d0faa4 100644
--- a/src/lib/kadm5/clnt/Makefile.in
+++ b/src/lib/kadm5/clnt/Makefile.in
@@ -72,6 +72,8 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 install:: install-libs
 
+depend:: includes
+
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index fcb92d797..175b83b3b 100644
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -89,6 +89,8 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 install:: install-libs
 
+depend:: includes
+
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 9c98679aa..2946ba942 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -61,6 +61,8 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 generate-files-mac: darwin.exports
 
+depend:: adb_err.h
+
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index 42e1263bb..9dde5204d 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -242,7 +242,7 @@ TAGS:	et_name.c error_message.c compile_et.c error_table.c \
 	etags et_name.c error_message.c compile_et.c \
 		error_table.c init_et.c
 
-depend::  et_lex.lex.c
+depend::  et_lex.lex.c includes compile_et
 
 
 @lib_frag@