Bug 604940: Add various things to GARBAGE. r=Mitch a=NPOTB
authorKyle Huey <khuey@kylehuey.com>
Tue, 19 Oct 2010 17:19:37 -0400
changeset 56126 5bcded926e0933ca1b459c8776012dce0b25e345
parent 56125 7d35f27d48975581082709e440ae78ac55c74084
child 56127 4226f35f75f8193899b7bd0eae955f46ec32944a
push idunknown
push userunknown
push dateunknown
reviewersMitch, NPOTB
bugs604940
milestone2.0b8pre
Bug 604940: Add various things to GARBAGE. r=Mitch a=NPOTB
accessible/src/Makefile.in
browser/installer/windows/Makefile.in
caps/tests/mochitest/Makefile.in
xpcom/glue/nomozalloc/Makefile.in
xpcom/reflect/xptcall/src/md/win32/Makefile.in
--- a/accessible/src/Makefile.in
+++ b/accessible/src/Makefile.in
@@ -70,10 +70,12 @@ DIRS +=   xul
 endif
 
 ifndef DISABLE_XFORMS_HOOKS
 DIRS +=   xforms
 endif
 
 include $(topsrcdir)/config/rules.mk
 
+GARBAGE += $(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX)  $(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX).fake
+
 libs::
 	$(INSTALL) $(PLATFORM_DIR)/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) $(wildcard $(PLATFORM_DIR)/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX).fake) .
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -98,10 +98,12 @@ uninstaller::
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi
 	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
 	  --preprocess-locale $(topsrcdir) \
 	  $(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer $(AB_CD) $(CONFIG_DIR)
 
+GARBARGE_DIRS += instgen
+
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
--- a/caps/tests/mochitest/Makefile.in
+++ b/caps/tests/mochitest/Makefile.in
@@ -50,10 +50,12 @@ include $(topsrcdir)/config/rules.mk
                 test_bug292789.html \
 		test_bug470804.html \
 		$(NULL)
 
 test_bug292789.html : % : %.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
 	     $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
 
+GARBAGE += test_bug292789.html
+
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
--- a/xpcom/glue/nomozalloc/Makefile.in
+++ b/xpcom/glue/nomozalloc/Makefile.in
@@ -65,16 +65,17 @@ CPPSRCS		= \
 		nsStringAPI.cpp \
 		GenericModule.cpp \
 		$(NULL)
 
 SDK_LIBRARY     =                        \
 		$(LIB_PREFIX)xpcomglue_s_nomozalloc.$(LIB_SUFFIX) \
 		$(NULL)
 
+GARBAGE += $(CSRCS) $(CPPSRCS) DeadlockDetector.h SSE.h
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 # Force use of PIC
 FORCE_USE_PIC	= 1
 
 # Pretend we're statically linking the CRT, even though we might not be: this
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -103,10 +103,12 @@ endif
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DEXPORT_XPTC_API -D_IMPL_NS_COM
 
 LOCAL_INCLUDES	+= -I$(srcdir)/../..
 
+GARBAGE += ../../$(LIBRARY) ../../$(FAKE_LIBRARY)
+
 libs:: $(LIBRARY)
 	$(INSTALL) $(LIBRARY) $(FAKE_LIBRARY) ../..