Bug 931404 - Move LOCAL_INCLUDES to moz.build in content/; r=gps

2013-11-11 09:04:06 +01:00 · 2013-11-11 09:04:06 +01:00 · b63b756490
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -3,40 +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/.

-ifdef MOZ_WEBRTC
-LOCAL_INCLUDES += \
-		-I$(topsrcdir)/netwerk/sctp/datachannel \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk

-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/caps/include \
-  -I$(topsrcdir)/content/events/src \
-  -I$(topsrcdir)/content/html/content/src \
-  -I$(topsrcdir)/content/html/document/src \
-  -I$(topsrcdir)/content/xbl/src \
-  -I$(topsrcdir)/content/xml/content/src \
-  -I$(topsrcdir)/content/xml/document/src \
-  -I$(topsrcdir)/content/xslt/src/xpath \
-  -I$(topsrcdir)/content/xul/content/src \
-  -I$(topsrcdir)/content/xul/document/src \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/ipc \
-  -I$(topsrcdir)/dom/workers \
-  -I$(topsrcdir)/js/ipc \
-  -I$(topsrcdir)/image/src \
-  -I$(topsrcdir)/js/xpconnect/src \
-  -I$(topsrcdir)/layout/base \
-  -I$(topsrcdir)/layout/generic \
-  -I$(topsrcdir)/layout/style \
-  -I$(topsrcdir)/layout/svg \
-  -I$(topsrcdir)/layout/xul/base/src \
-  -I$(topsrcdir)/netwerk/base/src \
-  -I$(topsrcdir)/js/xpconnect/wrappers \
-  $(NULL)
-
 # gcc requires -msse2 for this file since it uses SSE2 intrinsics.  (See bug
 # 585538 comment 12.)
 ifneq (,$(INTEL_ARCHITECTURE))
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@ -43,6 +43,9 @@ if CONFIG['MOZ_WEBRTC']:
    SOURCES += [
        'nsDOMDataChannel.cpp',
    ]
+    LOCAL_INCLUDES += [
+        '/netwerk/sctp/datachannel',
+    ]

 # Are we targeting x86-32 or x86-64?  If so, we want to include SSE2 code for
 # nsTextFragment.cpp
@ -184,3 +187,28 @@ LIBRARY_NAME = 'gkconbase_s'

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

+LOCAL_INCLUDES += [
+    '/caps/include',
+    '/content/events/src',
+    '/content/html/content/src',
+    '/content/html/document/src',
+    '/content/xbl/src',
+    '/content/xml/content/src',
+    '/content/xml/document/src',
+    '/content/xslt/src/xpath',
+    '/content/xul/content/src',
+    '/content/xul/document/src',
+    '/dom/base',
+    '/dom/ipc',
+    '/dom/workers',
+    '/image/src',
+    '/js/ipc',
+    '/js/xpconnect/src',
+    '/js/xpconnect/wrappers',
+    '/layout/base',
+    '/layout/generic',
+    '/layout/style',
+    '/layout/svg',
+    '/layout/xul/base/src',
+    '/netwerk/base/src',
+]
--- a/content/canvas/compiledtest/Makefile.in
+++ b/content/canvas/compiledtest/Makefile.in
@ -1,7 +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$(srcdir)/../src \
-  $(NULL)
--- a/content/canvas/compiledtest/moz.build
+++ b/content/canvas/compiledtest/moz.build
@ -10,3 +10,7 @@ CPP_UNIT_TESTS += [

 FAIL_ON_WARNINGS = True

+LOCAL_INCLUDES += [
+    '../src',
+]
+
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@ -3,24 +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/.

-ifdef MOZ_WEBGL
-LOCAL_INCLUDES += \
-	-I$(topsrcdir)/js/xpconnect/wrappers \
-	$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk

 CXXFLAGS	+= $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)

-INCLUDES	+= \
-		-I$(srcdir)/../../../layout/xul/base/src \
-		-I$(srcdir)/../../../layout/style \
-		-I$(srcdir)/../../../layout/generic \
-		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../html/content/src \
-		-I$(srcdir)/../../../js/xpconnect/src \
-		-I$(srcdir)/../../../dom/base \
-		-I$(srcdir)/../../../image/src \
-		-I$(topsrcdir)/content/xul/content/src \
-		$(NULL)
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@ -73,6 +73,9 @@ if CONFIG['MOZ_WEBGL']:
        'WebGLUniformLocation.cpp',
        'WebGLVertexArray.cpp',
    ]
+    LOCAL_INCLUDES += [
+        '/js/xpconnect/wrappers',
+    ]
 else:
    SOURCES += [
        'WebGLContextNotSupported.cpp',
@ -88,3 +91,15 @@ LIBRARY_NAME = 'gkconcvs_s'

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

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/html/content/src',
+    '/content/xul/content/src',
+    '/dom/base',
+    '/image/src',
+    '/js/xpconnect/src',
+    '/layout/generic',
+    '/layout/style',
+    '/layout/xul/base/src',
+]
+
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -1,29 +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
-
-LOCAL_INCLUDES	+= \
-             -I$(srcdir)/../../base/src \
-             -I$(srcdir)/../../html/content/src \
-             -I$(srcdir)/../../xul/content/src \
-             -I$(srcdir)/../../xml/content/src \
-             -I$(srcdir)/../../../dom/base \
-             -I$(srcdir)/../../../dom/settings \
-             -I$(srcdir)/../../../dom/src/storage \
-             -I$(srcdir)/../../../layout/generic \
-             -I$(srcdir)/../../../layout/xul/base/src \
-             -I$(srcdir)/../../../layout/xul/tree/ \
-             $(NULL)
-
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-LOCAL_INCLUDES += \
-              -I$(srcdir)/../../../dom/wifi \
-              $(NULL)
-endif
-
-ifdef MOZ_JSDEBUGGER
-DEFINES += -DMOZ_JSDEBUGGER
-endif
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@ -77,3 +77,23 @@ LIBRARY_NAME = 'gkconevents_s'

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

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/html/content/src',
+    '/content/xml/content/src',
+    '/content/xul/content/src',
+    '/dom/base',
+    '/dom/settings',
+    '/dom/src/storage',
+    '/layout/generic',
+    '/layout/xul/base/src',
+    '/layout/xul/tree/',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    LOCAL_INCLUDES += [
+        '/dom/wifi',
+    ]
+
+if CONFIG['MOZ_JSDEBUGGER']:
+    DEFINES['MOZ_JSDEBUGGER'] = True
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -1,28 +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$(srcdir)/../../document/src \
-		-I$(srcdir)/../../../base/src \
-		-I$(srcdir)/../../../events/src \
-		-I$(srcdir)/../../../xbl/src \
-		-I$(srcdir)/../../../xul/content/src \
-		-I$(srcdir)/../../../../layout/forms \
-		-I$(srcdir)/../../../../layout/style \
-		-I$(srcdir)/../../../../layout/tables \
-		-I$(srcdir)/../../../../layout/xul/base/src \
-		-I$(srcdir)/../../../../layout/generic \
-		-I$(srcdir)/../../../../dom/base \
-		-I$(srcdir)/../../../../editor/libeditor/base \
-		-I$(srcdir)/../../../../editor/libeditor/text \
-		-I$(srcdir)/../../../../editor/txmgr/src \
-		-I$(srcdir)/../../../../netwerk/base/src \
-		-I$(srcdir)/../../../../content/canvas/src \
-		-I$(srcdir) \
-		-I$(topsrcdir)/xpcom/ds \
-		-I$(topsrcdir)/content/media/ \
-		$(NULL)
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@ -166,3 +166,24 @@ LIBRARY_NAME = 'gkconhtmlcon_s'

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

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/canvas/src',
+    '/content/events/src',
+    '/content/html/document/src',
+    '/content/media/',
+    '/content/xbl/src',
+    '/content/xul/content/src',
+    '/dom/base',
+    '/editor/libeditor/base',
+    '/editor/libeditor/text',
+    '/editor/txmgr/src',
+    '/layout/forms',
+    '/layout/generic',
+    '/layout/style',
+    '/layout/tables',
+    '/layout/xul/base/src',
+    '/netwerk/base/src',
+    '/xpcom/ds',
+]
+
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/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/.
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES += \
-  -I$(srcdir)/../../../base/src \
-  $(NULL)
--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@ -19,3 +19,7 @@ LIBRARY_NAME = 'gkcontentmathml_s'

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

+LOCAL_INCLUDES += [
+    '/content/base/src',
+]
+
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@ -4,22 +4,7 @@

 include $(topsrcdir)/config/rules.mk

-ifdef MOZ_OMX_DECODER
-DEFINES += -DMOZ_OMX_DECODER
-endif
-
-LOCAL_INCLUDES  += \
-  -I$(topsrcdir)/content/base/src \
-  -I$(topsrcdir)/layout/generic \
-  -I$(topsrcdir)/layout/xul/base/src \
-  $(NULL)
-
-ifdef MOZ_DIRECTSHOW
-LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/
-endif
-
 CFLAGS   += $(GSTREAMER_CFLAGS)
 CXXFLAGS += $(GSTREAMER_CFLAGS)
-DEFINES  += -DMOZILLA_INTERNAL_API

 AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon
--- a/content/media/directshow/Makefile.in
+++ b/content/media/directshow/Makefile.in
@ -2,8 +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)/media/webrtc/trunk/webrtc/modules/video_capture/windows/
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@ -40,3 +40,7 @@ LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'gkcondirectshow_s'

+LOCAL_INCLUDES += [
+    '/media/webrtc/trunk/webrtc/modules/video_capture/windows',
+]
+
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@ -8,7 +8,3 @@ CFLAGS		+= $(GSTREAMER_CFLAGS)
 CXXFLAGS	+= $(GSTREAMER_CFLAGS)


-INCLUDES	+= \
-		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../html/content/src \
-		$(NULL)
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@ -27,3 +27,8 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/html/content/src',
+]
+
--- a/content/media/moz.build
+++ b/content/media/moz.build
@ -158,3 +158,19 @@ LIBRARY_NAME = 'gkconmedia_s'

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

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/layout/generic',
+    '/layout/xul/base/src',
+]
+
+if CONFIG['MOZ_DIRECTSHOW']:
+    LOCAL_INCLUDES += [
+        '/media/webrtc/trunk/webrtc/modules/video_capture/windows',
+    ]
+
+DEFINES['MOZILLA_INTERNAL_API'] = True
+
+if CONFIG['MOZ_OMX_DECODER']:
+    DEFINES['MOZ_OMX_DECODER'] = True
+
--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@ -4,11 +4,7 @@

 include $(topsrcdir)/config/rules.mk

-INCLUDES	+= \
- 		-I$(srcdir)/mediaresourcemanager \
-		-I$(topsrcdir)/ipc/chromium/src \
-		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../html/content/src \
+CXXFLAGS += \
 		-I$(ANDROID_SOURCE)/dalvik/libnativehelper/include/nativehelper \
 		-I$(ANDROID_SOURCE)/frameworks/base/include/ \
 		-I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \
--- a/content/media/omx/mediaresourcemanager/Makefile.in
+++ b/content/media/omx/mediaresourcemanager/Makefile.in
@ -4,8 +4,7 @@

 include $(topsrcdir)/config/rules.mk

-INCLUDES	+= \
-	        -I$(srcdir)/ \
+CXXFLAGS += \
 		-I$(ANDROID_SOURCE)/frameworks/base/include/ \
 		-I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \
 		-I$(ANDROID_SOURCE)/frameworks/base/include/utils/ \
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@ -34,3 +34,10 @@ LIBRARY_NAME = 'gkconomx_s'

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

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/html/content/src',
+    '/ipc/chromium/src',
+    'mediaresourcemanager',
+]
+
--- a/content/media/webaudio/blink/Makefile.in
+++ b/content/media/webaudio/blink/Makefile.in
@ -1,7 +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/media/webaudio
-
-include $(topsrcdir)/config/rules.mk
--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@ -32,3 +32,7 @@ LIBRARY_NAME = 'gkconwebaudio_blink_s'

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

+LOCAL_INCLUDES += [
+    '/content/media/webaudio',
+]
+
--- a/content/media/webaudio/compiledtest/Makefile.in
+++ b/content/media/webaudio/compiledtest/Makefile.in
@ -1,5 +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$(srcdir)/..
--- a/content/media/webaudio/compiledtest/moz.build
+++ b/content/media/webaudio/compiledtest/moz.build
@ -10,3 +10,7 @@ CPP_UNIT_TESTS += [

 FAIL_ON_WARNINGS = True

+LOCAL_INCLUDES += [
+    '..',
+]
+
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@ -4,7 +4,7 @@

 include $(topsrcdir)/config/rules.mk

-LOCAL_INCLUDES = \
+CXXFLAGS += \
 		$(MOZ_LIBVPX_CFLAGS) \
 		$(NULL)

--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@ -1,19 +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/.
-
-ifeq ($(OS_ARCH),WINNT)
-OS_CXXFLAGS += -DNOMINMAX
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_WEBRTC
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/media/webrtc/trunk \
-  -I$(topsrcdir)/media/webrtc/signaling/src/common \
-  -I$(topsrcdir)/media/webrtc/signaling/src/common/browser_logging \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/camera \
-  $(NULL)
-endif
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@ -22,8 +22,16 @@ if CONFIG['MOZ_WEBRTC']:
        'MediaEngineWebRTCAudio.cpp',
        'MediaEngineWebRTCVideo.cpp',
    ]
+    LOCAL_INCLUDES += [
+        '/dom/base',
+        '/dom/camera',
+        '/media/webrtc/signaling/src/common',
+        '/media/webrtc/signaling/src/common/browser_logging',
+        '/media/webrtc/trunk',
+    ]
+
 XPIDL_SOURCES += [
-        'nsITabSource.idl'
+    'nsITabSource.idl'
 ]

 SOURCES += [
@ -36,3 +44,5 @@ LIBRARY_NAME = 'gkconwebrtc_s'

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

+if CONFIG['OS_ARCH'] == 'WINNT':
+    DEFINES['NOMINMAX'] = True
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/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/.
-
-
-VPATH += \
-  $(srcdir)/ipc \
-  $(NULL)
-
-LOCAL_INCLUDES += $(VPATH:%=-I%)
-
-include $(topsrcdir)/config/rules.mk
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@ -56,3 +56,6 @@ EXPORT_LIBRARY = True

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

+LOCAL_INCLUDES += [
+    'ipc',
+]
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@ -1,20 +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$(srcdir)/../../../xml/content/src \
-		-I$(srcdir)/../../../../dom \
-		-I$(srcdir)/../../../base/src \
-		-I$(srcdir)/../../../../layout/generic \
-		-I$(srcdir)/../../../../layout/xul/base/src \
-		-I$(srcdir)/../../../../layout/svg \
-		-I$(srcdir)/../../../../layout/style \
-		-I$(srcdir)/../../../events/src \
-		-I$(srcdir)/../../../html/content/src \
-		-I$(topsrcdir)/content/xbl/src \
-		-I$(srcdir)/../../../smil \
-		$(NULL)
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@ -253,3 +253,17 @@ LIBRARY_NAME = 'gkcontentsvg_s'

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

+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/events/src',
+    '/content/html/content/src',
+    '/content/smil',
+    '/content/xbl/src',
+    '/content/xml/content/src',
+    '/dom',
+    '/layout/generic',
+    '/layout/style',
+    '/layout/svg',
+    '/layout/xul/base/src',
+]
+
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@ -5,10 +5,6 @@

 include $(topsrcdir)/config/rules.mk

-INCLUDES	+= \
-		-I$(srcdir)/../../../base/src \
-		$(NULL)
-
 EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/htmlmathml-f.ent \
 		$(NULL)
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@ -28,3 +28,7 @@ LIBXUL_LIBRARY = True

 MSVC_ENABLE_PGO = True

+LOCAL_INCLUDES += [
+    '/content/base/src',
+]
+