From 40f3302d45fd404cf3f734a9411854ab66549142 Mon Sep 17 00:00:00 2001
From: Philipp Kewisch <philipp@bugzilla.kewis.ch>
Date: Mon, 9 Aug 2010 18:12:17 +0100
Subject: [PATCH] Bug 582695 - Port build changes from bug 579178 (Don't
 enumerate components/*.manifest and chrome/*.manifest);
 r=Standard8,a=Standard8 bustage fix check-in for CLOSED TREE

---
 config/rules.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/config/rules.mk b/config/rules.mk
index 26d3b5aa53..857401adc0 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -874,6 +874,7 @@ ifdef IS_COMPONENT
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
 	$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
 ifndef NO_COMPONENTS_MANIFEST
+	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/components.manifest"
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)"
 endif
 ifdef BEOS_ADDON_WORKAROUND
@@ -1655,6 +1656,7 @@ ifndef NO_DIST_INSTALL
 	$(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(FINAL_TARGET)/components
 ifndef NO_INTERFACES_MANIFEST
 	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/interfaces.manifest "interfaces $(XPIDL_MODULE).xpt"
+	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/interfaces.manifest"
 endif
 endif
 
@@ -1730,7 +1732,12 @@ ifndef NO_DIST_INSTALL
 	  $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \
 	done
 endif
+endif
 
+EXTRA_MANIFESTS = $(filter %.manifest,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS))
+ifneq (,$(EXTRA_MANIFESTS))
+libs::
+	$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest $(patsubst %,"manifest components/%",$(notdir $(EXTRA_MANIFESTS)))
 endif
 
 ################################################################################
@@ -2173,6 +2180,8 @@ FREEZE_VARIABLES = \
   REQUIRES \
   SHORT_LIBNAME \
   TIERS \
+  EXTRA_COMPONENTS \
+  EXTRA_PP_COMPONENTS \
   $(NULL)
 
 $(foreach var,$(FREEZE_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))