summaryrefslogtreecommitdiff
path: root/mteval/Makefile.am
diff options
context:
space:
mode:
authorPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-05-02 15:03:24 +0200
committerPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-05-02 15:03:24 +0200
commit45cb0f7426de97cc181079daf3ca04dbc52dee3c (patch)
treeabd2158a559480504525082760a618c78847fcf7 /mteval/Makefile.am
parent5a8ef8ba65b244837e9cedbd64793b82bf284f93 (diff)
parent1c32f3e2831aefdf50fd226d3e1b314c804afc3b (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mteval/Makefile.am')
-rw-r--r--mteval/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/mteval/Makefile.am b/mteval/Makefile.am
index e7126675..8d844e24 100644
--- a/mteval/Makefile.am
+++ b/mteval/Makefile.am
@@ -2,11 +2,9 @@ bin_PROGRAMS = \
fast_score \
mbr_kbest
-if HAVE_GTEST
noinst_PROGRAMS = \
scorer_test
TESTS = scorer_test
-endif
noinst_LIBRARIES = libmteval.a
@@ -19,6 +17,6 @@ mbr_kbest_SOURCES = mbr_kbest.cc
mbr_kbest_LDADD = libmteval.a $(top_srcdir)/utils/libutils.a -lz
scorer_test_SOURCES = scorer_test.cc
-scorer_test_LDADD = libmteval.a $(GTEST_LDFLAGS) $(GTEST_LIBS) $(top_srcdir)/utils/libutils.a -lz
+scorer_test_LDADD = libmteval.a $(top_srcdir)/utils/libutils.a $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) -lz
-AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I$(top_srcdir)/utils
+AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I$(top_srcdir)/utils