Bug 461444: remove cases of excessive recursion in makefiles r=ted
authorMitchell Field <mitch_1_2@live.com.au>
Wed, 27 Jan 2010 11:16:53 -0800
changeset 37563 3d6a406c0067d9bbeec975e0d3a84d1e6662369a
parent 37487 b020c6b1588daeda71e3d3cfc30ff09dbc885bad
child 37565 86498b1cb1c0e082fba5c944ba48974d4e143b35
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
bugs461444
milestone1.9.3a1pre
Bug 461444: remove cases of excessive recursion in makefiles r=ted
toolkit/mozapps/downloads/DownloadLastDir.jsm
toolkit/mozapps/downloads/DownloadUtils.jsm
toolkit/mozapps/downloads/Makefile.in
toolkit/mozapps/downloads/nsHelperAppDlg.js
toolkit/mozapps/downloads/src/DownloadLastDir.jsm
toolkit/mozapps/downloads/src/DownloadUtils.jsm
toolkit/mozapps/downloads/src/Makefile.in
toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in
toolkit/mozapps/extensions/LightweightThemeManager.jsm
toolkit/mozapps/extensions/Makefile.in
toolkit/mozapps/extensions/nsAddonRepository.js
toolkit/mozapps/extensions/nsBlocklistService.js
toolkit/mozapps/extensions/nsExtensionManager.js
toolkit/mozapps/extensions/nsIAddonRepository.idl
toolkit/mozapps/extensions/nsIExtensionManager.idl
toolkit/mozapps/extensions/public/Makefile.in
toolkit/mozapps/extensions/public/nsIAddonRepository.idl
toolkit/mozapps/extensions/public/nsIExtensionManager.idl
toolkit/mozapps/extensions/src/LightweightThemeManager.jsm
toolkit/mozapps/extensions/src/Makefile.in
toolkit/mozapps/extensions/src/nsAddonRepository.js
toolkit/mozapps/extensions/src/nsBlocklistService.js
toolkit/mozapps/extensions/src/nsExtensionManager.js.in
toolkit/mozapps/handling/Makefile.in
toolkit/mozapps/handling/nsContentDispatchChooser.js
toolkit/mozapps/handling/src/Makefile.in
toolkit/mozapps/handling/src/nsContentDispatchChooser.js
toolkit/mozapps/shared/CertUtils.jsm
toolkit/mozapps/shared/FileUtils.jsm
toolkit/mozapps/shared/Makefile.in
toolkit/mozapps/shared/src/CertUtils.jsm
toolkit/mozapps/shared/src/FileUtils.jsm
toolkit/mozapps/shared/src/Makefile.in
toolkit/toolkit-makefiles.sh
rename from toolkit/mozapps/downloads/src/DownloadLastDir.jsm
rename to toolkit/mozapps/downloads/DownloadLastDir.jsm
rename from toolkit/mozapps/downloads/src/DownloadUtils.jsm
rename to toolkit/mozapps/downloads/DownloadUtils.jsm
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -30,23 +30,29 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH   = ../../..
+DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
-VPATH   = @srcdir@
+VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-DIRS = src
+MODULE = helperAppDlg
+
+EXTRA_PP_COMPONENTS = nsHelperAppDlg.js
+
+EXTRA_JS_MODULES = \
+  DownloadLastDir.jsm \
+  DownloadUtils.jsm \
+  $(NULL)
+
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk
-
-
rename from toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in
rename to toolkit/mozapps/downloads/nsHelperAppDlg.js
deleted file mode 100644
--- a/toolkit/mozapps/downloads/src/Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH   = ../../../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = helperAppDlg
-
-EXTRA_COMPONENTS = nsHelperAppDlg.js
-GARBAGE += nsHelperAppDlg.js
-
-EXTRA_JS_MODULES = \
-  DownloadUtils.jsm \
-  DownloadLastDir.jsm \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-nsHelperAppDlg.js: nsHelperAppDlg.js.in
-	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $@ 
-
rename from toolkit/mozapps/extensions/src/LightweightThemeManager.jsm
rename to toolkit/mozapps/extensions/LightweightThemeManager.jsm
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -29,22 +29,37 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public src
+MODULE = extensions
+
+XPIDLSRCS = \
+  nsIAddonRepository.idl \
+  nsIExtensionManager.idl \
+  $(NULL)
+
+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
rename from toolkit/mozapps/extensions/src/nsAddonRepository.js
rename to toolkit/mozapps/extensions/nsAddonRepository.js
rename from toolkit/mozapps/extensions/src/nsBlocklistService.js
rename to toolkit/mozapps/extensions/nsBlocklistService.js
rename from toolkit/mozapps/extensions/src/nsExtensionManager.js.in
rename to toolkit/mozapps/extensions/nsExtensionManager.js
rename from toolkit/mozapps/extensions/public/nsIAddonRepository.idl
rename to toolkit/mozapps/extensions/nsIAddonRepository.idl
rename from toolkit/mozapps/extensions/public/nsIExtensionManager.idl
rename to toolkit/mozapps/extensions/nsIExtensionManager.idl
deleted file mode 100644
--- a/toolkit/mozapps/extensions/public/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Extension Manager.
-#
-# The Initial Developer of the Original Code is Ben Goodger.
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Ben Goodger <ben@mozilla.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH   = ../../../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE        = extensions
-XPIDL_MODULE  = extensions
-
-XPIDLSRCS = \
-  nsIExtensionManager.idl \
-  nsIAddonRepository.idl \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/toolkit/mozapps/extensions/src/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH   = ../../../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = extensions
-
-EXTRA_COMPONENTS = nsExtensionManager.js
-EXTRA_PP_COMPONENTS = \
-  nsBlocklistService.js \
-  nsAddonRepository.js \
-  $(NULL)
-
-EXTRA_JS_MODULES = \
-  LightweightThemeManager.jsm \
-  $(NULL)
-
-GARBAGE += nsExtensionManager.js
-
-include $(topsrcdir)/config/rules.mk
-
-nsExtensionManager.js: nsExtensionManager.js.in
-	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $@ 
-
--- a/toolkit/mozapps/handling/Makefile.in
+++ b/toolkit/mozapps/handling/Makefile.in
@@ -30,19 +30,20 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH   = ../../..
+DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
-VPATH   = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = src
+MODULE = contentDispatchChooser
+
+EXTRA_COMPONENTS = nsContentDispatchChooser.js
 
 include $(topsrcdir)/config/rules.mk
-
rename from toolkit/mozapps/handling/src/nsContentDispatchChooser.js
rename to toolkit/mozapps/handling/nsContentDispatchChooser.js
deleted file mode 100644
--- a/toolkit/mozapps/handling/src/Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is protocol handling code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Shawn Wilsher <me@shawnwilsher.com> (Original Author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH   = ../../../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = contentDispatchChooser
-
-EXTRA_COMPONENTS = nsContentDispatchChooser.js
-
-include $(topsrcdir)/config/rules.mk
-
rename from toolkit/mozapps/shared/src/CertUtils.jsm
rename to toolkit/mozapps/shared/CertUtils.jsm
rename from toolkit/mozapps/shared/src/FileUtils.jsm
rename to toolkit/mozapps/shared/FileUtils.jsm
--- a/toolkit/mozapps/shared/Makefile.in
+++ b/toolkit/mozapps/shared/Makefile.in
@@ -30,18 +30,23 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = src
+MODULE = toolkitShared
+
+EXTRA_PP_JS_MODULES = \
+  CertUtils.jsm \
+  FileUtils.jsm \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/mozapps/shared/src/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Toolkit Shared code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Robert Strong <robert.bugzilla@gmail.com> (Original Author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH   = ../../../..
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = toolkitShared
-
-EXTRA_PP_JS_MODULES = \
-  CertUtils.jsm \
-  FileUtils.jsm \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -745,22 +745,18 @@ MAKEFILES_xulapp="
   toolkit/components/urlformatter/Makefile
   toolkit/components/urlformatter/public/Makefile
   toolkit/components/urlformatter/src/Makefile
   toolkit/components/viewconfig/Makefile
   toolkit/components/viewsource/Makefile
   toolkit/locales/Makefile
   toolkit/mozapps/Makefile
   toolkit/mozapps/downloads/Makefile
-  toolkit/mozapps/downloads/src/Makefile
   toolkit/mozapps/extensions/Makefile
-  toolkit/mozapps/extensions/public/Makefile
-  toolkit/mozapps/extensions/src/Makefile
   toolkit/mozapps/handling/Makefile
-  toolkit/mozapps/handling/src/Makefile
   toolkit/mozapps/plugins/Makefile
   toolkit/mozapps/update/Makefile
   toolkit/mozapps/update/public/Makefile
   toolkit/mozapps/update/src/Makefile
   toolkit/mozapps/update/src/updater/Makefile
   toolkit/mozapps/xpinstall/Makefile
   toolkit/profile/Makefile
   toolkit/profile/public/Makefile