wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 968631 - Port some LOCAL_INCLUDES variables to moz.build; r=mshal

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-02-10 13:41:02 -05:00
parent 32debe31bf
commit 5a96208edf
18 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
b2g/app/Makefile.in
View File

@ -27,14 +27,8 @@ LIBS += \
$(NULL)
endif
OS_LDFLAGS += -Wl,--export-dynamic
LOCAL_INCLUDES += -I$(topsrcdir)/widget/gonk/libdisplay
endif
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
LOCAL_INCLUDES += -I$(DEPTH)/build
STL_FLAGS=
LIBS += $(JEMALLOC_LIBS)

15
b2g/app/moz.build
View File

@ -20,3 +20,18 @@ DEFINES['XPCOM_GLUE'] = True
for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER'):
DEFINES[var] = CONFIG[var]
GENERATED_INCLUDES += [
'/build',
]
LOCAL_INCLUDES += [
'/toolkit/xre',
'/xpcom/base',
'/xpcom/build',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
LOCAL_INCLUDES += [
'/widget/gonk/libdisplay',
]

7
browser/app/Makefile.in
View File

@ -26,13 +26,6 @@ endif #} LIBXUL_SDK
# Build a binary bootstrapping with XRE_main
LOCAL_INCLUDES += \
-I$(topsrcdir)/toolkit/xre \
-I$(topsrcdir)/xpcom/base \
-I$(topsrcdir)/xpcom/build \
-I$(DEPTH)/build \
$(NULL)
STL_FLAGS=
LIBS += \

10
browser/app/moz.build
View File

@ -22,3 +22,13 @@ for var in ('MOZILLA_OFFICIAL', 'LIBXUL_SDK'):
DEFINES[var] = True
DEFINES['XPCOM_GLUE'] = True
GENERATED_INCLUDES += [
'/build',
]
LOCAL_INCLUDES += [
'/toolkit/xre',
'/xpcom/base',
'/xpcom/build',
]

5
browser/components/about/Makefile.in
View File

@ -1,5 +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

4
browser/components/about/moz.build
View File

@ -13,3 +13,7 @@ SOURCES += [
]
FINAL_LIBRARY = 'browsercomps'
LOCAL_INCLUDES += [
'../build',
]

9
browser/components/build/Makefile.in
View File

@ -6,13 +6,6 @@ ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32 shlwapi)
endif
LOCAL_INCLUDES = \
-I$(srcdir)/../shell/src \
-I$(srcdir)/../feeds/src \
-I$(srcdir)/../about \
-I$(srcdir)/../dirprovider \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,version)
endif
@ -22,8 +15,6 @@ EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
LOCAL_INCLUDES += -I$(srcdir)/../migration/src
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
# GTK2: Need to link with glib for GNOME shell service
ifneq (,$(filter cocoa gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))

8
browser/components/build/moz.build
View File

@ -17,3 +17,11 @@ LIBRARY_NAME = 'browsercomps'
IS_COMPONENT = True
FORCE_SHARED_LIB = True
LOCAL_INCLUDES += [
'../about',
'../dirprovider',
'../feeds/src',
'../migration/src',
'../shell/src',
]

5
browser/components/dirprovider/Makefile.in
View File

@ -1,5 +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

4
browser/components/dirprovider/moz.build
View File

@ -17,3 +17,7 @@ XPCSHELL_TESTS_MANIFESTS += [
]
FINAL_LIBRARY = 'browsercomps'
LOCAL_INCLUDES += [
'../build'
]

10
chrome/src/Makefile.in
View File

@ -5,16 +5,6 @@
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/netwerk/protocol/res \
-I$(topsrcdir)/netwerk/base/src \
$(NULL)
ifdef MOZ_ENABLE_GTK
CXXFLAGS += $(TK_CFLAGS)
endif
LOCAL_INCLUDES += \
-I$(topsrcdir)/xpcom/components \
-I$(DEPTH)/xpcom \
$(NULL)

10
chrome/src/moz.build
View File

@ -20,3 +20,13 @@ MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xpcom_core'
GENERATED_INCLUDES += [
'/xpcom',
]
LOCAL_INCLUDES += [
'/netwerk/base/src',
'/netwerk/protocol/res',
'/xpcom/components'
]

9
hal/Makefile.in
View File

@ -3,18 +3,11 @@
# 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_GAMEPAD
LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
endif
include $(topsrcdir)/config/rules.mk
CFLAGS += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
CXXFLAGS += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
# So that we can call nsScreenManagerGonk::GetConfiguration().
LOCAL_INCLUDES += -I$(topsrcdir)/widget/gonk
LOCAL_INCLUDES += -I$(topsrcdir)/widget/xpwidgets
LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include
LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include
endif

12
hal/moz.build
View File

@ -176,3 +176,15 @@ FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_GAMEPAD']:
LOCAL_INCLUDES += [
'/dom/base',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
# So that we can call nsScreenManagerGonk::GetConfiguration().
LOCAL_INCLUDES += [
'/widget/gonk',
'/widget/xpwidgets'
]

8
ipc/app/Makefile.in
View File

@ -22,9 +22,6 @@ LIBS += \
$(NULL)
endif
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
ifndef MOZ_WINCONSOLE
ifdef MOZ_DEBUG
MOZ_WINCONSOLE = 1
@ -54,11 +51,6 @@ ifeq ($(OS_ARCH),WINNT) #{
ifdef MOZ_CONTENT_SANDBOX
LIBS += ../../security/sandbox/$(LIB_PREFIX)sandbox_s.$(LIB_SUFFIX)
LIBS += $(NSPR_LIBS)
LOCAL_INCLUDES += \
-I$(topsrcdir)/security/ \
-I$(topsrcdir)/security/sandbox \
-I$(topsrcdir)/security/sandbox/chromium \
$(NULL)
endif
# Note the manifest file exists in the tree, so we use the explicit filename

4
ipc/app/moz.build
View File

@ -17,3 +17,7 @@ else:
]
include('/ipc/chromium/chromium-config.mozbuild')
LOCAL_INCLUDES += [
'/toolkit/xre',
'/xpcom/base',
]

13
toolkit/library/Makefile.in
View File

@ -16,7 +16,6 @@ endif
ifdef MOZ_CONTENT_SANDBOX
ifeq ($(OS_ARCH),WINNT)
LOCAL_INCLUDES += -I$(srcdir)/../sandboxbroker
SHARED_LIBRARY_LIBS += ../../security/sandbox/win/src/sandboxbroker/$(LIB_PREFIX)sandboxbroker.$(LIB_SUFFIX)
endif
endif
@ -29,16 +28,10 @@ SHARED_LIBRARY_LIBS += \
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
RCINCLUDE = xulrunner.rc
LOCAL_INCLUDES += -I$(topsrcdir)/widget/windows
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
endif
ifeq ($(OS_ARCH),OS2)
RCFLAGS += -i $(topsrcdir)/widget/os2
LOCAL_INCLUDES += -I$(topsrcdir)/widget/os2
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
endif
# dependent libraries
@ -304,12 +297,6 @@ EXTRA_MDDEPEND_FILES = $(GTEST_LIB).pp
include $(topsrcdir)/config/rules.mk
# need widget/windows for resource.h (included from widget.rc)
LOCAL_INCLUDES += \
-I$(topsrcdir)/config \
-I$(topsrcdir)/widget/windows \
$(NULL)
OS_LIBS += $(LIBICONV)
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)

5
toolkit/library/moz.build
View File

@ -14,6 +14,11 @@ if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'nsDllMain.cpp',
]
if not CONFIG['GNU_CC']:
LOCAL_INCLUDES += [
'/widget/windows',
'/xpcom/base',
]
# component libraries
additional_defines = (