summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-04-25 04:42:30 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-04-25 04:42:30 +0000
commitcfe35b311c96348b27ed3cef84c7fb84fe02199e (patch)
treec5479b63622d0a54a1838a0aa735021723017612 /Makefile.am
parent93a87b3a4d608dd0439b1f6c909520be197c88ef (diff)
downloadgtest-cfe35b311c96348b27ed3cef84c7fb84fe02199e.tar.gz
gtest-cfe35b311c96348b27ed3cef84c7fb84fe02199e.tar.bz2
gtest-cfe35b311c96348b27ed3cef84c7fb84fe02199e.tar.xz
Ports gtest to minGW (by Kenton Varda).
git-svn-id: http://googletest.googlecode.com/svn/trunk@244 861a406c-534a-0410-8894-cb66d6ee9925
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