Bug 818246 - Part 9: Move XPIDL_FLAGS to moz.build; r=gps

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/

browser/components/places/moz.build

@@ -5,3 +5,8 @@
 
 DIRS += ['src']
 TEST_DIRS += ['tests']
+
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/browser/components/',
+]
+

browser/components/places/src/Makefile.in

@@ -21,4 +21,3 @@ EXTRA_JS_MODULES = \
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += -I$(topsrcdir)/browser/components

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',
+]
+

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

dom/activities/interfaces/Makefile.in

@@ -11,8 +11,3 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/activities/interfaces/moz.build

@@ -15,3 +15,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_activities'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/alarm/Makefile.in

@@ -42,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)

dom/alarm/moz.build

@@ -12,3 +12,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_alarm'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/base/Makefile.in

@@ -139,7 +139,3 @@ CXXFLAGS += $(TK_CFLAGS)
 LDFLAGS += $(TK_LIBS)
 endif
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/base/moz.build

@@ -14,3 +14,8 @@ XPIDL_SOURCES += [
     'nsISiteSpecificUserAgent.idl',
 ]
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/battery/Makefile.in

@@ -35,7 +35,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 \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/battery/moz.build

@@ -11,3 +11,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_battery'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/camera/Makefile.in

@@ -62,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)

dom/camera/moz.build

@@ -10,3 +10,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_camera'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+    '-I$(topsrcdir)/dom/media',
+]
+

dom/cellbroadcast/interfaces/Makefile.in

@@ -13,8 +13,3 @@ include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/cellbroadcast/interfaces/moz.build

@@ -13,3 +13,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_cellbroadcast'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/file/Makefile.in

@@ -61,8 +61,3 @@ EXPORTS_mozilla/dom/file = \
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/file/moz.build

@@ -14,3 +14,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_file'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/fm/Makefile.in

@@ -33,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)
-

dom/fm/moz.build

@@ -10,3 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_fm'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/icc/interfaces/Makefile.in

@@ -12,7 +12,3 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/icc/interfaces/moz.build

@@ -12,3 +12,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_icc'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/indexedDB/Makefile.in

@@ -82,7 +82,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 \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/indexedDB/moz.build

@@ -24,3 +24,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_indexeddb'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/interfaces/apps/Makefile.in

@@ -15,7 +15,3 @@ GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/interfaces/apps/moz.build

@@ -14,3 +14,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_apps'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/interfaces/base/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/interfaces/base/moz.build

@@ -59,3 +59,7 @@ if CONFIG['MOZ_B2G']:
 
 XPIDL_MODULE = 'dom_base'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/interfaces/contacts/Makefile.in

@@ -14,7 +14,3 @@ GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/interfaces/contacts/moz.build

@@ -11,3 +11,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_contacts'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/interfaces/core/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/core/moz.build

@@ -29,3 +29,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_core'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/css/Makefile.in

@@ -15,7 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/stylesheets \
-  $(NULL)

dom/interfaces/css/moz.build

@@ -31,3 +31,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_css'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/stylesheets',
+]
+

dom/interfaces/devicestorage/Makefile.in

@@ -19,7 +19,3 @@ include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/interfaces/devicestorage/moz.build

@@ -12,3 +12,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_devicestorage'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/interfaces/events/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/events/moz.build

@@ -51,3 +51,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_events'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/geolocation/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/geolocation/moz.build

@@ -16,3 +16,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_geolocation'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/html/Makefile.in

@@ -15,7 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/core \
-  $(NULL)

dom/interfaces/html/moz.build

@@ -81,3 +81,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_html'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+]
+

dom/interfaces/json/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/json/moz.build

@@ -9,3 +9,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_json'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/notification/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/notification/moz.build

@@ -10,3 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_notification'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/offline/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/offline/moz.build

@@ -10,3 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_offline'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/permission/Makefile.in

@@ -14,6 +14,3 @@ GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/permission/moz.build

@@ -10,3 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_permissionsettings'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/range/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/range/moz.build

@@ -9,3 +9,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_range'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/settings/Makefile.in

@@ -14,7 +14,3 @@ GRE_MODULE     = 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/interfaces/settings/moz.build

@@ -11,3 +11,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_settings'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/interfaces/smil/Makefile.in

@@ -14,9 +14,3 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= dom
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/core \
-  -I$(topsrcdir)/dom/interfaces/events \
-  -I$(topsrcdir)/dom/interfaces/svg \
-  $(NULL)

dom/interfaces/smil/moz.build

@@ -9,3 +9,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_smil'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+    '-I$(topsrcdir)/dom/interfaces/events',
+    '-I$(topsrcdir)/dom/interfaces/svg',
+]
+

dom/interfaces/storage/Makefile.in

@@ -19,7 +19,3 @@ EXPORTS =                                      \
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/interfaces/storage/moz.build

@@ -15,3 +15,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_storage'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/interfaces/stylesheets/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/stylesheets/moz.build

@@ -12,3 +12,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_stylesheets'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/svg/Makefile.in

@@ -15,8 +15,3 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= dom
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/core \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/interfaces/svg/moz.build

@@ -26,3 +26,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_svg'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/interfaces/traversal/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/traversal/moz.build

@@ -11,3 +11,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_traversal'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/xbl/Makefile.in

@@ -15,6 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/interfaces/xbl/moz.build

@@ -9,3 +9,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xbl'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/interfaces/xpath/Makefile.in

@@ -12,7 +12,3 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= dom
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/core \
-  $(NULL)

dom/interfaces/xpath/moz.build

@@ -14,3 +14,8 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xpath'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+]
+

dom/interfaces/xul/Makefile.in

@@ -15,8 +15,3 @@ GRE_MODULE	= 1
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/core \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/interfaces/xul/moz.build

@@ -28,3 +28,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xul'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/core',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/messages/interfaces/Makefile.in

@@ -13,6 +13,3 @@ include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/messages/interfaces/moz.build

@@ -10,3 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_messages'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/mobilemessage/interfaces/Makefile.in

@@ -13,8 +13,3 @@ include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/mobilemessage/interfaces/moz.build

@@ -24,3 +24,9 @@ if CONFIG['MOZ_B2G_RIL']:
 
 XPIDL_MODULE = 'dom_mobilemessage'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/network/interfaces/Makefile.in

@@ -13,7 +13,3 @@ include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/network/interfaces/moz.build

@@ -25,3 +25,8 @@ if CONFIG['MOZ_B2G_RIL']:
 
 XPIDL_MODULE = 'dom_network'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/payment/interfaces/Makefile.in

@@ -10,6 +10,3 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/interfaces/base \
-  $(NULL)

dom/payment/interfaces/moz.build

@@ -12,3 +12,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_payment'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/interfaces/base',
+]
+

dom/system/gonk/Makefile.in

@@ -90,6 +90,3 @@ endif
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/network/interfaces \
-  $(NULL)

dom/system/gonk/moz.build

@@ -28,3 +28,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_system_gonk'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/network/interfaces',
+]
+

dom/telephony/Makefile.in

@@ -24,8 +24,3 @@ CPPSRCS = \
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/telephony/moz.build

@@ -13,3 +13,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_telephony'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/voicemail/Makefile.in

@@ -28,8 +28,3 @@ CPPSRCS = \
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  $(NULL)

dom/voicemail/moz.build

@@ -13,3 +13,9 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_voicemail'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+]
+

dom/wifi/Makefile.in

@@ -31,9 +31,3 @@ EXTRA_JS_MODULES = \
 include $(topsrcdir)/config/rules.mk
 
 
-XPIDL_FLAGS += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/interfaces/base \
-  -I$(topsrcdir)/dom/interfaces/events \
-  -I$(topsrcdir)/dom/system/gonk \
-  $(NULL)

dom/wifi/moz.build

@@ -11,3 +11,10 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_wifi'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/dom/base',
+    '-I$(topsrcdir)/dom/interfaces/base',
+    '-I$(topsrcdir)/dom/interfaces/events',
+    '-I$(topsrcdir)/dom/system/gonk',
+]
+

js/src/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

netwerk/mime/Makefile.in

@@ -29,4 +29,3 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
-XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public

netwerk/mime/moz.build

@@ -9,3 +9,7 @@ XPIDL_SOURCES += [
     'nsIMIMEService.idl',
 ]
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+

netwerk/protocol/file/Makefile.in

@@ -32,4 +32,3 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
-XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public

netwerk/protocol/file/moz.build

@@ -10,3 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_file'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+

netwerk/protocol/http/Makefile.in

@@ -88,4 +88,3 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
-XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public

netwerk/protocol/http/moz.build

@@ -19,3 +19,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_http'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+

netwerk/protocol/res/Makefile.in

@@ -32,4 +32,3 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
-XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public

netwerk/protocol/res/moz.build

@@ -9,3 +9,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_res'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+

netwerk/protocol/viewsource/Makefile.in

@@ -29,4 +29,3 @@ LOCAL_INCLUDES = \
 
 include $(topsrcdir)/config/rules.mk
 
-XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public

netwerk/protocol/viewsource/moz.build

@@ -9,3 +9,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_viewsource'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+

netwerk/protocol/wyciwyg/Makefile.in

@@ -41,4 +41,3 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
-XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public

netwerk/protocol/wyciwyg/moz.build

@@ -9,3 +9,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_wyciwyg'
 
+XPIDL_FLAGS += [
+    '-I$(topsrcdir)/netwerk/base/public',
+]
+