Bug 923395 - Part b: Remove makefiles that only set LOCAL_INCLUDES and DEFINES; r=gps
authorMs2ger <ms2ger@gmail.com>
Sun, 20 Oct 2013 09:25:19 +0200
changeset 160044 518d1cdb71b72bc9f550fa5332a8de5315f0d2bc
parent 160043 fc39ece941ffdec8265b8432ae78096a6416ec40
child 160045 866467e089b22b2477a27b4f314c02b4cfd7603b
push idunknown
push userunknown
push dateunknown
reviewersgps
bugs923395
milestone27.0a1
Bug 923395 - Part b: Remove makefiles that only set LOCAL_INCLUDES and DEFINES; r=gps
accessible/src/windows/sdn/Makefile.in
accessible/src/windows/sdn/moz.build
dom/media/bridge/Makefile.in
dom/media/bridge/moz.build
dom/system/windows/Makefile.in
dom/system/windows/moz.build
extensions/auth/Makefile.in
extensions/auth/moz.build
js/jsd/Makefile.in
js/jsd/moz.build
mobile/android/components/build/Makefile.in
mobile/android/components/build/moz.build
toolkit/components/ctypes/Makefile.in
toolkit/components/ctypes/moz.build
toolkit/components/satchel/Makefile.in
toolkit/components/satchel/moz.build
xpcom/glue/tests/gtest/Makefile.in
xpcom/glue/tests/gtest/moz.build
xpfe/appshell/src/Makefile.in
xpfe/appshell/src/moz.build
deleted file mode 100644
--- a/accessible/src/windows/sdn/Makefile.in
+++ /dev/null
@@ -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
-
--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@@ -18,12 +18,16 @@ LOCAL_INCLUDES += [
     '../../base',
     '../../generic',
     '../../html',
     '../../xpcom',
     '../../xul',
     '../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
 
deleted file mode 100644
--- a/dom/media/bridge/Makefile.in
+++ /dev/null
@@ -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)
--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -9,14 +9,25 @@ XPIDL_SOURCES += [
 ]
 
 MODULE = 'peerconnection'
 
 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
 
 EXPORT_LIBRARY = True
 
deleted file mode 100644
--- a/dom/system/windows/Makefile.in
+++ /dev/null
@@ -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
--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -5,16 +5,21 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 CPP_SOURCES += [
     'nsHapticFeedback.cpp',
 ]
 
+# We fire the nsDOMDeviceAcceleration
+LOCAL_INCLUDES += [
+    '/content/events/src',
+]
+
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemwindows_s'
 
 EXPORT_LIBRARY = True
 
deleted file mode 100644
--- a/extensions/auth/Makefile.in
+++ /dev/null
@@ -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
--- a/extensions/auth/moz.build
+++ b/extensions/auth/moz.build
@@ -12,16 +12,17 @@ CPP_SOURCES += [
     'nsAuthSASL.cpp',
     'nsHttpNegotiateAuth.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'nsAuthSSPI.cpp',
     ]
+    DEFINES['USE_SSPI'] = True
 else:
     CPP_SOURCES += [
         'nsAuthSambaNTLM.cpp',
     ]
 
 LIBRARY_NAME = 'auth'
 
 LIBXUL_LIBRARY = True
deleted file mode 100644
--- a/js/jsd/Makefile.in
+++ /dev/null
@@ -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
--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -26,14 +26,19 @@ CPP_SOURCES += [
     'jsd_step.cpp',
     'jsd_text.cpp',
     'jsd_val.cpp',
     'jsd_xpc.cpp',
     'jsdebug.cpp',
     'jshash.cpp',
 ]
 
+DEFINES['EXPORT_JSD_API'] = True
+
+if CONFIG['JS_THREADSAFE']:
+    DEFINES['JS_THREADSAFE'] = True
+
 LIBRARY_NAME = 'jsd'
 
 LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
deleted file mode 100644
--- a/mobile/android/components/build/Makefile.in
+++ /dev/null
@@ -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
--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@@ -18,15 +18,19 @@ CPP_SOURCES += [
     'nsBrowserModule.cpp',
     'nsShellService.cpp',
 ]
 
 if CONFIG['MOZ_ANDROID_HISTORY']:
     CPP_SOURCES += [
         'nsAndroidHistory.cpp',
     ]
+    LOCAL_INCLUDES += [
+        '/content/base/src',
+        '/docshell/base',
+    ]
 
 LIBRARY_NAME = 'browsercomps'
 
 LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
deleted file mode 100644
--- a/toolkit/components/ctypes/Makefile.in
+++ /dev/null
@@ -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)
--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@@ -7,16 +7,20 @@
 TEST_DIRS += ['tests']
 
 MODULE = 'jsctypes'
 
 CPP_SOURCES += [
     'ctypes.cpp',
 ]
 
+LOCAL_INCLUDES += [
+    '/js/xpconnect/loader',
+]
+
 LIBRARY_NAME = 'jsctypes'
 
 EXTRA_JS_MODULES += [
     'ctypes.jsm',
 ]
 
 LIBXUL_LIBRARY = True
 
deleted file mode 100644
--- a/toolkit/components/satchel/Makefile.in
+++ /dev/null
@@ -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)
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -14,16 +14,20 @@ XPIDL_SOURCES += [
 ]
 
 MODULE = 'satchel'
 
 CPP_SOURCES += [
     'nsFormFillController.cpp',
 ]
 
+LOCAL_INCLUDES += [
+    '../build',
+]
+
 EXTRA_COMPONENTS += [
     'FormHistoryStartup.js',
     'nsFormAutoComplete.js',
     'nsInputListAutoComplete.js',
     'satchel.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
deleted file mode 100644
--- a/xpcom/glue/tests/gtest/Makefile.in
+++ /dev/null
@@ -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)/../..
--- a/xpcom/glue/tests/gtest/moz.build
+++ b/xpcom/glue/tests/gtest/moz.build
@@ -5,14 +5,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpcom_glue_gtest'
 
 CPP_SOURCES += [
     'TestFileUtils.cpp',
 ]
 
+LOCAL_INCLUDES = [
+    '../..',
+]
+
 LIBRARY_NAME = 'xpcom_glue_gtest'
 
 LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
deleted file mode 100644
--- a/xpfe/appshell/src/Makefile.in
+++ /dev/null
@@ -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
--- a/xpfe/appshell/src/moz.build
+++ b/xpfe/appshell/src/moz.build
@@ -14,16 +14,20 @@ CPP_SOURCES += [
     'nsAppShellWindowEnumerator.cpp',
     'nsChromeTreeOwner.cpp',
     'nsContentTreeOwner.cpp',
     'nsWebShellWindow.cpp',
     'nsWindowMediator.cpp',
     'nsXULWindow.cpp',
 ]
 
+LOCAL_INCLUDES += [
+    '/dom/base',
+]
+
 LIBRARY_NAME = 'nsappshell'
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 EXPORT_LIBRARY = True