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

2024-11-24 13:21:05 +00:00 · 2013-10-20 09:25:19 +02:00 · 2013-10-20 09:25:19 +02:00 · 2ff7c10052
commit 2ff7c10052
parent b7619cd23d
20 changed files with 46 additions and 89 deletions
--- a/accessible/src/windows/sdn/Makefile.in
+++ b/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
-
--- a/accessible/src/windows/sdn/moz.build
+++ b/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
--- a/dom/media/bridge/Makefile.in
+++ b/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)
--- a/dom/media/bridge/moz.build
+++ b/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
--- a/dom/system/windows/Makefile.in
+++ b/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
--- a/dom/system/windows/moz.build
+++ b/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
--- a/extensions/auth/Makefile.in
+++ b/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
--- a/extensions/auth/moz.build
+++ b/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',
--- a/js/jsd/Makefile.in
+++ b/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
--- a/js/jsd/moz.build
+++ b/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
--- a/mobile/android/components/build/Makefile.in
+++ b/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
--- a/mobile/android/components/build/moz.build
+++ b/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'

--- a/toolkit/components/ctypes/Makefile.in
+++ b/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)
--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@ -12,6 +12,10 @@ CPP_SOURCES += [
    'ctypes.cpp',
 ]

+LOCAL_INCLUDES += [
+    '/js/xpconnect/loader',
+]
+
 LIBRARY_NAME = 'jsctypes'

 EXTRA_JS_MODULES += [
--- a/toolkit/components/satchel/Makefile.in
+++ b/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)
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@ -19,6 +19,10 @@ CPP_SOURCES += [
    'nsFormFillController.cpp',
 ]

+LOCAL_INCLUDES += [
+    '../build',
+]
+
 EXTRA_COMPONENTS += [
    'FormHistoryStartup.js',
    'nsFormAutoComplete.js',
--- a/xpcom/glue/tests/gtest/Makefile.in
+++ b/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)/../..
--- a/xpcom/glue/tests/gtest/moz.build
+++ b/xpcom/glue/tests/gtest/moz.build
@ -10,6 +10,10 @@ CPP_SOURCES += [
    'TestFileUtils.cpp',
 ]

+LOCAL_INCLUDES = [
+    '../..',
+]
+
 LIBRARY_NAME = 'xpcom_glue_gtest'

 LIBXUL_LIBRARY = True
--- a/xpfe/appshell/src/Makefile.in
+++ b/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
--- a/xpfe/appshell/src/moz.build
+++ b/xpfe/appshell/src/moz.build
@ -19,6 +19,10 @@ CPP_SOURCES += [
    'nsXULWindow.cpp',
 ]

+LOCAL_INCLUDES += [
+    '/dom/base',
+]
+
 LIBRARY_NAME = 'nsappshell'

 LIBXUL_LIBRARY = True