* pre.in: Add recursion hooks for distclean

	* post.in: Change recursion rules to skip recursion if NORECURSE
	is non-null; add distclean support; don't remove config.log,
	etc. if not doing distclean.

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

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 5f6947061d1622c3433e870b1e0f6362e6f1b82a..28a2056cd6c8b46cf8201fad4cc4ee84472e4036 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,11 @@
+Thu Feb 27 17:40:51 1997  Tom Yu  <tlyu@mit.edu>
+
+       * pre.in: Add recursion hooks for distclean.
+
+       * post.in: Change recursion rules to skip recursion if NORECURSE
+       is non-null; add distclean support; don't remove config.log,
+       etc. if not doing distclean.
+
 Sat Feb 22 18:42:32 1997  Richard Basch  <basch@lehman.com>
 
        * win-post.in: Move library list file rule from various

diff --git a/src/config/post.in b/src/config/post.in
index 0b1f2b44c59147063b68f25bf18d1afd97042f40..fef53e46e9989d707e4c3efdb49863142402da03 100644 (file)
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -22,7 +22,6 @@ depend:: .depend
        else :; fi
 
 clean:: clean-$(WHAT)
-       $(RM) config.log pre.out post.out Makefile.out
 
 clean-unix::
        if test -n "$(OBJS)" ; then $(RM) $(OBJS); else :; fi
@@ -32,6 +31,14 @@ clean-windows::
        $(RM) *.$(OBJEXT)
        $(RM) msvc.pdb *.err
 
+distclean:: distclean-$(WHAT)
+
+distclean-prerecurse::
+       $(MAKE) NORECURSE=true clean
+
+distclean-postrecurse::
+       $(RM) config.log config.cache config.status Makefile
+
 Makefiles-prerecurse:: Makefile
 
 Makefile: $(srcdir)/Makefile.in $(thisconfigdir)/config.status \
@@ -46,10 +53,10 @@ $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \
                        --localdir=$(BUILDTOP) \
                        --macrodir=$(BUILDTOP)/util/autoconf
 
-all-recurse clean-recurse install-recurse check-recurse Makefiles-recurse:
+all-recurse clean-recurse distclean-recurse install-recurse check-recurse Makefiles-recurse:
        @case "`echo 'x$(MFLAGS)'|sed -e 's/^x//' -e 's/ --.*$$//'`" \
                in *[ik]*) e=:;; *) e="exit 1";; esac; \
-       if test -n "$(SUBDIRS)"; then \
+       if test -n "$(SUBDIRS)" && test -z "$(NORECURSE)"; then \
        for i in . $(SUBDIRS) ; do \
                if test -d $$i ; then \
                case $$i in .);; *) \

diff --git a/src/config/pre.in b/src/config/pre.in
index fc5c06f19336cabb01ee32e3333e2fde76f48f04..89df23254823822b78f1d881651e94f555d09fc1 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -26,6 +26,10 @@ clean-unix:: clean-postrecurse
 clean-prerecurse::
 clean-postrecurse::
 
+distclean-unix:: distclean-prerecurse
+distclean-unix:: distclean-recurse
+distclean-unix:: distclean-postrecurse
+
 install-unix:: install-prerecurse
 install-unix:: install-recurse
 install-unix:: install-postrecurse