summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-04-25 04:42:30 (GMT)
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-04-25 04:42:30 (GMT)
commitf2334aa19555063791ec16fe2b476ec00195bbb8 (patch)
treec5479b63622d0a54a1838a0aa735021723017612 /Makefile.am
parentfa2b06c52fa3ffb1909ed8b928e106292609cfcb (diff)
downloadgoogletest-f2334aa19555063791ec16fe2b476ec00195bbb8.zip
googletest-f2334aa19555063791ec16fe2b476ec00195bbb8.tar.gz
googletest-f2334aa19555063791ec16fe2b476ec00195bbb8.tar.bz2
Ports gtest to minGW (by Kenton Varda).
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 4868c68..c83fb70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,8 +181,9 @@ samples_sample8_unittest_LDADD = lib/libgtest_main.la \
TESTS += test/gtest-death-test_test
check_PROGRAMS += test/gtest-death-test_test
test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc
-test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) -pthread
-test_gtest_death_test_test_LDADD = -lpthread lib/libgtest_main.la
+test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
+test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
+ lib/libgtest_main.la
TESTS += test/gtest_environment_test
check_PROGRAMS += test/gtest_environment_test