Merge mozilla-central into inbound

2024-09-13 09:24:08 -07:00 · 2013-03-13 09:03:20 -07:00 · 2013-03-13 09:03:20 -07:00 · 9569d6e356
commit 9569d6e356
parent 56dbcc42a1 56a7634c1c
413 changed files with 2544 additions and 2275 deletions
--- a/accessible/public/Makefile.in
+++ b/accessible/public/Makefile.in
@ -13,30 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE    = accessibility
 GRE_MODULE	= 1

-XPIDLSRCS = \
-      nsIAccessibleTypes.idl \
-      nsIAccessibleRetrieval.idl \
-      nsIAccessible.idl \
-      nsIAccessibleApplication.idl \
-      nsIAccessibleRelation.idl \
-      nsIAccessibleRole.idl \
-      nsIAccessibleStates.idl \
-      nsIAccessibleDocument.idl \
-      nsIAccessibleProvider.idl \
-      nsIAccessibleSelectable.idl \
-      nsIAccessibleCursorable.idl \
-      nsIAccessibleEvent.idl \
-      nsIAccessibleEditableText.idl \
-      nsIAccessibleHyperLink.idl \
-      nsIAccessibleHyperText.idl \
-      nsIAccessiblePivot.idl \
-      nsIAccessibleTable.idl \
-      nsIAccessibleText.idl \
-      nsIAccessibleValue.idl \
-      nsIAccessibleImage.idl \
-      nsIXBLAccessible.idl \
-      $(NULL)
-
 EXPORTS		= \
      nsIAccessibilityService.h \
      $(NULL)
--- a/accessible/public/moz.build
+++ b/accessible/public/moz.build
@ -5,3 +5,28 @@

 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
    DIRS += ['msaa', 'ia2']
+
+XPIDL_SOURCES += [
+    'nsIAccessible.idl',
+    'nsIAccessibleApplication.idl',
+    'nsIAccessibleCursorable.idl',
+    'nsIAccessibleDocument.idl',
+    'nsIAccessibleEditableText.idl',
+    'nsIAccessibleEvent.idl',
+    'nsIAccessibleHyperLink.idl',
+    'nsIAccessibleHyperText.idl',
+    'nsIAccessibleImage.idl',
+    'nsIAccessiblePivot.idl',
+    'nsIAccessibleProvider.idl',
+    'nsIAccessibleRelation.idl',
+    'nsIAccessibleRetrieval.idl',
+    'nsIAccessibleRole.idl',
+    'nsIAccessibleSelectable.idl',
+    'nsIAccessibleStates.idl',
+    'nsIAccessibleTable.idl',
+    'nsIAccessibleText.idl',
+    'nsIAccessibleTypes.idl',
+    'nsIAccessibleValue.idl',
+    'nsIXBLAccessible.idl',
+]
+
--- a/b2g/components/Makefile.in
+++ b/b2g/components/Makefile.in
@ -11,10 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = B2GComponents

-XPIDLSRCS = \
-        b2g.idl \
-        $(NULL)
-
 EXTRA_PP_COMPONENTS = \
        ActivitiesGlue.js \
        AlertsService.js \
--- a/b2g/components/moz.build
+++ b/b2g/components/moz.build
@ -4,3 +4,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'b2g.idl',
+]
+
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@ -10,13 +10,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE = browsercomps
-XPIDL_MODULE = browsercompsbase
-
-XPIDLSRCS = \
-  nsIBrowserGlue.idl \
-  nsIBrowserHandler.idl \
-  $(NULL)
-
 EXTRA_COMPONENTS = \
  BrowserComponents.manifest \
  $(NULL)
--- a/browser/components/feeds/public/Makefile.in
+++ b/browser/components/feeds/public/Makefile.in
@ -12,6 +12,4 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = browser-feeds

-XPIDLSRCS = nsIFeedResultService.idl nsIWebContentConverterRegistrar.idl nsIFeedWriter.idl
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/feeds/public/moz.build
+++ b/browser/components/feeds/public/moz.build
@ -3,3 +3,9 @@
 # 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 += [
+    'nsIFeedResultService.idl',
+    'nsIFeedWriter.idl',
+    'nsIWebContentConverterRegistrar.idl',
+]
+
--- a/browser/components/migration/public/Makefile.in
+++ b/browser/components/migration/public/Makefile.in
@ -11,7 +11,5 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= migration

-XPIDLSRCS	= nsIBrowserProfileMigrator.idl
-
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/migration/public/moz.build
+++ b/browser/components/migration/public/moz.build
@ -3,3 +3,7 @@
 # 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',
+]
+
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@ -25,3 +25,11 @@ if CONFIG['MOZ_SAFE_BROWSING']:

 TEST_DIRS += ['test']
 DIRS += ['build']
+
+XPIDL_SOURCES += [
+    'nsIBrowserGlue.idl',
+    'nsIBrowserHandler.idl',
+]
+
+XPIDL_MODULE = 'browsercompsbase'
+
--- a/browser/components/places/Makefile.in
+++ b/browser/components/places/Makefile.in
@ -12,4 +12,3 @@ include $(DEPTH)/config/autoconf.mk

 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += -I$(topsrcdir)/browser/components/
--- a/browser/components/places/moz.build
+++ b/browser/components/places/moz.build
@ -5,3 +5,8 @@

 DIRS += ['src']
 TEST_DIRS += ['tests']
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/browser/components/',
+]
+
--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@ -21,4 +21,3 @@ EXTRA_JS_MODULES = \

 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += -I$(topsrcdir)/browser/components
--- a/browser/components/places/src/moz.build
+++ b/browser/components/places/src/moz.build
@ -3,3 +3,7 @@
 # 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_FLAGS += [
+    '-I$(topsrcdir)/browser/components',
+]
+
--- a/browser/components/sessionstore/Makefile.in
+++ b/browser/components/sessionstore/Makefile.in
@ -12,9 +12,4 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = sessionstore

-XPIDLSRCS = \
-	nsISessionStartup.idl \
-	nsISessionStore.idl \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@ -5,3 +5,9 @@

 DIRS += ['src']
 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'nsISessionStartup.idl',
+    'nsISessionStore.idl',
+]
+
--- a/browser/components/shell/public/Makefile.in
+++ b/browser/components/shell/public/Makefile.in
@ -12,14 +12,4 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = shellservice

-XPIDLSRCS = nsIShellService.idl
-
-ifeq ($(OS_ARCH),WINNT)
-XPIDLSRCS += nsIWindowsShellService.idl
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-XPIDLSRCS += nsIMacShellService.idl
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/shell/public/moz.build
+++ b/browser/components/shell/public/moz.build
@ -3,3 +3,16 @@
 # 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',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    XPIDL_SOURCES += [
+        'nsIWindowsShellService.idl',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    XPIDL_SOURCES += [
+        'nsIMacShellService.idl',
+    ]
+
--- a/browser/fuel/public/Makefile.in
+++ b/browser/fuel/public/Makefile.in
@ -11,6 +11,4 @@ include $(DEPTH)/config/autoconf.mk

 MODULE        = fuel

-XPIDLSRCS = fuelIApplication.idl
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/fuel/public/moz.build
+++ b/browser/fuel/public/moz.build
@ -3,3 +3,7 @@
 # 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',
+]
+
--- a/browser/metro/components/Makefile.in
+++ b/browser/metro/components/Makefile.in
@ -13,11 +13,6 @@ include $(topsrcdir)/config/config.mk
 # metro/components.manifest
 MODULE = components

-XPIDLSRCS = \
-        SessionStore.idl \
-        LoginManagerPrompter.idl \
-        $(NULL)
-
 EXTRA_PP_COMPONENTS = \
        components.manifest \
        AboutRedirector.js \
--- a/browser/metro/components/moz.build
+++ b/browser/metro/components/moz.build
@ -3,3 +3,8 @@
 # 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 += [
+    'LoginManagerPrompter.idl',
+    'SessionStore.idl',
+]
+
--- a/caps/idl/Makefile.in
+++ b/caps/idl/Makefile.in
@ -13,11 +13,5 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= caps
 GRE_MODULE	= 1

-XPIDLSRCS	= \
-		nsIScriptSecurityManager.idl \
-		nsIPrincipal.idl \
-		nsISecurityCheckedComponent.idl \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/caps/idl/moz.build
+++ b/caps/idl/moz.build
@ -3,3 +3,9 @@
 # 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 += [
+    'nsIPrincipal.idl',
+    'nsIScriptSecurityManager.idl',
+    'nsISecurityCheckedComponent.idl',
+]
+
--- a/chrome/public/Makefile.in
+++ b/chrome/public/Makefile.in
@ -11,9 +11,4 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = chrome

-XPIDLSRCS = \
-  nsIChromeRegistry.idl \
-  nsIToolkitChromeRegistry.idl \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/chrome/public/moz.build
+++ b/chrome/public/moz.build
@ -3,3 +3,8 @@
 # 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',
+]
+
--- a/config/config.mk
+++ b/config/config.mk
@ -526,7 +526,7 @@ endif
 # Default location of include files
 IDL_DIR		= $(DIST)/idl

-XPIDL_FLAGS = -I$(srcdir) -I$(IDL_DIR)
+XPIDL_FLAGS += -I$(srcdir) -I$(IDL_DIR)
 ifdef LIBXUL_SDK
 XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
 endif
--- a/config/rules.mk
+++ b/config/rules.mk
@ -20,13 +20,22 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
  TEST_DIRS \
  TIERS \
  TOOL_DIRS \
+  XPIDL_MODULE \
  $(NULL)

 ifndef EXTERNALLY_MANAGED_MAKE_FILE
+# Using $(firstword) may not be perfect. But it should be good enough for most
+# scenarios.
+_current_makefile = $(CURDIR)/$(firstword $(MAKEFILE_LIST))
+
 $(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES),$(if $($(var)),\
-    $(error Variable $(var) is defined in Makefile. It should only be defined in moz.build files),\
+    $(error Variable $(var) is defined in $(_current_makefile). It should only be defined in moz.build files),\
    ))

+ifneq (,$(XPIDLSRCS)$(SDK_XPIDLSRCS))
+    $(error XPIDLSRCS and SDK_XPIDLSRCS have been merged and moved to moz.build files as the XPIDL_SOURCES variable. You must move these variables out of $(_current_makefile))
+endif
+
 # Import the automatically generated backend file. If this file doesn't exist,
 # the backend hasn't been properly configured. We want this to be a fatal
 # error, hence not using "-include".
@ -56,10 +65,6 @@ endif
 USE_AUTOTARGETS_MK = 1
 include $(topsrcdir)/config/makefiles/makeutils.mk

-ifdef SDK_XPIDLSRCS
-_EXTRA_XPIDLSRCS := $(filter-out $(XPIDLSRCS),$(SDK_XPIDLSRCS))
-XPIDLSRCS += $(_EXTRA_XPIDLSRCS)
-endif
 ifdef SDK_HEADERS
 _EXTRA_EXPORTS := $(filter-out $(EXPORTS),$(SDK_HEADERS))
 EXPORTS += $(_EXTRA_EXPORTS)
--- a/content/base/public/Makefile.in
+++ b/content/base/public/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= content
-XPIDL_MODULE	= content_base
 GRE_MODULE	= 1

 EXPORTS		= \
@ -59,33 +58,5 @@ EXPORTS_mozilla = \
 		CORSMode.h \
 		$(NULL)

-SDK_XPIDLSRCS   = \
-		nsISelection.idl  \
-		$(NULL)
-
-XPIDLSRCS	= \
-		nsIContentPolicy.idl        \
-		nsIDocumentEncoder.idl      \
-	        nsIDOMDataChannel.idl \
-		nsIDOMFile.idl \
-		nsIDOMFileReader.idl \
-		nsIDOMFileList.idl \
-		nsIDOMFormData.idl \
-		nsIDOMParser.idl \
-		nsIDOMSerializer.idl \
-		nsISelectionController.idl  \
-		nsISelectionDisplay.idl  \
-		nsISelectionListener.idl  \
-		nsISelectionPrivate.idl  \
-		nsIScriptLoaderObserver.idl  \
-		nsIDroppedLinkHandler.idl \
-		nsIImageLoadingContent.idl \
-		nsIObjectLoadingContent.idl \
-		nsIFrameLoader.idl \
-		nsIXMLHttpRequest.idl \
-		nsIContentSecurityPolicy.idl \
-		nsIMessageManager.idl \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/content/base/public/moz.build
+++ b/content/base/public/moz.build
@ -3,3 +3,30 @@
 # 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 += [
+    'nsIContentPolicy.idl',
+    'nsIContentSecurityPolicy.idl',
+    'nsIDOMDataChannel.idl',
+    'nsIDOMFile.idl',
+    'nsIDOMFileList.idl',
+    'nsIDOMFileReader.idl',
+    'nsIDOMFormData.idl',
+    'nsIDOMParser.idl',
+    'nsIDOMSerializer.idl',
+    'nsIDocumentEncoder.idl',
+    'nsIDroppedLinkHandler.idl',
+    'nsIFrameLoader.idl',
+    'nsIImageLoadingContent.idl',
+    'nsIMessageManager.idl',
+    'nsIObjectLoadingContent.idl',
+    'nsIScriptLoaderObserver.idl',
+    'nsISelection.idl',
+    'nsISelectionController.idl',
+    'nsISelectionDisplay.idl',
+    'nsISelectionListener.idl',
+    'nsISelectionPrivate.idl',
+    'nsIXMLHttpRequest.idl',
+]
+
+XPIDL_MODULE = 'content_base'
+
--- a/content/canvas/public/Makefile.in
+++ b/content/canvas/public/Makefile.in
@ -11,8 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= content
-XPIDL_MODULE = content_canvas
-
 EXPORTS_NAMESPACES = mozilla/ipc

 EXPORTS		= \
@ -29,8 +27,4 @@ EXPORTS_mozilla/ipc = \
 		DocumentRendererNativeIDParent.h \
 		$(NULL)

-XPIDLSRCS	= \
-		nsICanvasGLPrivate.idl \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/content/canvas/public/moz.build
+++ b/content/canvas/public/moz.build
@ -3,3 +3,9 @@
 # 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 += [
+    'nsICanvasGLPrivate.idl',
+]
+
+XPIDL_MODULE = 'content_canvas'
+
--- a/content/events/public/Makefile.in
+++ b/content/events/public/Makefile.in
@ -11,8 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= content
-XPIDL_MODULE	= content_events
-
 EXPORTS		= \
 		nsMutationEvent.h \
 		nsIPrivateTextEvent.h \
@ -30,9 +28,5 @@ EXPORTS_mozilla/dom = \
  EventTarget.h \
  $(NULL)

-XPIDLSRCS	= \
-		nsIEventListenerService.idl \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/content/events/public/moz.build
+++ b/content/events/public/moz.build
@ -3,3 +3,9 @@
 # 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 += [
+    'nsIEventListenerService.idl',
+]
+
+XPIDL_MODULE = 'content_events'
+
--- a/content/html/content/public/Makefile.in
+++ b/content/html/content/public/Makefile.in
@ -11,15 +11,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE       = content
-XPIDL_MODULE = content_html
-
-XPIDLSRCS = \
-		nsIFormSubmitObserver.idl \
-		nsIPhonetic.idl \
-		nsIHTMLMenu.idl \
-		nsIMenuBuilder.idl \
-		$(NULL)
-
 EXPORTS = \
 		nsIConstraintValidation.h \
 		nsIFormControl.h \
--- a/content/html/content/public/moz.build
+++ b/content/html/content/public/moz.build
@ -3,3 +3,12 @@
 # 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 += [
+    'nsIFormSubmitObserver.idl',
+    'nsIHTMLMenu.idl',
+    'nsIMenuBuilder.idl',
+    'nsIPhonetic.idl',
+]
+
+XPIDL_MODULE = 'content_html'
+
--- a/content/html/document/public/Makefile.in
+++ b/content/html/document/public/Makefile.in
@ -11,10 +11,4 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= content
-XPIDL_MODULE	= content_htmldoc
-
-XPIDLSRCS 	= \
-		nsIImageDocument.idl \
-        	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/content/html/document/public/moz.build
+++ b/content/html/document/public/moz.build
@ -3,3 +3,9 @@
 # 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 += [
+    'nsIImageDocument.idl',
+]
+
+XPIDL_MODULE = 'content_htmldoc'
+
--- a/content/xslt/public/Makefile.in
+++ b/content/xslt/public/Makefile.in
@ -10,21 +10,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE       = content
-XPIDL_MODULE = content_xslt
-
 EXPORTS		= \
 		nsIDocumentTransformer.h \
 		$(NULL)

-XPIDLSRCS	= \
-		nsIXSLTException.idl  \
-		nsIXSLTProcessor.idl  \
-		nsIXSLTProcessorPrivate.idl  \
-		txIFunctionEvaluationContext.idl  \
-		txINodeSet.idl  \
-		txIEXSLTRegExFunctions.idl  \
-		txIXPathObject.idl  \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/content/xslt/public/moz.build
+++ b/content/xslt/public/moz.build
@ -3,3 +3,15 @@
 # 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 += [
+    'nsIXSLTException.idl',
+    'nsIXSLTProcessor.idl',
+    'nsIXSLTProcessorPrivate.idl',
+    'txIEXSLTRegExFunctions.idl',
+    'txIFunctionEvaluationContext.idl',
+    'txINodeSet.idl',
+    'txIXPathObject.idl',
+]
+
+XPIDL_MODULE = 'content_xslt'
+
--- a/content/xul/content/public/Makefile.in
+++ b/content/xul/content/public/Makefile.in
@ -11,10 +11,4 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xul

-ifdef MOZ_XUL
-XPIDLSRCS	= \
-		nsIXULContextMenuBuilder.idl \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/content/xul/content/public/moz.build
+++ b/content/xul/content/public/moz.build
@ -3,3 +3,8 @@
 # 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',
+    ]
+
--- a/content/xul/document/public/Makefile.in
+++ b/content/xul/document/public/Makefile.in
@ -13,16 +13,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xuldoc
 GRE_MODULE	= 1

-XPIDLSRCS	= \
-		nsIController.idl \
-		nsIControllers.idl \
-		$(NULL)
-
 ifdef MOZ_XUL
-XPIDLSRCS += \
-		nsIXULOverlayProvider.idl \
-		$(NULL)
-
 EXPORTS		= \
 		nsIXULDocument.h \
 		$(NULL)
--- a/content/xul/document/public/moz.build
+++ b/content/xul/document/public/moz.build
@ -3,3 +3,13 @@
 # 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 += [
+    'nsIController.idl',
+    'nsIControllers.idl',
+]
+
+if CONFIG['MOZ_XUL']:
+    XPIDL_SOURCES += [
+        'nsIXULOverlayProvider.idl',
+    ]
+
--- a/content/xul/templates/public/Makefile.in
+++ b/content/xul/templates/public/Makefile.in
@ -12,14 +12,5 @@ include $(DEPTH)/config/autoconf.mk

 MODULE		= xultmpl

-XPIDLSRCS	= \
-		nsIXULSortService.idl \
-		nsIXULTemplateBuilder.idl \
-		nsIXULBuilderListener.idl \
-		nsIXULTemplateQueryProcessor.idl \
-		nsIXULTemplateResult.idl \
-		nsIXULTemplateRuleFilter.idl \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/content/xul/templates/public/moz.build
+++ b/content/xul/templates/public/moz.build
@ -3,3 +3,12 @@
 # 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 += [
+    'nsIXULBuilderListener.idl',
+    'nsIXULSortService.idl',
+    'nsIXULTemplateBuilder.idl',
+    'nsIXULTemplateQueryProcessor.idl',
+    'nsIXULTemplateResult.idl',
+    'nsIXULTemplateRuleFilter.idl',
+]
+
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@ -19,38 +19,6 @@ ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif

-SDK_XPIDLSRCS = \
-  nsIClipboardCommands.idl \
-  $(NULL)
-
-XPIDLSRCS = \
-  nsCDefaultURIFixup.idl \
-  nsIDocShell.idl \
-  nsIDocShellLoadInfo.idl \
-  nsIDocShellTreeItem.idl \
-  nsIDocShellTreeNode.idl \
-  nsIDocShellTreeOwner.idl \
-  nsIDocShellHistory.idl \
-  nsIGlobalHistory2.idl \
-  nsIMarkupDocumentViewer.idl \
-  nsIScrollable.idl \
-  nsITextScroll.idl \
-  nsIDocCharset.idl \
-  nsIWebNavigation.idl \
-  nsIWebNavigationInfo.idl \
-  nsIContentViewer.idl \
-  nsIContentViewerEdit.idl \
-  nsIContentViewerFile.idl \
-  nsIURIFixup.idl \
-  nsIWebPageDescriptor.idl \
-  nsIDownloadHistory.idl \
-  nsILoadContext.idl \
-  nsIRefreshURI.idl \
-  nsIContentViewerContainer.idl \
-  nsIDocumentLoaderFactory.idl \
-  nsIPrivacyTransitionObserver.idl \
-  $(NULL)
-
 EXPORTS = \
  nsDocShellLoadTypes.h \
  nsILinkHandler.h \
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@ -3,3 +3,32 @@
 # 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 += [
+    'nsCDefaultURIFixup.idl',
+    'nsIClipboardCommands.idl',
+    'nsIContentViewer.idl',
+    'nsIContentViewerContainer.idl',
+    'nsIContentViewerEdit.idl',
+    'nsIContentViewerFile.idl',
+    'nsIDocCharset.idl',
+    'nsIDocShell.idl',
+    'nsIDocShellHistory.idl',
+    'nsIDocShellLoadInfo.idl',
+    'nsIDocShellTreeItem.idl',
+    'nsIDocShellTreeNode.idl',
+    'nsIDocShellTreeOwner.idl',
+    'nsIDocumentLoaderFactory.idl',
+    'nsIDownloadHistory.idl',
+    'nsIGlobalHistory2.idl',
+    'nsILoadContext.idl',
+    'nsIMarkupDocumentViewer.idl',
+    'nsIPrivacyTransitionObserver.idl',
+    'nsIRefreshURI.idl',
+    'nsIScrollable.idl',
+    'nsITextScroll.idl',
+    'nsIURIFixup.idl',
+    'nsIWebNavigation.idl',
+    'nsIWebNavigationInfo.idl',
+    'nsIWebPageDescriptor.idl',
+]
+
--- a/docshell/shistory/public/Makefile.in
+++ b/docshell/shistory/public/Makefile.in
@ -13,19 +13,5 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= shistory
 GRE_MODULE	= 1

-SDK_XPIDLSRCS   = \
-                  nsIHistoryEntry.idl \
-                  nsISHistory.idl       \
-                  nsISHistoryListener.idl   \
-                  $(NULL)
-
-XPIDLSRCS	= \
-		  nsISHEntry.idl        \
-                  nsISHContainer.idl    \
-                  nsISHTransaction.idl  \
-                  nsISHistoryInternal.idl \
-		  nsIBFCacheEntry.idl \
-                  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/docshell/shistory/public/moz.build
+++ b/docshell/shistory/public/moz.build
@ -3,3 +3,14 @@
 # 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 += [
+    'nsIBFCacheEntry.idl',
+    'nsIHistoryEntry.idl',
+    'nsISHContainer.idl',
+    'nsISHEntry.idl',
+    'nsISHTransaction.idl',
+    'nsISHistory.idl',
+    'nsISHistoryInternal.idl',
+    'nsISHistoryListener.idl',
+]
+
--- a/dom/activities/interfaces/Makefile.in
+++ b/dom/activities/interfaces/Makefile.in
@ -9,21 +9,5 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-XPIDL_MODULE = dom_activities
-
-XPIDLSRCS = nsIDOMActivity.idl \
-            nsIDOMActivityOptions.idl \
-            nsIDOMActivityHandlerDescription.idl \
-            nsIDOMActivityRequestHandler.idl \
-            nsIDOMNavigatorActivities.idl \
-            nsIActivityProxy.idl \
-            nsIActivityUIGlue.idl \
-            $(NULL)
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/activities/interfaces/moz.build
+++ b/dom/activities/interfaces/moz.build
@ -3,3 +3,21 @@
 # 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 += [
+    'nsIActivityProxy.idl',
+    'nsIActivityUIGlue.idl',
+    'nsIDOMActivity.idl',
+    'nsIDOMActivityHandlerDescription.idl',
+    'nsIDOMActivityOptions.idl',
+    'nsIDOMActivityRequestHandler.idl',
+    'nsIDOMNavigatorActivities.idl',
+]
+
+XPIDL_MODULE = 'dom_activities'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@ -10,7 +10,6 @@ VPATH       = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE              = dom
-XPIDL_MODULE        = dom_alarm
 LIBRARY_NAME        = domalarm_s
 LIBXUL_LIBRARY      = 1
 FORCE_STATIC_LIB    = 1
@ -31,11 +30,6 @@ EXTRA_JS_MODULES = \
  AlarmService.jsm \
  $(NULL)

-XPIDLSRCS =               \
-  nsIDOMAlarmsManager.idl \
-  nsIAlarmHalService.idl  \
-  $(NULL)
-
 EXPORTS_mozilla/dom/alarm = \
  AlarmHalService.h         \
  $(NULL)
@ -48,6 +42,3 @@ include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@ -4,3 +4,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'nsIAlarmHalService.idl',
+    'nsIDOMAlarmsManager.idl',
+]
+
+XPIDL_MODULE = 'dom_alarm'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@ -21,7 +21,6 @@ include $(DEPTH)/config/autoconf.mk

 MODULE           = dom
 LIBRARY_NAME     = domaudiochannel_s
-XPIDL_MODULE     = dom_audiochannel
 LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
@ -44,11 +43,6 @@ CPPSRCS += \
  AudioChannelAgent.cpp \
  $(NULL)

-XPIDLSRCS = \
-  nsIAudioChannelAgent.idl \
-  $(NULL)
-
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@ -4,3 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_TOOL_DIRS += ['tests']
+
+XPIDL_SOURCES += [
+    'nsIAudioChannelAgent.idl',
+]
+
+XPIDL_MODULE = 'dom_audiochannel'
+
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@ -33,15 +33,6 @@ EXTRA_JS_MODULES += \
  ObjectWrapper.jsm \
  $(NULL)

-XPIDLSRCS = \
-  nsIDOMDOMError.idl \
-  nsIDOMDOMRequest.idl \
-  nsIDOMDOMCursor.idl \
-  nsIEntropyCollector.idl \
-  nsIScriptChannel.idl \
-  nsISiteSpecificUserAgent.idl \
-  $(NULL)
-
 EXPORTS = \
  nsDOMCID.h \
  nsDOMClassInfoClasses.h \
@ -148,7 +139,3 @@ CXXFLAGS += $(TK_CFLAGS)
 LDFLAGS += $(TK_LIBS)
 endif

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@ -4,3 +4,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'nsIDOMDOMCursor.idl',
+    'nsIDOMDOMError.idl',
+    'nsIDOMDOMRequest.idl',
+    'nsIEntropyCollector.idl',
+    'nsIScriptChannel.idl',
+    'nsISiteSpecificUserAgent.idl',
+]
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@ -10,7 +10,6 @@ VPATH            = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = dom_battery_s
-XPIDL_MODULE     = dom_battery
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
@ -32,15 +31,7 @@ LOCAL_INCLUDES = \
  -I$(topsrcdir)/content/events/src \
  $(NULL)

-XPIDLSRCS = \
-  nsINavigatorBattery.idl \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@ -4,3 +4,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'nsINavigatorBattery.idl',
+]
+
+XPIDL_MODULE = 'dom_battery'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@ -35,7 +35,6 @@ ifneq (,$(MOZ_B2G_BT))

 MODULE           = dom
 LIBRARY_NAME     = dombluetooth_s
-XPIDL_MODULE     = dom_bluetooth
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1

@ -62,15 +61,6 @@ ifdef MOZ_B2G_RIL
 CPPSRCS += BluetoothTelephonyListener.cpp
 endif

-XPIDLSRCS = \
-  nsIDOMNavigatorBluetooth.idl \
-  nsIDOMBluetoothManager.idl \
-  nsIDOMBluetoothAdapter.idl \
-  nsIDOMBluetoothDevice.idl \
-  nsIDOMBluetoothDeviceEvent.idl \
-  nsIDOMBluetoothDeviceAddressEvent.idl \
-  $(NULL)
-
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 VPATH += \
  $(srcdir)/linux \
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@ -13,3 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+if CONFIG['MOZ_B2G_BT']:
+    XPIDL_MODULE = 'dom_bluetooth'
+    XPIDL_SOURCES += [
+        'nsIDOMNavigatorBluetooth.idl',
+        'nsIDOMBluetoothManager.idl',
+        'nsIDOMBluetoothAdapter.idl',
+        'nsIDOMBluetoothDevice.idl',
+        'nsIDOMBluetoothDeviceEvent.idl',
+        'nsIDOMBluetoothDeviceAddressEvent.idl',
+    ]
+
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@ -11,18 +11,12 @@ include $(DEPTH)/config/autoconf.mk

 MODULE           = dom
 LIBRARY_NAME     = dom_browserelement_s
-XPIDL_MODULE     = dom_browserelement
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1

 include $(topsrcdir)/dom/dom-config.mk

-XPIDLSRCS = \
-  nsIOpenWindowEventDetail.idl \
-  nsIAsyncScrollEventDetail.idl \
-  $(NULL)
-
 EXPORTS = \
  nsOpenWindowEventDetail.h \
  nsAsyncScrollEventDetail.h \
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@ -4,3 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['mochitest']
+
+XPIDL_SOURCES += [
+    'nsIAsyncScrollEventDetail.idl',
+    'nsIOpenWindowEventDetail.idl',
+]
+
+XPIDL_MODULE = 'dom_browserelement'
+
--- a/dom/camera/Makefile.in
+++ b/dom/camera/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 MODULE           = dom
 LIBRARY_NAME     = domcamera_s
-XPIDL_MODULE     = dom_camera
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
@ -53,11 +52,6 @@ CPPSRCS += \
  $(NULL)
 endif

-XPIDLSRCS = \
-  nsIDOMNavigatorCamera.idl \
-  nsIDOMCameraManager.idl \
-  $(NULL)
-
 EXPORTS = \
  CameraCommon.h \
  DOMCameraManager.h \
@ -68,9 +62,3 @@ EXPORTS = \
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  -I$(topsrcdir)/dom/media \
-  $(NULL)
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@ -3,3 +3,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 += [
+    'nsIDOMCameraManager.idl',
+    'nsIDOMNavigatorCamera.idl',
+]
+
+XPIDL_MODULE = 'dom_camera'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+    '-I$(topsrcdir)/dom/media',
+]
+
--- a/dom/cellbroadcast/interfaces/Makefile.in
+++ b/dom/cellbroadcast/interfaces/Makefile.in
@ -9,22 +9,7 @@ VPATH            = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-XPIDL_MODULE = dom_cellbroadcast
-
 include $(topsrcdir)/dom/dom-config.mk

-XPIDLSRCS = \
-  nsICellBroadcastProvider.idl \
-  nsIDOMMozCellBroadcast.idl \
-  nsIDOMMozCellBroadcastEvent.idl \
-  nsIDOMMozCellBroadcastMessage.idl \
-  nsINavigatorCellBroadcast.idl \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/cellbroadcast/interfaces/moz.build
+++ b/dom/cellbroadcast/interfaces/moz.build
@ -3,3 +3,19 @@
 # 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 += [
+    'nsICellBroadcastProvider.idl',
+    'nsIDOMMozCellBroadcast.idl',
+    'nsIDOMMozCellBroadcastEvent.idl',
+    'nsIDOMMozCellBroadcastMessage.idl',
+    'nsINavigatorCellBroadcast.idl',
+]
+
+XPIDL_MODULE = 'dom_cellbroadcast'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/cellbroadcast/src/Makefile.in
+++ b/dom/cellbroadcast/src/Makefile.in
@ -10,7 +10,6 @@ VPATH            = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = dom_cellbroadcast_s
-XPIDL_MODULE     = dom_cellbroadcast
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
--- a/dom/cellbroadcast/src/moz.build
+++ b/dom/cellbroadcast/src/moz.build
@ -3,3 +3,5 @@
 # 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_MODULE = 'dom_cellbroadcast'
+
--- a/dom/contacts/Makefile.in
+++ b/dom/contacts/Makefile.in
@ -17,7 +17,6 @@ MODULE         = dom
 LIBRARY_NAME   = jsdomcontacts_s
 LIBXUL_LIBRARY = 1

-XPIDL_MODULE   = dom_contacts
 GRE_MODULE     = 1

 EXTRA_COMPONENTS =        \
--- a/dom/contacts/moz.build
+++ b/dom/contacts/moz.build
@ -4,3 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['tests']
+
+XPIDL_MODULE = 'dom_contacts'
+
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 MODULE           = dom
 LIBRARY_NAME     = domdevicestorage_s
-XPIDL_MODULE     = dom_devicestorage
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 ifndef _MSC_VER
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@ -4,3 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['test', 'ipc']
+
+XPIDL_MODULE = 'dom_devicestorage'
+
--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 MODULE           = dom
 LIBRARY_NAME     = domfile_s
-XPIDL_MODULE     = dom_file
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 ifndef _MSC_VER
@ -60,17 +59,5 @@ EXPORTS_mozilla/dom/file = \
  ArchiveRequest.h \
  $(NULL)

-XPIDLSRCS = \
-  nsIDOMFileHandle.idl \
-  nsIDOMFileRequest.idl \
-  nsIDOMLockedFile.idl \
-  nsIDOMArchiveRequest.idl \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@ -4,3 +4,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'nsIDOMArchiveRequest.idl',
+    'nsIDOMFileHandle.idl',
+    'nsIDOMFileRequest.idl',
+    'nsIDOMLockedFile.idl',
+]
+
+XPIDL_MODULE = 'dom_file'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/fm/Makefile.in
+++ b/dom/fm/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 MODULE           = dom
 LIBRARY_NAME     = domfm_s
-XPIDL_MODULE     = dom_fm
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1

@ -22,11 +21,6 @@ CPPSRCS += \
  nsFMRadioSettings.cpp \
  $(NULL)

-XPIDLSRCS = \
-  nsIDOMFMRadio.idl \
-  nsIFMRadio.idl \
-  $(NULL)
-
 EXTRA_COMPONENTS =      \
  DOMFMRadioChild.js       \
  DOMFMRadio.manifest \
@ -39,7 +33,3 @@ EXTRA_JS_MODULES =   \
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
-
--- a/dom/fm/moz.build
+++ b/dom/fm/moz.build
@ -3,3 +3,14 @@
 # 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 += [
+    'nsIDOMFMRadio.idl',
+    'nsIFMRadio.idl',
+]
+
+XPIDL_MODULE = 'dom_fm'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/icc/interfaces/Makefile.in
+++ b/dom/icc/interfaces/Makefile.in
@ -9,19 +9,6 @@ VPATH            = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-XPIDL_MODULE = dom_icc
-
 include $(topsrcdir)/dom/dom-config.mk

-XPIDLSRCS = \
-  nsIDOMIccManager.idl \
-  SimToolKit.idl \
-  nsIDOMICCCardLockErrorEvent.idl \
-  nsIIccProvider.idl \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/icc/interfaces/moz.build
+++ b/dom/icc/interfaces/moz.build
@ -3,3 +3,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 += [
+    'SimToolKit.idl',
+    'nsIDOMICCCardLockErrorEvent.idl',
+    'nsIDOMIccManager.idl',
+    'nsIIccProvider.idl',
+]
+
+XPIDL_MODULE = 'dom_icc'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 MODULE = dom
 LIBRARY_NAME = dom_indexeddb_s
-XPIDL_MODULE = dom_indexeddb
 LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 ifndef _MSC_VER
@ -79,27 +78,7 @@ DEFINES += -D_IMPL_NS_LAYOUT

 # Make sure to quickstub as much as possible here! See
 # js/xpconnect/src/dom_quickstubs.qsconf.
-XPIDLSRCS = \
-  nsIIDBCursor.idl \
-  nsIIDBCursorWithValue.idl \
-  nsIIDBDatabase.idl \
-  nsIIDBFactory.idl \
-  nsIIDBFileHandle.idl \
-  nsIIDBIndex.idl \
-  nsIIDBKeyRange.idl \
-  nsIIDBObjectStore.idl \
-  nsIIDBRequest.idl \
-  nsIIDBTransaction.idl \
-  nsIIDBVersionChangeEvent.idl \
-  nsIIDBOpenDBRequest.idl \
-  nsIIndexedDatabaseManager.idl \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@ -5,3 +5,27 @@

 DIRS += ['ipc']
 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'nsIIDBCursor.idl',
+    'nsIIDBCursorWithValue.idl',
+    'nsIIDBDatabase.idl',
+    'nsIIDBFactory.idl',
+    'nsIIDBFileHandle.idl',
+    'nsIIDBIndex.idl',
+    'nsIIDBKeyRange.idl',
+    'nsIIDBObjectStore.idl',
+    'nsIIDBOpenDBRequest.idl',
+    'nsIIDBRequest.idl',
+    'nsIIDBTransaction.idl',
+    'nsIIDBVersionChangeEvent.idl',
+    'nsIIndexedDatabaseManager.idl',
+]
+
+XPIDL_MODULE = 'dom_indexeddb'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/interfaces/apps/Makefile.in
+++ b/dom/interfaces/apps/Makefile.in
@ -11,21 +11,7 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_apps
 GRE_MODULE     = 1

-XPIDLSRCS =                               \
-            mozIApplication.idl \
-            mozIApplicationClearPrivateDataParams.idl \
-            nsIDOMApplicationRegistry.idl \
-            nsIDOMApplicationRegistry2.idl \
-            nsIAppsService.idl \
-            nsIDOMMozApplicationEvent.idl \
-            $(NULL)
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/interfaces/apps/moz.build
+++ b/dom/interfaces/apps/moz.build
@ -3,3 +3,19 @@
 # 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 += [
+    'mozIApplication.idl',
+    'mozIApplicationClearPrivateDataParams.idl',
+    'nsIAppsService.idl',
+    'nsIDOMApplicationRegistry.idl',
+    'nsIDOMApplicationRegistry2.idl',
+    'nsIDOMMozApplicationEvent.idl',
+]
+
+XPIDL_MODULE = 'dom_apps'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/interfaces/base/Makefile.in
+++ b/dom/interfaces/base/Makefile.in
@ -11,70 +11,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_base
 GRE_MODULE	= 1

-SDK_XPIDLSRCS =                                 \
-	domstubs.idl				\
-	nsIDOMBarProp.idl			\
-	nsIDOMWindow.idl			\
-	nsIDOMWindowCollection.idl		\
-	nsIDOMWindowUtils.idl			\
-	$(NULL)
-
-XPIDLSRCS =					\
-	nsIFrameRequestCallback.idl             \
-	nsIBrowserDOMWindow.idl			\
-	nsIContentPermissionPrompt.idl  \
-	nsIContentPrefService.idl		\
-	nsIContentPrefService2.idl		\
-	nsIContentURIGrouper.idl		\
-	nsIDOMClientInformation.idl		\
-	nsIDOMConstructor.idl			\
-	nsIDOMCRMFObject.idl			\
-	nsIDOMHistory.idl			\
-	nsIDOMLocation.idl			\
-	nsIDOMMediaQueryList.idl		\
-	nsIDOMMimeType.idl			\
-	nsIDOMMimeTypeArray.idl			\
-	nsIDOMNavigator.idl			\
-	nsIDOMPkcs11.idl			\
-	nsIDOMPlugin.idl			\
-	nsIDOMPluginArray.idl			\
-	nsIDOMScreen.idl			\
-	nsIDOMJSWindow.idl			\
-	nsIDOMModalContentWindow.idl		\
-	nsIDOMChromeWindow.idl			\
-        nsIDOMClientRect.idl			\
-        nsIDOMClientRectList.idl		\
-	nsIFocusManager.idl			\
-	nsIQueryContentEventResult.idl		\
-	nsITabChild.idl				\
-	nsITabParent.idl			\
-	nsIDOMGlobalPropertyInitializer.idl	\
-	nsIDOMGlobalObjectConstructor.idl \
-	nsIStructuredCloneContainer.idl		\
-	nsIIdleObserver.idl			\
-	$(NULL)
-
-ifdef MOZ_DISABLE_CRYPTOLEGACY
-XPIDLSRCS += \
-	nsIDOMCrypto.idl			\
-	$(NULL)
-else
-XPIDLSRCS += \
-	nsIDOMCryptoLegacy.idl			\
-	$(NULL)
-endif
-
-ifdef MOZ_B2G
-XPIDLSRCS += \
-	nsIDOMWindowB2G.idl \
-	$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/interfaces/base/moz.build
+++ b/dom/interfaces/base/moz.build
@ -3,3 +3,63 @@
 # 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 += [
+    'domstubs.idl',
+    'nsIBrowserDOMWindow.idl',
+    'nsIContentPermissionPrompt.idl',
+    'nsIContentPrefService.idl',
+    'nsIContentPrefService2.idl',
+    'nsIContentURIGrouper.idl',
+    'nsIDOMBarProp.idl',
+    'nsIDOMCRMFObject.idl',
+    'nsIDOMChromeWindow.idl',
+    'nsIDOMClientInformation.idl',
+    'nsIDOMClientRect.idl',
+    'nsIDOMClientRectList.idl',
+    'nsIDOMConstructor.idl',
+    'nsIDOMGlobalObjectConstructor.idl',
+    'nsIDOMGlobalPropertyInitializer.idl',
+    'nsIDOMHistory.idl',
+    'nsIDOMJSWindow.idl',
+    'nsIDOMLocation.idl',
+    'nsIDOMMediaQueryList.idl',
+    'nsIDOMMimeType.idl',
+    'nsIDOMMimeTypeArray.idl',
+    'nsIDOMModalContentWindow.idl',
+    'nsIDOMNavigator.idl',
+    'nsIDOMPkcs11.idl',
+    'nsIDOMPlugin.idl',
+    'nsIDOMPluginArray.idl',
+    'nsIDOMScreen.idl',
+    'nsIDOMWindow.idl',
+    'nsIDOMWindowCollection.idl',
+    'nsIDOMWindowUtils.idl',
+    'nsIFocusManager.idl',
+    'nsIFrameRequestCallback.idl',
+    'nsIIdleObserver.idl',
+    'nsIQueryContentEventResult.idl',
+    'nsIStructuredCloneContainer.idl',
+    'nsITabChild.idl',
+    'nsITabParent.idl',
+]
+
+if CONFIG['MOZ_DISABLE_CRYPTOLEGACY']:
+    XPIDL_SOURCES += [
+        'nsIDOMCrypto.idl',
+    ]
+else:
+    XPIDL_SOURCES += [
+        'nsIDOMCryptoLegacy.idl',
+    ]
+
+if CONFIG['MOZ_B2G']:
+    XPIDL_SOURCES += [
+        'nsIDOMWindowB2G.idl',
+    ]
+
+XPIDL_MODULE = 'dom_base'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/interfaces/canvas/Makefile.in
+++ b/dom/interfaces/canvas/Makefile.in
@ -11,12 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_canvas
 GRE_MODULE	= 1

-XPIDLSRCS = \
-	nsIDOMCanvasRenderingContext2D.idl \
-	nsIDOMWebGLRenderingContext.idl \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/canvas/moz.build
+++ b/dom/interfaces/canvas/moz.build
@ -3,3 +3,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 += [
+    'nsIDOMCanvasRenderingContext2D.idl',
+    'nsIDOMWebGLRenderingContext.idl',
+]
+
+XPIDL_MODULE = 'dom_canvas'
+
--- a/dom/interfaces/contacts/Makefile.in
+++ b/dom/interfaces/contacts/Makefile.in
@ -10,18 +10,7 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_contacts
 GRE_MODULE     = 1

-XPIDLSRCS =                             \
-            nsIDOMContactProperties.idl \
-            nsIDOMContactManager.idl    \
-            nsIDOMMozContactChangeEvent.idl \
-            $(NULL)
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/interfaces/contacts/moz.build
+++ b/dom/interfaces/contacts/moz.build
@ -3,3 +3,16 @@
 # 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 += [
+    'nsIDOMContactManager.idl',
+    'nsIDOMContactProperties.idl',
+    'nsIDOMMozContactChangeEvent.idl',
+]
+
+XPIDL_MODULE = 'dom_contacts'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/interfaces/core/Makefile.in
+++ b/dom/interfaces/core/Makefile.in
@ -11,38 +11,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_core
 GRE_MODULE	= 1

-SDK_XPIDLSRCS =                                 \
-	nsIDOMAttr.idl				\
-	nsIDOMCDATASection.idl			\
-	nsIDOMCharacterData.idl			\
-	nsIDOMComment.idl			\
-	nsIDOMDOMException.idl			\
-	nsIDOMDOMImplementation.idl		\
-	nsIDOMDocument.idl			\
-	nsIDOMDocumentFragment.idl		\
-	nsIDOMDocumentType.idl			\
-	nsIDOMElement.idl			\
-	nsIDOMMozNamedAttrMap.idl		\
-	nsIDOMNode.idl				\
-	nsIDOMNodeList.idl			\
-	nsIDOMProcessingInstruction.idl		\
-	nsIDOMText.idl				\
-	nsIDocumentRegister.idl		\
-	$(NULL)
-XPIDLSRCS =                                     \
-	nsIDOMDOMStringList.idl			\
-	nsIDOMXMLDocument.idl			\
-	nsIDOMUserDataHandler.idl		\
-	nsIDOMNSEditableElement.idl		\
-	nsIDOMNodeSelector.idl			\
-	nsIInlineEventHandlers.idl              \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)
--- a/dom/interfaces/core/moz.build
+++ b/dom/interfaces/core/moz.build
@ -3,3 +3,34 @@
 # 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 += [
+    'nsIDOMAttr.idl',
+    'nsIDOMCDATASection.idl',
+    'nsIDOMCharacterData.idl',
+    'nsIDOMComment.idl',
+    'nsIDOMDOMException.idl',
+    'nsIDOMDOMImplementation.idl',
+    'nsIDOMDOMStringList.idl',
+    'nsIDOMDocument.idl',
+    'nsIDOMDocumentFragment.idl',
+    'nsIDOMDocumentType.idl',
+    'nsIDOMElement.idl',
+    'nsIDOMMozNamedAttrMap.idl',
+    'nsIDOMNSEditableElement.idl',
+    'nsIDOMNode.idl',
+    'nsIDOMNodeList.idl',
+    'nsIDOMNodeSelector.idl',
+    'nsIDOMProcessingInstruction.idl',
+    'nsIDOMText.idl',
+    'nsIDOMUserDataHandler.idl',
+    'nsIDOMXMLDocument.idl',
+    'nsIDocumentRegister.idl',
+    'nsIInlineEventHandlers.idl',
+]
+
+XPIDL_MODULE = 'dom_core'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
--- a/dom/interfaces/css/Makefile.in
+++ b/dom/interfaces/css/Makefile.in
@ -11,41 +11,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_css
 GRE_MODULE	= 1

-SDK_XPIDLSRCS = 				\
-	nsIDOMCSSPrimitiveValue.idl		\
-	nsIDOMCSSRule.idl			\
-	nsIDOMCSSRuleList.idl			\
-	nsIDOMCSSStyleDeclaration.idl		\
-	nsIDOMCSSStyleSheet.idl			\
-	nsIDOMCSSValue.idl			\
-	nsIDOMCSSValueList.idl			\
-	nsIDOMElementCSSInlineStyle.idl		\
-	$(NULL)
-
-XPIDLSRCS =					\
-	nsIDOMCSSCharsetRule.idl		\
-	nsIDOMCSSConditionRule.idl		\
-	nsIDOMCSSFontFaceRule.idl		\
-	nsIDOMCSSGroupingRule.idl		\
-	nsIDOMCSSImportRule.idl			\
-	nsIDOMCSSMediaRule.idl			\
-	nsIDOMCSSMozDocumentRule.idl		\
-	nsIDOMCSSSupportsRule.idl		\
-	nsIDOMMozCSSKeyframeRule.idl		\
-	nsIDOMMozCSSKeyframesRule.idl		\
-	nsIDOMCSSPageRule.idl			\
-	nsIDOMCSSStyleRule.idl			\
-	nsIDOMCSSUnknownRule.idl		\
-	nsIDOMCounter.idl			\
-	nsIDOMRect.idl				\
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/stylesheets \
-  $(NULL)
--- a/dom/interfaces/css/moz.build
+++ b/dom/interfaces/css/moz.build
@ -3,3 +3,36 @@
 # 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 += [
+    'nsIDOMCSSCharsetRule.idl',
+    'nsIDOMCSSConditionRule.idl',
+    'nsIDOMCSSFontFaceRule.idl',
+    'nsIDOMCSSGroupingRule.idl',
+    'nsIDOMCSSImportRule.idl',
+    'nsIDOMCSSMediaRule.idl',
+    'nsIDOMCSSMozDocumentRule.idl',
+    'nsIDOMCSSPageRule.idl',
+    'nsIDOMCSSPrimitiveValue.idl',
+    'nsIDOMCSSRule.idl',
+    'nsIDOMCSSRuleList.idl',
+    'nsIDOMCSSStyleDeclaration.idl',
+    'nsIDOMCSSStyleRule.idl',
+    'nsIDOMCSSStyleSheet.idl',
+    'nsIDOMCSSSupportsRule.idl',
+    'nsIDOMCSSUnknownRule.idl',
+    'nsIDOMCSSValue.idl',
+    'nsIDOMCSSValueList.idl',
+    'nsIDOMCounter.idl',
+    'nsIDOMElementCSSInlineStyle.idl',
+    'nsIDOMMozCSSKeyframeRule.idl',
+    'nsIDOMMozCSSKeyframesRule.idl',
+    'nsIDOMRect.idl',
+]
+
+XPIDL_MODULE = 'dom_css'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/stylesheets',
+]
+
--- a/dom/interfaces/devicestorage/Makefile.in
+++ b/dom/interfaces/devicestorage/Makefile.in
@ -11,22 +11,11 @@ include $(DEPTH)/config/autoconf.mk

 MODULE           = dom
 LIBRARY_NAME     = domdevicestorage_s
-XPIDL_MODULE     = dom_devicestorage
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/dom/dom-config.mk

-XPIDLSRCS = \
-	nsIDOMDeviceStorage.idl \
-	nsIDOMDeviceStorageCursor.idl \
-	nsIDOMNavigatorDeviceStorage.idl \
-	nsIDOMDeviceStorageChangeEvent.idl
-
 include $(topsrcdir)/config/rules.mk


-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)
--- a/dom/interfaces/devicestorage/moz.build
+++ b/dom/interfaces/devicestorage/moz.build
@ -3,3 +3,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 += [
+    'nsIDOMDeviceStorage.idl',
+    'nsIDOMDeviceStorageChangeEvent.idl',
+    'nsIDOMDeviceStorageCursor.idl',
+    'nsIDOMNavigatorDeviceStorage.idl',
+]
+
+XPIDL_MODULE = 'dom_devicestorage'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+
--- a/dom/interfaces/events/Makefile.in
+++ b/dom/interfaces/events/Makefile.in
@ -11,60 +11,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_events
 GRE_MODULE	= 1

-SDK_XPIDLSRCS =                                 \
-	nsIDOMEvent.idl				\
-	nsIDOMEventTarget.idl			\
-	nsIDOMEventListener.idl			\
-	nsIDOMMouseEvent.idl			\
-	nsIDOMMouseScrollEvent.idl      \
-	nsIDOMUIEvent.idl			\
-	nsIDOMProgressEvent.idl			\
-	$(NULL)
-
-XPIDLSRCS =					\
-	nsIDOMNSEvent.idl			\
-	nsIDOMDataContainerEvent.idl	\
-	nsIDOMKeyEvent.idl			\
-	nsIDOMMutationEvent.idl			\
-	nsIDOMDragEvent.idl  			\
-	nsIDOMDataTransfer.idl  			\
-	nsIDOMDOMTransactionEvent.idl  			\
-	nsIDOMPopupBlockedEvent.idl		\
-	nsIDOMBeforeUnloadEvent.idl		\
-	nsIDOMSmartCardEvent.idl                \
-	nsIDOMPageTransitionEvent.idl		\
-	nsIDOMCommandEvent.idl			\
-	nsIDOMMessageEvent.idl			\
-	nsIDOMNotifyPaintEvent.idl              \
-	nsIDOMNotifyAudioAvailableEvent.idl     \
-	nsIDOMPaintRequest.idl			\
-	nsIDOMPaintRequestList.idl		\
-	nsIDOMSimpleGestureEvent.idl		\
-	nsIDOMDeviceLightEvent.idl              \
-	nsIDOMDeviceProximityEvent.idl          \
-	nsIDOMUserProximityEvent.idl            \
-	nsIDOMDeviceOrientationEvent.idl        \
-	nsIDOMDeviceMotionEvent.idl		\
-	nsIDOMElementReplaceEvent.idl		\
-	nsIDOMScrollAreaEvent.idl		\
-	nsIDOMTransitionEvent.idl		\
-	nsIDOMAnimationEvent.idl		\
-	nsIDOMPopStateEvent.idl			\
-	nsIDOMCloseEvent.idl			\
-	nsIDOMTouchEvent.idl			\
-	nsIDOMHashChangeEvent.idl		\
-	nsIDOMCustomEvent.idl			\
-	nsIDOMCompositionEvent.idl		\
-	nsIDOMWheelEvent.idl			\
-	nsIDOMBlobEvent.idl			\
-	nsIDOMClipboardEvent.idl  		\
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)
--- a/dom/interfaces/events/moz.build
+++ b/dom/interfaces/events/moz.build
@ -3,3 +3,55 @@
 # 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 += [
+    'nsIDOMAnimationEvent.idl',
+    'nsIDOMBeforeUnloadEvent.idl',
+    'nsIDOMBlobEvent.idl',
+    'nsIDOMClipboardEvent.idl',
+    'nsIDOMCloseEvent.idl',
+    'nsIDOMCommandEvent.idl',
+    'nsIDOMCompositionEvent.idl',
+    'nsIDOMCustomEvent.idl',
+    'nsIDOMDOMTransactionEvent.idl',
+    'nsIDOMDataContainerEvent.idl',
+    'nsIDOMDataTransfer.idl',
+    'nsIDOMDeviceLightEvent.idl',
+    'nsIDOMDeviceMotionEvent.idl',
+    'nsIDOMDeviceOrientationEvent.idl',
+    'nsIDOMDeviceProximityEvent.idl',
+    'nsIDOMDragEvent.idl',
+    'nsIDOMElementReplaceEvent.idl',
+    'nsIDOMEvent.idl',
+    'nsIDOMEventListener.idl',
+    'nsIDOMEventTarget.idl',
+    'nsIDOMHashChangeEvent.idl',
+    'nsIDOMKeyEvent.idl',
+    'nsIDOMMessageEvent.idl',
+    'nsIDOMMouseEvent.idl',
+    'nsIDOMMouseScrollEvent.idl',
+    'nsIDOMMutationEvent.idl',
+    'nsIDOMNSEvent.idl',
+    'nsIDOMNotifyAudioAvailableEvent.idl',
+    'nsIDOMNotifyPaintEvent.idl',
+    'nsIDOMPageTransitionEvent.idl',
+    'nsIDOMPaintRequest.idl',
+    'nsIDOMPaintRequestList.idl',
+    'nsIDOMPopStateEvent.idl',
+    'nsIDOMPopupBlockedEvent.idl',
+    'nsIDOMProgressEvent.idl',
+    'nsIDOMScrollAreaEvent.idl',
+    'nsIDOMSimpleGestureEvent.idl',
+    'nsIDOMSmartCardEvent.idl',
+    'nsIDOMTouchEvent.idl',
+    'nsIDOMTransitionEvent.idl',
+    'nsIDOMUIEvent.idl',
+    'nsIDOMUserProximityEvent.idl',
+    'nsIDOMWheelEvent.idl',
+]
+
+XPIDL_MODULE = 'dom_events'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
--- a/dom/interfaces/geolocation/Makefile.in
+++ b/dom/interfaces/geolocation/Makefile.in
@ -11,22 +11,7 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_geolocation
 GRE_MODULE     = 1

-XPIDLSRCS =                                    \
-            nsIDOMGeoGeolocation.idl           \
-            nsIDOMGeoPosition.idl              \
-            nsIDOMGeoPositionCoords.idl        \
-            nsIDOMGeoPositionCallback.idl      \
-            nsIDOMGeoPositionError.idl         \
-            nsIDOMGeoPositionErrorCallback.idl \
-            nsIDOMNavigatorGeolocation.idl     \
-            nsIGeolocation.idl \
-            $(NULL)
-
 include $(topsrcdir)/config/rules.mk

-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)
--- a/dom/interfaces/geolocation/moz.build
+++ b/dom/interfaces/geolocation/moz.build
@ -3,3 +3,20 @@
 # 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 += [
+    'nsIDOMGeoGeolocation.idl',
+    'nsIDOMGeoPosition.idl',
+    'nsIDOMGeoPositionCallback.idl',
+    'nsIDOMGeoPositionCoords.idl',
+    'nsIDOMGeoPositionError.idl',
+    'nsIDOMGeoPositionErrorCallback.idl',
+    'nsIDOMNavigatorGeolocation.idl',
+    'nsIGeolocation.idl',
+]
+
+XPIDL_MODULE = 'dom_geolocation'
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+
--- a/Show More
+++ b/Show More