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

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.235 -> 1.236
---
Log message:

Fix PR458: http://llvm.cs.uiuc.edu/PR458 :
* Don't include Makefile.rules in set of preconditions, it never has to be
  copied to objdir.
* Enable the "update makefile first before executing targets" feature in 
  gnu make by *not* using a full path to the Makefile in the rule.


---
Diffs of the changes:  (+3 -3)

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.235 llvm/Makefile.rules:1.236
--- llvm/Makefile.rules:1.235	Sun Nov 14 15:46:55 2004
+++ llvm/Makefile.rules	Wed Nov 17 13:08:44 2004
@@ -59,8 +59,8 @@
 # PRECONDITIONS: that which must be built/checked first
 ################################################################################
 
-SrcMakefiles       := $(filter %Makefile %Makefile.rules %Makefile.tests \
-                      %Makefile.JIT,$(wildcard $(BUILD_SRC_DIR)/Makefile*))
+SrcMakefiles       := $(filter %Makefile %Makefile.tests %Makefile.JIT,\
+                      $(wildcard $(BUILD_SRC_DIR)/Makefile*))
 ObjMakefiles       := $(subst $(BUILD_SRC_DIR),$(BUILD_OBJ_DIR),$(SrcMakefiles))
 ConfigureScript    := $(LLVM_SRC_ROOT)/configure
 ConfigStatusScript := $(LLVM_OBJ_ROOT)/config.status
@@ -104,7 +104,7 @@
 #------------------------------------------------------------------------
 ifneq ($(BUILD_OBJ_DIR),$(BUILD_SRC_DIR))
 
-$(BUILD_OBJ_DIR)/Makefile : $(BUILD_SRC_DIR)/Makefile
+Makefile: $(BUILD_SRC_DIR)/Makefile
 	$(Echo) "Updating Makefile"
 	$(Verb) $(MKDIR) $(@D)
 	$(Verb) cp -f $< $@