bug 461444 - remove cases of excessive recursion in makefiles - followup to fix some EXTRA_COMPONENTS -> EXTRA_PP_COMPONENTS r=ted.mielczarek
authorMitchell Field <mitch_1_2@live.com.au>
Tue, 26 Jan 2010 05:11:00 -0500
changeset 37505 0b2369a6ae91eb60237663a2aee157469973faa5
parent 37504 72bd18630b750d9d1fc36e5022c9e2d379b92ee7
child 37506 f41cab7bf009d75cd15f378761f70c505239d228
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)
reviewersted.mielczarek
bugs461444
milestone1.9.3a1pre
bug 461444 - remove cases of excessive recursion in makefiles - followup to fix some EXTRA_COMPONENTS -> EXTRA_PP_COMPONENTS r=ted.mielczarek
toolkit/mozapps/downloads/Makefile.in
toolkit/mozapps/downloads/nsHelperAppDlg.js
toolkit/mozapps/downloads/nsHelperAppDlg.js.in
toolkit/mozapps/extensions/Makefile.in
toolkit/mozapps/extensions/nsExtensionManager.js
toolkit/mozapps/extensions/nsExtensionManager.js.in
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -39,24 +39,20 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
 MODULE = helperAppDlg
 
-EXTRA_COMPONENTS = nsHelperAppDlg.js
-GARBAGE += nsHelperAppDlg.js
+EXTRA_PP_COMPONENTS = nsHelperAppDlg.js
 
 EXTRA_JS_MODULES = \
   DownloadLastDir.jsm \
   DownloadUtils.jsm \
   $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk
-
-nsHelperAppDlg.js: nsHelperAppDlg.js.in
-	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $@ 
rename from toolkit/mozapps/downloads/nsHelperAppDlg.js.in
rename to toolkit/mozapps/downloads/nsHelperAppDlg.js
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -43,28 +43,23 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = extensions
 
 XPIDLSRCS = \
   nsIAddonRepository.idl \
   nsIExtensionManager.idl \
   $(NULL)
 
-EXTRA_COMPONENTS = nsExtensionManager.js
-GARBAGE += nsExtensionManager.js
-
 EXTRA_PP_COMPONENTS = \
   nsAddonRepository.js \
   nsBlocklistService.js \
+  nsExtensionManager.js \
   $(NULL)
 
 EXTRA_JS_MODULES = \
   LightweightThemeManager.jsm \
   $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 include $(topsrcdir)/config/rules.mk
-
-nsExtensionManager.js: nsExtensionManager.js.in
-	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $@ 
rename from toolkit/mozapps/extensions/nsExtensionManager.js.in
rename to toolkit/mozapps/extensions/nsExtensionManager.js