Bug 973403 - Move the LOCAL_INCLUDES in memory to moz.build; r=glandium

memory/build/Makefile.in

@@ -9,21 +9,9 @@ DIST_INSTALL = 1
 endif
 
 ifdef MOZ_JEMALLOC3
-LOCAL_INCLUDES += -I../jemalloc/src/include
-ifdef _MSC_VER
-LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include/msvc_compat
-endif
-
 ifndef MOZ_NATIVE_JEMALLOC
 SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
 endif
 else
 SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
 endif
-
-ifdef MOZ_REPLACE_MALLOC
-# The zone allocator for OSX needs some jemalloc internal functions
-ifeq (Darwin,$(OS_TARGET))
-LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include
-endif
-endif

memory/build/moz.build

@@ -27,6 +27,9 @@ if CONFIG['MOZ_JEMALLOC3']:
     SOURCES += [
         'mozjemalloc_compat.c',
     ]
+    GENERATED_INCLUDES += ['../jemalloc/src/include']
+    if CONFIG['_MSC_VER']:
+        LOCAL_INCLUDES += ['/memory/jemalloc/src/include/msvc_compat']
 
 if CONFIG['MOZ_REPLACE_MALLOC']:
     SOURCES += [
@@ -39,3 +42,7 @@ LIBRARY_NAME = 'memory'
 if CONFIG['MOZ_MEMORY'] and (CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') or
                              CONFIG['MOZ_NATIVE_JEMALLOC']):
     FINAL_LIBRARY = 'mozglue'
+
+if CONFIG['MOZ_REPLACE_MALLOC'] and CONFIG['OS_TARGET'] == 'Darwin':
+    # The zone allocator for OSX needs some jemalloc internal functions
+    LOCAL_INCLUDES += ['/memory/jemalloc/src/include']

memory/jemalloc/Makefile.in

@@ -9,15 +9,6 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-LOCAL_INCLUDES += \
-  -I$(srcdir)/src/include \
-  -Isrc/include \
-  $(NULL)
-
-ifdef _MSC_VER
-LOCAL_INCLUDES += -I$(srcdir)/src/include/msvc_compat
-endif
-
 ifdef GNU_CC
 CFLAGS += -std=gnu99
 endif

memory/jemalloc/moz.build

@@ -42,9 +42,13 @@ FORCE_STATIC_LIB = True
 
 if CONFIG['_MSC_VER']:
     DEFINES['DLLEXPORT'] = True
+    LOCAL_INCLUDES += ['src/include/msvc_compat']
 
 if CONFIG['OS_TARGET'] == 'Linux':
     # For mremap
     DEFINES['_GNU_SOURCE'] = True
 
 DEFINES['abort'] = 'moz_abort'
+
+GENERATED_INCLUDES += ['src/include']
+LOCAL_INCLUDES += ['src/include']

memory/mozalloc/Makefile.in

@@ -15,5 +15,3 @@ SDK_LIBRARY = $(IMPORT_LIBRARY)
 else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
-
-LOCAL_INCLUDES += -I$(DEPTH)/xpcom

memory/mozalloc/moz.build

@@ -67,3 +67,5 @@ else:
 DEFINES['_GNU_SOURCE'] = True
 
 TEST_TOOL_DIRS += ['tests']
+
+GENERATED_INCLUDES += ['/xpcom']

memory/replace/jemalloc/Makefile.in

@@ -3,10 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
-LOCAL_INCLUDES += -I../../jemalloc/src/include
-ifdef _MSC_VER
-LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include/msvc_compat
-endif
 
 MOZ_GLUE_LDFLAGS = # Don't link against mozglue
 WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap

memory/replace/jemalloc/moz.build

@@ -24,3 +24,7 @@ FORCE_SHARED_LIB = True
 
 DEFINES['MOZ_JEMALLOC3'] = True
 DEFINES['MOZ_REPLACE_JEMALLOC'] = True
+
+GENERATED_INCLUDES += ['../../jemalloc/src/include']
+if CONFIG['_MSC_VER']:
+    LOCAL_INCLUDES += ['/memory/jemalloc/src/include/msvc_compat']