svn commit: r1301470 - /subversion/trunk/Makefile.in

[ju...@apache.org]

Author: julianfoad
Date: Fri Mar 16 12:52:01 2012
New Revision: 1301470

URL: http://svn.apache.org/viewvc?rev=1301470&view=rev
Log:
Make 'make distclean' remove the Makefile last, after all of the test data,
so that the user can still try again if it bails out part way through.  The
same for 'make extraclean', and similarly for 'make clean', following the
general principle that such rules should remove things in the reverse order
of their creation.

For example, on my system the 'svn-test-work' directory is usually mounted
as a RAM disk, and the 'rm -rf svn-test-work' part of 'make check-clean'
throws an error, and so 'make distclean' bails out, but it was bailing out
after having already deleted 'Makefile' so I couldn't easily try again.

* Makefile.in
  (fast-distclean): Remove the Makefile last, not first.
  (local-extraclean): Depend on local-distclean last, not first.
  (local-clean): Depend on fast-clean last, not first.
  (local-distclean): Depend on fast-distclean last, not first.

Modified:
    subversion/trunk/Makefile.in

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1301470&r1=1301469&r2=1301470&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Fri Mar 16 12:52:01 2012
@@ -384,13 +384,14 @@ fast-clean: doc-clean
 # clean all but bulky test output, returning to before './configure' was run.
 SVN_CONFIG_SCRIPT_FILES = @SVN_CONFIG_SCRIPT_FILES@
 fast-distclean: fast-clean
-	rm -fr Makefile config.cache config.log config.nice config.status \
+	rm -fr config.cache config.log config.nice config.status \
 	libtool mkmf.log subversion/svn_private_config.h \
 	subversion/bindings/javahl/classes subversion/bindings/javahl/include \
 	$(SVN_CONFIG_SCRIPT_FILES)
+	rm -f Makefile
 
 # clean everything out, returning to before './autogen.sh' was run.
-local-extraclean: local-distclean extraclean-swig extraclean-ctypes-python extraclean-javahl
+local-extraclean: extraclean-swig extraclean-ctypes-python extraclean-javahl local-distclean
 	rm -f $(top_srcdir)/build-outputs.mk \
               $(top_srcdir)/subversion/svn_private_config.h.in \
               $(top_srcdir)/configure \
@@ -408,10 +409,10 @@ local-extraclean: local-distclean extrac
 
 
 # clean everything, including test output.
-local-clean: fast-clean check-clean clean-swig clean-ctypes-python clean-javahl
+local-clean: check-clean clean-swig clean-ctypes-python clean-javahl fast-clean
 
 # clean everything, including test output.
-local-distclean: fast-distclean check-clean
+local-distclean: check-clean fast-distclean
 
 local-install: @INSTALL_RULES@