Bug 973405 - Move some misc LOCAL_INCLUDES to moz.build; r=glandium

db/sqlite3/src/Makefile.in

@@ -45,6 +45,3 @@ MODULE_OPTIMIZE_FLAGS = -O2
 endif
 
 include $(topsrcdir)/config/rules.mk
-
-# next line allows use of MOZ_OBJDIR in .mozconfig with older gcc on BeOS, maybe others
-LOCAL_INCLUDES += -I$(srcdir)

dom/bindings/test/Makefile.in

@@ -13,7 +13,7 @@ OS_CXXFLAGS += -Wno-uninitialized
 endif
 
 # Bug 932082 tracks having bindings use namespaced includes.
-LOCAL_INCLUDES += -I$(DIST)/include/mozilla/dom -I..
+LOCAL_INCLUDES += -I$(DIST)/include/mozilla/dom
 
 # Include rules.mk before any of our targets so our first target is coming from
 # rules.mk and running make with no target in this dir does the right thing.

dom/bindings/test/moz.build

@@ -36,6 +36,7 @@ WEBIDL_EXAMPLE_INTERFACES += [
     'TestExampleProxyInterface',
 ]
 
+GENERATED_INCLUDES += ['..']
 LOCAL_INCLUDES += [
     '/dom/bindings',
     '/js/xpconnect/src',

mobile/android/app/Makefile.in

@@ -8,12 +8,6 @@ PREF_JS_EXPORTS = $(srcdir)/mobile.js
 
 ifndef LIBXUL_SDK
 ifneq (Android,$(OS_TARGET))
-
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
-LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
-LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
-LOCAL_INCLUDES += -I$(DEPTH)/build
-
 STL_FLAGS=
 
 LIBS += \

mobile/android/app/moz.build

@@ -8,6 +8,12 @@ if not CONFIG['LIBXUL_SDK']:
     if CONFIG['OS_TARGET'] != 'Android':
         PROGRAM = CONFIG['MOZ_APP_NAME']
         DEFINES['XPCOM_GLUE'] = True
+        GENERATED_INCLUDES += ['/build']
+        LOCAL_INCLUDES += [
+            '/toolkit/xre',
+            '/xpcom/base',
+            '/xpcom/build',
+        ]
 
 for var in ('APP_NAME', 'APP_VERSION'):
     DEFINES[var] = CONFIG['MOZ_%s' % var]

modules/libmar/verify/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/.
 
-# This makefile just builds support for reading archives.
-ifneq ($(OS_ARCH),WINNT)
-LOCAL_INCLUDES += -I$(srcdir)/../sign
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 # The intermediate (.ii/.s) files for host and target can have the same name...

modules/libmar/verify/moz.build

@@ -17,6 +17,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     USE_STATIC_LIBS = True
 else:
     DEFINES['MAR_NSS'] = True
+    LOCAL_INCLUDES += ['../sign']
 
 LOCAL_INCLUDES += [
     '../src',

security/sandbox/Makefile.in

@@ -3,14 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ifeq ($(OS_ARCH),WINNT)
-
-LOCAL_INCLUDES += \
-    -I$(topsrcdir)/security/sandbox/chromium/base/shim \
-    -I$(topsrcdir)/security/sandbox/chromium \
-    -I$(topsrcdir)/security \
-    -I$(topsrcdir)/nsprpub \
-    $(NULL)
-
 EXTRA_SDK_DECLS = $(topsrcdir)/security/sandbox/chromium/base/shim/sdkdecls.h
 
 ifdef _MSC_VER

security/sandbox/moz.build

@@ -123,3 +123,8 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
     for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS',
                 'NOMINMAX', '_CRT_RAND_S'):
         DEFINES[var] = True
+
+    LOCAL_INCLUDES += ['/security/sandbox/chromium/base/shim']
+    LOCAL_INCLUDES += ['/security/sandbox/chromium']
+    LOCAL_INCLUDES += ['/security']
+    LOCAL_INCLUDES += ['/nsprpub']

storage/build/Makefile.in

@@ -3,6 +3,4 @@
 # 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 = \
-	$(SQLITE_CFLAGS) \
-	-I$(srcdir)/../src
+CXXFLAGS += $(SQLITE_CFLAGS)

storage/build/moz.build

@@ -17,3 +17,5 @@ FAIL_ON_WARNINGS = True
 LIBRARY_NAME = 'storagecomps'
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += ['../src']

storage/src/Makefile.in

@@ -3,9 +3,4 @@
 # 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/.
 
-# For nsDependentJSString
-LOCAL_INCLUDES = \
-  $(SQLITE_CFLAGS) \
-  -I$(topsrcdir)/db/sqlite3/src \
-  -I$(topsrcdir)/dom/base \
-  $(NULL)
+CXXFLAGS += $(SQLITE_CFLAGS)

storage/src/moz.build

@@ -59,3 +59,8 @@ if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_NATIVE_SQLITE']:
 # This is the default value.  If we ever change it when compiling sqlite, we
 # will need to change it here as well.
 DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000
+
+LOCAL_INCLUDES += [
+    '/db/sqlite3/src',
+    '/dom/base',
+]

uriloader/exthandler/Makefile.in

@@ -3,10 +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/.
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-LOCAL_INCLUDES += -I$(srcdir)/win
-endif
-
 ifdef MOZ_ENABLE_DBUS
 OS_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
 endif

uriloader/exthandler/moz.build

@@ -21,6 +21,7 @@ XPIDL_MODULE = 'exthandler'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     osdir = 'win'
+    LOCAL_INCLUDES += ['win']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     osdir = 'win'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':