summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2012-03-05 17:01:12 -0800
committerIan Romanick <ian.d.romanick@intel.com>2012-04-12 17:17:43 -0700
commit19a4c0646b62311d3df70653d0186fb4f7866fd3 (patch)
tree3abbdb3a583af5d40024ebeb7451e51060bbdf2d
parentfe358c0ffa4acb7ecab10fda68ba9740497d2e7f (diff)
gtest: Build as a convenience library.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--configure.ac1
-rw-r--r--src/gtest/.gitignore5
-rw-r--r--src/gtest/Makefile.am38
3 files changed, 44 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 21e4308faf4..9baccab3624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1999,6 +1999,7 @@ AC_CONFIG_FILES([configs/autoconf
src/egl/wayland/wayland-drm/Makefile
src/glx/Makefile
src/mapi/shared-glapi/Makefile
+ src/gtest/Makefile
src/mesa/drivers/dri/dri.pc
src/mesa/drivers/dri/Makefile
src/mesa/drivers/dri/common/Makefile
diff --git a/src/gtest/.gitignore b/src/gtest/.gitignore
new file mode 100644
index 00000000000..acf7b5fa820
--- /dev/null
+++ b/src/gtest/.gitignore
@@ -0,0 +1,5 @@
+.deps
+.libs
+Makefile
+Makefile.in
+libgtest.la
diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am
new file mode 100644
index 00000000000..954d4c28ba0
--- /dev/null
+++ b/src/gtest/Makefile.am
@@ -0,0 +1,38 @@
+ # Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+AM_CFLAGS = $(DEFINES)
+
+lib_LTLIBRARIES = libgtest.la
+
+libgtest_la_SOURCES = \
+ src/gtest-all.cc \
+ src/gtest_main.cc
+
+EXTRA_DIST = \
+ src/gtest.cc \
+ src/gtest-death-test.cc \
+ src/gtest-filepath.cc \
+ src/gtest-internal-inl.h \
+ src/gtest-port.cc \
+ src/gtest-printers.cc \
+ src/gtest-test-part.cc \
+ src/gtest-typed-test.cc