Bug 422991 - "'make distclean' misses some files" (cleanup browser/installer) [r=bsmedberg]
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 20 Oct 2008 22:17:16 -0500
changeset 20697 886ef76f9efe02e7eaf4cb9df5e96c8b6fabedd6
parent 20696 4478b68ef1cf20dd9d4966928d921ee84f194219
child 20698 dabc1188242e357529556add135db7c4106ef91a
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs422991
milestone1.9.1b2pre
Bug 422991 - "'make distclean' misses some files" (cleanup browser/installer) [r=bsmedberg]
browser/build.mk
browser/installer/Makefile.in
toolkit/mozapps/installer/packager.mk
--- a/browser/build.mk
+++ b/browser/build.mk
@@ -55,16 +55,22 @@ installer:
 	@$(MAKE) -C browser/installer installer
 
 package:
 	@$(MAKE) -C browser/installer
 
 install::
 	@$(MAKE) -C browser/installer install
 
+clean::
+	@$(MAKE) -C browser/installer clean
+
+distclean::
+	@$(MAKE) -C browser/installer distclean
+
 ifdef ENABLE_TESTS
 # Implemented in testing/testsuite-targets.mk
 
 # Browser tests live in a slightly different location, so we correct the path
 ifdef TEST_PATH
 BROWSER_TEST_PATH = --test-path=../browser/$(TEST_PATH)
 else
 BROWSER_TEST_PATH =
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -83,16 +83,18 @@ MOZ_OPTIONAL_PKG_LIST = \
 
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = packages-static
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
+
+GARBAGE += $(MOZ_PKG_MANIFEST)
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
 MOZ_PKG_MAC_ICON=branding/disk.icns
 MOZ_PKG_MAC_RSRC=branding/license.r
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -266,16 +266,18 @@ endif
 
 DEFINES += -DDLL_PREFIX=$(DLL_PREFIX) -DDLL_SUFFIX=$(DLL_SUFFIX)
 
 ifdef MOZ_PKG_REMOVALS
 MOZ_PKG_REMOVALS_GEN = removed-files
 
 $(MOZ_PKG_REMOVALS_GEN): $(MOZ_PKG_REMOVALS) Makefile Makefile.in
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(MOZ_PKG_REMOVALS) > $(MOZ_PKG_REMOVALS_GEN)
+
+GARBAGE += $(MOZ_PKG_REMOVALS_GEN)
 endif
 
 GARBAGE		+= $(DIST)/$(PACKAGE) $(PACKAGE)
 
 ifeq ($(OS_ARCH),IRIX)
 STRIP_FLAGS	= -f
 endif
 ifeq ($(OS_ARCH),BeOS)