summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2011-04-07 07:19:40 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2011-04-07 07:19:40 +0000
commit21c4624613100da40cd54f41278e837b2e663c6a (patch)
tree5b292626ae7caa842da322311374981b9e0f4db8
parent35402b83e52a4669da4d291d483107c2034d6097 (diff)
downloadgooglemock-21c4624613100da40cd54f41278e837b2e663c6a.tar.gz
fixes link errors in 'make check'
git-svn-id: http://googlemock.googlecode.com/svn/trunk@376 8415998a-534a-0410-bf83-d39667b30386
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index cf7dee9..0c1a802 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,14 +68,14 @@ test_gmock_spec_builders_test_SOURCES = test/gmock-spec-builders_test.cc
test_gmock_spec_builders_test_LDADD = $(GTEST_LIBS) lib/libgmock.la
# This tests using Google Mock in multiple translation units. It also
-# verifies that libgmock_main works.
+# verifies that libgmock_main and libgmock work.
TESTS += test/gmock_link_test
check_PROGRAMS += test/gmock_link_test
test_gmock_link_test_SOURCES = \
test/gmock_link2_test.cc \
test/gmock_link_test.cc \
test/gmock_link_test.h
-test_gmock_link_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la
+test_gmock_link_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la lib/libgmock.la
# Tests that fused gmock files compile and work.
TESTS += test/gmock_fused_test