Bug 973388 - Move the LOCAL_INCLUDES in xpcom to moz.build; r=glandium
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 18 Feb 2014 09:01:06 -0500
changeset 186540 368275eecfbabf80cd6bdfb83ac39b5d846df711
parent 186539 b2cf01ce8cfd1a2d289bf8e5487d743d9666e76b
child 186541 a7f8c25c07acc9bfec0144cae954e67b02c233a7
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs973388
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 973388 - Move the LOCAL_INCLUDES in xpcom to moz.build; r=glandium
xpcom/build/Makefile.in
xpcom/build/moz.build
xpcom/components/Makefile.in
xpcom/components/moz.build
xpcom/io/Makefile.in
xpcom/io/moz.build
xpcom/typelib/xpt/src/Makefile.in
xpcom/typelib/xpt/src/moz.build
xulrunner/stub/Makefile.in
xulrunner/stub/moz.build
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -1,26 +1,12 @@
 # vim:set ts=8 sw=8 sts=8 noet:
 #
 # 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) \
-		-I.. \
-		-I$(srcdir)/../glue \
-		-I$(srcdir)/../base \
-		-I$(srcdir)/../ds \
-		-I$(srcdir)/../io \
-		-I$(srcdir)/../components \
-		-I$(srcdir)/../threads \
-		-I$(srcdir)/../reflect/xptinfo/src \
-		-I$(topsrcdir)/chrome/src \
-		-I$(srcdir)/../../docshell/base \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CXXFLAGS	+= $(TK_CFLAGS)
 endif
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -73,8 +73,21 @@ FINAL_LIBRARY = 'xul'
 DEFINES['_IMPL_NS_STRINGAPI'] = True
 DEFINES['OMNIJAR_NAME'] = CONFIG['OMNIJAR_NAME']
 
 if CONFIG['TARGET_XPCOM_ABI']:
     DEFINES['TARGET_XPCOM_ABI'] = '"%s"' % CONFIG['TARGET_XPCOM_ABI']
 
 if CONFIG['MOZ_OPTIMIZE']:
     DEFINES['MOZ_OPTIMIZE'] = True
+
+GENERATED_INCLUDES += ['..']
+LOCAL_INCLUDES += [
+    '../base',
+    '../components',
+    '../ds',
+    '../glue',
+    '../io',
+    '../reflect/xptinfo/src',
+    '../threads',
+    '/chrome/src',
+    '/docshell/base',
+]
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -1,20 +1,10 @@
 #
 # 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)/../reflect/xptinfo/src \
-	-I$(srcdir)/../base \
-	-I$(srcdir)/../ds \
-	-I$(srcdir)/../build \
-	-I.. \
-	-I$(topsrcdir)/chrome/src \
-	-I$(topsrcdir)/modules/libjar \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS        += $(TK_CFLAGS)
 endif
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -38,8 +38,18 @@ SOURCES += [
     'nsNativeComponentLoader.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xpcom_core'
+
+GENERATED_INCLUDES += ['..']
+LOCAL_INCLUDES += [
+    '../base',
+    '../build',
+    '../ds',
+    '../reflect/xptinfo/src',
+    '/chrome/src',
+    '/modules/libjar',
+]
deleted file mode 100644
--- a/xpcom/io/Makefile.in
+++ /dev/null
@@ -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/.
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES	+= -I..
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -120,8 +120,10 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpcom_core'
 
 if CONFIG['OS_ARCH'] == 'Linux' and 'lib64' in CONFIG['libdir']:
     DEFINES['HAVE_USR_LIB64_DIR'] = True
+
+GENERATED_INCLUDES += ['..']
--- a/xpcom/typelib/xpt/src/Makefile.in
+++ b/xpcom/typelib/xpt/src/Makefile.in
@@ -5,14 +5,8 @@
 
 DIST_INSTALL	= 1
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef _MSC_VER
 OS_COMPILE_CFLAGS += -Zl
 endif
-
-LOCAL_INCLUDES += \
-                -I../../../ \
-                -I../../../base \
-                -I$(topsrcdir)/xpcom/base \
-                $(NULL)
--- a/xpcom/typelib/xpt/src/moz.build
+++ b/xpcom/typelib/xpt/src/moz.build
@@ -8,8 +8,11 @@ LIBRARY_NAME = 'xpt'
 
 UNIFIED_SOURCES += [
     'xpt_arena.c',
     'xpt_struct.c',
     'xpt_xdr.c',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'
+
+GENERATED_INCLUDES += ['/xpcom/base']
+LOCAL_INCLUDES += ['/xpcom/base']
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@@ -20,17 +20,16 @@ endif
 
 ifeq ($(OS_ARCH),WINNT)
 RCINCLUDE = xulrunner-stub.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_XULRUNNER -I$(srcdir)
 else
 RCFLAGS += -DMOZ_XULRUNNER --include-dir $(srcdir)
 endif
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 else
 MOZ_WINCONSOLE = 0
 endif
--- a/xulrunner/stub/moz.build
+++ b/xulrunner/stub/moz.build
@@ -22,8 +22,11 @@ DEFINES['XPCOM_GLUE'] = True
 LOCAL_INCLUDES += [
     '/xpcom/base',
     '/xpcom/build',
 ]
 
 
 # Statically link against the RTL on windows
 USE_STATIC_LIBS = True
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    LOCAL_INCLUDES += ['/toolkit/xre']