Moved Google Test code up one directory so that we can use a standard LLVM

Makefile with it, without resorting to the use of VPATH.

Also added Makefiles at every level of the directory tree to properly recurse
to Google Test and build it as a library (original Makefiles by Talin).

llvm-svn: 61539

11 files changed, 22 insertions, 2 deletions

diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile
new file mode 100644
index 00000000000..d73e85a5433
--- /dev/null
+++ b/llvm/utils/unittest/googletest/Makefile
@@ -0,0 +1,20 @@
+##===- utils/unittest/googletest/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.config
+
+LIBRARYNAME = GoogleTest
+BUILD_ARCHIVE = 1
+SOURCES = gtest-all.cc
+CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/
+CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/
+CPP.Flags += -Wno-missing-field-initializers -Wno-variadic-macros
+
+include $(LEVEL)/Makefile.common
diff --git a/llvm/utils/unittest/googletest/README.LLVM b/llvm/utils/unittest/googletest/README.LLVM
index 87b810838bd..38a77c01787 100644
--- a/llvm/utils/unittest/googletest/README.LLVM
+++ b/llvm/utils/unittest/googletest/README.LLVM
@@ -7,8 +7,8 @@ the actual source code, to minimize the addition to the LLVM distribution.
 Cleaned up as follows:
 $ rm -f aclocal* configure* Makefile* CHANGES CONTRIBUTORS README
 $ rm -rf build-aux m4 make msvc samples scons scripts test xcode
-
-# Clean up source files used for generating headers
 $ rm -f `find . -name \*\.pump`
+$ mv src/* .
+$ rmdir src
 
 For the license, see the file COPYING in this directory.
diff --git a/llvm/utils/unittest/googletest/src/gtest-all.cc b/llvm/utils/unittest/googletest/gtest-all.cc
index a67ea0fa0f3..a67ea0fa0f3 100644
--- a/llvm/utils/unittest/googletest/src/gtest-all.cc
+++ b/llvm/utils/unittest/googletest/gtest-all.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-death-test.cc b/llvm/utils/unittest/googletest/gtest-death-test.cc
index b667682fb98..b667682fb98 100644
--- a/llvm/utils/unittest/googletest/src/gtest-death-test.cc
+++ b/llvm/utils/unittest/googletest/gtest-death-test.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-filepath.cc b/llvm/utils/unittest/googletest/gtest-filepath.cc
index 640c27c313c..640c27c313c 100644
--- a/llvm/utils/unittest/googletest/src/gtest-filepath.cc
+++ b/llvm/utils/unittest/googletest/gtest-filepath.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-internal-inl.h b/llvm/utils/unittest/googletest/gtest-internal-inl.h
index b8f67c18657..b8f67c18657 100644
--- a/llvm/utils/unittest/googletest/src/gtest-internal-inl.h
+++ b/llvm/utils/unittest/googletest/gtest-internal-inl.h
diff --git a/llvm/utils/unittest/googletest/src/gtest-port.cc b/llvm/utils/unittest/googletest/gtest-port.cc
index 9878cae05d6..9878cae05d6 100644
--- a/llvm/utils/unittest/googletest/src/gtest-port.cc
+++ b/llvm/utils/unittest/googletest/gtest-port.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-test-part.cc b/llvm/utils/unittest/googletest/gtest-test-part.cc
index dcd30b25848..dcd30b25848 100644
--- a/llvm/utils/unittest/googletest/src/gtest-test-part.cc
+++ b/llvm/utils/unittest/googletest/gtest-test-part.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest-typed-test.cc b/llvm/utils/unittest/googletest/gtest-typed-test.cc
index d42a1596d57..d42a1596d57 100644
--- a/llvm/utils/unittest/googletest/src/gtest-typed-test.cc
+++ b/llvm/utils/unittest/googletest/gtest-typed-test.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest.cc b/llvm/utils/unittest/googletest/gtest.cc
index a9ca334ac1d..a9ca334ac1d 100644
--- a/llvm/utils/unittest/googletest/src/gtest.cc
+++ b/llvm/utils/unittest/googletest/gtest.cc
diff --git a/llvm/utils/unittest/googletest/src/gtest_main.cc b/llvm/utils/unittest/googletest/gtest_main.cc
index d20c02fdfb0..d20c02fdfb0 100644
--- a/llvm/utils/unittest/googletest/src/gtest_main.cc
+++ b/llvm/utils/unittest/googletest/gtest_main.cc