From 2bab033f262656132e0572415e25442b3ea3eea3 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Sat, 8 Apr 2006 02:14:37 +0000
Subject: [PATCH] Fix recursion: 1. Make setting OPTIONAL_DIRS use immediate
 assignment 2. Include Makefile.config before ifeq tests and then
 Makefile.rules later    instead of Makefile.common up front. This ensures
 that the variable    values are set before the ifeq statements in
 Makefile.rules are    evaluated. With this, recursion into projects/examples
 is corrected.

llvm-svn: 27519
---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8136798a3a8..9688879af8b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
 LEVEL = .
 DIRS = lib/System lib/Support utils lib
 
-include $(LEVEL)/Makefile.common
+include $(LEVEL)/Makefile.config 
 
 ifeq ($(MAKECMDGOALS),tools-only)
   DIRS += tools
@@ -21,12 +21,14 @@ else
     else
       $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
     endif
+    OPTIONAL_DIRS := examples projects
     DIRS += docs
-    OPTIONAL_DIRS = examples projects
   endif
 endif
 EXTRA_DIST := test llvm.spec include
 
+include $(LLVM_SRC_ROOT)/Makefile.rules
+
 # Specify options to pass to configure script when we're
 # running the dist-check target
 DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)