diff options
author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-05-02 15:03:24 +0200 |
---|---|---|
committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-05-02 15:03:24 +0200 |
commit | 3032285101026b47b0e5bacc67723efc2eadf390 (patch) | |
tree | a5ad0239fa24d320671ebd78925fab2d187624a3 /mteval/Makefile.am | |
parent | 9f001a7d10ccf138861c72bb791403c19d30d084 (diff) | |
parent | d59bad87d2b3ce1abf881b0c4e5bbc7648cf368f (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mteval/Makefile.am')
-rw-r--r-- | mteval/Makefile.am | 6 |
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 |