diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2011-04-07 07:19:40 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2011-04-07 07:19:40 +0000 |
| commit | 8e68753288986fd689e30efdaf4324f2f473ade7 (patch) | |
| tree | 5b292626ae7caa842da322311374981b9e0f4db8 | |
| parent | aa43220fe5d34f7283f3a55e11dda5e3f25e5632 (diff) | |
| download | googletest-8e68753288986fd689e30efdaf4324f2f473ade7.tar.gz googletest-8e68753288986fd689e30efdaf4324f2f473ade7.tar.bz2 googletest-8e68753288986fd689e30efdaf4324f2f473ade7.zip | |
fixes link errors in 'make check'
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index cf7dee92..0c1a802a 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 |