From 7428784e3816cbeb51203805d33bb0cba60a368f Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net" <bsmedberg%covad.net>
Date: Thu, 31 Mar 2005 21:40:23 +0000
Subject: [PATCH] Bug 287428 - xulrunner (libxul) busted when you use the
 "alldep" target instead of "default", because we don't build by tier. r=darin
 r2=dbaron

---
 Makefile.in     | 6 ++++--
 config/rules.mk | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0b80f7c2c015..ddac0df2f273 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,7 +50,9 @@ ifeq ($(BUILD_MODULES),all)
 # Divide the default build into tiers. 
 # Tiers must be defined on module boundaries 
 #
-default: $(SUBMAKEFILES)
+SUPPRESS_DEFAULT_RULES = 1
+
+default alldep all:: $(SUBMAKEFILES)
 	$(RM) -rf $(DIST)/sdk
 	$(RM) -rf $(DIST)/include
 	$(MAKE) -C config export
@@ -418,7 +420,7 @@ SUBMAKEFILES	:= xpcom/typelib/Makefile
 endif
 endif
 
-default: $(SUBMAKEFILES)
+default:: $(SUBMAKEFILES)
 	$(MAKE) export
 	$(MAKE) libs
 
diff --git a/config/rules.mk b/config/rules.mk
index 3ad379d9d4a5..8d6e24e2c0a3 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -566,6 +566,12 @@ endif
 
 ################################################################################
 
+# The root makefile doesn't want to do a plain export/libs, because
+# of the tiers and because of libxul. Suppress the default rules in favor
+# of something else. Makefiles which use this var *must* provide a sensible
+# default rule before including rules.mk
+ifndef SUPPRESS_DEFAULT_RULES
+
 all:: 
 	$(MAKE) export
 	$(MAKE) libs
@@ -576,6 +582,8 @@ alldep::
 	$(MAKE) depend
 	$(MAKE) libs
 
+endif # SUPPRESS_DEFAULT_RULES
+
 # Do everything from scratch
 everything::
 	$(MAKE) clean