[vmkit-commits] [vmkit] r182724 - Make handier makefile environment exportation

[Harris Bakiras]

Author: harris
Date: Mon May 27 02:28:38 2013
New Revision: 182724

URL: http://llvm.org/viewvc/llvm-project?rev=182724&view=rev
Log:
Make handier makefile environment exportation

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=182724&r1=182723&r2=182724&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Mon May 27 02:28:38 2013
@@ -1,20 +1,4 @@
 ###############################################################################
-#   build system data
-###############################################################################
-PROJECT_NAME := @PACKAGE_NAME@
-PROJ_VERSION := @PACKAGE_VERSION@
-
-realpath=$(shell cd $(1); $(PWD))
-
-PROJ_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
-PROJ_OBJ_ROOT := $(subst //,/, at abs_top_builddir@)
-PROJ_OBJ_CWD:= $(call realpath, .)
-PROJ_SRC_CWD:= $(call realpath, $(patsubst $(PROJ_OBJ_ROOT)%,$(PROJ_SRC_ROOT)%,$(PROJ_OBJ_CWD)))
-
-CONFIG_FILES=@ac_config_files@
-CONFIG_HEADERS=@ac_config_headers@
-
-###############################################################################
 #   options
 ###############################################################################
 MMTK_PLAN = @MMTK_PLAN@
@@ -62,8 +46,8 @@ WITH_64 = @WITH_64@
 ###############################################################################
 LLVM_CONFIG=@LLVM_CONFIG@
 LLVM_BIN=$(shell $(LLVM_CONFIG) --bindir)
-CLANG=@CLANG_PATH@/clang
-CLANGXX=@CLANG_PATH@/clang++
+CLANG=$(LLVM_BIN)/clang
+CLANGXX=$(LLVM_BIN)/clang++
 LLVMAS=$(LLVM_BIN)/llvm-as
 LLC=$(LLVM_BIN)/llc
 LOPT=$(LLVM_BIN)/opt
@@ -83,4 +67,43 @@ MKDIR=@MKDIR_P@
 TOUCH=@TOUCH@
 GREP=@GREP@
 
+
+###############################################################################
+#   Common build system data
+###############################################################################
+ifeq ($(OPTIMIZED),1)
+  VMKIT_BUILD_NAME:=Release
+  ifeq ($(DEBUG),1)
+    VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Debug
+  endif
+else
+  ifeq ($(DEBUG),1)
+    VMKIT_BUILD_NAME:=Debug
+  else
+    VMKIT_BUILD_NAME:=Unoptimized
+  endif
+endif
+
+ifeq ($(ASSERT),1)
+  VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Asserts
+endif
+
+ifndef VMKIT_OPTIONS_ONLY
+###############################################################################
+#   VMKit build system data
+###############################################################################
+PROJECT_NAME := @PACKAGE_NAME@
+PROJ_VERSION := @PACKAGE_VERSION@
+
+realpath=$(shell cd $(1); $(PWD))
+
+PROJ_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
+PROJ_OBJ_ROOT := $(subst //,/, at abs_top_builddir@)
+PROJ_OBJ_CWD:= $(call realpath, .)
+PROJ_SRC_CWD:= $(call realpath, $(patsubst $(PROJ_OBJ_ROOT)%,$(PROJ_SRC_ROOT)%,$(PROJ_OBJ_CWD)))
+
+CONFIG_FILES=@ac_config_files@
+CONFIG_HEADERS=@ac_config_headers@
+
 include $(PROJ_SRC_ROOT)/Makefile.rules
+endif

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=182724&r1=182723&r2=182724&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Mon May 27 02:28:38 2013
@@ -9,22 +9,9 @@ all::
 ###############################################################################
 #   Main options
 ###############################################################################
-ifeq ($(OPTIMIZED),1)
-  BUILD_NAME:=Release
-  ifeq ($(DEBUG),1)
-    BUILD_NAME:=$(BUILD_NAME)+Debug
-  endif
-else
-  ifeq ($(DEBUG),1)
-    BUILD_NAME:=Debug
-  else
-    BUILD_NAME:=Unoptimized
-  endif
-endif
+BUILD_NAME=$(VMKIT_BUILD_NAME)
 
-ifeq ($(ASSERT),1)
-  BUILD_NAME:=$(BUILD_NAME)+Asserts
-else
+ifneq ($(ASSERT),1)
   COMMON_CFLAGS+=-DNDEBUG
 endif