[vmkit-commits] [vmkit] r182968 - Make Makefiles variable exporting handier for external projects.

[Harris Bakiras]

Author: harris
Date: Thu May 30 17:16:56 2013
New Revision: 182968

URL: http://llvm.org/viewvc/llvm-project?rev=182968&view=rev
Log:
Make Makefiles variable exporting handier for external projects.

Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=182968&r1=182967&r2=182968&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Thu May 30 17:16:56 2013
@@ -40,7 +40,6 @@ EXEEXT=@EXEEXT@
 SHLIBEXT=@SHLIBEXT@
 
 WITH_64 = @WITH_64@
-VMKIT_BUILD_NAME=@VMKIT_BUILD_NAME@
 
 ###############################################################################
 #   binaries
@@ -73,23 +72,23 @@ GREP=@GREP@
 #   Common build system data
 ###############################################################################
 ifeq ($(OPTIMIZED),1)
-  BUILD_NAME:=Release
+  VMKIT_BUILD_NAME:=Release
   ifeq ($(DEBUG),1)
-    BUILD_NAME:=$(BUILD_NAME)+Debug
+    VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Debug
   endif
 else
   ifeq ($(DEBUG),1)
-    BUILD_NAME:=Debug
+    VMKIT_BUILD_NAME:=Debug
   else
-    BUILD_NAME:=Unoptimized
+    VMKIT_BUILD_NAME:=Unoptimized
   endif
 endif
 
 ifeq ($(ASSERT),1)
-  BUILD_NAME:=$(BUILD_NAME)+Asserts
+  VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Asserts
 endif
 
-ifndef VMKIT_OPTIONS_ONLY
+ifndef OPTIONS_ONLY
 ###############################################################################
 #   VMKit build system data
 ###############################################################################

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=182968&r1=182967&r2=182968&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu May 30 17:16:56 2013
@@ -9,6 +9,8 @@ all::
 ###############################################################################
 #   Main options
 ###############################################################################
+BUILD_NAME=$(VMKIT_BUILD_NAME)
+
 ifneq ($(ASSERT),1)
   COMMON_CFLAGS+=-DNDEBUG
 endif
@@ -84,7 +86,7 @@ tidy:
 
 clean::
 	$(Echo) "Cleaning compilation files"
-	$(Verb) rm -Rf $(BUILD_NAME) $(VMKIT_BUILD_NAME)
+	$(Verb) rm -Rf $(BUILD_NAME)
 
 distclean::
 	$(Echo) "Cleaning all compilation files"