Bug 581198 - Remove xpcom/io from LOCAL_INCLUDES; r=ted
authorMs2ger <ms2ger@gmail.com>
Thu, 20 Sep 2012 09:55:36 +0200
changeset 107587 075745deb9a88e96e8290fd20af30f2788117ea9
parent 107586 870c876a6976cc5971570d5e87684d309097437e
child 107588 f6778c068c0352e8ee58bf8870eb48a28dd723eb
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersted
bugs581198
milestone18.0a1
Bug 581198 - Remove xpcom/io from LOCAL_INCLUDES; r=ted
content/base/src/Makefile.in
content/html/document/src/Makefile.in
extensions/spellcheck/src/Makefile.in
parser/htmlparser/src/Makefile.in
toolkit/xre/Makefile.in
xpcom/io/Makefile.in
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -44,20 +44,16 @@ EXPORTS		= \
 		$(NULL)
 
 EXPORTS_NAMESPACES = mozilla/dom
 
 EXPORTS_mozilla/dom = \
   Link.h \
   $(NULL)
 
-LOCAL_INCLUDES = \
-		-I$(topsrcdir)/image/src \
-		$(NULL)
-
 CPPSRCS		= \
 		DirectionalityUtils.cpp \
 		nsAtomListUtils.cpp \
 		nsAttrAndChildArray.cpp \
 		nsAttrValue.cpp \
 		nsAttrValueOrString.cpp \
 		nsCCUncollectableMarker.cpp \
 		nsChannelPolicy.cpp \
@@ -166,36 +162,35 @@ EXTRA_COMPONENTS = \
 EXTRA_JS_MODULES = \
 		CSPUtils.jsm \
 		$(NULL)
 
 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
 
 # gcc requires -msse2 for this file since it uses SSE2 intrinsics.  (See bug
 # 585538 comment 12.)
 ifneq (,$(INTEL_ARCHITECTURE))
 ifdef GNU_CC
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -31,20 +31,19 @@ EXPORTS		= \
 		nsIHTMLDocument.h \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 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)
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -25,17 +25,16 @@ CPPSRCS		= \
 		mozEnglishWordUtils.cpp		\
 		mozGenericWordUtils.cpp		\
 		mozSpellI18NManager.cpp		\
 		mozInlineSpellChecker.cpp	\
 		mozInlineSpellWordUtil.cpp      \
 		$(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)
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -39,10 +39,8 @@ CPPSRCS = \
 		nsParserModule.cpp  \
 		nsParserNode.cpp    \
 		nsScanner.cpp       \
 		nsToken.cpp         \
 		nsParserMsgUtils.cpp\
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/io
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -163,26 +163,21 @@ endif
 
 TEST_DIRS += test
 
 include $(topsrcdir)/config/config.mk
 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)
 
 CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -72,18 +72,20 @@ EXPORTS		= \
 		nsLinebreakConverter.h \
 		nsLocalFile.h \
 		nsMultiplexInputStream.h \
 		nsNativeCharsetUtils.h \
 		nsScriptableInputStream.h \
 		nsStorageStream.h \
 		nsStringStream.h \
 		nsStreamUtils.h \
+		nsUnicharInputStream.h \
 		nsWildCard.h \
-		$(NULL)			
+		SpecialSystemDirectory.h \
+		$(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 EXPORTS		+= nsLocalFileOS2.h
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 EXPORTS		+= nsLocalFileWin.h
 else
 EXPORTS		+= nsLocalFileUnix.h