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
This commit is contained in:
Misha Brukman 2009-01-01 01:29:44 +00:00
parent 779f2e1702
commit fb14f57734
13 changed files with 36 additions and 3 deletions

View File

@ -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 \

13
utils/unittest/Makefile Normal file
View File

@ -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

View File

@ -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

View File

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