[llvm-commits] CVS: llvm/Makefile.rules

[Chris Lattner]

Changes in directory llvm:

Makefile.rules updated: 1.389 -> 1.390
---
Log message:

Reduce work done for directory traversal in srcdir==objdir builds.


---
Diffs of the changes:  (+16 -0)

 Makefile.rules |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.389 llvm/Makefile.rules:1.390
--- llvm/Makefile.rules:1.389	Fri Jul 21 18:04:48 2006
+++ llvm/Makefile.rules	Wed Jul 26 15:22:26 2006
@@ -487,6 +487,8 @@
 SubDirs := 
 ifdef DIRS
 SubDirs += $(DIRS)
+
+ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
 $(RecursiveTargets)::
 	$(Verb) for dir in $(DIRS); do \
 	  if [ ! -f $$dir/Makefile ]; then \
@@ -495,6 +497,13 @@
 	  fi; \
 	  ($(MAKE) -C $$dir $@ ) || exit 1; \
 	done
+else
+$(RecursiveTargets)::
+	$(Verb) for dir in $(DIRS); do \
+	  ($(MAKE) -C $$dir $@ ) || exit 1; \
+	done
+endif
+
 endif
 
 #---------------------------------------------------------
@@ -545,6 +554,7 @@
 
 SubDirs += $(OPTIONAL_DIRS)
 
+ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
 $(RecursiveTargets)::
 	$(Verb) for dir in $(OPTIONAL_DIRS); do \
 	  if [ -d $(PROJ_SRC_DIR)/$$dir ]; then\
@@ -555,6 +565,12 @@
 	    ($(MAKE) -C$$dir $@ ) || exit 1; \
 	  fi \
 	done
+else
+$(RecursiveTargets)::
+	$(Verb) for dir in $(OPTIONAL_DIRS); do \
+	  ($(MAKE) -C$$dir $@ ) || exit 1; \
+	done
+endif
 endif
 
 #---------------------------------------------------------