Bug 950130 - Move more INCLUDES / LOCAL_INCLUDES to moz.build; r=mshal

browser/components/feeds/src/moz.build

@@ -22,3 +22,8 @@ FINAL_LIBRARY = 'browsercomps'
 
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
     DEFINES[var] = CONFIG[var]
+
+LOCAL_INCLUDES += [
+    '../../build',
+]
+

build/stlport/Makefile.in

@@ -12,4 +12,3 @@ LIBRARY = $(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -fuse-cxa-atexit
-INCLUDES += -I$(srcdir)/stlport

build/stlport/moz.build

@@ -47,3 +47,8 @@ SOURCES += [
 ]
 
 DEFINES['_GNU_SOURCE'] = True
+
+LOCAL_INCLUDES += [
+    'stlport',
+]
+

extensions/spellcheck/hunspell/src/Makefile.in

@@ -4,8 +4,6 @@
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += -I$(topsrcdir)/extensions/spellcheck/src
-
 ifdef MOZ_NATIVE_HUNSPELL
 # MOZ_HUNSPELL_CFLAGS is extracted through pkgconfig during configure,
 # even though the variable doesn't show up in configure.in.

extensions/spellcheck/hunspell/src/moz.build

@@ -28,3 +28,8 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
     DEFINES['HUNSPELL_STATIC'] = True
 
 FINAL_LIBRARY = 'spellchecker'
+
+LOCAL_INCLUDES += [
+    '/extensions/spellcheck/src',
+]
+

extensions/spellcheck/src/moz.build

@@ -18,3 +18,9 @@ UNIFIED_SOURCES += [
 LIBRARY_NAME = 'spellchecker'
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '../hunspell/src',
+    '/content/base/src',
+    '/editor/libeditor/base',
+]

extensions/universalchardet/src/xpcom/moz.build

@@ -12,3 +12,7 @@ UNIFIED_SOURCES += [
 LIBRARY_NAME = 'universalchardet'
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '../base',
+]

ipc/glue/moz.build

@@ -125,3 +125,12 @@ FINAL_LIBRARY = 'xul'
 
 for var in ('MOZ_CHILD_PROCESS_NAME', 'MOZ_CHILD_PROCESS_BUNDLE'):
     DEFINES[var] = '"%s"' % CONFIG[var]
+
+LOCAL_INCLUDES += [
+    '/toolkit/crashreporter',
+]
+
+if CONFIG['MOZ_CONTENT_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
+    LOCAL_INCLUDES += [
+        '/security/sandbox/win/src/sandboxbroker',
+    ]

js/ipc/moz.build

@@ -22,3 +22,11 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 DEFINES['BIN_SUFFIX'] = '"%s"' % CONFIG['BIN_SUFFIX']
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+    '/js/ipc',
+    '/js/public',
+    '/js/xpconnect/src',
+]
+

js/src/Makefile.in

@@ -344,8 +344,6 @@ DIST_GARBAGE = config.cache config.log config.status* \
 distclean::
 	$(RM) $(DIST_GARBAGE)
 
-INCLUDES	+= -I$(srcdir)
-
 ifneq (,$(filter WINNT,$(OS_ARCH)))
 # _CRT_RAND_S must be #defined before #including stdlib.h to get rand_s()
 DEFINES         += -D_CRT_RAND_S

js/xpconnect/loader/moz.build

@@ -24,3 +24,10 @@ MSVC_ENABLE_PGO = True
 FINAL_LIBRARY = 'xpconnect_s'
 
 DEFINES['JS_THREADSAFE'] = True
+
+LOCAL_INCLUDES += [
+    '../src',
+    '../wrappers',
+    '/content/base/src',
+]
+

js/xpconnect/shell/Makefile.in

@@ -5,10 +5,6 @@
 
 SDK_BINARY	= $(PROGRAM)
 
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/toolkit/xre \
-  $(NULL)
-
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(LIBXUL_LIBS) \

js/xpconnect/shell/moz.build

@@ -26,4 +26,9 @@ if CONFIG['MOZ_CALLGRIND']:
 if CONFIG['MOZ_VTUNE']:
     DEFINES['MOZ_VTUNE'] = True
 
-include('/ipc/chromium/chromium-config.mozbuild')
+include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/toolkit/xre',
+]
+

js/xpconnect/src/Makefile.in

@@ -3,29 +3,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$(srcdir)/../wrappers \
-		-I$(srcdir)/../loader \
-		-I$(topsrcdir)/caps/include \
-		-I$(topsrcdir)/content/base/src \
-		-I$(topsrcdir)/content/base/public \
-		-I$(topsrcdir)/content/events/src \
-		-I$(topsrcdir)/content/html/content/src \
-		-I$(topsrcdir)/content/html/document/src \
-		-I$(topsrcdir)/content/svg/content/src \
-		-I$(topsrcdir)/layout/style \
-		-I$(topsrcdir)/layout/base \
-		-I$(topsrcdir)/dom/base \
-		-I$(topsrcdir)/xpcom/ds \
-		-I$(topsrcdir)/js/ipc \
-		$(NULL)
-
-ifdef MOZ_B2G_BT
-LOCAL_INCLUDES += \
-    -I$(topsrcdir)/dom/bluetooth \
-    $(NULL)
-endif
-
 EXTRA_MDDEPEND_FILES = dom_qsgen.pp dictionary_helper_gen.pp event_impl_gen.pp
 
 INSTALL_TARGETS += extra_export_files

js/xpconnect/src/moz.build

@@ -91,3 +91,25 @@ DEFINES['JS_THREADSAFE'] = True
 
 if CONFIG['MOZ_JSDEBUGGER']:
     DEFINES['MOZ_JSDEBUGGER'] = True
+
+LOCAL_INCLUDES += [
+    '../loader',
+    '../wrappers',
+    '/caps/include',
+    '/content/base/public',
+    '/content/base/src',
+    '/content/events/src',
+    '/content/html/content/src',
+    '/content/html/document/src',
+    '/content/svg/content/src',
+    '/dom/base',
+    '/js/ipc',
+    '/layout/base',
+    '/layout/style',
+    '/xpcom/ds',
+]
+
+if CONFIG['MOZ_B2G_BT']:
+    LOCAL_INCLUDES += [
+        '/dom/bluetooth',
+    ]

js/xpconnect/wrappers/moz.build

@@ -27,3 +27,9 @@ FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xpconnect_s'
+
+LOCAL_INCLUDES += [
+    '../../../dom/base',
+    '../src',
+]
+

media/libtremor/lib/moz.build

@@ -26,3 +26,8 @@ if CONFIG['OS_ARCH'] == 'AIX':
 
 if CONFIG['TARGET_CPU'] == 'arm' and CONFIG['GNU_CC'] and not CONFIG['MOZ_THUMB2']:
     DEFINES['_ARM_ASSEM_'] = True
+
+LOCAL_INCLUDES += [
+    '/media/libtremor/include/tremor',
+]
+

media/omx-plugin/Makefile.in

@@ -25,17 +25,13 @@ ifdef GNU_CXX
 CXXFLAGS += -Wno-multichar
 endif
 
-INCLUDES        += \
-                -I$(srcdir)/../../content/media/plugins \
-                $(NULL)
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
 EXTRA_DSO_LDOPTS += \
                -lutils -lstagefright -lmedia -lstagefright_omx -lbinder -lui \
                -lhardware -lcutils \
 		$(NULL)
 
-INCLUDES        += \
+CXXFLAGS += \
                 -I$(ANDROID_SOURCE)/dalvik/libnativehelper/include/nativehelper \
                 -I$(ANDROID_SOURCE)/frameworks/base/include/ \
                 -I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \
@@ -56,9 +52,4 @@ EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/ics/libvideoeditorplayer \
 		-lvideoeditorplayer \
 		$(NULL)
-
-INCLUDES        += \
-                -I$(srcdir)/include/ics \
-                -I$(srcdir)/include/ics/media/stagefright/openmax \
-                $(NULL)
 endif

media/omx-plugin/froyo/Makefile.in

@@ -20,10 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(srcdir)/../../../content/media/plugins \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
@@ -33,7 +29,3 @@ EXTRA_DSO_LDOPTS += \
 		-lstagefright_color_conversion \
 		$(NULL)
 
-INCLUDES        += \
-                -I$(srcdir)/../include/froyo \
-                -I$(srcdir)/../include/froyo/media/stagefright/openmax \
-                $(NULL)

media/omx-plugin/froyo/moz.build

@@ -11,3 +11,10 @@ SOURCES += [
 LIBRARY_NAME = 'omxpluginfroyo'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '../../../content/media/plugins',
+    '../include/froyo',
+    '../include/froyo/media/stagefright/openmax',
+]
+

media/omx-plugin/gb/Makefile.in

@@ -20,10 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(srcdir)/../../../content/media/plugins \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
@@ -33,7 +29,3 @@ EXTRA_DSO_LDOPTS += \
 		-lstagefright_color_conversion \
 		$(NULL)
 
-INCLUDES        += \
-                -I$(srcdir)/../include/gb \
-                -I$(srcdir)/../include/gb/media/stagefright/openmax \
-                $(NULL)

media/omx-plugin/gb/moz.build

@@ -11,3 +11,10 @@ SOURCES += [
 LIBRARY_NAME = 'omxplugingb'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '../../../content/media/plugins',
+    '../include/gb',
+    '../include/gb/media/stagefright/openmax',
+]
+

media/omx-plugin/gb235/Makefile.in

@@ -20,10 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(srcdir)/../../../content/media/plugins \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
@@ -33,7 +29,3 @@ EXTRA_DSO_LDOPTS += \
 		-lstagefright_color_conversion \
 		$(NULL)
 
-INCLUDES        += \
-                -I$(srcdir)/../include/gb \
-                -I$(srcdir)/../include/gb/media/stagefright/openmax \
-                $(NULL)

media/omx-plugin/gb235/moz.build

@@ -11,3 +11,10 @@ SOURCES += [
 LIBRARY_NAME = 'omxplugingb235'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '../../../content/media/plugins',
+    '../include/gb',
+    '../include/gb/media/stagefright/openmax',
+]
+