Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ms2ger 2013-11-28 15:25:39 +01:00
parent e20d055c6c
commit 4cd3e164ae
46 changed files with 187 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
netwerk/build/Makefile.in
View File

@ -1,46 +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)/../base/src \
-I$(srcdir)/../dns \
-I$(srcdir)/../socket \
-I$(srcdir)/../streamconv/src \
-I$(srcdir)/../streamconv/converters \
-I$(srcdir)/../mime \
-I$(srcdir)/../cache \
-I$(srcdir)/../protocol/about \
-I$(srcdir)/../protocol/app \
-I../dns \
$(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \
-I$(srcdir)/../protocol/$(d)) \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
LOCAL_INCLUDES += -I$(srcdir)/../system/win32
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
LOCAL_INCLUDES += -I$(srcdir)/../system/mac
endif
ifdef MOZ_ENABLE_QTNETWORK
LOCAL_INCLUDES += -I$(srcdir)/../system/qt
endif
ifeq (android,$(MOZ_WIDGET_TOOLKIT))
LOCAL_INCLUDES += -I$(srcdir)/../system/android
endif
ifdef NECKO_COOKIES
LOCAL_INCLUDES += -I$(srcdir)/../cookie
endif
ifdef NECKO_WIFI
LOCAL_INCLUDES += -I$(srcdir)/../wifi
endif
include $(topsrcdir)/config/rules.mk

57
netwerk/build/moz.build
View File

@ -21,3 +21,60 @@ LIBRARY_NAME = 'necko'
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../base/src',
'../cache',
'../dns',
'../mime',
'../protocol/about',
'../protocol/app',
'../socket',
'../streamconv/converters',
'../streamconv/src',
]
protocols = CONFIG['NECKO_PROTOCOLS'].copy()
protocols.remove("about")
LOCAL_INCLUDES += sorted([
'../protocol/%s' % d for d in protocols
])
if CONFIG['OS_ARCH'] == 'WINNT':
LOCAL_INCLUDES += [
'../system/win32',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
LOCAL_INCLUDES += [
'../system/mac',
]
if CONFIG['MOZ_ENABLE_QTNETWORK']:
LOCAL_INCLUDES += [
'../system/qt',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
LOCAL_INCLUDES += [
'../system/android',
]
if CONFIG['NECKO_COOKIES']:
LOCAL_INCLUDES += [
'../cookie',
]
if CONFIG['NECKO_WIFI']:
LOCAL_INCLUDES += [
'../wifi',
]
if CONFIG['MOZ_RTSP']:
LOCAL_INCLUDES += [
'../protocol/rtsp',
]
GENERATED_INCLUDES += [
'../dns',
]

8
netwerk/cache/Makefile.in vendored
View File

@ -1,8 +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)/../base/src \
$(NULL)

4
netwerk/cache/moz.build vendored
View File

@ -45,3 +45,7 @@ FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../base/src',
]

15
netwerk/cookie/Makefile.in
View File

@ -1,15 +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 NECKO_COOKIES
LOCAL_INCLUDES = \
-I$(topsrcdir)/intl/uconv/src \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

10
netwerk/cookie/moz.build
View File

@ -29,13 +29,15 @@ if CONFIG['NECKO_COOKIES']:
'nsCookie.cpp',
'nsCookieService.cpp',
]
LOCAL_INCLUDES += [
'/intl/uconv/src',
]
if CONFIG['NECKO_COOKIES']:
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
if CONFIG['NECKO_COOKIES'] and CONFIG['OS_ARCH'] != 'Darwin':
XPCSHELL_TESTS_MANIFESTS += ['test/unit_ipc/xpcshell.ini']
# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
if CONFIG['OS_ARCH'] != 'Darwin':
XPCSHELL_TESTS_MANIFESTS += ['test/unit_ipc/xpcshell.ini']
IPDL_SOURCES = [
'PCookieService.ipdl',

6
netwerk/dns/Makefile.in
View File

@ -3,12 +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/.
# need to include etld_data.inc
LOCAL_INCLUDES = \
-I$(srcdir)/../base/src \
-I. \
$(NULL)
include $(topsrcdir)/config/rules.mk
# Generate the include file containing compact, static definitions

5
netwerk/dns/moz.build
View File

@ -42,3 +42,8 @@ FINAL_LIBRARY = 'necko'
GENERATED_FILES = [
'etld_data.inc',
]
# need to include etld_data.inc
LOCAL_INCLUDES += [
'../base/src',
]

11
netwerk/ipc/Makefile.in
View File

@ -1,11 +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)/../protocol/http \
-I$(srcdir)/../base/src \
-I$(topsrcdir)/modules/libjar \
$(NULL)
include $(topsrcdir)/config/rules.mk

6
netwerk/ipc/moz.build
View File

@ -41,3 +41,9 @@ FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../base/src',
'../protocol/http',
'/modules/libjar',
]

10
netwerk/protocol/about/Makefile.in
View File

@ -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/.
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
netwerk/protocol/about/moz.build
View File

@ -27,3 +27,7 @@ FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
]

9
netwerk/protocol/app/Makefile.in
View File

@ -1,9 +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)/../../base/src \
-I$(srcdir)/../../../modules/libjar \
$(NULL)

5
netwerk/protocol/app/moz.build
View File

@ -11,3 +11,8 @@ SOURCES += [
FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../../modules/libjar',
'../../base/src',
]

8
netwerk/protocol/data/Makefile.in
View File

@ -1,8 +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)/../../base/src \
$(NULL)

4
netwerk/protocol/data/moz.build
View File

@ -12,3 +12,7 @@ UNIFIED_SOURCES += [
FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
]

8
netwerk/protocol/device/Makefile.in
View File

@ -1,8 +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)/../../base/src/ \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
netwerk/protocol/device/moz.build
View File

@ -23,3 +23,7 @@ FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src/',
]

9
netwerk/protocol/file/Makefile.in
View File

@ -1,9 +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)/../../base/src \
-I$(topsrcdir)/xpcom/ds \
$(NULL)

5
netwerk/protocol/file/moz.build
View File

@ -21,3 +21,8 @@ FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
'/xpcom/ds',
]

11
netwerk/protocol/ftp/Makefile.in
View File

@ -1,11 +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)/../../base/src \
-I$(topsrcdir)/xpcom/ds \
$(NULL)
include $(topsrcdir)/config/rules.mk

5
netwerk/protocol/ftp/moz.build
View File

@ -39,3 +39,8 @@ MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
'/xpcom/ds',
]

13
netwerk/protocol/http/Makefile.in
View File

@ -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$(srcdir)/../../base/src \
-I$(topsrcdir)/xpcom/ds \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
$(NULL)
include $(topsrcdir)/config/rules.mk

7
netwerk/protocol/http/moz.build
View File

@ -102,3 +102,10 @@ MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
'/content/base/src',
'/content/events/src',
'/xpcom/ds',
]

10
netwerk/protocol/res/Makefile.in
View File

@ -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/.
LOCAL_INCLUDES = \
-I$(topsrcdir)/netwerk/base/src \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
netwerk/protocol/res/moz.build
View File

@ -21,3 +21,7 @@ MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'/netwerk/base/src',
]

38
netwerk/protocol/rtsp/Makefile.in
View File

@ -2,30 +2,18 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/xpcom/ds \
-I$(srcdir) \
-I$(srcdir)/rtsp \
-I$(srcdir)/controller \
$(NULL)
ifeq ($(ANDROID_VERSION),$(findstring $(ANDROID_VERSION),15))
LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/mpeg2ts \
$(NULL)
else
LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/frameworks/av/media/libstagefright/mpeg2ts \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -Wno-multichar
ifeq ($(ANDROID_VERSION),$(findstring $(ANDROID_VERSION),15))
CXXFLAGS += \
-I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/mpeg2ts \
$(NULL)
else
CXXFLAGS += \
-I$(ANDROID_SOURCE)/frameworks/av/media/libstagefright/mpeg2ts \
$(NULL)
endif
CXXFLAGS += \
-Wno-multichar \
$(NULL)

12
netwerk/protocol/rtsp/moz.build
View File

@ -51,5 +51,17 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
DEFINES['IMPL_NS_NET'] = True
DEFINES['FORCE_PR_LOG'] = True
LOCAL_INCLUDES += [
'../../base/src',
'/content/base/src',
'/content/events/src',
'/xpcom/ds',
'controller',
'rtsp',
]
for var in ('IMPL_NS_NET', 'FORCE_PR_LOG'):
DEFINES[var] = True

8
netwerk/protocol/viewsource/Makefile.in
View File

@ -1,8 +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)/../../base/src \
$(NULL)

4
netwerk/protocol/viewsource/moz.build
View File

@ -18,3 +18,7 @@ UNIFIED_SOURCES += [
FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
]

12
netwerk/protocol/websocket/Makefile.in
View File

@ -1,12 +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)/../../base/src \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/xpcom/ds \
$(NULL)
include $(topsrcdir)/config/rules.mk

7
netwerk/protocol/websocket/moz.build
View File

@ -38,3 +38,10 @@ MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
'/content/base/src',
'/content/events/src',
'/xpcom/ds',
]

9
netwerk/protocol/wyciwyg/Makefile.in
View File

@ -1,9 +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)/../../base/src \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
netwerk/protocol/wyciwyg/moz.build
View File

@ -34,3 +34,7 @@ FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
]

7
netwerk/sctp/datachannel/Makefile.in
View File

@ -4,10 +4,3 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
LOCAL_INCLUDES = \
-I$(topsrcdir)/xpcom/ds \
-I$(srcdir)/../src \
-I$(DEPTH)/dist/include/mozilla/net \
-I$(topsrcdir)/media/webrtc/trunk/third_party/libjingle/source \
-I$(topsrcdir)/media/mtransport \
$(NULL)

7
netwerk/sctp/datachannel/moz.build
View File

@ -22,6 +22,13 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../src',
'/media/mtransport',
'/media/webrtc/trunk/third_party/libjingle/source',
'/xpcom/ds',
]
DEFINES['INET'] = 1
DEFINES['SCTP_DEBUG'] = 1

7
netwerk/sctp/src/Makefile.in
View File

@ -11,13 +11,6 @@ VPATH = \
NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/xpcom/ds \
$(NULL)
ifeq ($(OS_TARGET),Darwin)
DEFINES += \
-U__APPLE__ \

7
netwerk/sctp/src/moz.build
View File

@ -49,6 +49,13 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
'/content/base/src',
'/content/events/src',
'/xpcom/ds',
]
for var in ('SCTP_SIMPLE_ALLOCATOR', 'USE_SCTP_SHA1',
'SCTP_PROCESS_LEVEL_LOCKS', '__Userspace__', 'INET',
'CALLBACK_API', 'SCTP_DEBUG'):

5
netwerk/srtp/src/Makefile.in
View File

@ -15,11 +15,6 @@ VPATH = \
@srcdir@/crypto/rng \
$(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/include \
-I$(srcdir)/crypto/include \
$(NULL)
include $(topsrcdir)/config/rules.mk
ifdef GNU_CC

5
netwerk/srtp/src/moz.build
View File

@ -39,6 +39,11 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'crypto/include',
'include',
]
# We know stdint.h will define uint8/16/32/64_t, so we don't need
# to define SIZEOF_UNSIGNED_LONG/SIZEOF_UNSIGNED_LONG_LONG
for var in ('HAVE_STDLIB_H', 'HAVE_UINT8_T', 'HAVE_UINT16_T',

8
netwerk/streamconv/converters/Makefile.in
View File

@ -1,8 +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)/netwerk/base/src \
$(NULL)

4
netwerk/streamconv/converters/moz.build
View File

@ -31,3 +31,7 @@ FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'/netwerk/base/src',
]

7
netwerk/system/android/Makefile.in
View File

@ -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/.
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += -I$(srcdir)/../../base/src

4
netwerk/system/android/moz.build
View File

@ -11,3 +11,7 @@ SOURCES += [
FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
]

1
netwerk/system/qt/Makefile.in
View File

@ -6,4 +6,3 @@
include $(topsrcdir)/config/rules.mk
OS_INCLUDES += $(MOZ_QT_CFLAGS)
LOCAL_INCLUDES += -I$(srcdir)/../../base/src

4
netwerk/system/qt/moz.build
View File

@ -16,3 +16,7 @@ GENERATED_SOURCES += [
FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'necko'
LOCAL_INCLUDES += [
'../../base/src',
]