Bug 931459 - Move LOCAL_INCLUDES to moz.build in dom/; r=mshal

2024-11-29 07:42:04 +00:00 · 2013-11-11 09:04:11 +01:00 · 2013-11-11 09:04:11 +01:00 · 4fe918bb7b
commit 4fe918bb7b
parent b63b756490
56 changed files with 263 additions and 350 deletions
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/js/xpconnect/wrappers \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/apps/src/moz.build
+++ b/dom/apps/src/moz.build
@ -43,3 +43,8 @@ FAIL_ON_WARNINGS = True
 LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'dom_apps_s'
+
+LOCAL_INCLUDES += [
+    '/js/xpconnect/wrappers',
+]
+
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@ -16,12 +16,6 @@ endif

 include $(topsrcdir)/config/rules.mk

-LOCAL_INCLUDES += \
-		-I$(topsrcdir)/js/xpconnect/src \
-		-I$(topsrcdir)/js/xpconnect/wrappers \
-		-I$(topsrcdir)/xpcom/ds \
-		$(NULL)
-
 ifdef MOZ_X11
 CXXFLAGS += $(TK_CFLAGS)
 LDFLAGS += $(TK_LIBS)
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@ -149,3 +149,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
    ]

 include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/js/xpconnect/src',
+    '/js/xpconnect/wrappers',
+    '/xpcom/ds',
+]
+
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/content/events/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@ -23,3 +23,7 @@ LIBRARY_NAME = 'dom_battery_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/events/src',
+]
+
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@ -67,31 +67,6 @@ CPPSRCS = \
  $(NULL)
 endif

-LOCAL_INCLUDES += -I$(topsrcdir)/js/xpconnect/src \
-  -I$(topsrcdir)/js/xpconnect/wrappers \
-  -I$(topsrcdir)/js/ipc \
-  -I$(topsrcdir)/content/canvas/src \
-  -I$(topsrcdir)/content/html/content/src \
-  -I$(topsrcdir)/media/webrtc/signaling/src/peerconnection \
-  -I$(topsrcdir)/media/webrtc/signaling/src/common/time_profiling \
-  -I$(topsrcdir)/media/mtransport \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/battery \
-  -I$(topsrcdir)/dom/indexedDB \
-  -I$(topsrcdir)/content/xslt/src/base \
-  -I$(topsrcdir)/content/xslt/src/xpath \
-  -I$(topsrcdir)/content/xml/content/src \
-  -I$(topsrcdir)/content/xul/content/src \
-  -I$(topsrcdir)/content/xul/document/src \
-  -I$(topsrcdir)/content/media/webspeech/recognition \
-  $(NULL)
-
-ifdef MOZ_AUDIO_CHANNEL_MANAGER
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/dom/system/gonk \
-  $(NULL)
-endif
-
 ABS_DIST := $(abspath $(DIST))

 EXTRA_EXPORT_MDDEPEND_FILES := $(addsuffix .pp,$(binding_dependency_trackers))
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@ -44,19 +44,41 @@ LIBRARY_NAME = 'dombindings_s'
 EXPORT_LIBRARY = True

 LOCAL_INCLUDES += [
-    '../bluetooth',
-    '../camera',
-    '../file',
-    '../src/geolocation',
-    '../workers',
    '/content/base/src',
+    '/content/canvas/src',
    '/content/events/src',
+    '/content/html/content/src',
    '/content/html/document/src',
    '/content/media/webaudio',
+    '/content/media/webspeech/recognition',
    '/content/svg/content/src',
    '/content/xbl/src',
+    '/content/xml/content/src',
+    '/content/xslt/src/base',
+    '/content/xslt/src/xpath',
+    '/content/xul/content/src',
+    '/content/xul/document/src',
+    '/dom/base',
+    '/dom/battery',
+    '/dom/bluetooth',
+    '/dom/camera',
+    '/dom/file',
+    '/dom/indexedDB',
+    '/dom/src/geolocation',
+    '/dom/workers',
+    '/js/ipc',
+    '/js/xpconnect/src',
+    '/js/xpconnect/wrappers',
    '/layout/style',
    '/layout/xul/tree',
+    '/media/mtransport',
+    '/media/webrtc/signaling/src/common/time_profiling',
+    '/media/webrtc/signaling/src/peerconnection',
 ]

 include('/ipc/chromium/chromium-config.mozbuild')
+
+if CONFIG['MOZ_AUDIO_CHANNEL_MANAGER']:
+    LOCAL_INCLUDES += [
+        '/dom/system/gonk',
+    ]
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@ -20,12 +20,6 @@ test_webidl_files := $(addprefix ../,$(test_webidl_files))
 source_preprocessed_test_webidl_files := $(addprefix $(srcdir)/,$(preprocessed_test_webidl_files))
 preprocessed_test_webidl_files := $(addprefix ../,$(preprocessed_test_webidl_files))

-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/js/xpconnect/src \
-  -I$(topsrcdir)/js/xpconnect/wrappers \
-  -I$(topsrcdir)/dom/bindings \
-  $(NULL)
-
 CPPSRCS += \
  $(subst .webidl,Binding.cpp,$(test_webidl_files)) \
  $(subst .webidl,Binding.cpp,$(preprocessed_test_webidl_files)) \
--- a/dom/bindings/test/moz.build
+++ b/dom/bindings/test/moz.build
@ -16,3 +16,9 @@ MOCHITEST_MANIFESTS += ['mochitest.ini']

 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']

+LOCAL_INCLUDES += [
+    '/dom/bindings',
+    '/js/xpconnect/src',
+    '/js/xpconnect/wrappers',
+]
+
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@ -1,12 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= \
-		-I$(topsrcdir)/dom/base \
-		-I$(topsrcdir)/dom/ \
-		-I$(topsrcdir)/dom/ipc \
-		-I$(topsrcdir)/content/base/src \
-		$(NULL)
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@ -40,3 +40,11 @@ LOCAL_INCLUDES += [
 ]

 include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/dom/',
+    '/dom/base',
+    '/dom/ipc',
+]
+
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@ -1,13 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-LOCAL_INCLUDES = \
-		-I$(topsrcdir)/dom/base \
-		-I$(topsrcdir)/dom/ipc \
-		-I$(topsrcdir)/content/base/src \
-		-I$(topsrcdir)/content/events/src \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@ -38,3 +38,10 @@ LIBRARY_NAME = 'domdevicestorage_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/events/src',
+    '/dom/base',
+    '/dom/ipc',
+]
+
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@ -2,10 +2,6 @@
 # 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/.

-LOCAL_INCLUDES = \
-	-I$(topsrcdir)/intl/locale/src \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

 EncodingUtils.$(OBJ_SUFFIX): labelsencodings.properties.h
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@ -28,3 +28,7 @@ LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'domencoding_s'

+LOCAL_INCLUDES += [
+    '/intl/locale/src',
+]
+
--- a/dom/fmradio/ipc/Makefile.in
+++ b/dom/fmradio/ipc/Makefile.in
@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/dom/fmradio \
-  $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
-
--- a/dom/fmradio/ipc/moz.build
+++ b/dom/fmradio/ipc/moz.build
@ -28,3 +28,8 @@ LOCAL_INCLUDES += [
 ]

 include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/dom/fmradio',
+]
+
--- a/dom/gamepad/Makefile.in
+++ b/dom/gamepad/Makefile.in
@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/dom/base \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@ -24,3 +24,7 @@ LIBRARY_NAME = 'domgamepad_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/dom/base',
+]
+
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/content/events/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@ -20,3 +20,7 @@ LIBRARY_NAME = 'dom_icc_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/events/src',
+]
+
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@ -1,17 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/caps/include \
-  -I$(topsrcdir)/content/base/src \
-  -I$(topsrcdir)/content/events/src \
-  -I$(topsrcdir)/db/sqlite3/src \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/src/storage \
-  -I$(topsrcdir)/dom/quota \
-  -I$(topsrcdir)/xpcom/build \
-  $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@ -2,11 +2,6 @@
 # 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/.

-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/dom/indexedDB \
-  -I$(topsrcdir)/content/events/src \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

 xpcshell_tests = unit
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@ -40,3 +40,8 @@ MOCHITEST_MANIFESTS += ['mochitest.ini']

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/events/src',
+    '/dom/indexedDB',
+]
+
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@ -70,3 +70,14 @@ LIBRARY_NAME = 'dom_indexeddb_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/caps/include',
+    '/content/base/src',
+    '/content/events/src',
+    '/db/sqlite3/src',
+    '/dom/base',
+    '/dom/quota',
+    '/dom/src/storage',
+    '/xpcom/build',
+]
+
--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@ -4,34 +4,6 @@

 include $(topsrcdir)/config/rules.mk

-LOCAL_INCLUDES += \
-	-I$(srcdir)/../../content/base/src \
-	-I$(srcdir)/../../content/events/src \
-	-I$(srcdir)/../../docshell/base \
-	-I$(topsrcdir)/chrome/src \
-	-I$(topsrcdir)/uriloader/exthandler \
-	-I$(srcdir)/../../netwerk/base/src \
-	-I$(srcdir)/../src/base \
-	-I$(srcdir)/../src/geolocation \
-	-I$(srcdir)/../src/storage \
-	-I$(srcdir)/../../xpcom/base \
-	-I$(topsrcdir)/dom/indexedDB \
-	-I$(topsrcdir)/dom/indexedDB/ipc \
-	-I$(topsrcdir)/extensions/cookie \
-	-I$(topsrcdir)/dom/base \
-	-I$(topsrcdir)/toolkit/xre \
-	-I$(topsrcdir)/hal/sandbox \
-	-I$(topsrcdir)/dom/mobilemessage/src/ipc \
-	-I$(topsrcdir)/dom/devicestorage \
-	-I$(topsrcdir)/dom/fmradio/ipc \
-	-I$(topsrcdir)/widget/xpwidgets \
-	-I$(topsrcdir)/dom/bluetooth \
-	-I$(topsrcdir)/layout/base \
-	-I$(topsrcdir)/dom/bluetooth/ipc \
-	-I$(topsrcdir)/content/media/webspeech/synth/ipc \
-	-I$(topsrcdir)/js/ipc \
-	$(NULL)
-
 DEFINES += -DBIN_SUFFIX='"$(BIN_SUFFIX)"'

 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gonk qt))
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@ -81,3 +81,31 @@ EXPORT_LIBRARY = True

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '../src/base',
+    '../src/geolocation',
+    '../src/storage',
+    '/chrome/src',
+    '/content/base/src',
+    '/content/events/src',
+    '/content/media/webspeech/synth/ipc',
+    '/docshell/base',
+    '/dom/base',
+    '/dom/bluetooth',
+    '/dom/bluetooth/ipc',
+    '/dom/devicestorage',
+    '/dom/fmradio/ipc',
+    '/dom/indexedDB',
+    '/dom/indexedDB/ipc',
+    '/dom/mobilemessage/src/ipc',
+    '/extensions/cookie',
+    '/hal/sandbox',
+    '/js/ipc',
+    '/layout/base',
+    '/netwerk/base/src',
+    '/toolkit/xre',
+    '/uriloader/exthandler',
+    '/widget/xpwidgets',
+    '/xpcom/base',
+]
+
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@ -1,12 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifdef MOZ_WEBRTC
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/media/webrtc/trunk \
-  -I$(topsrcdir)/media/webrtc/signaling/src/common \
-  $(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@ -7,6 +7,11 @@
 if CONFIG['MOZ_WEBRTC']:
    DIRS += ['bridge']

+    LOCAL_INCLUDES += [
+        '/media/webrtc/signaling/src/common',
+        '/media/webrtc/trunk',
+    ]
+
 TEST_DIRS += ['tests/mochitest', 'tests/ipc']

 XPIDL_SOURCES += [
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/content/events/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@ -71,3 +71,7 @@ LIBRARY_NAME = 'dom_network_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/events/src',
+]
+
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@ -3,25 +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/.

-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-	LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
-endif
-
-LOCAL_INCLUDES += \
-  -DSK_BUILD_FOR_ANDROID_NDK \
-  -I$(topsrcdir)/widget/android \
-  -I$(topsrcdir)/widget/xpwidgets \
-  -I$(topsrcdir)/xpcom/base/ \
-  -I$(topsrcdir)/gfx/skia/include/core \
-  -I$(topsrcdir)/gfx/skia/include/config \
-  $(MOZ_CAIRO_CFLAGS) \
-  $(MOZ_PIXMAN_CFLAGS) \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

-CXXFLAGS         += $(TK_CFLAGS)
+CXXFLAGS += \
+  $(MOZ_CAIRO_CFLAGS) \
+  $(MOZ_PIXMAN_CFLAGS) \
+  $(TK_CFLAGS) \
+  $(NULL)
--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@ -3,16 +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/.

-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/widget/android \
-  -I$(topsrcdir)/widget/xpwidgets \
-  -I$(topsrcdir)/dom/plugins/base \
-  -I$(topsrcdir)/dom/plugins/base/android/include \
-  -I$(topsrcdir)/gfx/gl \
+CXXFLAGS += \
  $(MOZ_CAIRO_CFLAGS) \
  $(MOZ_PIXMAN_CFLAGS) \
  $(NULL)
-
-DEFINES += -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"'
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@ -35,3 +35,12 @@ EXPORT_LIBRARY = True

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/dom/plugins/base',
+    '/dom/plugins/base/android/include',
+    '/gfx/gl',
+    '/widget/android',
+    '/widget/xpwidgets',
+]
+
+DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@ -106,8 +106,26 @@ EXPORT_LIBRARY = True
 LOCAL_INCLUDES += [
    '/content/base/src',
    '/dom/base',
+    '/gfx/skia/include/config',
+    '/gfx/skia/include/core',
    '/layout/generic',
    '/layout/xul/base/src',
+    '/widget/android',
+    '/widget/xpwidgets',
+    '/xpcom/base',
 ]

+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    LOCAL_INCLUDES += [
+        '/dom/plugins/base/android',
+    ]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    LOCAL_INCLUDES += [
+        '/xpcom/base',
+    ]
+
 include('/ipc/chromium/chromium-config.mozbuild')
+
+DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
+
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@ -2,28 +2,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/.

-ifeq (WINNT,$(OS_ARCH))
-DEFINES += \
-  -DMOZ_HANGUI_PROCESS_NAME=\"plugin-hang-ui$(BIN_SUFFIX)\" \
-  $(NULL)
-endif
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../base \
-  -I$(topsrcdir)/xpcom/base/ \
-  $(NULL)
-
-ifeq (WINNT,$(OS_ARCH))
-LOCAL_INCLUDES += \
-  -I$(srcdir)/hangui \
-  -I$(topsrcdir)/widget/shared \
-  $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk

-CXXFLAGS += $(TK_CFLAGS)
-
-DEFINES += -DFORCE_PR_LOG
-
-CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
+CXXFLAGS += \
+  $(TK_CFLAGS) \
+  $(MOZ_CAIRO_CFLAGS) \
+  $(NULL)
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@ -54,6 +54,11 @@ if CONFIG['OS_ARCH'] == 'WINNT':
        'PluginHangUIParent.cpp',
        'PluginSurfaceParent.cpp',
    ]
+    DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX']
+    LOCAL_INCLUDES += [
+        '/widget/shared',
+        'hangui',
+    ]

 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
    EXPORTS.mozilla.plugins += [
@ -117,3 +122,10 @@ EXPORT_LIBRARY = True

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '../base',
+    '/xpcom/base/',
+]
+
+DEFINES['FORCE_PR_LOG'] = True
+
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/caps/include \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@ -50,3 +50,7 @@ LIBRARY_NAME = 'domquota_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/caps/include',
+]
+
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@ -2,29 +2,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/.

-LOCAL_INCLUDES = \
-		-I$(topsrcdir)/dom/base \
-		-I$(topsrcdir)/dom/ipc \
-		-I$(topsrcdir)/content/base/src \
-		-I$(topsrcdir)/content/events/src \
-		$(NULL)
+include $(topsrcdir)/config/rules.mk

 ifdef MOZ_ENABLE_QTMOBILITY
-LOCAL_INCLUDES  += $(MOZ_QT_CFLAGS) \
-                   -I$(topsrcdir)/dom/system/unix \
-                   $(NULL)
+CXXFLAGS += $(MOZ_QT_CFLAGS)
 endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/android
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/gonk
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/mac
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@ -24,3 +24,28 @@ LIBRARY_NAME = 'jsdomgeolocation_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/events/src',
+    '/dom/base',
+    '/dom/ipc',
+]
+
+if CONFIG['MOZ_ENABLE_QTMOBILITY']:
+    LOCAL_INCLUDES += [
+        '/dom/system/unix',
+    ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    LOCAL_INCLUDES += [
+        '/dom/system/android',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    LOCAL_INCLUDES += [
+        '/dom/system/gonk',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    LOCAL_INCLUDES += [
+        '/dom/system/mac',
+    ]
+
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@ -1,12 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/ipc \
-  -I$(topsrcdir)/content/base/src \
-  -I$(topsrcdir)/content/events/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@ -33,3 +33,10 @@ LIBRARY_NAME = 'jsdomnotification_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/events/src',
+    '/dom/base',
+    '/dom/ipc',
+]
+
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@ -1,14 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES = \
-                -I$(topsrcdir)/dom/base \
-		-I$(topsrcdir)/content/events/src
-
-ifdef ENABLE_TESTS
-DEFINES += -DDOM_STORAGE_TESTS
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@ -33,3 +33,10 @@ LIBRARY_NAME = 'jsdomstorage_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/events/src',
+    '/dom/base',
+]
+
+if CONFIG['ENABLE_TESTS']:
+    DEFINES['DOM_STORAGE_TESTS'] = True
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
-
-# We fire the nsDOMDeviceAcceleration
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/content/events/src \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/bindings \
-  -I$(topsrcdir)/js/xpconnect/loader \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
-                     -I$(topsrcdir)/content/events/src
-                     $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@ -21,3 +21,8 @@ EXPORT_LIBRARY = True

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/events/src',
+    '/dom/src/geolocation',
+]
+
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@ -12,14 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/src/geolocation \
-  -I$(topsrcdir)/dom/wifi \
-  -I$(topsrcdir)/dom/bluetooth \
-  -I$(topsrcdir)/content/events/src \
-  $(NULL)
-
 # TODO: Bug 908038, move this to moz.build
 WORKER_FILES := worker_buf.js \
  $(NULL)
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@ -93,3 +93,11 @@ LIBRARY_NAME = 'domsystemgonk_s'

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/content/events/src',
+    '/dom/base',
+    '/dom/bluetooth',
+    '/dom/src/geolocation',
+    '/dom/wifi',
+]
+
--- a/dom/system/mac/Makefile.in
+++ b/dom/system/mac/Makefile.in
@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
-                   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/system/mac/moz.build
+++ b/dom/system/mac/moz.build
@ -18,3 +18,7 @@ EXPORT_LIBRARY = True

 include('/ipc/chromium/chromium-config.mozbuild')

+LOCAL_INCLUDES += [
+    '/dom/src/geolocation',
+]
+
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@ -58,3 +58,13 @@ EXPORT_LIBRARY = True

 include('/ipc/chromium/chromium-config.mozbuild')

+# We fire the nsDOMDeviceAcceleration
+LOCAL_INCLUDES += [
+    '/content/events/src',
+    '/dom/base',
+    '/dom/bindings',
+    '/js/xpconnect/loader',
+]
+
+DEFINES['DLL_PREFIX'] = '"%s"' % CONFIG['DLL_PREFIX']
+DEFINES['DLL_SUFFIX'] = '"%s"' % CONFIG['DLL_SUFFIX']
--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@ -2,10 +2,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/.

-ifdef MOZ_ENABLE_QTMOBILITY
-LOCAL_INCLUDES  += $(MOZ_QT_CFLAGS) \
-                   -I$(topsrcdir)/dom/src/geolocation \
-                   $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_ENABLE_QTMOBILITY
+CXXFLAGS += $(MOZ_QT_CFLAGS)
+endif
--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@ -14,6 +14,10 @@ if CONFIG['MOZ_ENABLE_QTMOBILITY']:
        'QTMLocationProvider.cpp',
    ]

+    LOCAL_INCLUDES += [
+        '/dom/src/geolocation',
+    ]
+
 FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True