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

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.275 -> 1.276
---
Log message:

Complete the implementation of the spotless rule and make it not depend on
the .. directory.


---
Diffs of the changes:  (+12 -6)

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.275 llvm/Makefile.rules:1.276
--- llvm/Makefile.rules:1.275	Thu Dec 16 13:40:10 2004
+++ llvm/Makefile.rules	Fri Dec 17 01:45:03 2004
@@ -83,14 +83,20 @@
 
 ifneq ($(BUILD_OBJ_ROOT),$(BUILD_SRC_ROOT))
 spotless:
-	$(Echo) Wiping out $(BUILD_OBJ_ROOT) and rebuilding configuration.
 	$(Verb) if test -x config.status ; then \
-	  $(MV) config.status .. ; \
-	  $(MV) mklib  .. ; \
+	  $(EchoCmd) Wiping out $(BUILD_OBJ_ROOT) ; \
+	  $(MKDIR) .spotless.save ; \
+	  $(MV) config.status .spotless.save ; \
+	  $(MV) mklib  .spotless.save ; \
+	  $(MV) projects  .spotless.save ; \
 	  $(RM) -rf * ; \
-	  $(MV) ../config.status . ; \
-	  $(MV) ../mklib . ; \
-	  ./config.status ; \
+	  $(MV) .spotless.save/config.status . ; \
+	  $(MV) .spotless.save/mklib . ; \
+	  $(MV) .spotless.save/projects . ; \
+	  $(RM) -rf .spotless.save ; \
+	  $(EchoCmd) Rebuilding configuration of $(BUILD_OBJ_ROOT) ; \
+	  $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \
+	  $(ConfigStatusScript) ; \
 	else \
 	  $(EchoCmd) "make spotless" can only be run from $(BUILD_OBJ_ROOT); \
 	fi