Bug 973388 - Move the LOCAL_INCLUDES in xpcom to moz.build; r=glandium

2024-09-13 09:24:08 -07:00 · 2014-02-18 09:01:06 -05:00 · 2014-02-18 09:01:06 -05:00 · 741e1ab301
commit 741e1ab301
parent 5880a2d573
10 changed files with 31 additions and 38 deletions
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@ -5,20 +5,6 @@
 # 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))
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@ -78,3 +78,16 @@ if 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
@ -3,16 +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)/../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
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@ -43,3 +43,13 @@ 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',
+]
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/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/.
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES	+= -I..
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@ -125,3 +125,5 @@ 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
@ -10,9 +10,3 @@ 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
@ -13,3 +13,6 @@ UNIFIED_SOURCES += [
 ]

 FINAL_LIBRARY = 'xpcom_core'
+
+GENERATED_INCLUDES += ['/xpcom/base']
+LOCAL_INCLUDES += ['/xpcom/base']
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@ -25,7 +25,6 @@ RCFLAGS += -DMOZ_XULRUNNER -I$(srcdir)
 else
 RCFLAGS += -DMOZ_XULRUNNER --include-dir $(srcdir)
 endif
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif

 ifndef MOZ_WINCONSOLE
--- a/xulrunner/stub/moz.build
+++ b/xulrunner/stub/moz.build
@ -27,3 +27,6 @@ LOCAL_INCLUDES += [

 # Statically link against the RTL on windows
 USE_STATIC_LIBS = True
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    LOCAL_INCLUDES += ['/toolkit/xre']