Reverted r103214.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@103222 91177308-0d34-0410-b5e6-96231b3b80d8

31 files changed, 2413 insertions, 2265 deletions

diff --git a/docs/main/AnalyzerRegions.html b/docs/AnalyzerRegions.html
index 35708d57c9..35708d57c9 100644
--- a/docs/main/AnalyzerRegions.html
+++ b/docs/AnalyzerRegions.html
diff --git a/docs/main/Block-ABI-Apple.txt b/docs/Block-ABI-Apple.txt
index dd12036053..dd12036053 100644
--- a/docs/main/Block-ABI-Apple.txt
+++ b/docs/Block-ABI-Apple.txt
diff --git a/docs/main/BlockLanguageSpec.txt b/docs/BlockLanguageSpec.txt
index a612fd2889..a612fd2889 100644
--- a/docs/main/BlockLanguageSpec.txt
+++ b/docs/BlockLanguageSpec.txt
diff --git a/docs/main/DriverArchitecture.png b/docs/DriverArchitecture.png
index 056a70a98f..056a70a98f 100644
--- a/docs/main/DriverArchitecture.png
+++ b/docs/DriverArchitecture.png
diff --git a/docs/main/DriverInternals.html b/docs/DriverInternals.html
index a7d2da3771..a7d2da3771 100644
--- a/docs/main/DriverInternals.html
+++ b/docs/DriverInternals.html
diff --git a/docs/main/InternalsManual.html b/docs/InternalsManual.html
index daec6b0194..daec6b0194 100644
--- a/docs/main/InternalsManual.html
+++ b/docs/InternalsManual.html
diff --git a/docs/main/LanguageExtensions.html b/docs/LanguageExtensions.html
index 838b65f27b..838b65f27b 100644
--- a/docs/main/LanguageExtensions.html
+++ b/docs/LanguageExtensions.html
diff --git a/docs/Makefile b/docs/Makefile
index 98bcff3e8b..e9bbb28f68 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -7,7 +7,91 @@
 # 
 ##===----------------------------------------------------------------------===##
 
-LEVEL = ../../..
-DIRS  = main api
+LEVEL      := ../../..
+DIRS       := tools
+
+ifdef BUILD_FOR_WEBSITE
+PROJ_OBJ_DIR = .
+DOXYGEN = doxygen
+
+$(PROJ_OBJ_DIR)/doxygen.cfg: doxygen.cfg.in
+	cat $< | sed \
+	  -e 's/@abs_top_srcdir@/../g' \
+	  -e 's/@DOT@/dot/g' \
+	  -e 's/@PACKAGE_VERSION@/mainline/' \
+	  -e 's/@abs_top_builddir@/../g' > $@
+endif
 
 include $(LEVEL)/Makefile.common
+
+HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html) \
+              $(wildcard $(PROJ_SRC_DIR)/*.css)
+#IMAGES     := $(wildcard $(PROJ_SRC_DIR)/img/*.*)
+DOXYFILES  := doxygen.cfg.in doxygen.css doxygen.footer doxygen.header \
+              doxygen.intro
+EXTRA_DIST := $(HTML) $(DOXYFILES) llvm.css CommandGuide img
+
+.PHONY: install-html install-doxygen doxygen generated
+
+install_targets :=
+ifndef ONLY_MAN_DOCS
+install_targets += install-html
+endif
+ifeq ($(ENABLE_DOXYGEN),1)
+install_targets += install-doxygen
+endif
+install-local:: $(install_targets)
+
+# Live documentation is generated for the web site using this target:
+# 'make generated BUILD_FOR_WEBSITE=1'
+generated:: doxygen
+
+install-html: $(PROJ_OBJ_DIR)/html.tar.gz
+	$(Echo) Installing HTML documentation
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
+#	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
+
+$(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+	$(Echo) Packaging HTML documentation
+	$(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/html.tar
+	$(Verb) cd $(PROJ_SRC_DIR) && \
+	  $(TAR) cf $(PROJ_OBJ_DIR)/html.tar *.html
+	$(Verb) $(GZIP) $(PROJ_OBJ_DIR)/html.tar
+
+install-doxygen: doxygen
+	$(Echo) Installing doxygen documentation
+	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
+	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
+	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
+	  $(FIND) . -type f -exec \
+	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
+
+doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
+
+regendoc:
+	$(Echo) Building doxygen documentation
+	$(Verb) if test -e $(PROJ_OBJ_DIR)/doxygen ; then \
+	  $(RM) -rf $(PROJ_OBJ_DIR)/doxygen ; \
+	fi
+	$(Verb) $(DOXYGEN) $(PROJ_OBJ_DIR)/doxygen.cfg
+
+$(PROJ_OBJ_DIR)/doxygen.tar.gz: $(DOXYFILES) $(PROJ_OBJ_DIR)/doxygen.cfg
+	$(Echo) Packaging doxygen documentation
+	$(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/doxygen.tar
+	$(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/doxygen.tar doxygen
+	$(Verb) $(GZIP) $(PROJ_OBJ_DIR)/doxygen.tar
+	$(Verb) $(CP) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_OBJ_DIR)/doxygen/html/
+
+userloc: $(LLVM_SRC_ROOT)/docs/userloc.html
+
+$(LLVM_SRC_ROOT)/docs/userloc.html:
+	$(Echo) Making User LOC Table
+	$(Verb) cd $(LLVM_SRC_ROOT) ; ./utils/userloc.pl -details -recurse \
+	  -html lib include tools runtime utils examples autoconf test > docs/userloc.html
+
+uninstall-local::
+	$(Echo) Uninstalling Documentation
+	$(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)
diff --git a/docs/main/PCHInternals.html b/docs/PCHInternals.html
index e21ec5e90d..e21ec5e90d 100644
--- a/docs/main/PCHInternals.html
+++ b/docs/PCHInternals.html
diff --git a/docs/main/PCHLayout.graffle b/docs/PCHLayout.graffle
index 5c96bfb701..5c96bfb701 100644
--- a/docs/main/PCHLayout.graffle
+++ b/docs/PCHLayout.graffle
diff --git a/docs/main/PCHLayout.png b/docs/PCHLayout.png
index c304e04a05..c304e04a05 100644
--- a/docs/main/PCHLayout.png
+++ b/docs/PCHLayout.png
diff --git a/docs/main/PTHInternals.html b/docs/PTHInternals.html
index 279d47968b..279d47968b 100644
--- a/docs/main/PTHInternals.html
+++ b/docs/PTHInternals.html
diff --git a/docs/main/UsersManual.html b/docs/UsersManual.html
index 4ba00e0b9a..4ba00e0b9a 100644
--- a/docs/main/UsersManual.html
+++ b/docs/UsersManual.html
diff --git a/docs/api/Makefile b/docs/api/Makefile
deleted file mode 100644
index caeb3d4e4f..0000000000
--- a/docs/api/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-##===- docs/api/Makefile -----------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../../../..
-
-include $(LEVEL)/Makefile.common
-
-API.Project = clang
-API.project = clang
-API.srcdir  = $(PROJ_SRC_ROOT)/tools/clang
-
-include $(LLVM_SRC_ROOT)/docs/mk/api.mk
-
-# Define API.skeleton=1 to generate only a subset of API; for testing purposes.
-#
-ifneq (undefined,$(origin API.skeleton))
-$(API.doxygen.target): API.doxygen.cfg.opts += INPUT=$(PROJ_SRC_DIR)/intro.h
-$(API.doxygen.target): API.doxygen.cfg.opts += INPUT+=$(PROJ_SRC_ROOT)/tools/clang/include/clang/Basic
-endif
diff --git a/docs/api/api.css b/docs/api/api.css
deleted file mode 100644
index bcc485368b..0000000000
--- a/docs/api/api.css
+++ /dev/null
@@ -1,319 +0,0 @@
-* {
-  margin: 0px;
-  padding: 0px;
-}
-
-body {
-  padding: 1.0em 2.0em;
-}
-
-body, table {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 13px;
-  background-color: #FFFFFF;
-  color: #000000;
-}
-
-a {
-  color: #3C7AA0;
-  text-decoration: none;
-  font-weight: bold;
-}
-a:hover {
-  color: #53A9E8;
-}
-a.anchor {
-  color: #000000;
-}
-
-h1 {
-  font-size: 200%;
-  text-align: center;
-}
-h2 {
-  font-size: 140%;
-}
-h3 {
-  font-size: 120%;
-}
-
-h2, h3 {
-  border-bottom: 2px solid;
-  margin-top: 2em;
-}
-
-h1, h2, h3 {
-  margin-bottom: 0.5em;
-}
-
-h3.version {
-  border: none;
-  margin-top: 0;
-  text-align: center;
-}
-
-hr {
-  display: none;
-}
-
-div.header {
-}
-div.header div.title {
-  text-align: center;
-  font-size: xx-large;
-  font-weight: bold;
-}
-
-div.footer {
-  padding-top: 2em;
-}
-div.footer div {
-  padding-top: 0.5em;
-  border-top: 2px solid #000000;
-}
-div.footer div p {
-  text-align: right;
-  font-size: x-small;
-}
-
-div.navigation {
-  font-size: 9pt;
-}
-div.navigation div.tabs {
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  border-bottom: 2px solid #000000;
-}
-div.navigation div.tabs ul {
-}
-div.navigation div.tabs ul li {
-  display: inline;
-  line-height: 200%;
-}
-div.navigation div.tabs ul li a {
-  background-color: #183F66;
-  color: #EEEEEE;
-  border: 1px solid gray;
-  border: none;
-  padding: 0.25em 1.0em;
-}
-div.navigation div.tabs ul li a {
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#3C7AA0), to(#183F66));
-  background: -moz-linear-gradient(top, #3C7AA0, #183F66);
-  -webkit-border-radius: 1.0em;
-  -moz-border-radius: 1.0em;
-  -webkit-box-shadow: 0px 1px 2px #777777;
-  -moz-box-shadow: #777777 0px 1px 2px;
-}
-div.navigation div.tabs ul li a:hover {
-  background-color: #2E76CF;
-  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#53A9E8), to(#2E76CF));
-  background: -moz-linear-gradient(top, #53A9E8, #2E76CF);
-  text-shadow: 0px 0px 2px #2F2F2F;
-}
-div.navigation div.tabs ul li.current a {
-  color: #F0A000;
-}
-div.navigation div.tabs ul li.current a:hover {
-}
-
-div.navigation div.navpath {
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  padding-left: 1.0em;
-  border-bottom: 2px solid #000000;
-}
-
-div.contents {
-  padding: 1.0em 0.0em;
-}
-
-div.contents p {
-  margin: 1em 0em;
-}
-
-div.contents dl,
-div.contents ul {
-  margin-top: 1em;
-  margin-bottom: 1em;
-  padding-left: 2.0em;
-  list-style-type: none;
-}
-
-div.contents dl ul,
-div.contents ul ul {
-  margin-top: 0em;
-  margin-bottom: 0em;
-}
-
-div.center {
-  text-align:center;
-}
-
-div.dynheader {
-  padding-top: 1.0em;
-  padding-bottom: 1.0em;
-}
-
-table {
-  table-layout: auto;
-  border-spacing: 0;
-  border-collapse: collapse;
-  margin-top: 1.0em;
-  border-bottom: 1px solid #999999;
-}
-
-table h2 {
-  border-top: 1px solid #999999;
-  border-bottom: none;
-  padding: 0.2em 8px;
-  margin: 0;
-  background: #181E29;
-  color: #FFFFFF;
-  text-shadow: 0px 0px 2px #000000;
-  background: -webkit-gradient(linear, 0% 0%, 100% 0%, from(#181E29), to(#868CA8));
-  background: -moz-linear-gradient(left, #181E29, #868CA8);
-}
-
-td.indexkey, td.indexvalue {
-  background-color: #F0F1F2;
-  border: 1px solid;
-  padding: 0.4em 0.5em;
-}
-
-td.memTemplParams, td.memItemLeft, td.memItemRight {
-  border-top: 1px solid #999999;
-}
-td.memTemplParams, td.memTemplItemLeft, td.memTemplItemRight, td.memItemLeft, td.memItemRight, td.mdescLeft, td.mdescRight {
-  background-color: #F0F1F2;
-}
-td.memItemLeft, td.mdescLeft {
-  padding-left: 0.5em;
-  padding-left: 0.2em;
-  border-right: 1px solid #dddddd;
-}
-td.memItemRight, td.mdescRight {
-  padding-right: 0.5em;
-  padding-left: 0.2em;
-}
-
-td div.groupHeader {
-  border-top: 1px solid #999999;
-  padding: 0.2em 8px;
-}
-
-td.memItemLeft, td.memItemRight,
-td.mdescLeft, td.mdescRight {
-  padding-top: 0.2em;
-  padding-bottom: 0.2em;
-}
-
-tr.memlist {
-  background-color: #F0F1F2;
-}
-tr.memlist td {
-  border: 1px solid #999999;
-  padding: 0.2em 0.5em;
-}
-
-div.memitem {
-  border: 1px solid #999999;
-  margin-top: 1.0em;
-  margin-bottom: 1.0em;
-  -webkit-border-radius: 0.5em;
-  -webkit-box-shadow: 3px 3px 6px #777777;
-  -moz-border-radius: 0.5em;
-  -moz-box-shadow: black 3px 3px 3px;
-}
-div.memitem div.memproto {
-  background-color: #E3E4E5;
-  padding: 0.25em 0.5em;
-  -webkit-border-top-left-radius: 0.5em;
-  -webkit-border-top-right-radius: 0.5em;
-  -moz-border-radius-topleft: 0.5em;
-  -moz-border-radius-topright: 0.5em;
-}
-div.memitem div.memproto td code {
-  color: #AA0000;
-}
-div.memitem div.memproto td.paramname code {
-  color: #000000;
-}
-div.memitem div.memdoc {
-  background-color: #F0F1F2;
-  padding: 0.25em 0.5em;
-  -webkit-border-bottom-left-radius: 0.5em;
-  -webkit-border-bottom-right-radius: 0.5em;
-  -moz-border-radius-bottomleft: 0.5em;
-  -moz-border-radius-bottomright: 0.5em;
-}
-div.memitem div.memdoc table {
-  background-color: #F0F1F2;
-  border: none;
-}
-
-table.memname {
-  border: none;
-  background-color: #E3E4E5;
-  margin: 0;
-  padding: 0;
-}
-td.paramtype {
-  padding-left: 0.5em;
-}
-td.paramname {
-  padding-right: 0.5em;
-}
-
-pre.fragment {
-  background-color: #F5F5F5;
-  border: 1px solid #999999;
-  margin: 1em;
-  padding: 0.5em;
-  font-family: monospace, fixed;
-  font-size: 8pt;
-  overflow: auto;
-  word-wrap: break-word;
-}
-pre.fragment span.keyword {
-  color: #008000
-}
-pre.fragment span.keywordtype {
-  color: #604020
-}
-pre.fragment span.keywordflow {
-  color: #e08000
-}
-pre.fragment span.comment {
-  color: #800000
-}
-pre.fragment span.preprocessor {
-  color: #806020
-}
-pre.fragment span.stringliteral {
-  color: #002080
-}
-pre.fragment span.charliteral {
-  color: #008080
-}
-pre.fragment span.vhdldigit { 
-  color: #ff00ff 
-}
-pre.fragment span.vhdlchar { 
-  color: #000000 
-}
-pre.fragment span.vhdlkeyword { 
-  color: #700070 
-}
-pre.fragment span.vhdllogic { 
-  color: #ff0000 
-}
-
-div.contents div.intro div.logo {
-  background: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 400, from(#F0A000), to(rgba(24,63,102,0.8)));
-  background: -moz-radial-gradient(50% 50%, farthest-side, #F0A000, rgba(24,63,102,0.8));
-}
-
-div.contents div.dynheader {
-  padding: 0.25em 0.0em;
-}
diff --git a/docs/api/footer.html b/docs/api/footer.html
deleted file mode 100644
index 000f0978eb..0000000000
--- a/docs/api/footer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="footer">
-<div>
-<p>
-  generated on $datetime for <a href="http://clang.llvm.org">$projectname $projectnumber</a>
-  by <a href="http://www.doxygen.org">Doxygen $doxygenversion</a>
-</p>
-<p>
-  Copyright &copy; 2003-2010 University of Illinois at Urbana-Champaign.
-  All Rights Reserved.
-</p>
-</div>
-</div>
-</body>
-</html>
diff --git a/docs/api/header.html b/docs/api/header.html
deleted file mode 100644
index 0e8e97dabb..0000000000
--- a/docs/api/header.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-  <meta name="keywords" content="clang,LLVM,Low Level Virtual Machine,C,C++,doxygen,API,frontend,documentation"/>
-  <meta name="description" content="C++ source code API documentation for clang."/>
-  <title>$title</title>
-  <link href="$relpath$api.css" rel="stylesheet" type="text/css"/>
-  <!--[if IE]><link href="$relpath$api.ie.css" rel="stylesheet" type="text/css"/><![endif]-->
-</head>
-<body>
-<div class="header">
-</div>
diff --git a/docs/api/intro.h b/docs/api/intro.h
deleted file mode 100644
index 6d598310af..0000000000
--- a/docs/api/intro.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/** @mainpage clang API Documentation
-<div class="intro">
-<div class="logo">
-  <img src="http://llvm.org/img/DragonMedium.png"
-    alg="medium dragon logo" width="400" height="400">
-</div>
-
-@section main_intro Introduction
-Welcome to the clang project.
-
-<br>
-This documentation describes the <b>internal</b> software that makes 
-up clang, not the <b>external</b> use of clang. There are no instructions
-here on how to use clang, only the APIs that make up the software. For 
-usage instructions, please see the programmer's guide or reference 
-manual.
-
-@section main_caveat Caveat 
-This documentation is generated directly from the source code with Doxygen. 
-Since clang is constantly under active development, what you're about to
-read is out of date!
-</div>
-*/
diff --git a/docs/api/layout.xml b/docs/api/layout.xml
deleted file mode 100644
index b8df0aa911..0000000000
--- a/docs/api/layout.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<doxygenlayout version="1.0">
-  <!-- Navigation index tabs for HTML output -->
-  <navindex>
-    <tab type="mainpage" visible="yes" title=""/>
-    <tab type="namespaces" visible="yes" title="">
-      <tab type="namespaces" visible="yes" title=""/>
-      <tab type="namespacemembers" visible="yes" title=""/>
-    </tab>
-    <tab type="classes" visible="yes" title="">
-      <tab type="classes" visible="yes" title=""/>
-      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
-      <tab type="hierarchy" visible="yes" title=""/>
-      <tab type="classmembers" visible="yes" title=""/>
-    </tab>
-    <tab type="modules" visible="yes" title=""/>
-    <tab type="files" visible="yes" title="">
-      <tab type="files" visible="yes" title=""/>
-      <tab type="globals" visible="yes" title=""/>
-    </tab>
-    <tab type="dirs" visible="yes" title=""/>
-    <tab type="examples" visible="yes" title=""/>  
-    <tab type="pages" visible="yes" title=""/>
-  </navindex>
-
-  <!-- Layout definition for a class page -->
-  <class>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <inheritancegraph visible="$CLASS_GRAPH"/>
-    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
-    <allmemberslink visible="yes"/>
-    <memberdecl>
-      <nestedclasses visible="yes" title=""/>
-      <publictypes title=""/>
-      <publicslots title=""/>
-      <signals title=""/>
-      <publicmethods title=""/>
-      <publicstaticmethods title=""/>
-      <publicattributes title=""/>
-      <publicstaticattributes title=""/>
-      <protectedtypes title=""/>
-      <protectedslots title=""/>
-      <protectedmethods title=""/>
-      <protectedstaticmethods title=""/>
-      <protectedattributes title=""/>
-      <protectedstaticattributes title=""/>
-      <packagetypes title=""/>
-      <packagemethods title=""/>
-      <packagestaticmethods title=""/>
-      <packageattributes title=""/>
-      <packagestaticattributes title=""/>
-      <properties title=""/>
-      <events title=""/>
-      <privatetypes title=""/>
-      <privateslots title=""/>
-      <privatemethods title=""/>
-      <privatestaticmethods title=""/>
-      <privateattributes title=""/>
-      <privatestaticattributes title=""/>
-      <friends title=""/>
-      <related title="" subtitle=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <typedefs title=""/>
-      <enums title=""/>
-      <constructors title=""/>
-      <functions title=""/>
-      <related title=""/>
-      <variables title=""/>
-      <properties title=""/>
-      <events title=""/>
-    </memberdef>
-    <usedfiles visible="$SHOW_USED_FILES"/>
-    <authorsection visible="yes"/>
-  </class>
-
-  <!-- Layout definition for a namespace page -->
-  <namespace>
-    <briefdescription visible="yes"/>
-    <memberdecl>
-      <nestednamespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </namespace>
-
-  <!-- Layout definition for a file page -->
-  <file>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="$INCLUDE_GRAPH"/>
-    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
-    <sourcelink visible="yes"/>
-    <memberdecl>
-      <classes visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection/>
-  </file>
-
-  <!-- Layout definition for a group page -->
-  <group>
-    <briefdescription visible="yes"/>
-    <groupgraph visible="$GROUP_GRAPHS"/>
-    <memberdecl>
-      <classes visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <dirs visible="yes" title=""/>
-      <nestedgroups visible="yes" title=""/>
-      <files visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <pagedocs/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </group>
-
-  <!-- Layout definition for a directory page -->
-  <directory>
-    <briefdescription visible="yes"/>
-    <directorygraph visible="yes"/>
-    <memberdecl>
-      <dirs visible="yes"/>
-      <files visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-  </directory>
-</doxygenlayout>
diff --git a/docs/doxygen.cfg b/docs/doxygen.cfg
new file mode 100644
index 0000000000..40180b2415
--- /dev/null
+++ b/docs/doxygen.cfg
@@ -0,0 +1,1230 @@
+# Doxyfile 1.4.4
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = clang
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = mainline
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../docs/doxygen
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# forces the Windows encoding (this is the default for the Windows binary), 
+# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc).