Make the distclean target work as advertised. Bug #42167

Makefile.in

@@ -141,8 +141,8 @@ STATIC_MAKEFILES := $(NSPRPUB_DIR)
 
 GARBAGE += dist
 DIST_GARBAGE = config.cache config.log config.status config-defs.h \
-   dependencies.beos config/autoconf.mk \
-   $(shell cd $(topsrcdir); . ./allmakefiles.sh; echo $${MAKEFILES})
+   dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
+   $(shell cat unallmakefiles) unallmakefiles
 
 include $(topsrcdir)/config/rules.mk
 

config/Makefile.in

@@ -44,6 +44,9 @@ ifneq ($(origin BUILD_OFFICIAL)_$(origin MOZILLA_OFFICIAL),undefined_undefined)
 TARGETS		+= $(DEPTH)/build/build_number
 endif
 
+# Remove this on distclean regardless of "official" setting
+DIST_GARBAGE	+= $(DEPTH)/build/build_number
+
 # If this is an "official mozilla build" make them shortlived.
 ifdef MOZILLA_OFFICIAL
 export:: $(DEPTH)/modules/libpref/src/init/all.js

configure

@@ -11724,6 +11724,8 @@ echo $MAKEFILES | $PERL $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
 . ./conftest.sh
 rm conftest.sh
 
+echo $MAKEFILES > unallmakefiles
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure

configure.in

@@ -3992,6 +3992,8 @@ echo $MAKEFILES | $PERL $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
 . ./conftest.sh
 rm conftest.sh
 
+echo $MAKEFILES > unallmakefiles
+
 AC_OUTPUT($MAKEFILES)
 
 dnl ========================================================

layout/build/Makefile.in

@@ -101,6 +101,8 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 EXPORT_OBJS	= 1
 endif
 
+GARBAGE	+= $(BUILD_DATE)
+
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML