Fix the distclean target so that it removes all of the generated Makefiles not just the traversed ones.

Move the _TOOLS variables to config.mk to fix tinderboxen that run targets before running configure again.
Change CONFIG_TOOLS to use DEPTH instead of topsrcdir.


git-svn-id: svn://10.0.0.236/trunk@62891 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/Makefile.in

@@ -123,11 +123,15 @@ ifdef ENABLE_TESTS
 DIRS		+= xpcom/tests
 endif
 
-include $(topsrcdir)/config/rules.mk
+DIST_GARBAGE	:= dist config.cache config.log config.status config-defs.h \
+		dependencies.beos config/autoconf.mk \
+		$(shell cd $(topsrcdir); . ./allmakefiles.sh; \
+			echo $${MAKEFILES})
 
-GARBAGE += $(DIST) config-defs.h config.cache config.log config.status
+include $(topsrcdir)/config/rules.mk
 
 ifndef MOZ_MAIL_NEWS
 export::
 	$(MAKE) -C mailnews export
 endif
+

mozilla/config/autoconf.mk.in

@@ -26,9 +26,6 @@ MOZILLA_CLIENT	= 1
 NO_MDUPDATE	= 1
 
 DIST		= $(DEPTH)/dist
-BUILD_TOOLS	= $(topsrcdir)/build/unix
-CONFIG_TOOLS	= $(topsrcdir)/config
-AUTOCONF_TOOLS	= $(topsrcdir)/build/autoconf
 
 MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
 MOZ_GFX_TOOLKIT	= $(MOZ_WIDGET_TOOLKIT)

mozilla/config/config.mk

@@ -47,6 +47,10 @@ ifndef INCLUDED_COMMON_MK
 include $(topsrcdir)/config/common.mk
 endif
 
+BUILD_TOOLS	= $(topsrcdir)/build/unix
+CONFIG_TOOLS	= $(DEPTH)/config
+AUTOCONF_TOOLS	= $(topsrcdir)/build/autoconf
+
 #
 # Tweak the default OS_ARCH and OS_RELEASE macros as needed.
 #

mozilla/config/rules.mk

@@ -479,11 +479,10 @@ clean clobber realclean clobber_all:: $(SUBMAKEFILES)
 	+$(LOOP_OVER_DIRS)
 
 distclean:: $(SUBMAKEFILES)
+	+$(LOOP_OVER_DIRS)
 	rm -rf $(ALL_TRASH) \
 	$(wildcard *.map) \
-	$(basename $(wildcard Makefile.in)) \
-	.HSancillary
-	+$(LOOP_OVER_DIRS)
+	Makefile .HSancillary $(DIST_GARBAGE)
 
 alltags:
 	rm -f TAGS