[Mesa-dev] [PATCH 2/3] gtest: Build as a convenience library.

Eric Anholt eric at anholt.net
Mon Mar 5 17:01:12 PST 2012


---
 configure.ac          |    1 +
 src/gtest/.gitignore  |    5 +++++
 src/gtest/Makefile.am |   38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 src/gtest/.gitignore
 create mode 100644 src/gtest/Makefile.am

diff --git a/configure.ac b/configure.ac
index a2d906a..ce48c81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1961,6 +1961,7 @@ AC_CONFIG_FILES([configs/autoconf
 		src/egl/wayland/wayland-egl/wayland-egl.pc
 		src/egl/wayland/wayland-drm/Makefile
 		src/glx/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 0000000..acf7b5f
--- /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 0000000..954d4c2
--- /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
-- 
1.7.9.1



More information about the mesa-dev mailing list