diff options
| author | Mike Stump <mrs@apple.com> | 2009-09-16 01:26:05 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@apple.com> | 2009-09-16 01:26:05 +0000 |
| commit | f918b8f93429004100c4e01d001c9b1dd95bb4de (patch) | |
| tree | a0dc4574299782c7b229ddfd2dc319bcf7c77f95 | |
| parent | 29813c3509a0229947e35897a9a145c4fb3bc147 (diff) | |
Collapse more clang version numbers down into fewer places.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81983 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | VER | 1 | ||||
| -rw-r--r-- | docs/tools/Makefile | 5 | ||||
| -rw-r--r-- | lib/Headers/Makefile | 8 |
4 files changed, 10 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e225eb85a..6ed32d9578 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ # Clang version information +# FIXME: get from a file called ./VER set(CLANG_VERSION 1.1) macro(add_clang_library name) @@ -0,0 +1 @@ +1.1 diff --git a/docs/tools/Makefile b/docs/tools/Makefile index a1bbbcc920..12696ef0b6 100644 --- a/docs/tools/Makefile +++ b/docs/tools/Makefile @@ -21,6 +21,7 @@ SRC_DOC_DIR= DST_HTML_DIR=html/ DST_MAN_DIR=man/man1/ DST_PS_DIR=ps/ +CLANG_VERSION := trunk # If we are in BUILD_FOR_WEBSITE mode, default to the all target. all:: html man ps @@ -39,6 +40,8 @@ else LEVEL := ../../../.. include $(LEVEL)/Makefile.common +CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER) + SRC_DOC_DIR=$(PROJ_SRC_DIR)/ DST_HTML_DIR=$(PROJ_OBJ_DIR)/ DST_MAN_DIR=$(PROJ_OBJ_DIR)/ @@ -66,7 +69,7 @@ $(DST_HTML_DIR)%.html: %.pod $(DST_HTML_DIR)/.dir --podpath=. --infile=$< --outfile=$@ --title=$* $(DST_MAN_DIR)%.1: %.pod $(DST_MAN_DIR)/.dir - pod2man --release "clang 1.1" --center="Clang Tools Documentation" $< $@ + pod2man --release "clang $(CLANG_VERSION)" --center="Clang Tools Documentation" $< $@ $(DST_PS_DIR)%.ps: $(DST_MAN_DIR)%.1 $(DST_PS_DIR)/.dir groff -Tps -man $< > $@ diff --git a/lib/Headers/Makefile b/lib/Headers/Makefile index 3abe149879..cb36e84319 100644 --- a/lib/Headers/Makefile +++ b/lib/Headers/Makefile @@ -10,8 +10,9 @@ LEVEL = ../../../.. include $(LEVEL)/Makefile.common -# FIXME: Get version from a common place. -HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/1.1/include +CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER) + +HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h)) @@ -25,7 +26,7 @@ $(OBJHEADERS): $(HeaderDir)/%.h: $(PROJ_SRC_DIR)/%.h $(HeaderDir)/.dir # Hook into the standard Makefile rules. all-local:: $(OBJHEADERS) -PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/1.1/include +PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS)) @@ -37,4 +38,3 @@ $(INSTHEADERS): $(PROJ_headers)/%.h: $(HeaderDir)/%.h | $(PROJ_headers) $(Echo) Installing compiler include file: $(notdir $<) install-local:: $(INSTHEADERS) - |