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).


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

13 files changed, 36 insertions, 3 deletions

diff --git a/utils/Makefile b/utils/Makefile
index 0cfaf18..c43086b 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ..
-PARALLEL_DIRS := TableGen fpcmp PerfectShuffle
+PARALLEL_DIRS := TableGen fpcmp PerfectShuffle unittest
 
 EXTRA_DIST := cgiplotNLT.pl check-each-file codegen-diff countloc.sh cvsupdate \
               DSAclean.py DSAextract.py emacs findsym.pl GenLibDeps.pl \
diff --git a/utils/unittest/Makefile b/utils/unittest/Makefile
new file mode 100644
index 0000000..2f3e601
--- /dev/null
+++ b/utils/unittest/Makefile
@@ -0,0 +1,13 @@
+##===- utils/unittest/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 = googletest
+
+include $(LEVEL)/Makefile.common
diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile
new file mode 100644
index 0000000..d73e85a
--- /dev/null
+++ b/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/utils/unittest/googletest/README.LLVM b/utils/unittest/googletest/README.LLVM
index 87b8108..38a77c0 100644
--- a/utils/unittest/googletest/README.LLVM
+++ b/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/utils/unittest/googletest/src/gtest-all.cc b/utils/unittest/googletest/gtest-all.cc
index a67ea0f..a67ea0f 100644
--- a/utils/unittest/googletest/src/gtest-all.cc
+++ b/utils/unittest/googletest/gtest-all.cc
diff --git a/utils/unittest/googletest/src/gtest-death-test.cc b/utils/unittest/googletest/gtest-death-test.cc
index b667682..b667682 100644
--- a/utils/unittest/googletest/src/gtest-death-test.cc
+++ b/utils/unittest/googletest/gtest-death-test.cc
diff --git a/utils/unittest/googletest/src/gtest-filepath.cc b/utils/unittest/googletest/gtest-filepath.cc
index 640c27c..640c27c 100644
--- a/utils/unittest/googletest/src/gtest-filepath.cc
+++ b/utils/unittest/googletest/gtest-filepath.cc
diff --git a/utils/unittest/googletest/src/gtest-internal-inl.h b/utils/unittest/googletest/gtest-internal-inl.h
index b8f67c1..b8f67c1 100644
--- a/utils/unittest/googletest/src/gtest-internal-inl.h
+++ b/utils/unittest/googletest/gtest-internal-inl.h
diff --git a/utils/unittest/googletest/src/gtest-port.cc b/utils/unittest/googletest/gtest-port.cc
index 9878cae..9878cae 100644
--- a/utils/unittest/googletest/src/gtest-port.cc
+++ b/utils/unittest/googletest/gtest-port.cc
diff --git a/utils/unittest/googletest/src/gtest-test-part.cc b/utils/unittest/googletest/gtest-test-part.cc
index dcd30b2..dcd30b2 100644
--- a/utils/unittest/googletest/src/gtest-test-part.cc
+++ b/utils/unittest/googletest/gtest-test-part.cc
diff --git a/utils/unittest/googletest/src/gtest-typed-test.cc b/utils/unittest/googletest/gtest-typed-test.cc
index d42a159..d42a159 100644
--- a/utils/unittest/googletest/src/gtest-typed-test.cc
+++ b/utils/unittest/googletest/gtest-typed-test.cc
diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/gtest.cc
index a9ca334..a9ca334 100644
--- a/utils/unittest/googletest/src/gtest.cc
+++ b/utils/unittest/googletest/gtest.cc
diff --git a/utils/unittest/googletest/src/gtest_main.cc b/utils/unittest/googletest/gtest_main.cc
index d20c02f..d20c02f 100644
--- a/utils/unittest/googletest/src/gtest_main.cc
+++ b/utils/unittest/googletest/gtest_main.cc