From 454f73d76584c69ed9f621ebd4cc1b01236a5d14 Mon Sep 17 00:00:00 2001
From: wagerlabs <joelr1@gmail.com>
Date: Mon, 1 Feb 2010 08:47:57 +0000
Subject: [PATCH 1/2] win build fixes

---
 Makefile.in              |    6 ++++++
 browser/Makefile.in      |    1 -
 toolkit/toolkit-tiers.mk |    2 ++
 3 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 8413ba3..847f8a0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -120,6 +120,12 @@ tier_toolkit::
 	$(MAKE) tools_tier_gecko
 	$(MAKE) tools_tier_toolkit

+default::
+	$(warning MAKING XPCOM STUB)
+	$(MAKE) xpcom/stub/Makefile
+	$(call SUBMAKE,libs,xpcom/stub)
+	$(call SUBMAKE,$@,browser/components)
+
 ifeq (netwerk,$(MOZ_BUILD_APP))
 tier_necko::
 	$(EXIT_ON_ERROR) \
diff --git a/browser/Makefile.in b/browser/Makefile.in
index 012214b..caf9695 100644
--- a/browser/Makefile.in
+++ b/browser/Makefile.in
@@ -44,7 +44,6 @@ include $(topsrcdir)/config/config.mk

 PARALLEL_DIRS = \
   base \
-  components \
   fuel \
   locales \
   themes \
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
index 833a7a8..a3b6159 100644
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -231,8 +231,10 @@ endif
 tier_toolkit_dirs += toolkit/library

 ifdef MOZ_ENABLE_LIBXUL
+ifndef BUILD_STATIC_LIBS
 tier_toolkit_dirs += xpcom/stub
 endif
+endif

 ifdef NS_TRACE_MALLOC
 tier_toolkit_dirs += tools/trace-malloc
--
1.6.4.1