svn rev #22776: trunk/src/ config/ include/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22776
Commit By: ghudson
Log Message:
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.



Changed Files:
U   trunk/src/config/post.in
U   trunk/src/include/Makefile.in
Modified: trunk/src/config/post.in
===================================================================
--- trunk/src/config/post.in	2009-09-16 20:51:50 UTC (rev 22775)
+++ trunk/src/config/post.in	2009-09-16 22:54:59 UTC (rev 22776)
@@ -28,7 +28,12 @@
 	@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 :; \
 			else (set -x; touch $(BUILDTOP)/.depend-verify-srcdir); fi \

Modified: trunk/src/include/Makefile.in
===================================================================
--- trunk/src/include/Makefile.in	2009-09-16 20:51:50 UTC (rev 22775)
+++ trunk/src/include/Makefile.in	2009-09-16 22:54:59 UTC (rev 22776)
@@ -130,6 +130,9 @@
 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