Bug 1670357 - Remove `make` targets for cleaning: `clean`, `realclean`, `clobber`, `distclean`, `clobber_all`, `everything` r=firefox-build-system-reviewers,mhentges

The `clobber` targets are superseded by `mach clobber`, so we don't need them for any reason. The `clean` target is meant to get you to a post-`configure` state, but it doesn't really work, and if it's necessary for you to be in that state for some reason you can just clobber and re-`configure`, so it doesn't seem worth it to get it working again. Instead, delete all of them. Also delete `everything` which is not useful when `clobber` doesn't exist. Differential Revision: https://phabricator.services.mozilla.com/D93514
2020-10-15 20:37:18 +00:00 · 2020-10-15 20:37:18 +00:00 · 362abcf949
--- a/Makefile.in
+++ b/Makefile.in
@ -23,21 +23,6 @@ endif

 include $(topsrcdir)/config/config.mk

-GARBAGE_DIRS += _javagen _profile staticlib
-# To share compilation of dependencies, Rust libraries all set their
-# CARGO_TARGET_DIR as a subdirectory of topobjdir.  Normally, we would add
-# RUST*TARGET to GARBAGE_DIRS for those directories building Rust libraries.
-# But the directories building Rust libraries don't actually have
-# subdirectories to remove.  So we add to GARBAGE_DIRS once here, globally,
-# for it to have the desired effect.
-GARBAGE_DIRS += $(RUST_TARGET)
-GARBAGE_DIRS += config.statusd
-DIST_GARBAGE = config.cache config.log config.status config-defs.h \
-   config/autoconf.mk \
-   mozilla-config.h \
-   xpcom/xpcom-config.h \
-   .mozconfig.mk
-
 ifneq (mobile/android,$(MOZ_BUILD_APP))
 $(MDDEPDIR)/buildid.h.stub $(MDDEPDIR)/source-repo.h.stub: FORCE
 endif
@ -112,9 +97,6 @@ install-test-files:

 include $(topsrcdir)/build/moz-automation.mk

-# dist and _tests should be purged during cleaning.
-GARBAGE_DIRS += dist _tests
-
 # Dummy rule for the cases below where we don't depend on dist/include
 recurse_pre-export::

@ -180,9 +162,6 @@ default::
 	@echo "==================="
 endif

-distclean::
-	$(RM) $(DIST_GARBAGE)
-
 ifdef MOZ_CRASHREPORTER
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk

--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@ -48,8 +48,6 @@ libs::
 endif
 endif

-GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, firefox.js)
-
 endif

 # channel-prefs.js is handled separate from other prefs due to bug 756325
@ -76,7 +74,7 @@ LPROJ_ROOT := $(firstword $(subst -, ,$(AB_CD)))
 endif
 LPROJ := Contents/Resources/$(LPROJ_ROOT).lproj

-clean clobber repackage::
+repackage::
 	$(RM) -r $(dist_dest)

 MAC_BUNDLE_VERSION = $(shell $(PYTHON3) $(srcdir)/macversion.py --version=$(MOZ_APP_VERSION) --buildid=$(DEPTH)/buildid.h)
--- a/browser/build.mk
+++ b/browser/build.mk
@ -14,12 +14,6 @@ stage-package:
 install::
 	@$(MAKE) -C browser/installer install

-clean::
-	@$(MAKE) -C browser/installer clean
-
-distclean::
-	@$(MAKE) -C browser/installer distclean
-
 source-package::
 	@$(MAKE) -C browser/installer source-package

--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@ -73,7 +73,5 @@ $(CONFIG_DIR)/setup.exe::
 	  --convert-utf8-utf16le \
 	  $(srcdir)/nsis/extensionsLocale.nsh $(CONFIG_DIR)/extensionsLocale.nsh

-GARBAGE_DIRS += instgen
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
--- a/build/unix/elfhack/Makefile.in
+++ b/build/unix/elfhack/Makefile.in
@ -28,8 +28,6 @@ test-ctors$(DLL_SUFFIX): DT_TYPE=INIT

 .PRECIOUS: test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX)

-GARBAGE += test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX) test-array$(DLL_SUFFIX).bak test-ctors$(DLL_SUFFIX).bak
-
 ifndef CROSS_COMPILE
 ifdef COMPILE_ENVIRONMENT
 libs:: test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX)
@ -42,6 +40,5 @@ libs:: dummy
 	LD_PRELOAD=$(CURDIR)/test-array$(DLL_SUFFIX) $(CURDIR)/dummy
 	LD_PRELOAD=$(CURDIR)/test-ctors$(DLL_SUFFIX) $(CURDIR)/dummy

-GARBAGE += dummy
 endif
 endif
--- a/config/Makefile.in
+++ b/config/Makefile.in
@ -32,9 +32,6 @@ endif

 include $(topsrcdir)/config/rules.mk

-GARBAGE += \
-  $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) $(srcdir)/*.pyc *.pyc
-
 FORCE:

 ifndef JS_STANDALONE
--- a/config/config.mk
+++ b/config/config.mk
@ -324,8 +324,6 @@ endif

 ######################################################################

-GARBAGE		+= $(DEPENDENCIES) core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB
-
 ifeq ($(OS_ARCH),Darwin)
 ifndef NSDISTMODE
 NSDISTMODE=absolute_symlink
--- a/config/makefiles/autotargets.mk
+++ b/config/makefiles/autotargets.mk
@ -78,7 +78,6 @@ ifneq (,$(GENERATED_DIRS))
  GENERATED_DIRS := $(strip $(sort $(GENERATED_DIRS)))
  tmpauto :=$(call mkdir_deps,GENERATED_DIRS)
  GENERATED_DIRS_DEPS +=$(tmpauto)
-  GARBAGE_DIRS        +=$(GENERATED_DIRS)
 endif

 #################################################################
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
@ -364,8 +364,6 @@ endif # HOST_RUST_LIBRARY_FILE

 ifdef RUST_PROGRAMS

-GARBAGE_DIRS += $(RUST_TARGET)
-
 force-cargo-program-build: $(call resfile,module)
 	$(REPORT_BUILD)
 	$(call CARGO_BUILD) $(addprefix --bin ,$(RUST_CARGO_PROGRAMS)) $(cargo_target_flag) -- $(addprefix -C link-arg=$(CURDIR)/,$(call resfile,module))
@ -380,8 +378,6 @@ force-cargo-program-check:
 endif # RUST_PROGRAMS
 ifdef HOST_RUST_PROGRAMS

-GARBAGE_DIRS += $(RUST_HOST_TARGET)
-
 force-cargo-host-program-build:
 	$(REPORT_BUILD)
 	$(call CARGO_BUILD) $(addprefix --bin ,$(HOST_RUST_CARGO_PROGRAMS)) $(cargo_host_flag)
--- a/config/makefiles/xpidl/Makefile.in
+++ b/config/makefiles/xpidl/Makefile.in
@ -62,8 +62,6 @@ xpt_files := $(addsuffix .xpt,$(xpidl_modules))

 depends_files := $(foreach root,$(xpidl_modules),$(idl_deps_dir)/$(root).pp)

-GARBAGE += $(stub_file) $(xpt_files) $(depends_files) $(target_file)
-
 ifdef COMPILE_ENVIRONMENT
 xpidl:: $(generated_files)
 endif
--- a/config/rules.mk
+++ b/config/rules.mk
@ -215,33 +215,6 @@ endif

 WASM_ARCHIVE = $(addsuffix .$(WASM_OBJ_SUFFIX),$(WASM_LIBRARY))

-ALL_TRASH = \
-	$(GARBAGE) $(TARGETS) $(OBJS) $(PROGOBJS) LOGS TAGS a.out \
-	$(filter-out $(ASFILES),$(OBJS:.$(OBJ_SUFFIX)=.s)) $(OBJS:.$(OBJ_SUFFIX)=.ii) \
-	$(OBJS:.$(OBJ_SUFFIX)=.i) \
-	$(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) \
-	so_locations _gen _stubs $(wildcard *.res) $(wildcard *.RES) \
-	$(wildcard *.pdb) $(CODFILE) $(IMPORT_LIBRARY) \
-	$(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) $(wildcard *.ilk) \
-	$(PROGRAM:$(BIN_SUFFIX)=.exp) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.exp) \
-	$(PROGRAM:$(BIN_SUFFIX)=.lib) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.lib) \
-	$(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.$(OBJ_SUFFIX)) \
-	$(WASM_ARCHIVE) $(wildcard gts_tmp_*) $(LIBRARY:%.a=.%.timestamp)
-ALL_TRASH_DIRS = \
-	$(GARBAGE_DIRS) /no-such-file
-
-ifdef QTDIR
-GARBAGE                 += $(MOCSRCS)
-endif
-
-ifdef SIMPLE_PROGRAMS
-GARBAGE			+= $(SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
-endif
-
-ifdef HOST_SIMPLE_PROGRAMS
-GARBAGE			+= $(HOST_SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
-endif
-
 ifdef MACH
 ifndef NO_BUILDSTATUS_MESSAGES
 define BUILDSTATUS
@ -278,8 +251,6 @@ ifndef HOST_PROGOBJS
 HOST_PROGOBJS		= $(HOST_OBJS)
 endif

-GARBAGE_DIRS    += $(wildcard $(CURDIR)/$(MDDEPDIR))
-
 #
 # Tags: emacs (etags), vi (ctags)
 # TAG_PROGRAM := ctags -L -
@ -391,11 +362,6 @@ ECHO := true
 QUIET := -q
 endif

-# Do everything from scratch
-everything::
-	$(MAKE) clean
-	$(MAKE) all
-
 # Dependencies which, if modified, should cause everything to rebuild
 GLOBAL_DEPS += Makefile $(addprefix $(DEPTH)/config/,$(INCLUDED_AUTOCONF_MK)) $(MOZILLA_DIR)/config/config.mk

@ -437,21 +403,6 @@ syms::
 include $(MOZILLA_DIR)/config/makefiles/target_binaries.mk
 endif

-clean clobber realclean clobber_all::
-	-$(RM) $(ALL_TRASH)
-	-$(RM) -r $(ALL_TRASH_DIRS)
-
-clean clobber realclean clobber_all distclean::
-	$(foreach dir,$(DIRS),-$(call SUBMAKE,$@,$(dir)))
-
-distclean::
-	-$(RM) -r $(ALL_TRASH_DIRS)
-	-$(RM) $(ALL_TRASH)  \
-	Makefile .HSancillary \
-	$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o*) \
-	$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \
-	$(wildcard *.$(IMPORT_LIB_SUFFIX))
-
 alltags:
 	$(RM) TAGS
 	find $(topsrcdir) -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' -o -name '*.idl' \) -print | $(TAG_PROGRAM)
@ -1191,7 +1142,7 @@ endif
 # Fake targets.  Always run these rules, even if a file/directory with that
 # name already exists.
 #
-.PHONY: all alltags boot chrome realchrome clean clobber clobber_all export install libs makefiles realclean run_apprunner tools $(DIRS) FORCE
+.PHONY: all alltags boot chrome realchrome export install libs makefiles run_apprunner tools $(DIRS) FORCE

 # Used as a dependency to force targets to rebuild
 FORCE:
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@ -51,20 +51,3 @@ compiletests:
 	$(call SUBMAKE,libs,test)

 endif
-
-GARBAGE += \
-  webidl.stub \
-  codegen.pp \
-  codegen.json \
-  parser.out \
-  WebIDLGrammar.pkl \
-  $(wildcard *.h) \
-  $(wildcard *Binding.cpp) \
-  $(wildcard *Event.cpp) \
-  $(wildcard *-event.cpp) \
-  $(wildcard *.webidl) \
-  $(NULL)
-
-DIST_GARBAGE += \
-  file-lists.json \
-  $(NULL)
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@ -2,9 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-GARBAGE_DIRS += _ipdlheaders
-GARBAGE += $(wildcard *.pyc $(srcdir)/ipdl/*.pyc $(srcdir)/ipdl/cxx/*.pyc) ipdl.track
-
 ifdef COMPILE_ENVIRONMENT

 # This file is generated by the moz.build backend.
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@ -74,18 +74,6 @@ ifndef HAVE_DTRACE
 endif
 endif

-GARBAGE_DIRS += config.statusd
-DIST_GARBAGE = config.cache config.log config.status \
-   config/autoconf.mk config/emptyvars.mk \
-   js-config.h js-confdefs.h \
-   backend.mk config/backend.mk devtools/backend.mk editline/backend.mk \
-   gdb/backend.mk jsapi-tests/backend.mk shell/backend.mk tests/backend.mk \
-   backend.RecursiveMakeBackend backend.RecursiveMakeBackend.pp \
-   devtools/rootAnalysis/Makefile
-
-distclean::
-	$(RM) $(DIST_GARBAGE)
-
 CFLAGS += $(MOZ_ZLIB_CFLAGS)

 # Silence warnings on AIX/HP-UX from non-GNU compilers
@ -137,7 +125,7 @@ $(LIBRARY): $(DTRACE_PROBE_OBJ)
 $(DTRACE_PROBE_OBJ): $(srcdir)/devtools/javascript-trace.d $(OBJS)
 	dtrace -x nolibs -G -C -s $< -o $@ $(filter-out $<, $^)

-OBJS += $(DTRACE_PROBE_OBJ) # for "make clean"
+OBJS += $(DTRACE_PROBE_OBJ)
 endif # OS_ARCH != Darwin
 endif # HAVE_DTRACE

@ -158,12 +146,4 @@ source-package:
 	MOZJS_ALPHA=$(MOZJS_ALPHA) \
 	$(srcdir)/make-source-package.sh

-clean::
-	DIST=$(DIST) \
-	MOZJS_MAJOR_VERSION=$(MOZJS_MAJOR_VERSION) \
-	MOZJS_MINOR_VERSION=$(MOZJS_MINOR_VERSION) \
-	MOZJS_PATCH_VERSION=$(MOZJS_PATCH_VERSION) \
-	MOZJS_ALPHA=$(MOZJS_ALPHA) \
-	$(srcdir)/make-source-package.sh clean
-
 endif
--- a/parser/html/java/Makefile
+++ b/parser/html/java/Makefile
@ -50,11 +50,3 @@ named_characters:: translator \
 ; java -cp translator.jar \
    nu.validator.htmlparser.generator.GenerateNamedCharactersCpp \
      named-character-references.html ../
-
-clean_javaparser:: \
-; rm -rf javaparser/bin javaparser.jar
-
-clean_htmlparser:: \
-; rm -rf htmlparser/bin translator.jar
-
-clean:: clean_javaparser clean_htmlparser
--- a/parser/html/java/README.txt
+++ b/parser/html/java/README.txt
@ -34,12 +34,6 @@ translate_from_snapshot:
  stored in ../javasrc.
 named_characters:
  Generates data tables for named character tokenization.
-clean_javaparser:
-  Removes the build products of the javaparser target.
-clean_htmlparser:
-  Removes the build products of the translator target.
-clean:
-  Runs both clean_javaparser and clean_htmlparser.

 ## How to add an attribute

--- a/python/mozbuild/mozbuild/backend/make.py
+++ b/python/mozbuild/mozbuild/backend/make.py
@ -91,8 +91,6 @@ class MakeBackend(CommonBackend):
                        ret.append('%s: %s' % (tier, stub_file))
            for output in outputs:
                ret.append('%s: %s ;' % (output, stub_file))
-                ret.append('GARBAGE += %s' % output)
-            ret.append('GARBAGE += %s' % stub_file)
            ret.append('EXTRA_MDDEPEND_FILES += %s' % dep_file)

            ret.append((
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@ -457,7 +457,6 @@ class RecursiveMakeBackend(MakeBackend):
            }
            variables = [suffix_map[obj.canonical_suffix]]
            if isinstance(obj, GeneratedSources):
-                variables.append('GARBAGE')
                base = backend_file.objdir
                cls = ObjDirPath
                prefix = '!'
@ -482,7 +481,6 @@ class RecursiveMakeBackend(MakeBackend):
            }
            variables = [suffix_map[obj.canonical_suffix]]
            if isinstance(obj, HostGeneratedSources):
-                variables.append('GARBAGE')
                base = backend_file.objdir
                cls = ObjDirPath
                prefix = '!'
@ -506,7 +504,6 @@ class RecursiveMakeBackend(MakeBackend):
            }
            variables = [suffix_map[obj.canonical_suffix]]
            if isinstance(obj, WasmGeneratedSources):
-                variables.append('GARBAGE')
                base = backend_file.objdir
                cls = ObjDirPath
                prefix = '!'
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@ -404,8 +404,6 @@ class TestRecursiveMakeBackend(BackendTester):
            'include $(topsrcdir)/config/AB_rCD.mk',
            'PRE_COMPILE_TARGETS += $(MDDEPDIR)/bar.c.stub',
            'bar.c: $(MDDEPDIR)/bar.c.stub ;',
-            'GARBAGE += bar.c',
-            'GARBAGE += $(MDDEPDIR)/bar.c.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/bar.c.pp',
            '$(MDDEPDIR)/bar.c.stub: %s/generate-bar.py' % env.topsrcdir,
            '$(REPORT_BUILD)',
@ -414,8 +412,6 @@ class TestRecursiveMakeBackend(BackendTester):
            '',
            'EXPORT_TARGETS += $(MDDEPDIR)/foo.h.stub',
            'foo.h: $(MDDEPDIR)/foo.h.stub ;',
-            'GARBAGE += foo.h',
-            'GARBAGE += $(MDDEPDIR)/foo.h.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/foo.h.pp',
            '$(MDDEPDIR)/foo.h.stub: %s/generate-foo.py $(srcdir)/foo-data' % (env.topsrcdir),
            '$(REPORT_BUILD)',
@ -438,8 +434,6 @@ class TestRecursiveMakeBackend(BackendTester):
            'include $(topsrcdir)/config/AB_rCD.mk',
            'PRE_COMPILE_TARGETS += $(MDDEPDIR)/bar.c.stub',
            'bar.c: $(MDDEPDIR)/bar.c.stub ;',
-            'GARBAGE += bar.c',
-            'GARBAGE += $(MDDEPDIR)/bar.c.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/bar.c.pp',
            '$(MDDEPDIR)/bar.c.stub: %s/generate-bar.py FORCE' % env.topsrcdir,
            '$(REPORT_BUILD)',
@ -448,8 +442,6 @@ class TestRecursiveMakeBackend(BackendTester):
            '',
            'PRE_COMPILE_TARGETS += $(MDDEPDIR)/foo.c.stub',
            'foo.c: $(MDDEPDIR)/foo.c.stub ;',
-            'GARBAGE += foo.c',
-            'GARBAGE += $(MDDEPDIR)/foo.c.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/foo.c.pp',
            '$(MDDEPDIR)/foo.c.stub: %s/generate-foo.py $(srcdir)/foo-data' % (env.topsrcdir),
            '$(REPORT_BUILD)',
@ -472,8 +464,6 @@ class TestRecursiveMakeBackend(BackendTester):
            'include $(topsrcdir)/config/AB_rCD.mk',
            'MISC_TARGETS += $(MDDEPDIR)/foo.xyz.stub',
            'foo.xyz: $(MDDEPDIR)/foo.xyz.stub ;',
-            'GARBAGE += foo.xyz',
-            'GARBAGE += $(MDDEPDIR)/foo.xyz.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/foo.xyz.pp',
            '$(MDDEPDIR)/foo.xyz.stub: %s/generate-foo.py $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,  # noqa
            '$(REPORT_BUILD)',
@ -500,8 +490,6 @@ class TestRecursiveMakeBackend(BackendTester):
            'include $(topsrcdir)/config/AB_rCD.mk',
            'MISC_TARGETS += $(MDDEPDIR)/foo.xyz.stub',
            'foo.xyz: $(MDDEPDIR)/foo.xyz.stub ;',
-            'GARBAGE += foo.xyz',
-            'GARBAGE += $(MDDEPDIR)/foo.xyz.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/foo.xyz.pp',
            '$(MDDEPDIR)/foo.xyz.stub: %s/generate-foo.py $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,  # noqa
            '$(REPORT_BUILD)',
@ -510,8 +498,6 @@ class TestRecursiveMakeBackend(BackendTester):
            '',
            'MISC_TARGETS += $(MDDEPDIR)/abc.xyz.stub',
            'abc.xyz: $(MDDEPDIR)/abc.xyz.stub ;',
-            'GARBAGE += abc.xyz',
-            'GARBAGE += $(MDDEPDIR)/abc.xyz.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/abc.xyz.pp',
            '$(MDDEPDIR)/abc.xyz.stub: %s/generate-foo.py $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input FORCE' % env.topsrcdir,  # noqa
            '$(REPORT_BUILD)',
@ -535,8 +521,6 @@ class TestRecursiveMakeBackend(BackendTester):
            'include $(topsrcdir)/config/AB_rCD.mk',
            'MISC_TARGETS += $(MDDEPDIR)/foo$(AB_CD).xyz.stub',
            'foo$(AB_CD).xyz: $(MDDEPDIR)/foo$(AB_CD).xyz.stub ;',
-            'GARBAGE += foo$(AB_CD).xyz',
-            'GARBAGE += $(MDDEPDIR)/foo$(AB_CD).xyz.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/foo$(AB_CD).xyz.pp',
            '$(MDDEPDIR)/foo$(AB_CD).xyz.stub: %s/generate-foo.py $(call MERGE_FILE,localized-input) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,  # noqa
            '$(REPORT_BUILD)',
@ -544,8 +528,6 @@ class TestRecursiveMakeBackend(BackendTester):
            '@$(TOUCH) $@',
            '',
            'bar$(AB_rCD).xyz: $(MDDEPDIR)/bar$(AB_rCD).xyz.stub ;',
-            'GARBAGE += bar$(AB_rCD).xyz',
-            'GARBAGE += $(MDDEPDIR)/bar$(AB_rCD).xyz.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/bar$(AB_rCD).xyz.pp',
            '$(MDDEPDIR)/bar$(AB_rCD).xyz.stub: %s/generate-foo.py $(call MERGE_RELATIVE_FILE,localized-input,inner/locales) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,  # noqa
            '$(REPORT_BUILD)',
@ -553,8 +535,6 @@ class TestRecursiveMakeBackend(BackendTester):
            '@$(TOUCH) $@',
            '',
            'zot$(AB_rCD).xyz: $(MDDEPDIR)/zot$(AB_rCD).xyz.stub ;',
-            'GARBAGE += zot$(AB_rCD).xyz',
-            'GARBAGE += $(MDDEPDIR)/zot$(AB_rCD).xyz.stub',
            'EXTRA_MDDEPEND_FILES += $(MDDEPDIR)/zot$(AB_rCD).xyz.pp',
            '$(MDDEPDIR)/zot$(AB_rCD).xyz.stub: %s/generate-foo.py $(call MERGE_RELATIVE_FILE,localized-input,locales) $(srcdir)/non-localized-input $(if $(IS_LANGUAGE_REPACK),FORCE)' % env.topsrcdir,  # noqa
            '$(REPORT_BUILD)',
--- a/testing/condprofile/Makefile
+++ b/testing/condprofile/Makefile
@ -5,7 +5,7 @@ INSTALL = $(BIN)/pip install --no-deps
 BUILD_DIRS = bin build include lib lib64 man share
 VIRTUALENV = virtualenv

-.PHONY: all test build clean docs
+.PHONY: all test build docs

 all: build

@ -16,9 +16,6 @@ build: $(PYTHON)
 	$(PYTHON) setup.py develop
 	$(BIN)/pip install tox

-clean:
-	rm -rf $(BUILD_DIRS)
-
 test: build
 	$(BIN)/tox

--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@ -78,8 +78,6 @@ jstestbrowser:
 	$(call RUN_REFTEST,'$(DIST)/$(TESTS_PATH)/jstests.list' --extra-profile-file=$(DIST)/test-stage/jsreftest/tests/user.js)
 	$(CHECK_TEST_ERROR)

-GARBAGE += $(addsuffix .log,$(MOCHITESTS) reftest crashtest jstestbrowser)
-
 REMOTE_CPPUNITTESTS = \
 	$(PYTHON3) -u $(topsrcdir)/testing/remotecppunittests.py \
 	  --xre-path=$(DEPTH)/dist/bin \
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@ -308,8 +308,6 @@ ifdef MOZ_FOLD_LIBS
  DEFINES += -DMOZ_FOLD_LIBS=1
 endif

-GARBAGE		+= $(DIST)/$(PACKAGE) $(PACKAGE)
-
 # The following target stages files into two directories: one directory for
 # core files, and one for optional extensions based on the information in
 # the MOZ_PKG_MANIFEST file.
--- a/xpcom/xpidl/Makefile.in
+++ b/xpcom/xpidl/Makefile.in
@ -4,6 +4,3 @@

 export::
 	$(call SUBMAKE,xpidl,$(DEPTH)/config/makefiles/xpidl)
-
-clean clobber realclean clobber_all distclean::
-	$(call SUBMAKE,$@,$(DEPTH)/config/makefiles/xpidl)