Bug 461444: remove cases of excessive recursion in makefiles r=ted

--HG--
rename : toolkit/mozapps/downloads/src/DownloadLastDir.jsm => toolkit/mozapps/downloads/DownloadLastDir.jsm
rename : toolkit/mozapps/downloads/src/DownloadUtils.jsm => toolkit/mozapps/downloads/DownloadUtils.jsm
rename : toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in => toolkit/mozapps/downloads/nsHelperAppDlg.js
rename : toolkit/mozapps/extensions/src/LightweightThemeManager.jsm => toolkit/mozapps/extensions/LightweightThemeManager.jsm
rename : toolkit/mozapps/extensions/src/nsAddonRepository.js => toolkit/mozapps/extensions/nsAddonRepository.js
rename : toolkit/mozapps/extensions/src/nsBlocklistService.js => toolkit/mozapps/extensions/nsBlocklistService.js
rename : toolkit/mozapps/extensions/src/nsExtensionManager.js.in => toolkit/mozapps/extensions/nsExtensionManager.js
rename : toolkit/mozapps/extensions/public/nsIAddonRepository.idl => toolkit/mozapps/extensions/nsIAddonRepository.idl
rename : toolkit/mozapps/extensions/public/nsIExtensionManager.idl => toolkit/mozapps/extensions/nsIExtensionManager.idl
rename : toolkit/mozapps/handling/src/nsContentDispatchChooser.js => toolkit/mozapps/handling/nsContentDispatchChooser.js
rename : toolkit/mozapps/shared/src/CertUtils.jsm => toolkit/mozapps/shared/CertUtils.jsm
rename : toolkit/mozapps/shared/src/FileUtils.jsm => toolkit/mozapps/shared/FileUtils.jsm
This commit is contained in:
Mitchell Field 2010-01-27 11:16:53 -08:00
parent 2a06d29f87
commit 09e94f0ad4
22 changed files with 46 additions and 301 deletions

View File

@ -35,18 +35,24 @@
#
# ***** 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

View File

@ -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) $^ > $@

View File

@ -34,14 +34,29 @@
#
# ***** 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

View File

@ -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

View File

@ -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) $^ > $@

View File

@ -35,14 +35,15 @@
#
# ***** 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

View File

@ -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

View File

@ -35,13 +35,18 @@
#
# ***** 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

View File

@ -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

View File

@ -750,12 +750,8 @@ MAKEFILES_xulapp="
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