From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 16 Sep 2009 22:54:59 +0000 (+0000)
Subject: Remove autoconf.h on "make distclean".
X-Git-Tag: krb5-1.8-alpha1~347
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac45b351222b3a9ac2c7a00a0aef576823ea831a;p=krb5.git

Remove autoconf.h on "make distclean".
Check for the presence of a build in the src tree for "make depend".
Suggest "make distclean" when "make depend" detects a build in the
 src tree or an attempt to make depend in the src tree.

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

diff --git a/src/config/post.in b/src/config/post.in
index 6ac10b05f..023fd4797 100644
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -28,6 +28,11 @@ $(BUILDTOP)/.depend-verify-srcdir:
 	@if test "$(srcdir)" = "." ; then \
 		echo 1>&2 error: cannot build dependencies with srcdir=. ; \
 		echo 1>&2 "(can't distinguish generated files from source files)" ; \
+		echo 1>&2 "Run 'make distclean' and create a separate build dir" ; \
+		exit 1 ; \
+	elif test -f "$(top_srcdir)/include/autoconf.h"; then \
+		echo 1>&2 "error: generated headers found in source tree" ; \
+		echo 1>&2 "Run 'make distclean' in source tree first" ; \
 		exit 1 ; \
 	else \
 		if test -r $(BUILDTOP)/.depend-verify-srcdir; then :; \
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 4c8ca59d4..ec6a3f25e 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -130,6 +130,9 @@ clean-windows::
 clean::
 	$(RM) osconf.new $(BUILT_HEADERS)
 
+distclean::
+	$(RM) autoconf.h
+
 install-headers-unix install:: krb5/krb5.h profile.h
 	$(INSTALL_DATA) $(srcdir)/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h
 	$(INSTALL_DATA) $(srcdir)/kdb.h $(DESTDIR)$(KRB5_INCDIR)$(S)kdb.h