[cfe-commits] r106864 - in /cfe/trunk: docs/tools/Makefile lib/Headers/Makefile lib/Runtime/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jun 25 12:33:49 2010
New Revision: 106864

URL: http://llvm.org/viewvc/llvm-project?rev=106864&view=rev
Log:
build: Get CLANG_VERSION from Version.inc instead of depending on VER file directly.

Modified:
    cfe/trunk/docs/tools/Makefile
    cfe/trunk/lib/Headers/Makefile
    cfe/trunk/lib/Runtime/Makefile

Modified: cfe/trunk/docs/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/tools/Makefile?rev=106864&r1=106863&r2=106864&view=diff
==============================================================================
--- cfe/trunk/docs/tools/Makefile (original)
+++ cfe/trunk/docs/tools/Makefile Fri Jun 25 12:33:49 2010
@@ -40,7 +40,8 @@
 CLANG_LEVEL := ../..
 include $(CLANG_LEVEL)/Makefile
 
-CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+	$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
 
 SRC_DOC_DIR=$(PROJ_SRC_DIR)/
 DST_HTML_DIR=$(PROJ_OBJ_DIR)/

Modified: cfe/trunk/lib/Headers/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/Makefile?rev=106864&r1=106863&r2=106864&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/Makefile (original)
+++ cfe/trunk/lib/Headers/Makefile Fri Jun 25 12:33:49 2010
@@ -14,7 +14,8 @@
 
 include $(CLANG_LEVEL)/Makefile
 
-CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+	$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
 
 HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
 

Modified: cfe/trunk/lib/Runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Runtime/Makefile?rev=106864&r1=106863&r2=106864&view=diff
==============================================================================
--- cfe/trunk/lib/Runtime/Makefile (original)
+++ cfe/trunk/lib/Runtime/Makefile Fri Jun 25 12:33:49 2010
@@ -16,7 +16,9 @@
 CLANG_LEVEL := ../..
 include $(CLANG_LEVEL)/Makefile
 
-CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+	$(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
+
 ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
 PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)