Bug 937224 - Part d: Move LOCAL_INCLUDES to moz.build in image/; r=mshal

image/build/Makefile.in

@@ -1,13 +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/.
-
-LOCAL_INCLUDES	= \
-		-I. \
-		-I$(srcdir)/../src \
-		-I$(srcdir)/../encoders/ico \
-		-I$(srcdir)/../encoders/png \
-		-I$(srcdir)/../encoders/jpeg \
-		-I$(srcdir)/../encoders/bmp \
-		$(NULL)

image/build/moz.build

@@ -13,3 +13,11 @@ LIBRARY_NAME = 'imglib2'
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+LOCAL_INCLUDES += [
+    '../encoders/bmp',
+    '../encoders/ico',
+    '../encoders/jpeg',
+    '../encoders/png',
+    '../src',
+]
+

image/decoders/icon/Makefile.in

@@ -1,30 +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/.
-
-ifdef MOZ_WIDGET_GTK
-PLATFORM = gtk
-endif
-
-ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
-PLATFORM = qt
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-PLATFORM = win
-endif
-
-ifeq ($(OS_ARCH),OS2)
-PLATFORM = os2
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-PLATFORM = mac
-endif
-
-ifeq ($(OS_TARGET),Android)
-PLATFORM = android
-endif
-
-LOCAL_INCLUDES	= -I$(srcdir)/$(PLATFORM)

image/decoders/icon/gtk/Makefile.in

@@ -2,9 +2,10 @@
 # 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
 
 ifdef MOZ_ENABLE_GNOMEUI
-LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS)
+CXXFLAGS += $(MOZ_GNOMEUI_CFLAGS)
 else
-LOCAL_INCLUDES += $(TK_CFLAGS)
+CXXFLAGS += $(TK_CFLAGS)
 endif

image/decoders/icon/moz.build

@@ -21,3 +21,25 @@ LIBRARY_NAME = 'imgicon'
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+
+platform = None
+
+if CONFIG['MOZ_WIDGET_GTK']:
+    platform = 'gtk'
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
+    platform = 'qt'
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    platform = 'win'
+elif CONFIG['OS_ARCH'] == 'OS2':
+    platform = 'os2'
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    platform = 'mac'
+
+if CONFIG['OS_TARGET'] == 'Android':
+    platform = 'android'
+
+if platform:
+    LOCAL_INCLUDES += [platform]

image/decoders/icon/qt/Makefile.in

@@ -2,4 +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/.
 
-LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS += $(MOZ_QT_CFLAGS)

image/src/Makefile.in

@@ -3,21 +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/.
 
-# We need to instantiate the decoders
-LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders
-
-# For URI-related functionality
-LOCAL_INCLUDES += -I$(topsrcdir)/netwerk/base/src
-
-# Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
-LOCAL_INCLUDES += \
-			-I$(topsrcdir)/content/svg/content/src \
-			-I$(topsrcdir)/content/base/src \
-			$(NULL)
-
-# Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
-LOCAL_INCLUDES += -I$(topsrcdir)/layout/svg
-
 include $(topsrcdir)/config/rules.mk
 
 # Because imgFrame.cpp includes "cairo.h"

image/src/moz.build

@@ -48,3 +48,15 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'imglib2'
+
+LOCAL_INCLUDES += [
+    # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
+    '/content/base/src',
+    '/content/svg/content/src',
+    # We need to instantiate the decoders
+    '/image/decoders',
+    # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
+    '/layout/svg',
+    # For URI-related functionality
+    '/netwerk/base/src',
+]