Add examples dir, built with BUILD_EXAMPLES=1 (Makefiles, no CMake equivalent yet).
Move tools/wpa to examples/wpa, and unbreak its build.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@88825 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Makefile b/Makefile
index 22fe214..17ccc73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,12 @@
LEVEL = ../..
DIRS := include lib tools docs
+PARALLEL_DIRS :=
+
+ifeq ($(BUILD_EXAMPLES),1)
+ PARALLEL_DIRS += examples
+endif
+
include $(LEVEL)/Makefile.common
ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644
index 0000000..e6ae4b3
--- /dev/null
+++ b/examples/Makefile
@@ -0,0 +1,14 @@
+##===- examples/Makefile -----------------------------------*- Makefile -*-===##
+#
+# The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../../..
+
+PARALLEL_DIRS := wpa
+
+include $(LEVEL)/Makefile.common
diff --git a/tools/wpa/CMakeLists.txt b/examples/wpa/CMakeLists.txt
similarity index 100%
rename from tools/wpa/CMakeLists.txt
rename to examples/wpa/CMakeLists.txt
diff --git a/tools/wpa/Makefile b/examples/wpa/Makefile
similarity index 100%
rename from tools/wpa/Makefile
rename to examples/wpa/Makefile
diff --git a/tools/wpa/clang-wpa.cpp b/examples/wpa/clang-wpa.cpp
similarity index 93%
rename from tools/wpa/clang-wpa.cpp
rename to examples/wpa/clang-wpa.cpp
index 346634b..4a0fe49 100644
--- a/tools/wpa/clang-wpa.cpp
+++ b/examples/wpa/clang-wpa.cpp
@@ -34,7 +34,6 @@
return 0;
TextDiagnosticBuffer DiagClient;
- Diagnostic Diags(&DiagClient);
for (unsigned i = 0, e = InputFilenames.size(); i != e; ++i) {
const std::string &InFile = InputFilenames[i];
@@ -42,7 +41,7 @@
std::string ErrMsg;
llvm::OwningPtr<ASTUnit> AST;
- AST.reset(ASTUnit::LoadFromPCHFile(InFile, Diags, FileMgr, &ErrMsg));
+ AST.reset(ASTUnit::LoadFromPCHFile(InFile, &ErrMsg, &DiagClient));
if (!AST) {
llvm::errs() << "[" << InFile << "] error: " << ErrMsg << '\n';