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 973393 - Move the LOCAL_INCLUDES in ipc to moz.build; r=glandium

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-02-18 02:12:54 -05:00
parent 5d49ab766c
commit f8f9eb7353
4 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ipc/chromium/Makefile.in
View File

@ -10,10 +10,6 @@ ifndef MOZ_NATIVE_LIBEVENT # {
vpath %.c \
$(srcdir)/src/third_party/libevent \
$(NULL)
else # } else {
# message_pump_libevent.cc includes third_party/libevent/event.h,
# which we put in $(DIST), see export rule below
LOCAL_INCLUDES += -I$(DIST)
endif # }
vpath %.cc \
@ -26,39 +22,6 @@ vpath %.mm \
$(srcdir)/src/chrome/common \
$(NULL)
# libevent
ifndef MOZ_NATIVE_LIBEVENT # {
ifneq ($(OS_ARCH),WINNT) # (if OS_POSIX) {
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/include
ifeq ($(OS_ARCH),Darwin) # (OS_MACOSX) {
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/mac
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 {
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/linux
endif # }
else # } else (OS_BSD) {
LOCAL_INCLUDES += -I$(srcdir)/src/third_party/libevent/bsd
endif # }
endif # }
endif # }
endif # }
OS_CXXFLAGS += $(TK_CFLAGS)
include $(topsrcdir)/config/rules.mk
@ -66,10 +29,10 @@ include $(topsrcdir)/config/rules.mk
ifdef MOZ_NATIVE_LIBEVENT # {
export-preqs = \
$(call mkdir_deps,$(DIST)/third_party/libevent) \
$(call mkdir_deps,$(CURDIR)/third_party/libevent) \
$(NULL)
export:: $(export-preqs)
echo '#include <event.h>' > $(DIST)/third_party/libevent/event.h
echo '#include <event.h>' > $(CURDIR)/third_party/libevent/event.h
endif # }

10
ipc/chromium/moz.build
View File

@ -142,6 +142,10 @@ elif not CONFIG['MOZ_NATIVE_LIBEVENT']:
'src/third_party/libevent/strlcpy.c',
]
DEFINES['HAVE_CONFIG_H'] = True
LOCAL_INCLUDES += [
'src/third_party/libevent',
'src/third_party/libevent/include',
]
if os_posix:
SOURCES += [
@ -203,6 +207,7 @@ if os_macosx:
UNIFIED_SOURCES += [
'src/third_party/libevent/kqueue.c',
]
LOCAL_INCLUDES += ['src/third_party/libevent/mac']
if os_linux:
SOURCES += [
@ -231,6 +236,10 @@ if os_linux:
SOURCES += [
'src/third_party/libevent/epoll.c',
]
if CONFIG['OS_TARGET'] == 'Android':
LOCAL_INCLUDES += ['src/third_party/libevent/android']
else:
LOCAL_INCLUDES += ['src/third_party/libevent/linux']
if os_bsd:
SOURCES += [
@ -260,6 +269,7 @@ if os_bsd:
SOURCES += [
'src/third_party/libevent/kqueue.c',
]
LOCAL_INCLUDES += ['src/third_party/libevent/bsd']
if CONFIG['_MSC_VER']:
SOURCES += [

3
ipc/ipdl/Makefile.in
View File

@ -8,9 +8,6 @@ GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc
# This file is generated by the moz.build backend.
include ipdlsrcs.mk
LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders
include $(topsrcdir)/config/rules.mk

2
ipc/ipdl/moz.build
View File

@ -12,3 +12,5 @@ FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
GENERATED_INCLUDES += ['/ipc/ipdl/_ipdlheaders']