Bug 939044 - Rename remaining MODULE definitions to XPIDL_MODULE. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 19 Nov 2013 11:47:43 +0900
changeset 156202 9266f5d70bb9904b3acbdc95dafe96702159544a
parent 156201 05e66d941de21f4edbb22801c740878474d23b72
child 156203 c029f20f7f9401af8dffdc31e6ab1dbb43bb38f6
push id25670
push usermh@glandium.org
push dateTue, 19 Nov 2013 02:51:47 +0000
treeherdermozilla-central@e4b59fdbc9c2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs939044
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 939044 - Rename remaining MODULE definitions to XPIDL_MODULE. r=mshal
accessible/public/moz.build
browser/components/feeds/public/moz.build
browser/components/migration/public/moz.build
browser/components/sessionstore/moz.build
browser/components/shell/public/moz.build
browser/fuel/public/moz.build
browser/metro/components/moz.build
caps/idl/moz.build
chrome/public/moz.build
content/xul/content/public/moz.build
content/xul/document/public/moz.build
content/xul/templates/public/moz.build
docshell/base/moz.build
docshell/shistory/public/moz.build
dom/base/moz.build
dom/media/bridge/moz.build
dom/plugins/base/moz.build
editor/composer/public/moz.build
editor/idl/moz.build
editor/txmgr/idl/moz.build
editor/txtsvc/public/moz.build
embedding/base/moz.build
embedding/components/commandhandler/public/moz.build
embedding/components/find/public/moz.build
embedding/components/webbrowserpersist/public/moz.build
embedding/components/windowwatcher/public/moz.build
extensions/cookie/moz.build
extensions/pref/autoconfig/public/moz.build
extensions/spellcheck/idl/moz.build
gfx/src/moz.build
hal/moz.build
image/decoders/icon/moz.build
image/decoders/icon/qt/public/moz.build
image/public/moz.build
intl/locale/idl/moz.build
intl/lwbrk/idl/moz.build
intl/strres/public/moz.build
intl/uconv/idl/moz.build
intl/unicharutil/idl/moz.build
js/ductwork/debugger/moz.build
js/xpconnect/idl/moz.build
js/xpconnect/tests/idl/moz.build
layout/inspector/public/moz.build
layout/tools/layout-debug/src/moz.build
mobile/android/components/build/moz.build
mobile/android/components/moz.build
modules/libjar/moz.build
modules/libjar/zipwriter/public/moz.build
modules/libpref/public/moz.build
netwerk/base/public/moz.build
netwerk/mime/moz.build
netwerk/test/httpserver/moz.build
parser/html/moz.build
parser/htmlparser/public/moz.build
profile/public/moz.build
rdf/base/idl/moz.build
security/manager/boot/public/moz.build
security/manager/pki/public/moz.build
security/manager/ssl/public/moz.build
startupcache/moz.build
storage/public/moz.build
toolkit/components/alerts/moz.build
toolkit/components/autocomplete/moz.build
toolkit/components/captivedetect/moz.build
toolkit/components/diskspacewatcher/moz.build
toolkit/components/downloads/moz.build
toolkit/components/exthelper/moz.build
toolkit/components/feeds/moz.build
toolkit/components/filepicker/moz.build
toolkit/components/find/moz.build
toolkit/components/jsdownloads/public/moz.build
toolkit/components/parentalcontrols/moz.build
toolkit/components/passwordmgr/moz.build
toolkit/components/places/moz.build
toolkit/components/satchel/moz.build
toolkit/components/telemetry/moz.build
toolkit/components/typeaheadfind/moz.build
toolkit/components/url-classifier/moz.build
toolkit/components/urlformatter/moz.build
toolkit/devtools/server/moz.build
toolkit/identity/moz.build
toolkit/mozapps/extensions/moz.build
toolkit/mozapps/update/moz.build
toolkit/xre/moz.build
tools/profiler/moz.build
uriloader/base/moz.build
uriloader/exthandler/moz.build
uriloader/prefetch/moz.build
widget/moz.build
xpcom/sample/moz.build
xpfe/appshell/public/moz.build
xulrunner/examples/simple/components/public/moz.build
--- a/accessible/public/moz.build
+++ b/accessible/public/moz.build
@@ -30,14 +30,14 @@ XPIDL_SOURCES += [
     'nsIAccessibleText.idl',
     'nsIAccessibleTextChangeEvent.idl',
     'nsIAccessibleTypes.idl',
     'nsIAccessibleValue.idl',
     'nsIAccessibleVirtualCursorChangeEvent.idl',
     'nsIXBLAccessible.idl',
 ]
 
-MODULE = 'accessibility'
+XPIDL_MODULE = 'accessibility'
 
 EXPORTS += [
     'nsIAccessibilityService.h',
 ]
 
--- a/browser/components/feeds/public/moz.build
+++ b/browser/components/feeds/public/moz.build
@@ -5,10 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIFeedResultService.idl',
     'nsIFeedWriter.idl',
     'nsIWebContentConverterRegistrar.idl',
 ]
 
-MODULE = 'browser-feeds'
+XPIDL_MODULE = 'browser-feeds'
 
--- a/browser/components/migration/public/moz.build
+++ b/browser/components/migration/public/moz.build
@@ -3,10 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIBrowserProfileMigrator.idl',
 ]
 
-MODULE = 'migration'
+XPIDL_MODULE = 'migration'
 
--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@@ -6,17 +6,17 @@
 
 DIRS += ['src']
 
 XPIDL_SOURCES += [
     'nsISessionStartup.idl',
     'nsISessionStore.idl',
 ]
 
-MODULE = 'sessionstore'
+XPIDL_MODULE = 'sessionstore'
 
 XPCSHELL_TESTS_MANIFESTS += [
     'test/unit/xpcshell.ini',
 ]
 
 BROWSER_CHROME_MANIFESTS += [
     'test/browser.ini',
 ]
--- a/browser/components/shell/public/moz.build
+++ b/browser/components/shell/public/moz.build
@@ -12,10 +12,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     XPIDL_SOURCES += [
         'nsIWindowsShellService.idl',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     XPIDL_SOURCES += [
         'nsIMacShellService.idl',
     ]
 
-MODULE = 'shellservice'
+XPIDL_MODULE = 'shellservice'
 
--- a/browser/fuel/public/moz.build
+++ b/browser/fuel/public/moz.build
@@ -3,10 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'fuelIApplication.idl',
 ]
 
-MODULE = 'fuel'
+XPIDL_MODULE = 'fuel'
 
--- a/browser/metro/components/moz.build
+++ b/browser/metro/components/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'SessionStore.idl',
 ]
 
-MODULE = 'components'
+XPIDL_MODULE = 'components'
 
 # metro/components.manifest
 EXTRA_COMPONENTS += [
     'AlertsService.js',
     'BrowserStartup.js',
     'ContentDispatchChooser.js',
     'ContentPermissionPrompt.js',
     'DirectoryProvider.js',
--- a/caps/idl/moz.build
+++ b/caps/idl/moz.build
@@ -6,10 +6,10 @@
 
 XPIDL_SOURCES += [
     'nsIDomainPolicy.idl',
     'nsIPrincipal.idl',
     'nsIScriptSecurityManager.idl',
     'nsISecurityCheckedComponent.idl',
 ]
 
-MODULE = 'caps'
+XPIDL_MODULE = 'caps'
 
--- a/chrome/public/moz.build
+++ b/chrome/public/moz.build
@@ -4,10 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIChromeRegistry.idl',
     'nsIToolkitChromeRegistry.idl',
 ]
 
-MODULE = 'chrome'
+XPIDL_MODULE = 'chrome'
 
--- a/content/xul/content/public/moz.build
+++ b/content/xul/content/public/moz.build
@@ -4,10 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_XUL']:
     XPIDL_SOURCES += [
         'nsIXULContextMenuBuilder.idl',
     ]
 
-MODULE = 'xul'
+XPIDL_MODULE = 'xul'
 
--- a/content/xul/document/public/moz.build
+++ b/content/xul/document/public/moz.build
@@ -12,10 +12,10 @@ XPIDL_SOURCES += [
 if CONFIG['MOZ_XUL']:
     XPIDL_SOURCES += [
         'nsIXULOverlayProvider.idl',
     ]
     EXPORTS += [
         'nsIXULDocument.h',
     ]
 
-MODULE = 'xuldoc'
+XPIDL_MODULE = 'xuldoc'
 
--- a/content/xul/templates/public/moz.build
+++ b/content/xul/templates/public/moz.build
@@ -8,10 +8,10 @@ XPIDL_SOURCES += [
     'nsIXULBuilderListener.idl',
     'nsIXULSortService.idl',
     'nsIXULTemplateBuilder.idl',
     'nsIXULTemplateQueryProcessor.idl',
     'nsIXULTemplateResult.idl',
     'nsIXULTemplateRuleFilter.idl',
 ]
 
-MODULE = 'xultmpl'
+XPIDL_MODULE = 'xultmpl'
 
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -28,17 +28,17 @@ XPIDL_SOURCES += [
     'nsIScrollable.idl',
     'nsITextScroll.idl',
     'nsIURIFixup.idl',
     'nsIWebNavigation.idl',
     'nsIWebNavigationInfo.idl',
     'nsIWebPageDescriptor.idl',
 ]
 
-MODULE = 'docshell'
+XPIDL_MODULE = 'docshell'
 
 EXPORTS += [
     'nsDocShellLoadTypes.h',
     'nsILinkHandler.h',
     'nsIWebShellServices.h',
     'SerializedLoadContext.h',
 ]
 
--- a/docshell/shistory/public/moz.build
+++ b/docshell/shistory/public/moz.build
@@ -9,10 +9,10 @@ XPIDL_SOURCES += [
     'nsISHContainer.idl',
     'nsISHEntry.idl',
     'nsISHistory.idl',
     'nsISHistoryInternal.idl',
     'nsISHistoryListener.idl',
     'nsISHTransaction.idl',
 ]
 
-MODULE = 'shistory'
+XPIDL_MODULE = 'shistory'
 
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -9,17 +9,17 @@ TEST_DIRS += ['test']
 XPIDL_SOURCES += [
     'nsIDOMDOMCursor.idl',
     'nsIDOMDOMRequest.idl',
     'nsIEntropyCollector.idl',
     'nsIScriptChannel.idl',
     'nsISiteSpecificUserAgent.idl',
 ]
 
-MODULE = 'dom'
+XPIDL_MODULE = 'dom'
 
 EXPORTS += [
     'Crypto.h',
     'nsContentPermissionHelper.h',
     'nsDOMCID.h',
     'nsDOMClassInfoClasses.h',
     'nsDOMClassInfoID.h',
     'nsDOMJSUtils.h',
--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'IPeerConnection.idl',
 ]
 
-MODULE = 'peerconnection'
+XPIDL_MODULE = 'peerconnection'
 
 SOURCES += [
     'MediaModule.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/ipc/chromium/src',
     '/media/mtransport',
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -13,17 +13,17 @@ XPIDL_SOURCES += [
     'nsIPluginHost.idl',
     'nsIPluginInputStream.idl',
     'nsIPluginInstanceOwner.idl',
     'nsIPluginTag.idl',
     'nsIPluginTagInfo.idl',
     'nspluginroot.idl',
 ]
 
-MODULE = 'plugin'
+XPIDL_MODULE = 'plugin'
 
 EXPORTS += [
     'npapi.h',
     'npfunctions.h',
     'npruntime.h',
     'nptypes.h',
     'nsJSNPRuntime.h',
     'nsNPAPIPluginInstance.h',
--- a/editor/composer/public/moz.build
+++ b/editor/composer/public/moz.build
@@ -3,10 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIEditingSession.idl',
 ]
 
-MODULE = 'composer'
+XPIDL_MODULE = 'composer'
 
--- a/editor/idl/moz.build
+++ b/editor/idl/moz.build
@@ -20,10 +20,10 @@ XPIDL_SOURCES += [
     'nsIHTMLObjectResizeListener.idl',
     'nsIHTMLObjectResizer.idl',
     'nsIPlaintextEditor.idl',
     'nsITableEditor.idl',
     'nsIURIRefObject.idl',
     'nsPIEditorTransaction.idl',
 ]
 
-MODULE = 'editor'
+XPIDL_MODULE = 'editor'
 
--- a/editor/txmgr/idl/moz.build
+++ b/editor/txmgr/idl/moz.build
@@ -6,10 +6,10 @@
 
 XPIDL_SOURCES += [
     'nsITransaction.idl',
     'nsITransactionList.idl',
     'nsITransactionListener.idl',
     'nsITransactionManager.idl',
 ]
 
-MODULE = 'txmgr'
+XPIDL_MODULE = 'txmgr'
 
--- a/editor/txtsvc/public/moz.build
+++ b/editor/txtsvc/public/moz.build
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIInlineSpellChecker.idl',
     'nsITextServicesFilter.idl',
 ]
 
-MODULE = 'txtsvc'
+XPIDL_MODULE = 'txtsvc'
 
 EXPORTS += [
     'nsISpellChecker.h',
     'nsITextService.h',
     'nsITextServicesDocument.h',
     'nsTextServicesCID.h',
 ]
 
--- a/embedding/base/moz.build
+++ b/embedding/base/moz.build
@@ -6,13 +6,13 @@
 
 XPIDL_SOURCES += [
     'nsIDialogCreator.idl',
     'nsIWindowCreator.idl',
     'nsIWindowCreator2.idl',
     'nsIWindowProvider.idl',
 ]
 
-MODULE = 'embed_base'
+XPIDL_MODULE = 'embed_base'
 
 EXPORTS += [
     'nsEmbedCID.h',
 ]
--- a/embedding/components/commandhandler/public/moz.build
+++ b/embedding/components/commandhandler/public/moz.build
@@ -8,10 +8,10 @@ XPIDL_SOURCES += [
     'nsICommandManager.idl',
     'nsICommandParams.idl',
     'nsIControllerCommand.idl',
     'nsIControllerCommandTable.idl',
     'nsIControllerContext.idl',
     'nsPICommandUpdater.idl',
 ]
 
-MODULE = 'commandhandler'
+XPIDL_MODULE = 'commandhandler'
 
--- a/embedding/components/find/public/moz.build
+++ b/embedding/components/find/public/moz.build
@@ -4,10 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIFind.idl',
     'nsIWebBrowserFind.idl',
 ]
 
-MODULE = 'find'
+XPIDL_MODULE = 'find'
 
--- a/embedding/components/webbrowserpersist/public/moz.build
+++ b/embedding/components/webbrowserpersist/public/moz.build
@@ -4,10 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsCWebBrowserPersist.idl',
     'nsIWebBrowserPersist.idl',
 ]
 
-MODULE = 'webbrowserpersist'
+XPIDL_MODULE = 'webbrowserpersist'
 
--- a/embedding/components/windowwatcher/public/moz.build
+++ b/embedding/components/windowwatcher/public/moz.build
@@ -9,14 +9,14 @@ XPIDL_SOURCES += [
     'nsIPromptFactory.idl',
     'nsIPromptService.idl',
     'nsIPromptService2.idl',
     'nsIWindowWatcher.idl',
     'nsPIPromptService.idl',
     'nsPIWindowWatcher.idl',
 ]
 
-MODULE = 'windowwatcher'
+XPIDL_MODULE = 'windowwatcher'
 
 EXPORTS += [
     'nsPromptUtils.h',
 ]
 
--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@@ -6,17 +6,17 @@
 
 TEST_TOOL_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsICookieAcceptDialog.idl',
     'nsICookiePromptService.idl',
 ]
 
-MODULE = 'cookie'
+XPIDL_MODULE = 'cookie'
 
 SOURCES += [
     'nsCookieModule.cpp',
     'nsCookiePermission.cpp',
     'nsCookiePromptService.cpp',
     'nsPermission.cpp',
     'nsPermissionManager.cpp',
     'nsPopupWindowManager.cpp',
--- a/extensions/pref/autoconfig/public/moz.build
+++ b/extensions/pref/autoconfig/public/moz.build
@@ -4,10 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIAutoConfig.idl',
     'nsIReadConfig.idl',
 ]
 
-MODULE = 'autoconfig'
+XPIDL_MODULE = 'autoconfig'
 
--- a/extensions/spellcheck/idl/moz.build
+++ b/extensions/spellcheck/idl/moz.build
@@ -6,10 +6,10 @@
 
 XPIDL_SOURCES += [
     'mozIPersonalDictionary.idl',
     'mozISpellCheckingEngine.idl',
     'mozISpellI18NManager.idl',
     'mozISpellI18NUtil.idl',
 ]
 
-MODULE = 'spellchecker'
+XPIDL_MODULE = 'spellchecker'
 
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIFontEnumerator.idl',
     'nsIScriptableRegion.idl',
 ]
 
-MODULE = 'gfx'
+XPIDL_MODULE = 'gfx'
 
 EXPORTS += [
     'gfxCore.h',
     'gfxCrashReporterUtils.h',
     'nsBoundingMetrics.h',
     'nsColor.h',
     'nsColorNameList.h',
     'nsColorNames.h',
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'gonk/nsIRecoveryService.idl',
 ]
 
-MODULE = 'hal'
+XPIDL_MODULE = 'hal'
 
 EXPORTS.mozilla += [
     'Hal.h',
     'HalImpl.h',
     'HalSandbox.h',
     'HalScreenConfiguration.h',
     'HalSensor.h',
     'HalTypes.h',
--- a/image/decoders/icon/moz.build
+++ b/image/decoders/icon/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIIconURI.idl',
 ]
 
-MODULE = 'imgicon'
+XPIDL_MODULE = 'imgicon'
 
 SOURCES += [
     'nsIconModule.cpp',
     'nsIconProtocolHandler.cpp',
     'nsIconURI.cpp',
 ]
 
 LIBRARY_NAME = 'imgicon'
--- a/image/decoders/icon/qt/public/moz.build
+++ b/image/decoders/icon/qt/public/moz.build
@@ -3,10 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsGtkQtIconsConverter.idl',
 ]
 
-MODULE = 'gtkqticonsconverter'
+XPIDL_MODULE = 'gtkqticonsconverter'
 
--- a/image/public/moz.build
+++ b/image/public/moz.build
@@ -12,14 +12,14 @@ XPIDL_SOURCES += [
     'imgILoader.idl',
     'imgINotificationObserver.idl',
     'imgIOnloadBlocker.idl',
     'imgIRequest.idl',
     'imgIScriptedNotificationObserver.idl',
     'imgITools.idl',
 ]
 
-MODULE = 'imglib2'
+XPIDL_MODULE = 'imglib2'
 
 EXPORTS += [
     'ImageLogging.h',
 ]
 
--- a/intl/locale/idl/moz.build
+++ b/intl/locale/idl/moz.build
@@ -6,10 +6,10 @@
 
 XPIDL_SOURCES += [
     'nsICollation.idl',
     'nsILocale.idl',
     'nsILocaleService.idl',
     'nsIScriptableDateFormat.idl',
 ]
 
-MODULE = 'locale'
+XPIDL_MODULE = 'locale'
 
--- a/intl/lwbrk/idl/moz.build
+++ b/intl/lwbrk/idl/moz.build
@@ -3,10 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsISemanticUnitScanner.idl',
 ]
 
-MODULE = 'lwbrk'
+XPIDL_MODULE = 'lwbrk'
 
--- a/intl/strres/public/moz.build
+++ b/intl/strres/public/moz.build
@@ -4,10 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIStringBundle.idl',
     'nsIStringBundleOverride.idl',
 ]
 
-MODULE = 'intl'
+XPIDL_MODULE = 'intl'
 
--- a/intl/uconv/idl/moz.build
+++ b/intl/uconv/idl/moz.build
@@ -7,10 +7,10 @@
 XPIDL_SOURCES += [
     'nsICharsetConverterManager.idl',
     'nsICurrentCharsetListener.idl',
     'nsIScriptableUConv.idl',
     'nsITextToSubURI.idl',
     'nsIUTF8ConverterService.idl',
 ]
 
-MODULE = 'uconv'
+XPIDL_MODULE = 'uconv'
 
--- a/intl/unicharutil/idl/moz.build
+++ b/intl/unicharutil/idl/moz.build
@@ -5,10 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIEntityConverter.idl',
     'nsISaveAsCharset.idl',
     'nsIUnicodeNormalizer.idl',
 ]
 
-MODULE = 'unicharutil'
+XPIDL_MODULE = 'unicharutil'
 
--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'IJSDebugger.idl',
 ]
 
-MODULE = 'jsdebugger'
+XPIDL_MODULE = 'jsdebugger'
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
 SOURCES += [
     'JSDebugger.cpp',
 ]
 
 LIBRARY_NAME = 'jsdebugger'
--- a/js/xpconnect/idl/moz.build
+++ b/js/xpconnect/idl/moz.build
@@ -15,10 +15,10 @@ XPIDL_SOURCES += [
     'xpccomponents.idl',
     'xpcexception.idl',
     'xpcIJSGetFactory.idl',
     'xpcIJSModuleLoader.idl',
     'xpcIJSWeakReference.idl',
     'xpcjsid.idl',
 ]
 
-MODULE = 'xpconnect'
+XPIDL_MODULE = 'xpconnect'
 
--- a/js/xpconnect/tests/idl/moz.build
+++ b/js/xpconnect/tests/idl/moz.build
@@ -6,10 +6,10 @@
 
 XPIDL_SOURCES += [
     'xpctest_attributes.idl',
     'xpctest_bug809674.idl',
     'xpctest_interfaces.idl',
     'xpctest_params.idl',
 ]
 
-MODULE = 'xpctest'
+XPIDL_MODULE = 'xpctest'
 
--- a/layout/inspector/public/moz.build
+++ b/layout/inspector/public/moz.build
@@ -11,10 +11,10 @@ XPIDL_SOURCES += [
     'inIDOMView.idl',
     'inIFlasher.idl',
     'inISearchObserver.idl',
     'inISearchProcess.idl',
     'nsIDOMFontFace.idl',
     'nsIDOMFontFaceList.idl',
 ]
 
-MODULE = 'inspector'
+XPIDL_MODULE = 'inspector'
 
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsILayoutDebuggingTools.idl',
     'nsILayoutRegressionTester.idl',
 ]
 
-MODULE = 'layout_debug'
+XPIDL_MODULE = 'layout_debug'
 
 EXPORTS += [
     'nsLayoutDebugCIID.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsDebugFactory.cpp',
     'nsLayoutDebugCLH.cpp',
--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIShellService.idl',
 ]
 
-MODULE = 'browsercomps'
+XPIDL_MODULE = 'browsercomps'
 
 EXPORTS += [
     'nsBrowserComponents.h',
 ]
 
 SOURCES += [
     'nsBrowserModule.cpp',
     'nsShellService.cpp',
--- a/mobile/android/components/moz.build
+++ b/mobile/android/components/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'SessionStore.idl',
 ]
 
-MODULE = 'MobileComponents'
+XPIDL_MODULE = 'MobileComponents'
 
 EXTRA_COMPONENTS += [
     'AddonUpdateService.js',
     'BlocklistPrompt.js',
     'ContentDispatchChooser.js',
     'ContentPermissionPrompt.js',
     'DownloadManagerUI.js',
     'FilePicker.js',
--- a/modules/libjar/moz.build
+++ b/modules/libjar/moz.build
@@ -11,17 +11,17 @@ TEST_TOOL_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsIJARChannel.idl',
     'nsIJARProtocolHandler.idl',
     'nsIJARURI.idl',
     'nsIZipReader.idl',
 ]
 
-MODULE = 'jar'
+XPIDL_MODULE = 'jar'
 LIBRARY_NAME	= 'jar'
 
 EXPORTS += [
     'nsJARURI.h',
     'nsZipArchive.h',
     'zipstruct.h',
 ]
 
--- a/modules/libjar/zipwriter/public/moz.build
+++ b/modules/libjar/zipwriter/public/moz.build
@@ -3,10 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIZipWriter.idl',
 ]
 
-MODULE = 'zipwriter'
+XPIDL_MODULE = 'zipwriter'
 
--- a/modules/libpref/public/moz.build
+++ b/modules/libpref/public/moz.build
@@ -8,14 +8,14 @@ XPIDL_SOURCES += [
     'nsIPrefBranch.idl',
     'nsIPrefBranch2.idl',
     'nsIPrefBranchInternal.idl',
     'nsIPrefLocalizedString.idl',
     'nsIPrefService.idl',
     'nsIRelativeFilePref.idl',
 ]
 
-MODULE = 'pref'
+XPIDL_MODULE = 'pref'
 
 EXPORTS.mozilla += [
     'Preferences.h',
 ]
 
--- a/netwerk/base/public/moz.build
+++ b/netwerk/base/public/moz.build
@@ -120,17 +120,17 @@ XPIDL_SOURCES += [
     'nsPISocketTransportService.idl',
 ]
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     XPIDL_SOURCES += [
         'nsIBrowserSearchService.idl',
     ]
 
-MODULE = 'necko'
+XPIDL_MODULE = 'necko'
 
 EXPORTS += [
     'netCore.h',
     'nsASocketHandler.h',
     'nsAsyncRedirectVerifyHelper.h',
     'nsChannelProperties.h',
     'nsNetStrings.h',
     'nsNetUtil.h',
--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIMIMEHeaderParam.idl',
     'nsIMIMEInfo.idl',
     'nsIMIMEService.idl',
 ]
 
-MODULE = 'mimetype'
+XPIDL_MODULE = 'mimetype'
 
 EXPORTS += [
     'nsMimeTypes.h',
 ]
 
 SOURCES += [
     'nsMIMEHeaderParamImpl.cpp',
 ]
--- a/netwerk/test/httpserver/moz.build
+++ b/netwerk/test/httpserver/moz.build
@@ -3,16 +3,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIHttpServer.idl',
 ]
 
-MODULE = 'test_necko'
+XPIDL_MODULE = 'test_necko'
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
 
 EXTRA_COMPONENTS += [
     'httpd.js',
 ]
 
--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIParserUtils.idl',
     'nsIScriptableUnescapeHTML.idl',
 ]
 
-MODULE = 'html5'
+XPIDL_MODULE = 'html5'
 
 EXPORTS += [
     'jArray.h',
     'nsAHtml5TreeBuilderState.h',
     'nsAHtml5TreeOpSink.h',
     'nsHtml5ArrayCopy.h',
     'nsHtml5AtomList.h',
     'nsHtml5Atoms.h',
--- a/parser/htmlparser/public/moz.build
+++ b/parser/htmlparser/public/moz.build
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIExpatSink.idl',
     'nsIExtendedExpatSink.idl',
 ]
 
-MODULE = 'htmlparser'
+XPIDL_MODULE = 'htmlparser'
 
 EXPORTS += [
     'nsHTMLTagList.h',
     'nsHTMLTags.h',
     'nsIContentSink.h',
     'nsIDTD.h',
     'nsIFragmentContentSink.h',
     'nsIHTMLContentSink.h',
--- a/profile/public/moz.build
+++ b/profile/public/moz.build
@@ -3,10 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIProfileUnlocker.idl',
 ]
 
-MODULE = 'profile'
+XPIDL_MODULE = 'profile'
 
--- a/rdf/base/idl/moz.build
+++ b/rdf/base/idl/moz.build
@@ -24,10 +24,10 @@ XPIDL_SOURCES += [
     'nsIRDFXMLSerializer.idl',
     'nsIRDFXMLSink.idl',
     'nsIRDFXMLSource.idl',
     'rdfIDataSource.idl',
     'rdfISerializer.idl',
     'rdfITripleVisitor.idl',
 ]
 
-MODULE = 'rdf'
+XPIDL_MODULE = 'rdf'
 
--- a/security/manager/boot/public/moz.build
+++ b/security/manager/boot/public/moz.build
@@ -6,10 +6,10 @@
 
 XPIDL_SOURCES += [
     'nsIBufEntropyCollector.idl',
     'nsISecurityUITelemetry.idl',
     'nsISecurityWarningDialogs.idl',
     'nsISSLStatusProvider.idl',
 ]
 
-MODULE = 'pipboot'
+XPIDL_MODULE = 'pipboot'
 
--- a/security/manager/pki/public/moz.build
+++ b/security/manager/pki/public/moz.build
@@ -4,10 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIASN1Tree.idl',
     'nsIPKIParamBlock.idl',
 ]
 
-MODULE = 'pippki'
+XPIDL_MODULE = 'pippki'
 
--- a/security/manager/ssl/public/moz.build
+++ b/security/manager/ssl/public/moz.build
@@ -56,10 +56,10 @@ XPIDL_SOURCES += [
     'nsIX509CertValidity.idl',
 ]
 
 if CONFIG['MOZ_XUL']:
     XPIDL_SOURCES += [
         'nsICertTree.idl',
     ]
 
-MODULE = 'pipnss'
+XPIDL_MODULE = 'pipnss'
 
--- a/startupcache/moz.build
+++ b/startupcache/moz.build
@@ -6,17 +6,17 @@
 
 if not CONFIG['MOZ_B2G']:
     TEST_TOOL_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsIStartupCache.idl',
 ]
 
-MODULE = 'startupcache'
+XPIDL_MODULE = 'startupcache'
 
 EXPORTS.mozilla.scache += [
     'StartupCache.h',
     'StartupCacheUtils.h',
 ]
 
 SOURCES += [
     'StartupCache.cpp',
--- a/storage/public/moz.build
+++ b/storage/public/moz.build
@@ -23,17 +23,17 @@ XPIDL_SOURCES += [
     'mozIStorageStatement.idl',
     'mozIStorageStatementCallback.idl',
     'mozIStorageStatementParams.idl',
     'mozIStorageStatementRow.idl',
     'mozIStorageVacuumParticipant.idl',
     'mozIStorageValueArray.idl',
 ]
 
-MODULE = 'storage'
+XPIDL_MODULE = 'storage'
 
 EXPORTS += [
     'mozStorageHelper.h',
 ]
 
 EXPORTS.mozilla += [
     'storage.h',
 ]
--- a/toolkit/components/alerts/moz.build
+++ b/toolkit/components/alerts/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsIAlertsService.idl',
 ]
 
-MODULE = 'alerts'
+XPIDL_MODULE = 'alerts'
 
 SOURCES += [
     'nsAlertsService.cpp',
     'nsXULAlerts.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
--- a/toolkit/components/autocomplete/moz.build
+++ b/toolkit/components/autocomplete/moz.build
@@ -10,17 +10,17 @@ XPIDL_SOURCES += [
     'nsIAutoCompleteController.idl',
     'nsIAutoCompleteInput.idl',
     'nsIAutoCompletePopup.idl',
     'nsIAutoCompleteResult.idl',
     'nsIAutoCompleteSearch.idl',
     'nsIAutoCompleteSimpleResult.idl',
 ]
 
-MODULE = 'autocomplete'
+XPIDL_MODULE = 'autocomplete'
 
 SOURCES += [
     'nsAutoCompleteController.cpp',
     'nsAutoCompleteSimpleResult.cpp',
 ]
 
 LIBRARY_NAME = 'tkautocomplete'
 
--- a/toolkit/components/captivedetect/moz.build
+++ b/toolkit/components/captivedetect/moz.build
@@ -5,15 +5,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsICaptivePortalDetector.idl',
 ]
 
-MODULE = 'captivedetect'
+XPIDL_MODULE = 'captivedetect'
 
 EXTRA_COMPONENTS += [
     'captivedetect.js',
     'CaptivePortalDetectComponents.manifest',
 ]
 
--- a/toolkit/components/diskspacewatcher/moz.build
+++ b/toolkit/components/diskspacewatcher/moz.build
@@ -8,17 +8,17 @@ XPIDL_SOURCES += [
     'nsIDiskSpaceWatcher.idl',
 ]
 
 EXPORTS += [
     'DiskSpaceWatcher.h'
 ]
 
 XPIDL_MODULE = 'diskspacewatcher'
-MODULE = 'toolkitcomps'
+XPIDL_MODULE = 'toolkitcomps'
 
 SOURCES = [
     'DiskSpaceWatcher.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'diskspacewatcher'
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@@ -9,17 +9,17 @@ TEST_DIRS += ['test']
 XPIDL_SOURCES += [
     'nsIApplicationReputation.idl',
     'nsIDownload.idl',
     'nsIDownloadManager.idl',
     'nsIDownloadManagerUI.idl',
     'nsIDownloadProgressListener.idl',
 ]
 
-MODULE = 'downloads'
+XPIDL_MODULE = 'downloads'
 
 SOURCES += [
     'nsDownloadManager.cpp',
     'SQLFunctions.cpp',
 ]
 
 if CONFIG['MOZ_URL_CLASSIFIER']:
     SOURCES += [
--- a/toolkit/components/exthelper/moz.build
+++ b/toolkit/components/exthelper/moz.build
@@ -3,10 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'extIApplication.idl',
 ]
 
-MODULE = 'exthelper'
+XPIDL_MODULE = 'exthelper'
 
--- a/toolkit/components/feeds/moz.build
+++ b/toolkit/components/feeds/moz.build
@@ -14,14 +14,14 @@ XPIDL_SOURCES += [
     'nsIFeedGenerator.idl',
     'nsIFeedListener.idl',
     'nsIFeedPerson.idl',
     'nsIFeedProcessor.idl',
     'nsIFeedResult.idl',
     'nsIFeedTextConstruct.idl',
 ]
 
-MODULE = 'feeds'
+XPIDL_MODULE = 'feeds'
 
 EXTRA_COMPONENTS += [
     'FeedProcessor.js',
     'FeedProcessor.manifest',
 ]
--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@@ -2,17 +2,17 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_XUL'] and \
     CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'qt', 'os2', 'cocoa', 'windows'):
         LIBXUL_LIBRARY = True
-        MODULE = 'filepicker'
+        XPIDL_MODULE = 'filepicker'
         LIBRARY_NAME = 'fileview'
         XPIDL_SOURCES += [
             'nsIFileView.idl',
         ]
         SOURCES += [
             'nsFileView.cpp',
         ]
         EXTRA_COMPONENTS += [
--- a/toolkit/components/find/moz.build
+++ b/toolkit/components/find/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIFindService.idl',
 ]
 
-MODULE = 'mozfind'
+XPIDL_MODULE = 'mozfind'
 
 SOURCES += [
     'nsFindService.cpp',
 ]
 
 LIBRARY_NAME = 'mozfind_s'
 
 LIBXUL_LIBRARY = True
--- a/toolkit/components/jsdownloads/public/moz.build
+++ b/toolkit/components/jsdownloads/public/moz.build
@@ -1,9 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jsdownloads'
+XPIDL_MODULE = 'jsdownloads'
 
 XPIDL_SOURCES += [
     'mozIDownloadPlatform.idl',
 ]
--- a/toolkit/components/parentalcontrols/moz.build
+++ b/toolkit/components/parentalcontrols/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIParentalControlsService.idl',
 ]
 
-MODULE = 'parentalcontrols'
+XPIDL_MODULE = 'parentalcontrols'
 
 if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS'] and CONFIG['OS_ARCH'] == 'WINNT':
     LIBXUL_LIBRARY = True
     LIBRARY_NAME = 'parentalcontrols_s'
     SOURCES += [
         'nsParentalControlsServiceWin.cpp',
     ]
     FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -10,17 +10,17 @@ XPIDL_SOURCES += [
     'nsILoginInfo.idl',
     'nsILoginManager.idl',
     'nsILoginManagerCrypto.idl',
     'nsILoginManagerPrompter.idl',
     'nsILoginManagerStorage.idl',
     'nsILoginMetaInfo.idl',
 ]
 
-MODULE = 'loginmgr'
+XPIDL_MODULE = 'loginmgr'
 
 EXTRA_COMPONENTS += [
     'crypto-SDR.js',
     'nsLoginInfo.js',
     'nsLoginManager.js',
     'nsLoginManagerPrompter.js',
     'passwordmgr.manifest',
 ]
--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -6,17 +6,17 @@
 
 if CONFIG['MOZ_PLACES']:
     TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsINavHistoryService.idl',
 ]
 
-MODULE = 'places'
+XPIDL_MODULE = 'places'
 
 if CONFIG['MOZ_PLACES']:
     LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
     LIBRARY_NAME = 'places'
 
     XPIDL_SOURCES += [
         'mozIAsyncFavicons.idl',
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -8,17 +8,17 @@ TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsIFormAutoComplete.idl',
     'nsIFormFillController.idl',
     'nsIFormHistory.idl',
     'nsIInputListAutoComplete.idl',
 ]
 
-MODULE = 'satchel'
+XPIDL_MODULE = 'satchel'
 
 SOURCES += [
     'nsFormFillController.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '../build',
 ]
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -6,17 +6,17 @@
 
 TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsITelemetry.idl',
     'nsITelemetryPing.idl',
 ]
 
-MODULE = 'telemetry'
+XPIDL_MODULE = 'telemetry'
 
 EXPORTS.mozilla += [
     'ProcessedStack.h',
     'Telemetry.h',
 ]
 
 SOURCES += [
     'Telemetry.cpp',
--- a/toolkit/components/typeaheadfind/moz.build
+++ b/toolkit/components/typeaheadfind/moz.build
@@ -3,17 +3,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsITypeAheadFind.idl',
 ]
 
-MODULE = 'fastfind'
+XPIDL_MODULE = 'fastfind'
 
 SOURCES += [
     'nsTypeAheadFind.cpp',
 ]
 
 LIBRARY_NAME = 'fastfind_s'
 
 LIBXUL_LIBRARY = True
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -10,17 +10,17 @@ XPIDL_SOURCES += [
     'nsIUrlClassifierDBService.idl',
     'nsIUrlClassifierHashCompleter.idl',
     'nsIUrlClassifierPrefixSet.idl',
     'nsIUrlClassifierStreamUpdater.idl',
     'nsIUrlClassifierUtils.idl',
     'nsIUrlListManager.idl',
 ]
 
-MODULE = 'url-classifier'
+XPIDL_MODULE = 'url-classifier'
 
 SOURCES += [
     'ChunkSet.cpp',
     'Classifier.cpp',
     'HashStore.cpp',
     'LookupCache.cpp',
     'nsCheckSummedOutputStream.cpp',
     'nsUrlClassifierDBService.cpp',
--- a/toolkit/components/urlformatter/moz.build
+++ b/toolkit/components/urlformatter/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsIURLFormatter.idl',
 ]
 
-MODULE = 'urlformatter'
+XPIDL_MODULE = 'urlformatter'
 
 EXTRA_COMPONENTS += [
     'nsURLFormatter.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'nsURLFormatter.js',
 ]
--- a/toolkit/devtools/server/moz.build
+++ b/toolkit/devtools/server/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsIJSInspector.idl',
 ]
 
-MODULE = 'jsinspector'
+XPIDL_MODULE = 'jsinspector'
 
 SOURCES += [
     'nsJSInspector.cpp',
 ]
 
 LIBRARY_NAME = 'jsinspector'
 
 LIBXUL_LIBRARY = True
--- a/toolkit/identity/moz.build
+++ b/toolkit/identity/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsIIdentityCryptoService.idl',
 ]
 
-MODULE = 'identity'
+XPIDL_MODULE = 'identity'
 
 SOURCES += [
     'IdentityCryptoService.cpp',
 ]
 
 LIBRARY_NAME = 'identity'
 
 JS_MODULES_PATH = 'modules/identity'
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -8,17 +8,17 @@ TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'amIAddonManager.idl',
     'amIInstallTrigger.idl',
     'amIWebInstaller.idl',
     'amIWebInstallListener.idl',
 ]
 
-MODULE = 'extensions'
+XPIDL_MODULE = 'extensions'
 
 EXTRA_COMPONENTS += [
     'addonManager.js',
     'amContentHandler.js',
     'amWebInstallListener.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
--- a/toolkit/mozapps/update/moz.build
+++ b/toolkit/mozapps/update/moz.build
@@ -12,17 +12,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'andr
         # which the maintenance service uses.
         DIRS += ['common']
         if CONFIG['OS_ARCH'] == 'WINNT':
             DIRS += ['common-standalone']
 
     if CONFIG['MOZ_UPDATER']:
         DIRS += ['updater']
 
-MODULE = 'update'
+XPIDL_MODULE = 'update'
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit_timermanager/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIUpdateTimerManager.idl',
 ]
 
 EXTRA_COMPONENTS += [
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -10,17 +10,17 @@ XPIDL_SOURCES += [
     'nsINativeAppSupport.idl',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     XPIDL_SOURCES += [
         'nsIWinAppHelper.idl',
     ]
 
-MODULE = 'xulapp'
+XPIDL_MODULE = 'xulapp'
 
 if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
     EXPORTS += ['EventTracer.h']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += ['nsWindowsDllInterceptor.h']
     SOURCES += [
         'nsNativeAppSupportWin.cpp',
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
     FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
     LIBXUL_LIBRARY = True
 
-    MODULE = 'profiler'
+    XPIDL_MODULE = 'profiler'
     LIBRARY_NAME = 'profiler'
     XPIDL_SOURCES += [
         'nsIProfiler.idl',
         'nsIProfileSaveEvent.idl',
     ]
     EXPORTS += [
         'GeckoProfilerFunc.h',
         'GeckoProfilerImpl.h',
--- a/uriloader/base/moz.build
+++ b/uriloader/base/moz.build
@@ -11,17 +11,17 @@ XPIDL_SOURCES += [
     'nsITransfer.idl',
     'nsIURIContentListener.idl',
     'nsIURILoader.idl',
     'nsIWebProgress.idl',
     'nsIWebProgressListener.idl',
     'nsIWebProgressListener2.idl',
 ]
 
-MODULE = 'uriloader'
+XPIDL_MODULE = 'uriloader'
 
 EXPORTS += [
     'nsDocLoader.h',
     'nsURILoader.h',
 ]
 
 SOURCES += [
     'nsDocLoader.cpp',
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -12,17 +12,17 @@ XPIDL_SOURCES += [
     'nsIExternalHelperAppService.idl',
     'nsIExternalProtocolService.idl',
     'nsIExternalSharingAppService.idl',
     'nsIExternalURLHandlerService.idl',
     'nsIHandlerService.idl',
     'nsIHelperAppLauncherDialog.idl',
 ]
 
-MODULE = 'exthandler'
+XPIDL_MODULE = 'exthandler'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     osdir = 'os2'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     osdir = 'win'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     osdir = 'win'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -4,17 +4,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsIOfflineCacheUpdate.idl',
     'nsIPrefetchService.idl',
 ]
 
-MODULE = 'prefetch'
+XPIDL_MODULE = 'prefetch'
 
 EXPORTS += [
     'nsCPrefetchService.h',
 ]
 
 EXPORTS.mozilla.docshell += [
     'OfflineCacheUpdateChild.h',
     'OfflineCacheUpdateParent.h',
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -90,17 +90,17 @@ XPIDL_SOURCES += [
 ]
 
 if CONFIG['MOZ_METRO']:
     XPIDL_SOURCES += [
         'MetroUIUtils.idl',
         'nsIWinMetroUtils.idl',
     ]
 
-MODULE = 'widget'
+XPIDL_MODULE = 'widget'
 
 EXPORTS += [
     'InputData.h',
     'nsIDeviceContextSpec.h',
     'nsINativeKeyBindings.h',
     'nsIPluginWidget.h',
     'nsIRollupListener.h',
     'nsIWidget.h',
--- a/xpcom/sample/moz.build
+++ b/xpcom/sample/moz.build
@@ -7,19 +7,19 @@
 # If you're copying from this file, you'll likely need to replace
 # TEST_TOOL_DIRS with DIRS.
 TEST_TOOL_DIRS += ['program']
 
 # XPIDL_SOURCES specifies IDL files. The build system runs the xpidl tool
 # on these files to generate C++ headers and .xpt typelib files.
 XPIDL_SOURCES += ['nsISample.idl']
 
-# MODULE specifies where header files from this Makefile are installed,
+# XPIDL_MODULE specifies where header files from this Makefile are installed,
 # i.e. dist/include/xpcomsample
-MODULE = 'xpcomsample'
+XPIDL_MODULE = 'xpcomsample'
 
 # CPP_SOURCES specifies C++ files to be built into a library.
 SOURCES += [
     'nsSample.cpp',
     'nsSampleModule.cpp',
 ]
 
 # EXTRA_COMPONENTS installs components written JavaScript to
--- a/xpfe/appshell/public/moz.build
+++ b/xpfe/appshell/public/moz.build
@@ -8,14 +8,14 @@ XPIDL_SOURCES += [
     'nsIAppShellService.idl',
     'nsIPopupWindowManager.idl',
     'nsIWindowMediator.idl',
     'nsIWindowMediatorListener.idl',
     'nsIXULBrowserWindow.idl',
     'nsIXULWindow.idl',
 ]
 
-MODULE = 'appshell'
+XPIDL_MODULE = 'appshell'
 
 EXPORTS += [
     'nsAppShellCID.h',
 ]
 
--- a/xulrunner/examples/simple/components/public/moz.build
+++ b/xulrunner/examples/simple/components/public/moz.build
@@ -3,11 +3,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'nsISimpleTest.idl',
 ]
 
-MODULE = 'simple'
+XPIDL_MODULE = 'simple'
 
 XPI_NAME = 'simple'