From d6823a5cf398a0df48792f4f90d68b9febe7d92f Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Wed, 26 Oct 2016 11:00:57 +0100
Subject: [PATCH] test: Add gTest/gMock files to SOURCES

Built tarballs are not including all of the files needed
to build the test suite because they are missing from the
<target>_SOURCES variable in Makefile.am.
---
 test/Makefile.am | 54 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index da771aba..cd0975b7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,9 +25,59 @@ arestest_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
 
 noinst_LTLIBRARIES = libgmock.la libgtest.la
 
-libgmock_la_SOURCES = $(GMOCK_DIR)/src/gmock-all.cc
+libgmock_la_SOURCES = $(GMOCK_DIR)/src/gmock-all.cc			\
+  $(GMOCK_DIR)/src/gmock-cardinalities.cc				\
+  $(GMOCK_DIR)/src/gmock-internal-utils.cc				\
+  $(GMOCK_DIR)/src/gmock-matchers.cc					\
+  $(GMOCK_DIR)/src/gmock-spec-builders.cc				\
+  $(GMOCK_DIR)/src/gmock.cc						\
+  $(GMOCK_DIR)/include/gmock/gmock-cardinalities.h			\
+  $(GMOCK_DIR)/include/gmock/gmock-generated-matchers.h		\
+  $(GMOCK_DIR)/include/gmock/gmock-more-actions.h			\
+  $(GMOCK_DIR)/include/gmock/gmock-actions.h				\
+  $(GMOCK_DIR)/include/gmock/gmock-generated-actions.h			\
+  $(GMOCK_DIR)/include/gmock/gmock-matchers.h				\
+  $(GMOCK_DIR)/include/gmock/gmock-generated-function-mockers.h	\
+  $(GMOCK_DIR)/include/gmock/gmock.h					\
+  $(GMOCK_DIR)/include/gmock/gmock-generated-nice-strict.h		\
+  $(GMOCK_DIR)/include/gmock/gmock-spec-builders.h			\
+  $(GMOCK_DIR)/include/gmock/internal/gmock-internal-utils.h		\
+  $(GMOCK_DIR)/include/gmock/internal/gmock-generated-internal-utils.h	\
+  $(GMOCK_DIR)/include/gmock/internal/gmock-port.h			\
+  $(GMOCK_DIR)/include/gmock/gmock-more-matchers.h
+
 libgmock_la_CPPFLAGS = -isystem $(GTEST_DIR)/include -I$(GTEST_DIR) -isystem $(GMOCK_DIR)/include -I$(GMOCK_DIR)
-libgtest_la_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
+
+libgtest_la_SOURCES = $(GTEST_DIR)/src/gtest-all.cc			\
+  $(GTEST_DIR)/src/gtest.cc						\
+  $(GTEST_DIR)/src/gtest-death-test.cc					\
+  $(GTEST_DIR)/src/gtest-filepath.cc					\
+  $(GTEST_DIR)/src/gtest-port.cc					\
+  $(GTEST_DIR)/src/gtest-printers.cc					\
+  $(GTEST_DIR)/src/gtest-test-part.cc					\
+  $(GTEST_DIR)/src/gtest-typed-test.cc					\
+  $(GTEST_DIR)/src/gtest-internal-inl.h				\
+  $(GTEST_DIR)/include/gtest/gtest-test-part.h				\
+  $(GTEST_DIR)/include/gtest/gtest-param-test.h			\
+  $(GTEST_DIR)/include/gtest/gtest-printers.h				\
+  $(GTEST_DIR)/include/gtest/gtest-message.h				\
+  $(GTEST_DIR)/include/gtest/gtest.h					\
+  $(GTEST_DIR)/include/gtest/gtest_pred_impl.h				\
+  $(GTEST_DIR)/include/gtest/gtest-death-test.h			\
+  $(GTEST_DIR)/include/gtest/gtest-spi.h				\
+  $(GTEST_DIR)/include/gtest/gtest-typed-test.h			\
+  $(GTEST_DIR)/include/gtest/internal/gtest-filepath.h			\
+  $(GTEST_DIR)/include/gtest/internal/gtest-param-util-generated.h	\
+  $(GTEST_DIR)/include/gtest/internal/gtest-type-util.h		\
+  $(GTEST_DIR)/include/gtest/internal/gtest-string.h			\
+  $(GTEST_DIR)/include/gtest/internal/gtest-port.h			\
+  $(GTEST_DIR)/include/gtest/internal/gtest-param-util.h		\
+  $(GTEST_DIR)/include/gtest/internal/gtest-death-test-internal.h	\
+  $(GTEST_DIR)/include/gtest/internal/gtest-linked_ptr.h		\
+  $(GTEST_DIR)/include/gtest/internal/gtest-internal.h			\
+  $(GTEST_DIR)/include/gtest/internal/gtest-tuple.h			\
+  $(GTEST_DIR)/include/gtest/gtest_prod.h
+
 libgtest_la_CPPFLAGS = -isystem $(GTEST_DIR)/include -I$(GTEST_DIR) -isystem $(GMOCK_DIR)/include -I$(GMOCK_DIR)
 
 aresfuzz_SOURCES = $(FUZZSOURCES)