Bug 549637: don't build toolkit and toolkit/components separately, r=ted
authorGavin Sharp <gavin@gavinsharp.com>
Tue, 02 Mar 2010 10:11:01 -0800
changeset 39595 20c9f687ee2c022ac873452d8082dc351eff97da
parent 39594 d24c14dfea78a2d56e5638559d99f6cd71dd15d9
child 39596 5723b43063b6e5224e05f941b01bd6b4c70542d8
push idunknown
push userunknown
push dateunknown
reviewersted
bugs549637
milestone1.9.3a4pre
Bug 549637: don't build toolkit and toolkit/components separately, r=ted
toolkit/Makefile.in
toolkit/toolkit-tiers.mk
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -39,16 +39,17 @@
 DEPTH     = ..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS = \
+  components \
   content \
   locales \
   mozapps \
   obsolete \
   profile \
   spatial-navigation \
   themes \
   $(NULL)
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -202,20 +202,17 @@ endif
 
 tier_platform_dirs += chrome profile
 
 # This must preceed xpfe
 ifdef MOZ_JPROF
 tier_platform_dirs        += tools/jprof
 endif
 
-tier_platform_dirs	+= \
-	xpfe \
-	toolkit/components \
-	$(NULL)
+tier_platform_dirs	+= xpfe
 
 ifdef MOZ_ENABLE_XREMOTE
 tier_platform_dirs += widget/src/xremoteclient
 endif
 
 ifdef MOZ_SPELLCHECK
 tier_platform_dirs	+= extensions/spellcheck
 endif