[cfe-commits] r105637 - in /cfe/trunk: ./ docs/ docs/tools/ examples/ examples/PrintFunctionNames/ examples/clang-interpreter/ examples/wpa/ include/ include/clang-c/ include/clang/ include/clang/AST/ include/clang/Basic/ include/clang/Driver/ lib/ lib/AST/ lib/Analysis/ lib/Basic/ lib/Checker/ lib/CodeGen/ lib/Driver/ lib/Frontend/ lib/Headers/ lib/Index/ lib/Lex/ lib/Parse/ lib/Rewrite/ lib/Runtime/ lib/Sema/ test/ tools/ tools/c-index-test/ tools/driver/ tools/libclang/
Daniel Dunbar
daniel at zuster.org
Tue Jun 8 13:34:18 PDT 2010
Author: ddunbar
Date: Tue Jun 8 15:34:18 2010
New Revision: 105637
URL: http://llvm.org/viewvc/llvm-project?rev=105637&view=rev
Log:
Makefile: Switch Clang Makefiles to always include the top-level Clang Makefile.
- This eliminates most dependencies on how Clang is installed relative to LLVM.
Modified:
cfe/trunk/Makefile
cfe/trunk/docs/Makefile
cfe/trunk/docs/tools/Makefile
cfe/trunk/examples/Makefile
cfe/trunk/examples/PrintFunctionNames/Makefile
cfe/trunk/examples/clang-interpreter/Makefile
cfe/trunk/examples/wpa/Makefile
cfe/trunk/include/Makefile
cfe/trunk/include/clang-c/Makefile
cfe/trunk/include/clang/AST/Makefile
cfe/trunk/include/clang/Basic/Makefile
cfe/trunk/include/clang/Driver/Makefile
cfe/trunk/include/clang/Makefile
cfe/trunk/lib/AST/Makefile
cfe/trunk/lib/Analysis/Makefile
cfe/trunk/lib/Basic/Makefile
cfe/trunk/lib/Checker/Makefile
cfe/trunk/lib/CodeGen/Makefile
cfe/trunk/lib/Driver/Makefile
cfe/trunk/lib/Frontend/Makefile
cfe/trunk/lib/Headers/Makefile
cfe/trunk/lib/Index/Makefile
cfe/trunk/lib/Lex/Makefile
cfe/trunk/lib/Makefile
cfe/trunk/lib/Parse/Makefile
cfe/trunk/lib/Rewrite/Makefile
cfe/trunk/lib/Runtime/Makefile
cfe/trunk/lib/Sema/Makefile
cfe/trunk/test/Makefile
cfe/trunk/tools/Makefile
cfe/trunk/tools/c-index-test/Makefile
cfe/trunk/tools/driver/Makefile
cfe/trunk/tools/libclang/Makefile
Modified: cfe/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/Makefile (original)
+++ cfe/trunk/Makefile Tue Jun 8 15:34:18 2010
@@ -1,4 +1,19 @@
-LEVEL = ../..
+##===- Makefile --------------------------------------------*- Makefile -*-===##
+#
+# The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+# If CLANG_LEVEL is not set, then we are the top-level Makefile. Otherwise, we
+# are being included from a subdirectory makefile.
+
+ifndef CLANG_LEVEL
+
+IS_TOP_LEVEL := 1
+CLANG_LEVEL := .
DIRS := include lib tools docs
PARALLEL_DIRS :=
@@ -6,9 +21,22 @@
ifeq ($(BUILD_EXAMPLES),1)
PARALLEL_DIRS += examples
endif
+endif
+
+###
+# Common Makefile code, shared by all Clang Makefiles.
+# Set LLVM source root level.
+LEVEL := $(CLANG_LEVEL)/../..
+
+# Include LLVM common makefile.
include $(LEVEL)/Makefile.common
+###
+# Clang Top Level specific stuff.
+
+ifeq ($(IS_TOP_LEVEL),1)
+
ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
$(RecursiveTargets)::
$(Verb) if [ ! -f test/Makefile ]; then \
@@ -37,3 +65,5 @@
-or -name '*.h' > cscope.files
.PHONY: test report clean cscope.files
+
+endif
Modified: cfe/trunk/docs/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/docs/Makefile (original)
+++ cfe/trunk/docs/Makefile Tue Jun 8 15:34:18 2010
@@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
-LEVEL := ../../..
+CLANG_LEVEL := ..
DIRS := tools
ifdef BUILD_FOR_WEBSITE
@@ -22,7 +22,7 @@
-e 's/@abs_top_builddir@/../g' > $@
endif
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
HTML := $(wildcard $(PROJ_SRC_DIR)/*.html) \
$(wildcard $(PROJ_SRC_DIR)/*.css)
Modified: cfe/trunk/docs/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/tools/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/docs/tools/Makefile (original)
+++ cfe/trunk/docs/tools/Makefile Tue Jun 8 15:34:18 2010
@@ -37,8 +37,8 @@
else
# Otherwise, if not in BUILD_FOR_WEBSITE mode, use the project info.
-LEVEL := ../../../..
-include $(LEVEL)/Makefile.common
+CLANG_LEVEL := ../..
+include $(CLANG_LEVEL)/Makefile
CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
Modified: cfe/trunk/examples/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/examples/Makefile (original)
+++ cfe/trunk/examples/Makefile Tue Jun 8 15:34:18 2010
@@ -7,8 +7,8 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../..
+CLANG_LEVEL := ..
PARALLEL_DIRS := clang-interpreter PrintFunctionNames wpa
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/examples/PrintFunctionNames/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/PrintFunctionNames/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/examples/PrintFunctionNames/Makefile (original)
+++ cfe/trunk/examples/PrintFunctionNames/Makefile Tue Jun 8 15:34:18 2010
@@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME = PrintFunctionNames
CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
@@ -15,7 +15,7 @@
# Include this here so we can get the configuration of the targets that have
# been configured for construction. We have to do this early so we can set up
# LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
+include $(CLANG_LEVEL)/../../Makefile.config
LINK_LIBS_IN_SHARED = 1
SHARED_LIBRARY = 1
@@ -24,4 +24,4 @@
USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/examples/clang-interpreter/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/clang-interpreter/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/examples/clang-interpreter/Makefile (original)
+++ cfe/trunk/examples/clang-interpreter/Makefile Tue Jun 8 15:34:18 2010
@@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
TOOLNAME = clang-interpreter
CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
@@ -19,7 +19,7 @@
# Include this here so we can get the configuration of the targets that have
# been configured for construction. We have to do this early so we can set up
# LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
+include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := jit interpreter nativecodegen bitreader bitwriter ipo \
selectiondag asmparser
@@ -27,4 +27,4 @@
clangChecker.a clangAnalysis.a clangRewrite.a clangAST.a \
clangParse.a clangLex.a clangBasic.a
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/examples/wpa/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/wpa/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/examples/wpa/Makefile (original)
+++ cfe/trunk/examples/wpa/Makefile Tue Jun 8 15:34:18 2010
@@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
TOOLNAME = clang-wpa
CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
@@ -19,10 +19,10 @@
# Include this here so we can get the configuration of the targets that have
# been configured for construction. We have to do this early so we can set up
# LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
+include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := asmparser bitreader mc core
USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/include/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/include/Makefile (original)
+++ cfe/trunk/include/Makefile Tue Jun 8 15:34:18 2010
@@ -1,4 +1,4 @@
-LEVEL = ../../..
+CLANG_LEVEL := ..
DIRS := clang clang-c
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/include/clang-c/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/include/clang-c/Makefile (original)
+++ cfe/trunk/include/clang-c/Makefile Tue Jun 8 15:34:18 2010
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
DIRS :=
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
install-local::
$(Echo) Installing Clang C API include files
Modified: cfe/trunk/include/clang/AST/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Makefile (original)
+++ cfe/trunk/include/clang/AST/Makefile Tue Jun 8 15:34:18 2010
@@ -1,10 +1,10 @@
-LEVEL = ../../../../..
+CLANG_LEVEL := ../../..
BUILT_SOURCES = StmtNodes.inc DeclNodes.inc
TD_SRC_DIR = $(PROJ_SRC_DIR)/../Basic
TABLEGEN_INC_FILES_COMMON = 1
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
INPUT_TDS = $(TD_SRC_DIR)/StmtNodes.td $(TD_SRC_DIR)/DeclNodes.td
Modified: cfe/trunk/include/clang/Basic/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Makefile (original)
+++ cfe/trunk/include/clang/Basic/Makefile Tue Jun 8 15:34:18 2010
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+CLANG_LEVEL := ../../..
BUILT_SOURCES = DiagnosticAnalysisKinds.inc DiagnosticASTKinds.inc \
DiagnosticCommonKinds.inc DiagnosticDriverKinds.inc \
DiagnosticFrontendKinds.inc DiagnosticLexKinds.inc \
@@ -7,7 +7,7 @@
TABLEGEN_INC_FILES_COMMON = 1
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
INPUT_TDS = $(wildcard $(PROJ_SRC_DIR)/Diagnostic*.td)
Modified: cfe/trunk/include/clang/Driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/Makefile (original)
+++ cfe/trunk/include/clang/Driver/Makefile Tue Jun 8 15:34:18 2010
@@ -1,9 +1,9 @@
-LEVEL = ../../../../..
+CLANG_LEVEL := ../../..
BUILT_SOURCES = Options.inc CC1Options.inc CC1AsOptions.inc
TABLEGEN_INC_FILES_COMMON = 1
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir
$(Echo) "Building Clang Driver Option tables with tblgen"
Modified: cfe/trunk/include/clang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/include/clang/Makefile (original)
+++ cfe/trunk/include/clang/Makefile Tue Jun 8 15:34:18 2010
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
DIRS := AST Basic Driver
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
install-local::
$(Echo) Installing Clang include files
Modified: cfe/trunk/lib/AST/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/AST/Makefile (original)
+++ cfe/trunk/lib/AST/Makefile Tue Jun 8 15:34:18 2010
@@ -11,11 +11,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangAST
BUILD_ARCHIVE = 1
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Analysis/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/Makefile (original)
+++ cfe/trunk/lib/Analysis/Makefile Tue Jun 8 15:34:18 2010
@@ -11,11 +11,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangAnalysis
BUILD_ARCHIVE = 1
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Basic/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Makefile (original)
+++ cfe/trunk/lib/Basic/Makefile Tue Jun 8 15:34:18 2010
@@ -11,7 +11,7 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangBasic
BUILD_ARCHIVE = 1
@@ -20,7 +20,7 @@
CPPFLAGS += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
endif
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
SVN_REVISION := $(shell $(LLVM_SRC_ROOT)/utils/GetSourceVersion $(PROJ_SRC_DIR)/../..)
Modified: cfe/trunk/lib/Checker/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Checker/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Checker/Makefile (original)
+++ cfe/trunk/lib/Checker/Makefile Tue Jun 8 15:34:18 2010
@@ -11,11 +11,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangChecker
BUILD_ARCHIVE = 1
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/CodeGen/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/Makefile (original)
+++ cfe/trunk/lib/CodeGen/Makefile Tue Jun 8 15:34:18 2010
@@ -12,7 +12,7 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangCodeGen
BUILD_ARCHIVE = 1
@@ -21,5 +21,5 @@
CPP.Flags += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
endif
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Makefile (original)
+++ cfe/trunk/lib/Driver/Makefile Tue Jun 8 15:34:18 2010
@@ -7,10 +7,10 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangDriver
BUILD_ARCHIVE = 1
CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Frontend/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/Makefile (original)
+++ cfe/trunk/lib/Frontend/Makefile Tue Jun 8 15:34:18 2010
@@ -7,11 +7,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangFrontend
BUILD_ARCHIVE = 1
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Headers/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/Makefile (original)
+++ cfe/trunk/lib/Headers/Makefile Tue Jun 8 15:34:18 2010
@@ -7,12 +7,12 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
BUILT_SOURCES = arm_neon.h.inc
TABLEGEN_INC_FILES_COMMON = 1
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
@@ -30,7 +30,7 @@
$(HeaderDir)/arm_neon.h: $(BUILT_SOURCES)
$(Verb) cp $< $@
$(Echo) Copying $(notdir $<) to build dir
-
+
# Hook into the standard Makefile rules.
all-local:: $(OBJHEADERS)
Modified: cfe/trunk/lib/Index/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Index/Makefile (original)
+++ cfe/trunk/lib/Index/Makefile Tue Jun 8 15:34:18 2010
@@ -11,8 +11,8 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
-include $(LEVEL)/Makefile.config
+CLANG_LEVEL := ../..
+include $(CLANG_LEVEL)/../../Makefile.config
LIBRARYNAME := clangIndex
BUILD_ARCHIVE = 1
@@ -23,5 +23,5 @@
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Lex/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/Makefile (original)
+++ cfe/trunk/lib/Lex/Makefile Tue Jun 8 15:34:18 2010
@@ -11,8 +11,8 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
-include $(LEVEL)/Makefile.config
+CLANG_LEVEL := ../..
+include $(CLANG_LEVEL)/../../Makefile.config
LIBRARYNAME := clangLex
BUILD_ARCHIVE = 1
@@ -23,5 +23,5 @@
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Makefile (original)
+++ cfe/trunk/lib/Makefile Tue Jun 8 15:34:18 2010
@@ -6,10 +6,10 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../..
+CLANG_LEVEL := ..
PARALLEL_DIRS = Headers Runtime Basic Lex Parse AST Sema CodeGen Analysis \
Checker Rewrite Frontend Index Driver
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Parse/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/Makefile (original)
+++ cfe/trunk/lib/Parse/Makefile Tue Jun 8 15:34:18 2010
@@ -11,11 +11,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangParse
BUILD_ARCHIVE = 1
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Rewrite/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/Makefile (original)
+++ cfe/trunk/lib/Rewrite/Makefile Tue Jun 8 15:34:18 2010
@@ -11,11 +11,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangRewrite
BUILD_ARCHIVE = 1
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/lib/Runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Runtime/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Runtime/Makefile (original)
+++ cfe/trunk/lib/Runtime/Makefile Tue Jun 8 15:34:18 2010
@@ -13,8 +13,8 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
-include $(LEVEL)/Makefile.common
+CLANG_LEVEL := ../..
+include $(CLANG_LEVEL)/Makefile
CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
Modified: cfe/trunk/lib/Sema/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Makefile (original)
+++ cfe/trunk/lib/Sema/Makefile Tue Jun 8 15:34:18 2010
@@ -12,11 +12,11 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME := clangSema
BUILD_ARCHIVE = 1
CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/test/Makefile (original)
+++ cfe/trunk/test/Makefile Tue Jun 8 15:34:18 2010
@@ -1,5 +1,5 @@
-LEVEL = ../../..
-include $(LEVEL)/Makefile.common
+CLANG_LEVEL := ..
+include $(CLANG_LEVEL)/Makefile
# Test in all immediate subdirectories if unset.
ifdef TESTSUITE
Modified: cfe/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/tools/Makefile (original)
+++ cfe/trunk/tools/Makefile Tue Jun 8 15:34:18 2010
@@ -7,13 +7,13 @@
#
##===----------------------------------------------------------------------===##
-LEVEL := ../../..
+CLANG_LEVEL := ..
DIRS := driver libclang c-index-test
-include $(LEVEL)/Makefile.config
+include $(CLANG_LEVEL)/../../Makefile.config
ifeq ($(OS), $(filter $(OS), Cygwin MingW))
DIRS := $(filter-out libclang c-index-test, $(DIRS))
endif
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/tools/c-index-test/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/tools/c-index-test/Makefile (original)
+++ cfe/trunk/tools/c-index-test/Makefile Tue Jun 8 15:34:18 2010
@@ -6,7 +6,7 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
TOOLNAME = c-index-test
CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
@@ -14,10 +14,10 @@
# No plugins, optimize startup time.
TOOL_NO_EXPORTS = 1
-include $(LEVEL)/Makefile.config
+include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := bitreader mc core
USEDLIBS = clang.a clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(CLANG_LEVEL)/Makefile
Modified: cfe/trunk/tools/driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/tools/driver/Makefile (original)
+++ cfe/trunk/tools/driver/Makefile Tue Jun 8 15:34:18 2010
@@ -6,7 +6,7 @@
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
TOOLNAME = clang
ifndef CLANG_IS_PRODUCTION
@@ -24,7 +24,7 @@
# Include this here so we can get the configuration of the targets that have
# been configured for construction. We have to do this early so we can set up
# LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
+include $(CLANG_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
ipo selectiondag
@@ -32,7 +32,7 @@
clangChecker.a clangAnalysis.a clangRewrite.a clangAST.a \
clangParse.a clangLex.a clangBasic.a
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(CLANG_LEVEL)/Makefile
# Translate make variable to define when building a "production" clang.
ifdef CLANG_IS_PRODUCTION
Modified: cfe/trunk/tools/libclang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/Makefile?rev=105637&r1=105636&r2=105637&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/Makefile (original)
+++ cfe/trunk/tools/libclang/Makefile Tue Jun 8 15:34:18 2010
@@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
-LEVEL = ../../../..
+CLANG_LEVEL := ../..
LIBRARYNAME = clang
EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/libclang.exports
@@ -17,7 +17,7 @@
# Include this here so we can get the configuration of the targets
# that have been configured for construction. We have to do this
# early so we can set up LINK_COMPONENTS before including Makefile.rules
-include $(LEVEL)/Makefile.config
+include $(CLANG_LEVEL)/../../Makefile.config
LINK_LIBS_IN_SHARED = 1
SHARED_LIBRARY = 1
@@ -26,7 +26,7 @@
USEDLIBS = clangFrontend.a clangDriver.a clangSema.a \
clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
-include $(LEVEL)/Makefile.common
+include $(CLANG_LEVEL)/Makefile
##===----------------------------------------------------------------------===##
# FIXME: This is copied from the 'lto' makefile. Should we share this?
More information about the cfe-commits
mailing list