Bug 785118 - use PARALLEL_DIRS in netwerk/; r=glandium
authorNathan Froyd <froydnj@mozilla.com>
Thu, 23 Aug 2012 12:54:51 -0400
changeset 105364 63d6c36e40b8cae2185a5fc90f2a074dcbc3a9ae
parent 105363 0291edeff9fbbf9b030c18f4e356183be2358e05
child 105365 b4316e1c474d14ddfa6e9e03575e801cdeae006b
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersglandium
bugs785118
milestone17.0a1
Bug 785118 - use PARALLEL_DIRS in netwerk/; r=glandium
netwerk/Makefile.in
netwerk/mime/Makefile.in
netwerk/protocol/file/Makefile.in
netwerk/protocol/http/Makefile.in
netwerk/protocol/res/Makefile.in
netwerk/protocol/viewsource/Makefile.in
netwerk/protocol/wyciwyg/Makefile.in
netwerk/streamconv/public/Makefile.in
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -7,37 +7,36 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= necko
 
-DIRS		= \
-		base \
-		cookie \
-		dns \
-		socket \
-		mime \
-		streamconv \
-		cache \
-		protocol \
-		system \
-		ipc  \
-        $(NULL)
+PARALLEL_DIRS = \
+  base \
+  cookie \
+  dns \
+  socket \
+  mime \
+  streamconv \
+  cache \
+  protocol \
+  system \
+  ipc  \
+  $(NULL)
 
 ifdef NECKO_WIFI
-DIRS 		+= wifi
+PARALLEL_DIRS += wifi
 endif
 
-DIRS		+= \
-		build \
-		locales \
-		$(NULL)
+PARALLEL_DIRS += locales
+
+DIRS = build
 
 ifdef ENABLE_TESTS
 TOOL_DIRS  += test
 endif
 
 EXPORTS     = necko-config.h
 
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@@ -28,8 +28,10 @@ XPIDLSRCS = \
 
 CPPSRCS = \
   nsMIMEHeaderParamImpl.cpp \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
+
+XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@@ -32,8 +32,10 @@ CPPSRCS = \
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
+
+XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -93,8 +93,10 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
+
+XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@@ -31,8 +31,10 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/netwerk/base/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
+
+XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@@ -28,8 +28,10 @@ CPPSRCS = \
   nsViewSourceChannel.cpp \
   $(NULL)
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
+XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -40,8 +40,10 @@ LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
+
+XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public
--- a/netwerk/streamconv/public/Makefile.in
+++ b/netwerk/streamconv/public/Makefile.in
@@ -27,8 +27,10 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 XPIDLSRCS += \
 		nsIAppleFileDecoder.idl \
 		$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
+
+XPIDL_FLAGS += -I$(topsrcdir)/netwerk/base/public