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 883502 - Part 1: Move 'chromium_config.mk' includes after rules.mk. r=gps

Browse Source
This commit is contained in:
Brian O'Keefe 2013-07-04 08:28:43 -04:00
parent db81338f37
commit f98dd45a72
101 changed files with 110 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/src/windows/msaa/Makefile.in
View File

@ -14,8 +14,8 @@ EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(srcdir) \

2
chrome/src/Makefile.in
View File

@ -15,8 +15,8 @@ MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/netwerk/protocol/res \

2
content/base/src/Makefile.in
View File

@ -31,8 +31,8 @@ EXTRA_COMPONENTS = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/caps/include \

2
content/events/src/Makefile.in
View File

@ -16,8 +16,8 @@ LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(srcdir)/../../base/src \

2
content/mathml/content/src/Makefile.in
View File

@ -15,9 +15,9 @@ LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
INCLUDES += \
-I$(srcdir)/../../../base/src \

2
content/media/Makefile.in
View File

@ -15,8 +15,8 @@ LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
INCLUDES += \
-I$(topsrcdir)/content/base/src \

2
content/media/webspeech/recognition/Makefile.in
View File

@ -20,5 +20,5 @@ LIBXUL_LIBRARY := 1
LOCAL_INCLUDES += $(VPATH:%=-I%)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
content/media/webspeech/synth/Makefile.in
View File

@ -23,5 +23,5 @@ LIBXUL_LIBRARY = 1
LOCAL_INCLUDES += $(VPATH:%=-I%)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
content/svg/content/src/Makefile.in
View File

@ -15,9 +15,9 @@ LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
INCLUDES += \
-I$(srcdir)/../../../xml/content/src \

2
docshell/base/Makefile.in
View File

@ -20,8 +20,8 @@ DEFINES += -DMOZ_TOOLKIT_SEARCH
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(srcdir)/../shistory/src \

2
dom/alarm/Makefile.in
View File

@ -17,6 +17,6 @@ include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/audiochannel/Makefile.in
View File

@ -25,6 +25,6 @@ EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

3
dom/base/Makefile.in
View File

@ -30,9 +30,8 @@ DEFINES += -DMOZ_B2G_FM
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/js/xpconnect/src \

2
dom/battery/Makefile.in
View File

@ -20,6 +20,6 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/bindings/Makefile.in
View File

@ -14,7 +14,6 @@ EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
# Need this to find all our DOM source files.
include $(topsrcdir)/dom/dom-config.mk
@ -113,6 +112,7 @@ CXXFLAGS += -Wno-uninitialized
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
# If you change bindinggen_dependencies here, change it in
# dom/bindings/test/Makefile.in too.

2
dom/bluetooth/Makefile.in
View File

@ -52,5 +52,5 @@ LOCAL_INCLUDES += $(VPATH:%=-I%)
endif # MOZ_B2G_BT
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/browser-element/Makefile.in
View File

@ -17,8 +17,8 @@ include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
INCLUDES += \
-I$(topsrcdir)/dom/base \

2
dom/devicestorage/Makefile.in
View File

@ -23,8 +23,8 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -D_IMPL_NS_LAYOUT

2
dom/devicestorage/ipc/Makefile.in
View File

@ -17,5 +17,5 @@ MOCHITEST_FILES := \
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/icc/src/Makefile.in
View File

@ -20,5 +20,5 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/indexedDB/Makefile.in
View File

@ -29,6 +29,6 @@ DEFINES += -D_IMPL_NS_LAYOUT
# Make sure to quickstub as much as possible here! See
# js/xpconnect/src/dom_quickstubs.qsconf.
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/indexedDB/ipc/Makefile.in
View File

@ -32,8 +32,8 @@ MOCHITEST_FILES = test_ipc.html
#NO_XPCSHELL_MANIFEST_CHECK = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
xpcshell_tests = unit

2
dom/ipc/Makefile.in
View File

@ -15,8 +15,8 @@ EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(srcdir)/../../content/base/src \

2
dom/media/Makefile.in
View File

@ -25,5 +25,5 @@ LOCAL_INCLUDES += \
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/mobilemessage/src/Makefile.in
View File

@ -51,5 +51,5 @@ EXTRA_COMPONENTS = \
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/network/src/Makefile.in
View File

@ -30,5 +30,5 @@ LOCAL_INCLUDES += \
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/plugins/base/Makefile.in
View File

@ -41,7 +41,7 @@ LOCAL_INCLUDES += \
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CXXFLAGS += $(TK_CFLAGS)

3
dom/plugins/base/android/Makefile.in
View File

@ -16,7 +16,6 @@ EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/widget/android \
@ -31,4 +30,4 @@ LOCAL_INCLUDES += \
DEFINES += -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"'
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

3
dom/plugins/ipc/Makefile.in
View File

@ -34,9 +34,8 @@ LOCAL_INCLUDES += \
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CXXFLAGS += $(TK_CFLAGS)

3
dom/plugins/ipc/hangui/Makefile.in
View File

@ -30,7 +30,6 @@ ifdef GNU_CC
WIN32_EXE_LDFLAGS = -municode
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk

2
dom/power/Makefile.in
View File

@ -16,5 +16,5 @@ FAIL_ON_WARNINGS := 1
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/quota/Makefile.in
View File

@ -21,5 +21,5 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/src/geolocation/Makefile.in
View File

@ -45,7 +45,7 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/system/mac
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -D_IMPL_NS_LAYOUT

2
dom/src/notification/Makefile.in
View File

@ -22,7 +22,7 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -D_IMPL_NS_LAYOUT

2
dom/src/storage/Makefile.in
View File

@ -26,5 +26,5 @@ DEFINES += -DDOM_STORAGE_TESTS
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/system/Makefile.in
View File

@ -46,5 +46,5 @@ LOCAL_INCLUDES += \
include $(topsrcdir)/config/config.mk
EXPORT_LIBRARY = 1
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/system/android/Makefile.in
View File

@ -16,11 +16,11 @@ EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \
-I$(topsrcdir)/content/events/src
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/system/mac/Makefile.in
View File

@ -16,9 +16,9 @@ EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

3
dom/system/unix/Makefile.in
View File

@ -16,8 +16,6 @@ EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifdef MOZ_MAEMO_LIBLOCATION
LOCAL_INCLUDES += $(MOZ_PLATFORM_MAEMO_CFLAGS) \
@ -36,3 +34,4 @@ LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) \
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
dom/time/Makefile.in
View File

@ -16,5 +16,5 @@ FAIL_ON_WARNINGS := 1
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
extensions/cookie/Makefile.in
View File

@ -17,5 +17,5 @@ LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

1
gfx/gl/Makefile.in
View File

@ -73,7 +73,6 @@ DEFINES += -DMOZ_ANDROID_OMTC
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES := $(filter-out -DUNICODE,$(DEFINES))

3
gfx/ipc/Makefile.in
View File

@ -15,8 +15,7 @@ LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)

1
gfx/layers/Makefile.in
View File

@ -33,7 +33,6 @@ DEFINES += -DMOZ_ENABLE_D3D10_LAYER
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \

2
hal/Makefile.in
View File

@ -35,8 +35,8 @@ LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CFLAGS += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
CXXFLAGS += $(GLIB_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)

2
image/decoders/icon/android/Makefile.in
View File

@ -14,5 +14,5 @@ LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS := 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
ipc/app/Makefile.in
View File

@ -45,7 +45,6 @@ endif
NSDISTMODE = copy
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifeq (android,$(MOZ_WIDGET_TOOLKIT))
FINAL_TARGET = $(DIST)/bin/lib
@ -58,6 +57,7 @@ WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LDFLAGS += $(MOZ_ALLOW_HEAP_EXECUTE_FLAGS)

24
ipc/chromium/Makefile.in
View File

@ -38,19 +38,18 @@ vpath %.mm \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifdef OS_POSIX # {
ifneq ($(OS_ARCH),WINNT) # (if OS_POSIX) {
ifeq ($(OS_TARGET),Android)
DEFINES += -DANDROID -D_POSIX_MONOTONIC_CLOCK=0
endif # Android
endif # } OS_POSIX
endif # } Not WINNT (OS_POSIX)
# libevent
ifndef MOZ_NATIVE_LIBEVENT # {
ifdef OS_POSIX # {
ifneq ($(OS_ARCH),WINNT) # (if OS_POSIX) {
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/include
@ -79,12 +78,13 @@ CSRCS += \
strlcpy.c \
$(NULL)
ifdef OS_MACOSX # {
ifeq ($(OS_ARCH),Darwin) # (OS_MACOSX) {
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/mac
CSRCS += kqueue.c
endif # }
ifdef OS_LINUX # {
else # } else {
ifneq (,$(filter-out DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) # (OS_LINUX) {
ifeq ($(OS_TARGET),Android) # {
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/android
else # } else {
@ -94,14 +94,17 @@ CSRCS += \
epoll.c \
epoll_sub.c \
$(NULL)
endif # }
ifdef OS_BSD # {
ifneq (,$(OS_DRAGONFLY)$(OS_FREEBSD)) # {
else # } else (OS_BSD) {
ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH))) # (not OS_DRAGONFLY and not OS_FREEBSD) {
DEFINES += -D_EVENT_HAVE_SENDFILE
endif # }
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/bsd
CSRCS += kqueue.c
endif # }
endif # }
endif # }
@ -111,6 +114,7 @@ endif # }
OS_CXXFLAGS += $(TK_CFLAGS)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifdef MOZ_NATIVE_LIBEVENT # {

3
ipc/dbus/Makefile.in
View File

@ -18,9 +18,8 @@ ifdef MOZ_ENABLE_DBUS
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifdef MOZ_ENABLE_DBUS
CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)

3
ipc/glue/Makefile.in
View File

@ -19,6 +19,5 @@ DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\"
DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\"
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
ipc/ipdl/Makefile.in
View File

@ -25,8 +25,8 @@ LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
# NB: the IPDL compiler manages .ipdl-->.h/.cpp dependencies itself,

2
ipc/ipdl/test/cxx/Makefile.in
View File

@ -61,8 +61,8 @@ TESTER_TEMPLATE := $(srcdir)/IPDLUnitTests.template.cpp
GENTESTER := $(srcdir)/genIPDLUnitTests.py
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
IPDLUNITTEST_BIN = $(DEPTH)/dist/bin/ipdlunittest$(BIN_SUFFIX)

2
ipc/ipdl/test/cxx/app/Makefile.in
View File

@ -27,5 +27,5 @@ ifdef _MSC_VER
WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
endif
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

3
ipc/netd/Makefile.in
View File

@ -14,6 +14,5 @@ LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

3
ipc/nfc/Makefile.in
View File

@ -16,6 +16,5 @@ EXPORT_LIBRARY = 1
EXPORTS_NAMESPACES = mozilla/ipc
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

3
ipc/ril/Makefile.in
View File

@ -14,6 +14,5 @@ LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
ipc/testshell/Makefile.in
View File

@ -22,5 +22,5 @@ LOCAL_INCLUDES += \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

3
ipc/unixsocket/Makefile.in
View File

@ -15,6 +15,5 @@ EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
js/ipc/Makefile.in
View File

@ -26,7 +26,7 @@ LOCAL_INCLUDES += \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -DBIN_SUFFIX='"$(BIN_SUFFIX)"'

2
js/xpconnect/shell/Makefile.in
View File

@ -56,8 +56,8 @@ ifdef _MSC_VER
WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
endif
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -DJS_THREADSAFE

3
js/xpconnect/src/Makefile.in
View File

@ -34,8 +34,6 @@ LOCAL_INCLUDES = \
-I$(topsrcdir)/js/ipc \
$(NULL)
include $(topsrcdir)/ipc/chromium/chromium-config.mk
SHARED_LIBRARY_LIBS = \
../loader/$(LIB_PREFIX)jsloader_s.$(LIB_SUFFIX) \
../wrappers/$(LIB_PREFIX)xpcwrappers_s.$(LIB_SUFFIX) \
@ -44,6 +42,7 @@ SHARED_LIBRARY_LIBS = \
EXTRA_MDDEPEND_FILES = dom_qsgen.pp dictionary_helper_gen.pp event_impl_gen.pp
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += \
-DJSFILE \

1
layout/base/Makefile.in
View File

@ -16,7 +16,6 @@ LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \

3
layout/build/Makefile.in
View File

@ -272,9 +272,8 @@ SHARED_LIBRARY_LIBS += \
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += -I$(srcdir)/../base \
-I$(srcdir)/../generic \

2
layout/generic/Makefile.in
View File

@ -21,8 +21,8 @@ RESOURCES_HTML = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(srcdir) \

2
layout/ipc/Makefile.in
View File

@ -15,8 +15,8 @@ EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/content/base/src \

1
layout/style/Makefile.in
View File

@ -20,7 +20,6 @@ OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \

2
media/webrtc/signaling/test/Makefile.in
View File

@ -160,5 +160,5 @@ endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/media/webrtc/webrtc-config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
modules/libjar/Makefile.in
View File

@ -18,5 +18,5 @@ FAIL_ON_WARNINGS = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
modules/libpref/src/Makefile.in
View File

@ -20,8 +20,8 @@ DEFINES += -DOS_ARCH=$(OS_ARCH) \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \
mailnews.js editor.js \

2
netwerk/base/src/Makefile.in
View File

@ -29,8 +29,8 @@ endif
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifeq ($(OS_TARGET),Android)
# this works around a "branch out of range" error when compiling this file opt

2
netwerk/build/Makefile.in
View File

@ -123,6 +123,6 @@ LOCAL_INCLUDES += -I$(srcdir)/../wifi
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
netwerk/cookie/Makefile.in
View File

@ -27,6 +27,6 @@ endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
netwerk/ipc/Makefile.in
View File

@ -20,5 +20,5 @@ LOCAL_INCLUDES += \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

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

@ -19,6 +19,6 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

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

@ -17,6 +17,6 @@ LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

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

@ -21,8 +21,8 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifeq ($(OS_ARCH),WINNT)
ifndef MOZ_DEBUG

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

@ -23,6 +23,6 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

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

@ -20,6 +20,6 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

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

@ -22,6 +22,6 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

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

@ -18,6 +18,6 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

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

@ -40,6 +40,6 @@ endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

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

@ -124,8 +124,8 @@ endif
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifdef GNU_CC
CFLAGS += -std=gnu99

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

@ -100,8 +100,8 @@ DEFINES += \
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifdef GNU_CC
CFLAGS += -std=gnu99

3
toolkit/components/alerts/Makefile.in
View File

@ -14,6 +14,5 @@ LIBXUL_LIBRARY = 1
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
toolkit/components/places/Makefile.in
View File

@ -27,8 +27,8 @@ EXTRA_PP_JS_MODULES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
toolkit/crashreporter/Makefile.in
View File

@ -40,8 +40,8 @@ LOCAL_INCLUDES += -I$(srcdir)/google-breakpad/src
DEFINES += -DUNICODE -D_UNICODE
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
check::
$(PYTHON) $(srcdir)/tools/unit-symbolstore.py

2
toolkit/crashreporter/injector/Makefile.in
View File

@ -18,8 +18,8 @@ MOZ_GLUE_LDFLAGS =
SHARED_LIBRARY_LIBS += ../breakpad-windows-standalone/$(LIB_PREFIX)google_breakpad_standalone_s.$(LIB_SUFFIX)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src
ifndef GNU_CC

2
toolkit/xre/Makefile.in
View File

@ -129,8 +129,8 @@ endif
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/testing/gtest/mozilla \

2
uriloader/exthandler/Makefile.in
View File

@ -84,8 +84,8 @@ EXTRA_COMPONENTS = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)

2
uriloader/prefetch/Makefile.in
View File

@ -20,7 +20,7 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
# vim: ts=4 sw=4 noexpandtab

3
widget/android/Makefile.in
View File

@ -33,6 +33,7 @@ NOT_THERE_YET_CPPSRCS = \
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
#DEFINES += -DDEBUG_WIDGETS
@ -46,5 +47,3 @@ LOCAL_INCLUDES += \
-I$(topsrcdir)/widget/android/android \
-I$(srcdir) \
$(NULL)
include $(topsrcdir)/ipc/chromium/chromium-config.mk

4
widget/gonk/Makefile.in
View File

@ -29,6 +29,7 @@ LIBXUL_LIBRARY = 1
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -DHAVE_OFF64_T -DSK_BUILD_FOR_ANDROID_NDK
@ -44,6 +45,3 @@ LOCAL_INCLUDES += \
-I$(topsrcdir)/content/media/omx/mediaresourcemanager \
-I$(srcdir) \
$(NULL)
include $(topsrcdir)/ipc/chromium/chromium-config.mk

3
widget/gonk/libdisplay/Makefile.in
View File

@ -26,6 +26,7 @@ FORCE_STATIC_LIB= 1
STL_FLAGS=
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -DXPCOM_GLUE
@ -36,5 +37,3 @@ LOCAL_INCLUDES += \
-I$(ANDROID_SOURCE)/system/core/libsuspend/include \
-I$(srcdir) \
$(NULL)
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2
widget/gtk2/Makefile.in
View File

@ -44,8 +44,8 @@ DEFINES += -DNATIVE_THEME_SUPPORT
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CFLAGS += $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) \

2
widget/qt/Makefile.in
View File

@ -22,8 +22,8 @@ INACTIVE_COMPONENT = 1
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CXXFLAGS += $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \
$(MOZ_PIXMAN_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)

2
widget/shared/Makefile.in
View File

@ -14,7 +14,7 @@ LIBRARY_NAME = widget_shared
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CXXFLAGS += $(TK_CFLAGS)

3
widget/windows/Makefile.in
View File

@ -43,8 +43,7 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)

2
widget/windows/winrt/Makefile.in
View File

@ -36,7 +36,6 @@ LOCAL_INCLUDES = \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
MIDL_GENERATED_FILES = \
UIABridge_i.c \
@ -57,5 +56,6 @@ do_interfaces_gen: UIABridge.idl
export:: do_interfaces_gen
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS)

2
widget/xpwidgets/Makefile.in
View File

@ -45,7 +45,7 @@ LOCAL_INCLUDES += \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CXXFLAGS += $(TK_CFLAGS)

2
xpcom/base/Makefile.in
View File

@ -52,8 +52,8 @@ endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifdef MOZ_WIDGET_GTK
CXXFLAGS += $(TK_CFLAGS)

Some files were not shown because too many files have changed in this diff Show More