Bug 923395 - Part b: Remove makefiles that only set LOCAL_INCLUDES and DEFINES; r=gps

accessible/src/windows/sdn/Makefile.in

@@ -1,10 +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/.
-
-# The midl generated code include Windows headers which defines min and max
-# macros which conflicts with std::min/max.  Suppress the macros:
-OS_CXXFLAGS += -DNOMINMAX
-
-include $(topsrcdir)/config/rules.mk
-

accessible/src/windows/sdn/moz.build

@@ -23,6 +23,10 @@ LOCAL_INCLUDES += [
     '../msaa',
 ]
 
+# The midl generated code include Windows headers which defines min and max
+# macros which conflicts with std::min/max.  Suppress the macros:
+DEFINES['NOMINMAX'] = True
+
 LIBRARY_NAME = 'accessibility_toolkit_sdn_s'
 
 EXPORT_LIBRARY = True

dom/media/bridge/Makefile.in

@@ -1,14 +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$(topsrcdir)/media/mtransport \
-  -I$(topsrcdir)/media/webrtc/signaling/include \
-  -I$(topsrcdir)/media/webrtc/signaling/src/sipcc/include \
-  -I$(topsrcdir)/media/webrtc/signaling/src/peerconnection \
-  -I$(topsrcdir)/media/webrtc/signaling/src/mediapipeline \
-  -I$(topsrcdir)/media/webrtc/signaling/src/media-conduit \
-  -I$(topsrcdir)/media/webrtc/signaling/src/common/time_profiling \
-  -I$(topsrcdir)/ipc/chromium/src \
-  $(NULL)

dom/media/bridge/moz.build

@@ -14,6 +14,17 @@ CPP_SOURCES += [
     'MediaModule.cpp',
 ]
 
+LOCAL_INCLUDES += [
+    '/ipc/chromium/src',
+    '/media/mtransport',
+    '/media/webrtc/signaling/include',
+    '/media/webrtc/signaling/src/common/time_profiling',
+    '/media/webrtc/signaling/src/media-conduit',
+    '/media/webrtc/signaling/src/mediapipeline',
+    '/media/webrtc/signaling/src/peerconnection',
+    '/media/webrtc/signaling/src/sipcc/include',
+]
+
 LIBRARY_NAME = 'peerconnection'
 
 LIBXUL_LIBRARY = True

dom/system/windows/Makefile.in

@@ -1,6 +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/.
-
-# We fire the nsDOMDeviceAcceleration
-LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src

dom/system/windows/moz.build

@@ -10,6 +10,11 @@ CPP_SOURCES += [
     'nsHapticFeedback.cpp',
 ]
 
+# We fire the nsDOMDeviceAcceleration
+LOCAL_INCLUDES += [
+    '/content/events/src',
+]
+
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True

extensions/auth/Makefile.in

@@ -1,8 +0,0 @@
-# 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/.
-
-ifeq ($(OS_ARCH),WINNT)
-LOCAL_INCLUDES	+= -DUSE_SSPI
-endif

extensions/auth/moz.build

@@ -17,6 +17,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'nsAuthSSPI.cpp',
     ]
+    DEFINES['USE_SSPI'] = True
 else:
     CPP_SOURCES += [
         'nsAuthSambaNTLM.cpp',

js/jsd/Makefile.in

@@ -1,15 +0,0 @@
-#!gmake
-#
-# 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 JS_THREADSAFE
-DEFINES         += -DJS_THREADSAFE
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -DEXPORT_JSD_API

js/jsd/moz.build

@@ -31,6 +31,11 @@ CPP_SOURCES += [
     'jshash.cpp',
 ]
 
+DEFINES['EXPORT_JSD_API'] = True
+
+if CONFIG['JS_THREADSAFE']:
+    DEFINES['JS_THREADSAFE'] = True
+
 LIBRARY_NAME = 'jsd'
 
 LIBXUL_LIBRARY = True

mobile/android/components/build/Makefile.in

@@ -1,10 +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_ANDROID_HISTORY
-LOCAL_INCLUDES += \
-	-I$(topsrcdir)/docshell/base \
-	-I$(topsrcdir)/content/base/src \
-	$(NULL)
-endif

mobile/android/components/build/moz.build

@@ -23,6 +23,10 @@ if CONFIG['MOZ_ANDROID_HISTORY']:
     CPP_SOURCES += [
         'nsAndroidHistory.cpp',
     ]
+    LOCAL_INCLUDES += [
+        '/content/base/src',
+        '/docshell/base',
+    ]
 
 LIBRARY_NAME = 'browsercomps'
 

toolkit/components/ctypes/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/.
-
-LOCAL_INCLUDES := \
-  -I$(topsrcdir)/js/xpconnect/loader \
-  $(NULL)

toolkit/components/ctypes/moz.build

@@ -12,6 +12,10 @@ CPP_SOURCES += [
     'ctypes.cpp',
 ]
 
+LOCAL_INCLUDES += [
+    '/js/xpconnect/loader',
+]
+
 LIBRARY_NAME = 'jsctypes'
 
 EXTRA_JS_MODULES += [

toolkit/components/satchel/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/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../build \
-  $(NULL)

toolkit/components/satchel/moz.build

@@ -19,6 +19,10 @@ CPP_SOURCES += [
     'nsFormFillController.cpp',
 ]
 
+LOCAL_INCLUDES += [
+    '../build',
+]
+
 EXTRA_COMPONENTS += [
     'FormHistoryStartup.js',
     'nsFormAutoComplete.js',

xpcom/glue/tests/gtest/Makefile.in

@@ -1,6 +0,0 @@
-# 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)/../..

xpcom/glue/tests/gtest/moz.build

@@ -10,6 +10,10 @@ CPP_SOURCES += [
     'TestFileUtils.cpp',
 ]
 
+LOCAL_INCLUDES = [
+    '../..',
+]
+
 LIBRARY_NAME = 'xpcom_glue_gtest'
 
 LIBXUL_LIBRARY = True

xpfe/appshell/src/Makefile.in

@@ -1,6 +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$(topsrcdir)/dom/base

xpfe/appshell/src/moz.build

@@ -19,6 +19,10 @@ CPP_SOURCES += [
     'nsXULWindow.cpp',
 ]
 
+LOCAL_INCLUDES += [
+    '/dom/base',
+]
+
 LIBRARY_NAME = 'nsappshell'
 
 LIBXUL_LIBRARY = True