Bug 333308: make clean and make distclean miss various files. r=bsmedberg, a=schrep

Makefile.in

@@ -73,7 +73,7 @@ ifdef ENABLE_TESTS
 tier_testharness_dirs += tools/test-harness
 endif
 
-GARBAGE_DIRS += dist
+GARBAGE_DIRS += dist _javagen _tests
 DIST_GARBAGE = config.cache config.log config.status config-defs.h \
    dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
    unallmakefiles mozilla-config.h \

config/Makefile.in

@@ -127,13 +127,15 @@ export::
 		-DMOZ_NATIVE_LCMS=$(MOZ_NATIVE_LCMS) \
 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
 	$(INSTALL) system_wrappers $(DIST)/include
+
+GARBAGE_DIRS += system_wrappers
 endif
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(DEPTH)/mozilla-config.h $(DESTDIR)$(includedir)
 
 GARBAGE += \
-	$(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
+	$(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) buildid
 
 ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC

config/rules.mk

@@ -119,6 +119,7 @@ endif
 
 ifdef GQI_SRCS
 CPPSRCS += $(GQI_SRCS:.gqi=QI.cpp)
+GARBAGE += $(GQI_SRCS:.gqi=QI.cpp)
 endif
 
 #
@@ -372,6 +373,10 @@ LOOP_OVER_DIRS = \
     @$(EXIT_ON_ERROR) \
     $(foreach dir,$(DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; ) true
 
+LOOP_OVER_STATIC_DIRS = \
+    @$(EXIT_ON_ERROR) \
+    $(foreach dir,$(STATIC_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; ) true
+
 LOOP_OVER_TOOL_DIRS = \
     @$(EXIT_ON_ERROR) \
     $(foreach dir,$(TOOL_DIRS),$(UPDATE_TITLE) $(MAKE) -C $(dir) $@; ) true
@@ -791,12 +796,13 @@ run_viewer: $(FINAL_TARGET)/viewer
 clean clobber realclean clobber_all:: $(SUBMAKEFILES)
 	-rm -f $(ALL_TRASH)
 	-rm -rf $(ALL_TRASH_DIRS)
-	+-$(foreach dir,$(STATIC_DIRS),$(MAKE) -C $(dir) $@; )
 	+-$(LOOP_OVER_DIRS)
+	+-$(LOOP_OVER_STATIC_DIRS)
 	+-$(LOOP_OVER_TOOL_DIRS)
 
 distclean:: $(SUBMAKEFILES)
 	+-$(LOOP_OVER_DIRS)
+	+-$(LOOP_OVER_STATIC_DIRS)
 	+-$(LOOP_OVER_TOOL_DIRS)
 	-rm -rf $(ALL_TRASH_DIRS) 
 	-rm -f $(ALL_TRASH)  \

embedding/components/printingui/src/mac/printpde/Makefile.in

@@ -76,12 +76,14 @@ export::
 	ln -fs $(srcdir)/res
 	ln -fs $(srcdir)/public
 	ln -fs $(srcdir)/Info-*.plist .
+
+GARBAGE += src res public Info-*.plist
+GARBAGE_DIRS += $(PROJECT)
 endif
 
+GARBAGE_DIRS += build
+
 libs::
 	$(PBBUILD) $(PROJECT_ARG) -target PrintPDE -buildstyle $(BUILDSTYLE) $(PBBUILD_ARG)
 	mkdir -p $(DIST)/package
 	$(INSTALL) $(XCODE_PRODUCT_DIR)/PrintPDE.plugin $(DIST)/package
-
-clean clobber::
-	rm -rf build

layout/style/test/Makefile.in

@@ -66,6 +66,8 @@ css_properties.js: host_ListCSSProperties$(HOST_BIN_SUFFIX) css_properties_like_
 	./host_ListCSSProperties$(HOST_BIN_SUFFIX) > $@
 	cat $(srcdir)/css_properties_like_longhand.js >> $@
 
+GARBAGE += css_properties.js
+
 _TEST_FILES =	test_bug74880.html \
 		test_bug221428.html \
 		test_bug302186.html \

modules/plugin/samples/default/mac/Makefile.in

@@ -72,8 +72,20 @@ export::
 	ln -fs $(srcdir)/npmac.cpp
 	ln -fs $(srcdir)/Info-*.plist .
 	ln -fs $(srcdir)/NullPlugin.rsrc
+
+GARBAGE_DIRS += $(PROJECT)
+GARBAGE += \
+	English.lproj \
+	DefaultPluginPrefix.h \
+	NullPlugin.cpp \
+	npmac.cpp \
+	Info-*.plist \
+	NullPlugin.rsrc \
+	$(NULL)
 endif
 
+GARBAGE_DIRS += build
+
 libs install:: install-plugin
 
 install-plugin: build-plugin
@@ -82,6 +94,3 @@ install-plugin: build-plugin
 build-plugin:
 	$(PBBUILD) $(PROJECT_ARG) -target $(TARGET) -buildstyle $(BUILDSTYLE) $(PBBUILD_ARG)
 	echo -n NSPLMOSS > "$(XCODE_PRODUCT_DIR)/Default Plugin.plugin/Contents/PkgInfo"
-
-clean clobber distclean::
-	rm -rf build

plugin/oji/JEP/Makefile.in

@@ -55,10 +55,12 @@ MRJ_PLUGIN_BUNDLE=MRJPlugin.plugin
 # for objdir builds, copy the project, and symlink the sources
 ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
 ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
-export::
 ifdef MOZ_PLUGINS
+export::
 	rsync -a --exclude CVS/ $(srcdir)/$(JEP_PLUGIN_BUNDLE) .
 	rsync -a --exclude CVS/ $(srcdir)/$(MRJ_PLUGIN_BUNDLE) .
+
+GARBAGE_DIRS += $(JEP_PLUGIN_BUNDLE) $(MRJ_PLUGIN_BUNDLE)
 endif
 endif
 
@@ -69,5 +71,3 @@ ifdef MOZ_PLUGINS
 	$(INSTALL) $(JEP_PLUGIN_BUNDLE) $(DIST)/bin/plugins
 	$(INSTALL) $(MRJ_PLUGIN_BUNDLE) $(DIST)/bin/plugins
 endif
-
-clean clobber distclean::

testing/mochitest/Makefile.in

@@ -108,6 +108,7 @@ runtests.py: runtests.py.in
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \
 	$(TEST_DRIVER_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@
 
+GARBAGE += runtests.pl runtests.py
 
 libs:: $(_SERV_FILES)
 	$(INSTALL) $^ $(_DEST_DIR)

toolkit/xre/Makefile.in

@@ -253,6 +253,8 @@ export:: $(addprefix $(topsrcdir)/xpfe/bootstrap/, $(SHAREDCPPSRCS))
 platform.ini: FORCE
 	$(PYTHON) $(srcdir)/make-platformini.py --buildid=$(shell cat $(DEPTH)/config/buildid) $(topsrcdir)/config/milestone.txt > $@
 
+GARBAGE += platform.ini
+
 libs:: platform.ini
 	$(INSTALL) $^ $(DIST)/bin
 

widget/src/cocoa/Makefile.in

@@ -166,6 +166,8 @@ export::
 $(RESOURCE): nsMacWidget.r
 	/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $< -o $@
 
+GARBAGE += $(RESOURCE)
+
 libs:: $(RESOURCE)
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin