diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-04-07 02:37:43 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-04-07 02:37:43 (GMT) |
| commit | 98054bd1346ef3d3f58eb6920c03a77718b6e21c (patch) | |
| tree | 04237abb2a955e254ce89a3ffd1d72d20c583a9b | |
| parent | c7a9cc35121536e44373a2eb5670f7d3a3d5ee28 (diff) | |
| download | googletest-98054bd1346ef3d3f58eb6920c03a77718b6e21c.zip googletest-98054bd1346ef3d3f58eb6920c03a77718b6e21c.tar.gz googletest-98054bd1346ef3d3f58eb6920c03a77718b6e21c.tar.bz2 | |
fixes link error in 'make check' on some systems
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 94912e0..c3572dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -242,6 +242,7 @@ TESTS += samples/sample1_unittest check_PROGRAMS += samples/sample1_unittest samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc samples_sample1_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la \ samples/libsamples.la # Another sample. It also verifies that libgtest works. @@ -251,11 +252,12 @@ samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc samples_sample10_unittest_LDADD = lib/libgtest.la # This tests most constructs of gtest and verifies that libgtest_main -# works. +# and libgtest work. TESTS += test/gtest_all_test check_PROGRAMS += test/gtest_all_test test_gtest_all_test_SOURCES = test/gtest_all_test.cc -test_gtest_all_test_LDADD = lib/libgtest_main.la +test_gtest_all_test_LDADD = lib/libgtest_main.la \ + lib/libgtest.la # Tests that fused gtest files compile and work. FUSED_GTEST_SRC = \ |