Bug 581198 - Remove xpcom/io from LOCAL_INCLUDES; r=ted

This commit is contained in:
Ms2ger 2012-09-20 09:55:36 +02:00
Родитель 4052485701
Коммит 4cf7905fe1
6 изменённых файлов: 25 добавлений и 37 удалений

Просмотреть файл

@ -49,10 +49,6 @@ EXPORTS_mozilla/dom = \
Link.h \
$(NULL)
LOCAL_INCLUDES = \
-I$(topsrcdir)/image/src \
$(NULL)
CPPSRCS = \
DirectionalityUtils.cpp \
nsAtomListUtils.cpp \
@ -171,26 +167,25 @@ include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
INCLUDES += \
-I$(srcdir)/../../events/src \
-I$(srcdir)/../../xml/content/src \
-I$(srcdir)/../../../layout/xul/base/src \
-I$(srcdir)/../../xul/content/src \
-I$(srcdir)/../../xul/document/src \
-I$(srcdir)/../../html/content/src \
-I$(srcdir)/../../base/src \
-I$(srcdir)/../../xbl/src \
-I$(srcdir)/../../../layout/generic \
-I$(srcdir)/../../../layout/style \
-I$(srcdir)/../../../layout/svg/base/src \
-I$(srcdir)/../../../dom/base \
-I$(srcdir)/../../xml/document/src \
-I$(topsrcdir)/xpcom/io \
-I$(topsrcdir)/dom/ipc \
-I$(topsrcdir)/js/xpconnect/src \
-I$(topsrcdir)/caps/include \
-I$(topsrcdir)/netwerk/base/src \
$(NULL)
LOCAL_INCLUDES += \
-I$(topsrcdir)/caps/include \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/content/html/content/src \
-I$(topsrcdir)/content/xbl/src \
-I$(topsrcdir)/content/xml/content/src \
-I$(topsrcdir)/content/xml/document/src \
-I$(topsrcdir)/content/xul/content/src \
-I$(topsrcdir)/content/xul/document/src \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/dom/ipc \
-I$(topsrcdir)/image/src \
-I$(topsrcdir)/js/xpconnect/src \
-I$(topsrcdir)/layout/generic \
-I$(topsrcdir)/layout/style \
-I$(topsrcdir)/layout/svg/base/src \
-I$(topsrcdir)/layout/xul/base/src \
-I$(topsrcdir)/netwerk/base/src \
$(NULL)
DEFINES += -D_IMPL_NS_LAYOUT
DEFINES += -DHB_DONT_DEFINE_STDINT

Просмотреть файл

@ -36,13 +36,12 @@ FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
INCLUDES += \
LOCAL_INCLUDES += \
-I$(srcdir)/../../../base/src \
-I$(srcdir)/../../../events/src \
-I$(srcdir)/../../content/src \
-I$(topsrcdir)/layout/style \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/xpcom/io \
-I$(topsrcdir)/caps/include \
-I$(topsrcdir)/xpcom/ds \
$(NULL)

Просмотреть файл

@ -30,12 +30,11 @@ CPPSRCS = \
$(NULL)
SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/xpcom/io \
-I$(srcdir)/../hunspell/src \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/editor/libeditor/base \
$(NULL)

Просмотреть файл

@ -44,5 +44,3 @@ CPPSRCS = \
$(NULL)
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/io

Просмотреть файл

@ -168,16 +168,11 @@ include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
-I$(srcdir)/../profile \
-I$(topsrcdir)/dom/ipc \
-I$(topsrcdir)/toolkit/crashreporter \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/xpcom/build \
-I$(topsrcdir)/xpcom/io \
$(NULL)
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(srcdir)/../profile \
-I$(topsrcdir)/config \
$(NULL)

Просмотреть файл

@ -77,8 +77,10 @@ EXPORTS = \
nsStorageStream.h \
nsStringStream.h \
nsStreamUtils.h \
nsUnicharInputStream.h \
nsWildCard.h \
$(NULL)
SpecialSystemDirectory.h \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
EXPORTS += nsLocalFileOS2.h