[vmkit-commits] [vmkit] r195631 - fix a bug in the Makefile that can potentially delete all the directories

Gael Thomas gael.thomas at lip6.fr
Mon Nov 25 01:47:22 PST 2013


Author: gthomas
Date: Mon Nov 25 03:47:22 2013
New Revision: 195631

URL: http://llvm.org/viewvc/llvm-project?rev=195631&view=rev
Log:
fix a bug in the Makefile that can potentially delete all the directories

Modified:
    vmkit/branches/mcjit/Makefile.rules

Modified: vmkit/branches/mcjit/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/Makefile.rules?rev=195631&r1=195630&r2=195631&view=diff
==============================================================================
--- vmkit/branches/mcjit/Makefile.rules (original)
+++ vmkit/branches/mcjit/Makefile.rules Mon Nov 25 03:47:22 2013
@@ -7,6 +7,10 @@
 PROJ_OBJ_CWD:= $(call realpath, .)
 PROJ_SRC_CWD:= $(call realpath, $(patsubst $(PROJ_OBJ_ROOT)%,$(PROJ_SRC_ROOT)%,$(PROJ_OBJ_CWD)))
 
+ifndef BUILD_NAME
+BUILD_NAME=fake
+endif
+
 BUILD_DIR=$(PROJ_OBJ_CWD)/$(BUILD_NAME)
 BIN_DIR=$(PROJ_OBJ_ROOT)/$(BUILD_NAME)/bin
 LIB_DIR=$(PROJ_OBJ_ROOT)/$(BUILD_NAME)/lib
@@ -57,7 +61,7 @@ SHFLAGS=$(SHOPT) -fno-common -Wl,-flat_n
 ###############################################################################
 #   Targets
 ###############################################################################
-.PHONY: all tidy clean cleanall confclean
+.PHONY: all tidy clean confclean
 .SECONDARY:
 .SUFFIXES:
 
@@ -84,7 +88,7 @@ check::
 ###############################################################################
 #   Recursive target managment
 ###############################################################################
-RECURSIVE_TARGETS=all clean cleanall
+RECURSIVE_TARGETS=all clean
 
 define do_sub_target
 $1::
@@ -103,10 +107,6 @@ clean::
 	$(Echo) "Cleaning compilation files"
 	$(Verb) rm -Rf $(BUILD_DIR)
 
-cleanall:: 
-	$(Echo) "Cleaning all compilation files"
-	$(Verb) rm -Rf autoconf/autom4te.cache config.log config.status Makefile.config $(BUILD_DIR)
-
 confclean: clean
 	$(Echo) "Cleaning configuration"
 	$(Verb) rm -Rf $(patsubst $(PROJ_OBJ_ROOT)/%,%,$(CONFIG_FILES))
@@ -314,7 +314,7 @@ $(eval $(call define_compile_rule,.cc,$(
 
 ifneq ($(MAKECMDGOALS),tidy)
 ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),cleanall)
+ifneq ($(MAKECMDGOALS),confclean)
 -include $(DEP_FILES)
 endif
 endif





More information about the vmkit-commits mailing list