[llvm-commits] CVS: llvm/Makefile

[Reid Spencer]

Changes in directory llvm:

Makefile updated: 1.56 -> 1.57
---
Log message:

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.


---
Diffs of the changes:  (+4 -2)

 Makefile |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.56 llvm/Makefile:1.57
--- llvm/Makefile:1.56	Fri Apr  7 20:57:10 2006
+++ llvm/Makefile	Fri Apr  7 21:14:37 2006
@@ -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
       $(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)