Bug 818246 - Part 7: Move XPIDL_MODULE to moz.build; rs=gps

2024-10-08 19:04:45 +00:00 · 2013-03-11 22:00:00 -07:00 · 2013-03-11 22:00:00 -07:00 · cd4191e248
commit cd4191e248
parent 02d464acc1
216 changed files with 218 additions and 134 deletions
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@ -10,8 +10,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE = browsercomps
-XPIDL_MODULE = browsercompsbase
-
 EXTRA_COMPONENTS = \
  BrowserComponents.manifest \
  $(NULL)
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@ -31,3 +31,5 @@ XPIDL_SOURCES += [
    'nsIBrowserHandler.idl',
 ]

+XPIDL_MODULE = 'browsercompsbase'
+
--- a/config/rules.mk
+++ b/config/rules.mk
@ -20,6 +20,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
  TEST_DIRS \
  TIERS \
  TOOL_DIRS \
+  XPIDL_MODULE \
  $(NULL)

 ifndef EXTERNALLY_MANAGED_MAKE_FILE
--- 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		= \
--- a/content/base/public/moz.build
+++ b/content/base/public/moz.build
@ -28,3 +28,5 @@ XPIDL_SOURCES += [
    '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		= \
--- a/content/canvas/public/moz.build
+++ b/content/canvas/public/moz.build
@ -7,3 +7,5 @@ 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 \
--- a/content/events/public/moz.build
+++ b/content/events/public/moz.build
@ -7,3 +7,5 @@ XPIDL_SOURCES += [
    'nsIEventListenerService.idl',
 ]

+XPIDL_MODULE = 'content_events'
+
--- a/content/html/content/public/Makefile.in
+++ b/content/html/content/public/Makefile.in
@ -11,8 +11,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE       = content
-XPIDL_MODULE = content_html
-
 EXPORTS = \
 		nsIConstraintValidation.h \
 		nsIFormControl.h \
--- a/content/html/content/public/moz.build
+++ b/content/html/content/public/moz.build
@ -10,3 +10,5 @@ XPIDL_SOURCES += [
    'nsIPhonetic.idl',
 ]

+XPIDL_MODULE = 'content_html'
+
--- a/content/html/document/public/Makefile.in
+++ b/content/html/document/public/Makefile.in
@ -11,6 +11,4 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= content
-XPIDL_MODULE	= content_htmldoc
-
 include $(topsrcdir)/config/rules.mk
--- a/content/html/document/public/moz.build
+++ b/content/html/document/public/moz.build
@ -7,3 +7,5 @@ XPIDL_SOURCES += [
    'nsIImageDocument.idl',
 ]

+XPIDL_MODULE = 'content_htmldoc'
+
--- a/content/xslt/public/Makefile.in
+++ b/content/xslt/public/Makefile.in
@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE       = content
-XPIDL_MODULE = content_xslt
-
 EXPORTS		= \
 		nsIDocumentTransformer.h \
 		$(NULL)
--- a/content/xslt/public/moz.build
+++ b/content/xslt/public/moz.build
@ -13,3 +13,5 @@ XPIDL_SOURCES += [
    'txIXPathObject.idl',
 ]

+XPIDL_MODULE = 'content_xslt'
+
--- a/dom/activities/interfaces/Makefile.in
+++ b/dom/activities/interfaces/Makefile.in
@ -9,8 +9,6 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-XPIDL_MODULE = dom_activities
-
 include $(topsrcdir)/config/rules.mk

 XPIDL_FLAGS += \
--- a/dom/activities/interfaces/moz.build
+++ b/dom/activities/interfaces/moz.build
@ -13,3 +13,5 @@ XPIDL_SOURCES += [
    'nsIDOMNavigatorActivities.idl',
 ]

+XPIDL_MODULE = 'dom_activities'
+
--- 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
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@ -10,3 +10,5 @@ XPIDL_SOURCES += [
    'nsIDOMAlarmsManager.idl',
 ]

+XPIDL_MODULE = 'dom_alarm'
+
--- 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
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@ -9,3 +9,5 @@ XPIDL_SOURCES += [
    'nsIAudioChannelAgent.idl',
 ]

+XPIDL_MODULE = 'dom_audiochannel'
+
--- 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
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@ -9,3 +9,5 @@ XPIDL_SOURCES += [
    'nsINavigatorBattery.idl',
 ]

+XPIDL_MODULE = 'dom_battery'
+
--- 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

--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@ -14,6 +14,7 @@
 # limitations under the License.

 if CONFIG['MOZ_B2G_BT']:
+    XPIDL_MODULE = 'dom_bluetooth'
    XPIDL_SOURCES += [
        'nsIDOMNavigatorBluetooth.idl',
        'nsIDOMBluetoothManager.idl',
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@ -10,3 +10,5 @@ XPIDL_SOURCES += [
    '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
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@ -8,3 +8,5 @@ XPIDL_SOURCES += [
    'nsIDOMNavigatorCamera.idl',
 ]

+XPIDL_MODULE = 'dom_camera'
+
--- a/dom/cellbroadcast/interfaces/Makefile.in
+++ b/dom/cellbroadcast/interfaces/Makefile.in
@ -9,8 +9,6 @@ VPATH            = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 include $(topsrcdir)/config/rules.mk
--- a/dom/cellbroadcast/interfaces/moz.build
+++ b/dom/cellbroadcast/interfaces/moz.build
@ -11,3 +11,5 @@ XPIDL_SOURCES += [
    'nsINavigatorCellBroadcast.idl',
 ]

+XPIDL_MODULE = 'dom_cellbroadcast'
+
--- 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
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@ -12,3 +12,5 @@ XPIDL_SOURCES += [
    'nsIDOMLockedFile.idl',
 ]

+XPIDL_MODULE = 'dom_file'
+
--- 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

--- a/dom/fm/moz.build
+++ b/dom/fm/moz.build
@ -8,3 +8,5 @@ XPIDL_SOURCES += [
    'nsIFMRadio.idl',
 ]

+XPIDL_MODULE = 'dom_fm'
+
--- a/dom/icc/interfaces/Makefile.in
+++ b/dom/icc/interfaces/Makefile.in
@ -9,8 +9,6 @@ VPATH            = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 include $(topsrcdir)/config/rules.mk
--- a/dom/icc/interfaces/moz.build
+++ b/dom/icc/interfaces/moz.build
@ -10,3 +10,5 @@ XPIDL_SOURCES += [
    'nsIIccProvider.idl',
 ]

+XPIDL_MODULE = 'dom_icc'
+
--- 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
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@ -22,3 +22,5 @@ XPIDL_SOURCES += [
    'nsIIndexedDatabaseManager.idl',
 ]

+XPIDL_MODULE = 'dom_indexeddb'
+
--- a/dom/interfaces/apps/Makefile.in
+++ b/dom/interfaces/apps/Makefile.in
@ -11,7 +11,6 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_apps
 GRE_MODULE     = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/apps/moz.build
+++ b/dom/interfaces/apps/moz.build
@ -12,3 +12,5 @@ XPIDL_SOURCES += [
    'nsIDOMMozApplicationEvent.idl',
 ]

+XPIDL_MODULE = 'dom_apps'
+
--- a/dom/interfaces/base/Makefile.in
+++ b/dom/interfaces/base/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_base
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/base/moz.build
+++ b/dom/interfaces/base/moz.build
@ -57,3 +57,5 @@ if CONFIG['MOZ_B2G']:
        'nsIDOMWindowB2G.idl',
    ]

+XPIDL_MODULE = 'dom_base'
+
--- a/dom/interfaces/canvas/Makefile.in
+++ b/dom/interfaces/canvas/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_canvas
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/canvas/moz.build
+++ b/dom/interfaces/canvas/moz.build
@ -8,3 +8,5 @@ XPIDL_SOURCES += [
    'nsIDOMWebGLRenderingContext.idl',
 ]

+XPIDL_MODULE = 'dom_canvas'
+
--- a/dom/interfaces/contacts/Makefile.in
+++ b/dom/interfaces/contacts/Makefile.in
@ -10,7 +10,6 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_contacts
 GRE_MODULE     = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/contacts/moz.build
+++ b/dom/interfaces/contacts/moz.build
@ -9,3 +9,5 @@ XPIDL_SOURCES += [
    'nsIDOMMozContactChangeEvent.idl',
 ]

+XPIDL_MODULE = 'dom_contacts'
+
--- a/dom/interfaces/core/Makefile.in
+++ b/dom/interfaces/core/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_core
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/core/moz.build
+++ b/dom/interfaces/core/moz.build
@ -27,3 +27,5 @@ XPIDL_SOURCES += [
    'nsIInlineEventHandlers.idl',
 ]

+XPIDL_MODULE = 'dom_core'
+
--- a/dom/interfaces/css/Makefile.in
+++ b/dom/interfaces/css/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_css
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/css/moz.build
+++ b/dom/interfaces/css/moz.build
@ -29,3 +29,5 @@ XPIDL_SOURCES += [
    'nsIDOMRect.idl',
 ]

+XPIDL_MODULE = 'dom_css'
+
--- a/dom/interfaces/devicestorage/Makefile.in
+++ b/dom/interfaces/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

--- a/dom/interfaces/devicestorage/moz.build
+++ b/dom/interfaces/devicestorage/moz.build
@ -10,3 +10,5 @@ XPIDL_SOURCES += [
    'nsIDOMNavigatorDeviceStorage.idl',
 ]

+XPIDL_MODULE = 'dom_devicestorage'
+
--- a/dom/interfaces/events/Makefile.in
+++ b/dom/interfaces/events/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_events
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/events/moz.build
+++ b/dom/interfaces/events/moz.build
@ -49,3 +49,5 @@ XPIDL_SOURCES += [
    'nsIDOMWheelEvent.idl',
 ]

+XPIDL_MODULE = 'dom_events'
+
--- a/dom/interfaces/geolocation/Makefile.in
+++ b/dom/interfaces/geolocation/Makefile.in
@ -11,7 +11,6 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_geolocation
 GRE_MODULE     = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/geolocation/moz.build
+++ b/dom/interfaces/geolocation/moz.build
@ -14,3 +14,5 @@ XPIDL_SOURCES += [
    'nsIGeolocation.idl',
 ]

+XPIDL_MODULE = 'dom_geolocation'
+
--- a/dom/interfaces/html/Makefile.in
+++ b/dom/interfaces/html/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_html
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/html/moz.build
+++ b/dom/interfaces/html/moz.build
@ -79,3 +79,5 @@ XPIDL_SOURCES += [
    'nsIMozBrowserFrame.idl',
 ]

+XPIDL_MODULE = 'dom_html'
+
--- a/dom/interfaces/json/Makefile.in
+++ b/dom/interfaces/json/Makefile.in
@ -11,7 +11,6 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_json
 GRE_MODULE     = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/json/moz.build
+++ b/dom/interfaces/json/moz.build
@ -7,3 +7,5 @@ XPIDL_SOURCES += [
    'nsIJSON.idl',
 ]

+XPIDL_MODULE = 'dom_json'
+
--- a/dom/interfaces/notification/Makefile.in
+++ b/dom/interfaces/notification/Makefile.in
@ -11,7 +11,6 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_notification
 GRE_MODULE     = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/notification/moz.build
+++ b/dom/interfaces/notification/moz.build
@ -8,3 +8,5 @@ XPIDL_SOURCES += [
    'nsIDOMNavigatorDesktopNotification.idl',
 ]

+XPIDL_MODULE = 'dom_notification'
+
--- a/dom/interfaces/offline/Makefile.in
+++ b/dom/interfaces/offline/Makefile.in
@ -11,7 +11,6 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_offline
 GRE_MODULE     = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/offline/moz.build
+++ b/dom/interfaces/offline/moz.build
@ -8,3 +8,5 @@ XPIDL_SOURCES += [
    'nsIDOMOfflineResourceList.idl',
 ]

+XPIDL_MODULE = 'dom_offline'
+
--- a/dom/interfaces/permission/Makefile.in
+++ b/dom/interfaces/permission/Makefile.in
@ -10,7 +10,6 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_permissionsettings
 GRE_MODULE     = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/permission/moz.build
+++ b/dom/interfaces/permission/moz.build
@ -8,3 +8,5 @@ XPIDL_SOURCES += [
    'nsIPermissionPromptService.idl',
 ]

+XPIDL_MODULE = 'dom_permissionsettings'
+
--- a/dom/interfaces/range/Makefile.in
+++ b/dom/interfaces/range/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_range
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/range/moz.build
+++ b/dom/interfaces/range/moz.build
@ -7,3 +7,5 @@ XPIDL_SOURCES += [
    'nsIDOMRange.idl',
 ]

+XPIDL_MODULE = 'dom_range'
+
--- a/dom/interfaces/settings/Makefile.in
+++ b/dom/interfaces/settings/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_settings
 GRE_MODULE     = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/settings/moz.build
+++ b/dom/interfaces/settings/moz.build
@ -9,3 +9,5 @@ XPIDL_SOURCES += [
    'nsISettingsService.idl',
 ]

+XPIDL_MODULE = 'dom_settings'
+
--- a/dom/interfaces/sidebar/Makefile.in
+++ b/dom/interfaces/sidebar/Makefile.in
@ -11,7 +11,6 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE          = dom
-XPIDL_MODULE    = dom_sidebar
 GRE_MODULE      = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/sidebar/moz.build
+++ b/dom/interfaces/sidebar/moz.build
@ -8,3 +8,5 @@ XPIDL_SOURCES += [
    'nsIWebContentHandlerRegistrar.idl',
 ]

+XPIDL_MODULE = 'dom_sidebar'
+
--- a/dom/interfaces/smil/Makefile.in
+++ b/dom/interfaces/smil/Makefile.in
@ -12,8 +12,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_smil
-
 include $(topsrcdir)/config/rules.mk

 XPIDL_FLAGS += \
--- a/dom/interfaces/smil/moz.build
+++ b/dom/interfaces/smil/moz.build
@ -7,3 +7,5 @@ XPIDL_SOURCES += [
    'nsIDOMTimeEvent.idl',
 ]

+XPIDL_MODULE = 'dom_smil'
+
--- a/dom/interfaces/storage/Makefile.in
+++ b/dom/interfaces/storage/Makefile.in
@ -11,7 +11,6 @@ VPATH          = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE         = dom
-XPIDL_MODULE   = dom_storage
 GRE_MODULE     = 1

 EXPORTS =                                      \
--- a/dom/interfaces/storage/moz.build
+++ b/dom/interfaces/storage/moz.build
@ -13,3 +13,5 @@ XPIDL_SOURCES += [
    'nsIDOMToString.idl',
 ]

+XPIDL_MODULE = 'dom_storage'
+
--- a/dom/interfaces/stylesheets/Makefile.in
+++ b/dom/interfaces/stylesheets/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_stylesheets
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/stylesheets/moz.build
+++ b/dom/interfaces/stylesheets/moz.build
@ -10,3 +10,5 @@ XPIDL_SOURCES += [
    'nsIDOMStyleSheetList.idl',
 ]

+XPIDL_MODULE = 'dom_stylesheets'
+
--- a/dom/interfaces/svg/Makefile.in
+++ b/dom/interfaces/svg/Makefile.in
@ -13,8 +13,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_svg
-
 include $(topsrcdir)/config/rules.mk

 XPIDL_FLAGS += \
--- a/dom/interfaces/svg/moz.build
+++ b/dom/interfaces/svg/moz.build
@ -24,3 +24,5 @@ XPIDL_SOURCES += [
    'nsIDOMSVGZoomEvent.idl',
 ]

+XPIDL_MODULE = 'dom_svg'
+
--- a/dom/interfaces/traversal/Makefile.in
+++ b/dom/interfaces/traversal/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_traversal
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/traversal/moz.build
+++ b/dom/interfaces/traversal/moz.build
@ -9,3 +9,5 @@ XPIDL_SOURCES += [
    'nsIDOMTreeWalker.idl',
 ]

+XPIDL_MODULE = 'dom_traversal'
+
--- a/dom/interfaces/xbl/Makefile.in
+++ b/dom/interfaces/xbl/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_xbl
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/xbl/moz.build
+++ b/dom/interfaces/xbl/moz.build
@ -7,3 +7,5 @@ XPIDL_SOURCES += [
    'nsIDOMDocumentXBL.idl',
 ]

+XPIDL_MODULE = 'dom_xbl'
+
--- a/dom/interfaces/xpath/Makefile.in
+++ b/dom/interfaces/xpath/Makefile.in
@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_xpath
-
 include $(topsrcdir)/config/rules.mk

 XPIDL_FLAGS += \
--- a/dom/interfaces/xpath/moz.build
+++ b/dom/interfaces/xpath/moz.build
@ -12,3 +12,5 @@ XPIDL_SOURCES += [
    'nsIDOMXPathResult.idl',
 ]

+XPIDL_MODULE = 'dom_xpath'
+
--- a/dom/interfaces/xul/Makefile.in
+++ b/dom/interfaces/xul/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= dom
-XPIDL_MODULE	= dom_xul
 GRE_MODULE	= 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/xul/moz.build
+++ b/dom/interfaces/xul/moz.build
@ -26,3 +26,5 @@ XPIDL_SOURCES += [
    'nsIDOMXULTreeElement.idl',
 ]

+XPIDL_MODULE = 'dom_xul'
+
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@ -11,7 +11,6 @@ relativesrcdir   = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE           = dom
-XPIDL_MODULE     = dom_media
 LIBRARY_NAME     = dom_media_s
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@ -15,3 +15,5 @@ XPIDL_SOURCES += [
    'nsIMediaManager.idl',
 ]

+XPIDL_MODULE = 'dom_media'
+
--- a/dom/messages/interfaces/Makefile.in
+++ b/dom/messages/interfaces/Makefile.in
@ -9,8 +9,6 @@ VPATH            = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 include $(topsrcdir)/config/rules.mk
--- a/dom/messages/interfaces/moz.build
+++ b/dom/messages/interfaces/moz.build
@ -8,3 +8,5 @@ XPIDL_SOURCES += [
    'nsISystemMessagesInternal.idl',
 ]

+XPIDL_MODULE = 'dom_messages'
+
--- a/dom/mms/interfaces/Makefile.in
+++ b/dom/mms/interfaces/Makefile.in
@ -9,6 +9,4 @@ VPATH            = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-XPIDL_MODULE = dom_mms
-
 include $(topsrcdir)/config/rules.mk
--- a/Show More
+++ b/Show More