Index: clang-tools-extra/trunk/Makefile
===================================================================
--- clang-tools-extra/trunk/Makefile
+++ clang-tools-extra/trunk/Makefile
@@ -1,41 +0,0 @@
-##===- tools/extra/Makefile --------------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../..
-
-include $(CLANG_LEVEL)/../../Makefile.config
-
-PARALLEL_DIRS := tool-template modularize pp-trace
-DIRS := clang-apply-replacements clang-rename clang-tidy clang-query unittests
-
-include $(CLANG_LEVEL)/Makefile
-
-###
-# Handle the nested test suite.
-
-ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
-$(RecursiveTargets)::
-	$(Verb) for dir in test; do \
-	  if [ -f $(PROJ_SRC_DIR)/$${dir}/Makefile ] && [ ! -f $${dir}/Makefile ]; then \
-	    $(MKDIR) $${dir}; \
-	    $(CP) $(PROJ_SRC_DIR)/$${dir}/Makefile $${dir}/Makefile; \
-	  fi \
-	done
-endif
-
-test::
-	@ $(MAKE) -C test
-
-report::
-	@ $(MAKE) -C test report
-
-clean::
-	@ $(MAKE) -C test clean
-
-.PHONY: test report clean
Index: clang-tools-extra/trunk/clang-apply-replacements/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-apply-replacements/Makefile
+++ clang-tools-extra/trunk/clang-apply-replacements/Makefile
@@ -1,15 +0,0 @@
-##===- clang-apply-replacements/Makefile -------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../..
-include $(CLANG_LEVEL)/../../Makefile.config
-
-DIRS = lib/Tooling tool
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-apply-replacements/lib/Tooling/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-apply-replacements/lib/Tooling/Makefile
+++ clang-tools-extra/trunk/clang-apply-replacements/lib/Tooling/Makefile
@@ -1,14 +0,0 @@
-##===- clang-apply-replacements/lib/Tooling/Makefile -------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../../../..
-LIBRARYNAME := clangApplyReplacements
-include $(CLANG_LEVEL)/../../Makefile.config
-include $(CLANG_LEVEL)/Makefile
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../include
Index: clang-tools-extra/trunk/clang-apply-replacements/tool/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-apply-replacements/tool/Makefile
+++ clang-tools-extra/trunk/clang-apply-replacements/tool/Makefile
@@ -1,29 +0,0 @@
-##===- clang-apply-replacements/tool/Makefile --------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../../..
-include $(CLANG_LEVEL)/../../Makefile.config
-
-TOOLNAME = clang-apply-replacements
-
-# No plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-SOURCES = ClangApplyReplacementsMain.cpp
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
-USEDLIBS = clangApplyReplacements.a clangFormat.a \
-	   clangTooling.a clangToolingCore.a clangFrontend.a \
-	   clangSerialization.a clangDriver.a clangRewriteFrontend.a \
-	   clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
-	   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
-
-CPP.Flags += -I$(PROJ_SRC_DIR)/../include
Index: clang-tools-extra/trunk/clang-query/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-query/Makefile
+++ clang-tools-extra/trunk/clang-query/Makefile
@@ -1,16 +0,0 @@
-##===- tools/extra/clang-query/Makefile --------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../..
-LIBRARYNAME := clangQuery
-include $(CLANG_LEVEL)/../../Makefile.config
-
-DIRS = tool
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-query/tool/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-query/tool/Makefile
+++ clang-tools-extra/trunk/clang-query/tool/Makefile
@@ -1,39 +0,0 @@
-##===- tools/extra/clang-query/tool/Makefile ---------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../../..
-include $(CLANG_LEVEL)/../../Makefile.config
-
-TOOLNAME = clang-query
-
-# No plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-SOURCES = ClangQuery.cpp
-
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option
-USEDLIBS = clangQuery.a clangDynamicASTMatchers.a clangFormat.a clangTooling.a \
-	   clangFrontend.a clangSerialization.a clangDriver.a clangRewriteFrontend.a \
-	   LLVMLineEditor.a clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
-	   clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
-
-CPP.Flags += -I$(PROJ_SRC_DIR)/..
-
-# BUILT_SOURCES gets used as a prereq for many top-level targets. However, at
-# the point those targets are defined, $(ObjDir) hasn't been defined and so the
-# directory to create becomes /<name>/ which is not what we want. So instead,
-# this .objdir recipe is defined at at point where $(ObjDir) is defined and
-# it's specialized to $(ObjDir) to ensure it only works on targets we want it
-# to.
-$(ObjDir)/%.objdir:
-	$(Verb) $(MKDIR) $(ObjDir)/$* > /dev/null
-	$(Verb) $(DOTDIR_TIMESTAMP_COMMAND) > $@
-
Index: clang-tools-extra/trunk/clang-rename/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-rename/Makefile
+++ clang-tools-extra/trunk/clang-rename/Makefile
@@ -1,16 +0,0 @@
-##===- tools/extra/clang-rename/Makefile -------------------*- Makefile -*-===##
-#
-# The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../..
-LIBRARYNAME = clangRename
-include $(CLANG_LEVEL)/../../Makefile.config
-
-DIRS = tool
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-rename/tool/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-rename/tool/Makefile
+++ clang-tools-extra/trunk/clang-rename/tool/Makefile
@@ -1,13 +0,0 @@
-CLANG_LEVEL := ../../../..
-TOOLNAME = clang-rename
-include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
-USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \
-           clangTooling.a clangToolingCore.a \
-	   clangParse.a clangSema.a clangIndex.a \
-           clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
-           clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \
-           clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
-
Index: clang-tools-extra/trunk/clang-tidy/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/Makefile
+++ clang-tools-extra/trunk/clang-tidy/Makefile
@@ -1,16 +0,0 @@
-##===- tools/extra/clang-tidy/Makefile ---------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../..
-LIBRARYNAME := clangTidy
-include $(CLANG_LEVEL)/../../Makefile.config
-
-DIRS = utils cert cppcoreguidelines readability llvm google misc modernize performance tool
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-tidy/cert/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/cert/Makefile
+++ clang-tools-extra/trunk/clang-tidy/cert/Makefile
@@ -1,12 +0,0 @@
-##===- clang-tidy/cert/Makefile ----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-CLANG_LEVEL := ../../../..
-LIBRARYNAME := clangTidyCERTModule
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/Makefile
+++ clang-tools-extra/trunk/clang-tidy/cppcoreguidelines/Makefile
@@ -1,12 +0,0 @@
-##===- clang-tidy/cppcoreguidelines/Makefile ----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-CLANG_LEVEL := ../../../..
-LIBRARYNAME := clangTidyCppCoreGuidelinesModule
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-tidy/google/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/google/Makefile
+++ clang-tools-extra/trunk/clang-tidy/google/Makefile
@@ -1,12 +0,0 @@
-##===- clang-tidy/google/Makefile --------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-CLANG_LEVEL := ../../../..
-LIBRARYNAME := clangTidyGoogleModule
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-tidy/llvm/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/llvm/Makefile
+++ clang-tools-extra/trunk/clang-tidy/llvm/Makefile
@@ -1,12 +0,0 @@
-##===- clang-tidy/llvm/Makefile ----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-CLANG_LEVEL := ../../../..
-LIBRARYNAME := clangTidyLLVMModule
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-tidy/misc/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/misc/Makefile
+++ clang-tools-extra/trunk/clang-tidy/misc/Makefile
@@ -1,12 +0,0 @@
-##===- clang-tidy/misc/Makefile ----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-CLANG_LEVEL := ../../../..
-LIBRARYNAME := clangTidyMiscModule
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-tidy/modernize/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/modernize/Makefile
+++ clang-tools-extra/trunk/clang-tidy/modernize/Makefile
@@ -1,12 +0,0 @@
-##===- clang-tidy/modernize/Makefile -----------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-CLANG_LEVEL := ../../../..
-LIBRARYNAME := clangTidyModernizeModule
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-tidy/performance/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/performance/Makefile
+++ clang-tools-extra/trunk/clang-tidy/performance/Makefile
@@ -1,12 +0,0 @@
-##===- clang-tidy/performance/Makefile ---------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-CLANG_LEVEL := ../../../..
-LIBRARYNAME := clangTidyPerformanceModule
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-tidy/readability/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/readability/Makefile
+++ clang-tools-extra/trunk/clang-tidy/readability/Makefile
@@ -1,12 +0,0 @@
-##===- clang-tidy/readability/Makefile ---------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-CLANG_LEVEL := ../../../..
-LIBRARYNAME := clangTidyReadability
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/clang-tidy/tool/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/tool/Makefile
+++ clang-tools-extra/trunk/clang-tidy/tool/Makefile
@@ -1,49 +0,0 @@
-##===- clang-tidy/tool/Makefile ----------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../../..
-
-TOOLNAME = clang-tidy
-
-# No plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
-USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
-           clangTidyMiscModule.a clangTidyModernizeModule.a \
-	   clangTidyPerformanceModule.a clangTidyReadability.a \
-	   clangTidyUtils.a clangTidyCERTModule.a clangStaticAnalyzerFrontend.a \
-	   clangTidyCppCoreGuidelinesModule.a \
-	   clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \
-	   clangFormat.a clangASTMatchers.a clangTooling.a clangToolingCore.a \
-	   clangFrontend.a clangSerialization.a clangDriver.a clangParse.a \
-	   clangSema.a clangAnalysis.a clangRewriteFrontend.a clangRewrite.a \
-	   clangEdit.a clangAST.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
-
-PROJ_sharedir := $(DESTDIR)$(PROJ_prefix)/share/clang
-
-FILESLIST := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.py))
-
-SRCFILES := $(addprefix $(PROJ_SRC_DIR)/, $(FILESLIST))
-DESTFILES := $(addprefix $(PROJ_sharedir)/, $(FILESLIST))
-
-$(PROJ_sharedir):
-	$(Echo) Making install directory: $@
-	$(Verb) $(MKDIR) $@
-
-$(DESTFILES): $(SRCFILES) $(PROJ_sharedir)
-
-$(PROJ_sharedir)/%.py: $(PROJ_SRC_DIR)/%.py
-	$(Echo) Installing script file: $(notdir $<)
-	$(Verb) $(ScriptInstall) $< $(PROJ_sharedir)
-
-install-local:: $(DESTFILES)
Index: clang-tools-extra/trunk/clang-tidy/utils/Makefile
===================================================================
--- clang-tools-extra/trunk/clang-tidy/utils/Makefile
+++ clang-tools-extra/trunk/clang-tidy/utils/Makefile
@@ -1,12 +0,0 @@
-##===- clang-tidy/google/Makefile --------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-CLANG_LEVEL := ../../../..
-LIBRARYNAME := clangTidyUtils
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/docs/Makefile
===================================================================
--- clang-tools-extra/trunk/docs/Makefile
+++ clang-tools-extra/trunk/docs/Makefile
@@ -1,160 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-all: doxygen html
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/ExtraClangTools.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/ExtraClangTools.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/ExtraClangTools"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/ExtraClangTools"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-doxygen:
-	mkdir -p $(BUILDDIR)/html/doxygen
-	doxygen
-
Index: clang-tools-extra/trunk/modularize/Makefile
===================================================================
--- clang-tools-extra/trunk/modularize/Makefile
+++ clang-tools-extra/trunk/modularize/Makefile
@@ -1,24 +0,0 @@
-##===- tools/modularize/Makefile ---------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../..
-
-TOOLNAME = modularize
-NO_INSTALL = 0
-
-# No plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils
-USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
-           clangTooling.a clangParse.a clangSema.a clangAnalysis.a \
-           clangEdit.a clangAST.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
-
Index: clang-tools-extra/trunk/pp-trace/Makefile
===================================================================
--- clang-tools-extra/trunk/pp-trace/Makefile
+++ clang-tools-extra/trunk/pp-trace/Makefile
@@ -1,22 +0,0 @@
-##===- extra/pp-trace/Makefile --------------------------*- Makefile -*---===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===---------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../..
-
-TOOLNAME = pp-trace
-
-# No plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils
-USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \
-           clangTooling.a clangParse.a clangSema.a clangAnalysis.a \
-           clangEdit.a clangAST.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/test/Makefile
===================================================================
--- clang-tools-extra/trunk/test/Makefile
+++ clang-tools-extra/trunk/test/Makefile
@@ -1,73 +0,0 @@
-##===- tools/extra/test/Makefile ---------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../..
-include $(CLANG_LEVEL)/Makefile
-
-# Test in all immediate subdirectories if unset.
-ifdef TESTSUITE
-TESTDIRS := $(TESTSUITE:%=$(PROJ_SRC_DIR)/%)
-else
-TESTDIRS ?= $(PROJ_SRC_DIR)
-endif
-
-# 'lit' wants objdir paths, so it will pick up the lit.site.cfg.
-TESTDIRS := $(TESTDIRS:$(PROJ_SRC_DIR)%=$(PROJ_OBJ_DIR)%)
-
-# Allow EXTRA_TESTDIRS to provide additional test directories.
-TESTDIRS += $(EXTRA_TESTDIRS)
-
-ifndef TESTARGS
-ifdef VERBOSE
-TESTARGS = -v
-else
-TESTARGS = -s -v
-endif
-endif
-
-# Make sure any extra test suites can find the main site config.
-LIT_ARGS := --param clang_site_config=$(PROJ_OBJ_DIR)/lit.site.cfg
-
-ifdef VG
-  LIT_ARGS += "--vg"
-endif
-
-all:: lit.site.cfg Unit/lit.site.cfg
-	@ echo '--- Running the Clang extra tools tests for $(TARGET_TRIPLE) ---'
-	@ $(PYTHON) $(LLVM_SRC_ROOT)/utils/lit/lit.py \
-	  $(LIT_ARGS) $(TESTARGS) $(TESTDIRS)
-
-FORCE:
-
-lit.site.cfg: FORCE
-	@echo "Making lit.site.cfg for Clang extra tools..."
-	@$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp
-	@$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> lit.tmp
-	@$(ECHOPATH) s=@CLANG_TOOLS_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> lit.tmp
-	@$(ECHOPATH) s=@CLANG_TOOLS_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> lit.tmp
-	@$(ECHOPATH) s=@CLANG_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp
-	@$(ECHOPATH) s=@PYTHON_EXECUTABLE@=$(PYTHON)=g >> lit.tmp
-	@$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp
-	@sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
-	@-rm -f lit.tmp
-
-Unit/lit.site.cfg: FORCE
-	@echo "Making Unit/lit.site.cfg for Clang extra tools..."
-	@$(MKDIR) $(dir $@)
-	@$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> unit.tmp
-	@$(ECHOPATH) s=@CLANG_TOOLS_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> unit.tmp
-	@$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> unit.tmp
-	@$(ECHOPATH) s=@CLANG_TOOLS_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> unit.tmp
-	@sed -f unit.tmp $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
-	@-rm -f unit.tmp
-
-clean::
-	@ find . -name Output | xargs rm -fr
-
-.PHONY: all report clean
Index: clang-tools-extra/trunk/tool-template/Makefile
===================================================================
--- clang-tools-extra/trunk/tool-template/Makefile
+++ clang-tools-extra/trunk/tool-template/Makefile
@@ -1,25 +0,0 @@
-##===-------- tools/toolTemplate/Makefile ------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../..
-
-TOOLNAME = tool-template
-NO_INSTALL = 1
-
-# No plugins, optimize startup time.
-TOOL_NO_EXPORTS = 1
-
-include $(CLANG_LEVEL)/../../Makefile.config
-LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option
-USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \
-           clangRewriteFrontend.a clangToolingCore.a clangRewrite.a \
-           clangParse.a clangSema.a clangAnalysis.a \
-           clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/unittests/Makefile
===================================================================
--- clang-tools-extra/trunk/unittests/Makefile
+++ clang-tools-extra/trunk/unittests/Makefile
@@ -1,15 +0,0 @@
-##===- tools/extra/test/Unit/Makefile ----------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL := ../../..
-include $(CLANG_LEVEL)/../../Makefile.config
-
-PARALLEL_DIRS := clang-apply-replacements clang-query clang-tidy clang-rename
-
-include $(CLANG_LEVEL)/Makefile
Index: clang-tools-extra/trunk/unittests/clang-apply-replacements/Makefile
===================================================================
--- clang-tools-extra/trunk/unittests/clang-apply-replacements/Makefile
+++ clang-tools-extra/trunk/unittests/clang-apply-replacements/Makefile
@@ -1,25 +0,0 @@
-##===- unittests/clang-apply-replacements/Makefile ---------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL = ../../../..
-include $(CLANG_LEVEL)/../../Makefile.config
-
-TESTNAME = ClangApplyReplacementsTests
-LINK_COMPONENTS := asmparser bitreader support mc mcparser option \
-		TransformUtils
-USEDLIBS = clangApplyReplacements.a clangFormat.a clangTooling.a \
-	   clangToolingCore.a clangFrontend.a \
-           clangSerialization.a clangDriver.a clangRewriteFrontend.a \
-           clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \
-           clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
-MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../clang-apply-replacements/include -I$(PROJ_SRC_DIR)/../include
-include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
Index: clang-tools-extra/trunk/unittests/clang-query/Makefile
===================================================================
--- clang-tools-extra/trunk/unittests/clang-query/Makefile
+++ clang-tools-extra/trunk/unittests/clang-query/Makefile
@@ -1,24 +0,0 @@
-##===- unittests/clang-query/Makefile ----------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL = ../../../..
-include $(CLANG_LEVEL)/../../Makefile.config
-
-TESTNAME = ClangQuery
-LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
-		 TransformUtils
-USEDLIBS = clangQuery.a clangTooling.a clangFrontend.a clangSerialization.a \
-	   clangDriver.a clangParse.a clangSema.a clangEdit.a clangAnalysis.a \
-	   clangAST.a clangASTMatchers.a clangDynamicASTMatchers.a clangLex.a \
-	   clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
-MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../clang-query
-include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
Index: clang-tools-extra/trunk/unittests/clang-rename/Makefile
===================================================================
--- clang-tools-extra/trunk/unittests/clang-rename/Makefile
+++ clang-tools-extra/trunk/unittests/clang-rename/Makefile
@@ -1,25 +0,0 @@
-##===- unittests/clang-rename/Makefile ---------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL = ../../../..
-include $(CLANG_LEVEL)/../../Makefile.config
-
-TESTNAME = ClangRenameTests
-LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
-		 TransformUtils
-USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \
-           clangTooling.a clangParse.a clangSema.a clangIndex.a \
-           clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
-           clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \
-           clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
-MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../clang-rename
-include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
Index: clang-tools-extra/trunk/unittests/clang-tidy/Makefile
===================================================================
--- clang-tools-extra/trunk/unittests/clang-tidy/Makefile
+++ clang-tools-extra/trunk/unittests/clang-tidy/Makefile
@@ -1,30 +0,0 @@
-##===- unittests/clang-tidy/Makefile -----------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-CLANG_LEVEL = ../../../..
-include $(CLANG_LEVEL)/../../Makefile.config
-
-TESTNAME = ClangTidy
-LINK_COMPONENTS := asmparser bitreader support MC MCParser option \
-		 TransformUtils
-USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \
-	   clangTidyMiscModule.a clangTidyReadability.a clangTidy.a \
-	   clangTidyUtils.a \
-	   clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \
-	   clangStaticAnalyzerCore.a \
-	   clangFormat.a clangTooling.a clangToolingCore.a \
-	   clangFrontend.a clangSerialization.a \
-	   clangDriver.a clangRewriteFrontend.a clangRewrite.a \
-	   clangParse.a clangSema.a clangAnalysis.a clangAST.a \
-	   clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a
-
-include $(CLANG_LEVEL)/Makefile
-MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../clang-tidy
-include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest