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 | 45cb0f7426de97cc181079daf3ca04dbc52dee3c (patch) | |
| tree | abd2158a559480504525082760a618c78847fcf7 /dpmert/Makefile.am | |
| parent | 5a8ef8ba65b244837e9cedbd64793b82bf284f93 (diff) | |
| parent | 1c32f3e2831aefdf50fd226d3e1b314c804afc3b (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'dpmert/Makefile.am')
| -rw-r--r-- | dpmert/Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dpmert/Makefile.am b/dpmert/Makefile.am index 2676fb50..00768271 100644 --- a/dpmert/Makefile.am +++ b/dpmert/Makefile.am @@ -5,17 +5,15 @@ bin_PROGRAMS = \ sentserver \ sentclient -if HAVE_GTEST noinst_PROGRAMS = \ lo_test TESTS = lo_test -endif sentserver_SOURCES = sentserver.c -sentserver_LDFLAGS = -all-static -pthread +sentserver_LDFLAGS = -pthread sentclient_SOURCES = sentclient.c -sentclient_LDFLAGS = -all-static -pthread +sentclient_LDFLAGS = -pthread mr_dpmert_generate_mapper_input_SOURCES = mr_dpmert_generate_mapper_input.cc line_optimizer.cc mr_dpmert_generate_mapper_input_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a -lz @@ -30,6 +28,6 @@ mr_dpmert_reduce_SOURCES = error_surface.cc ces.cc mr_dpmert_reduce.cc line_opti mr_dpmert_reduce_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a -lz lo_test_SOURCES = lo_test.cc ces.cc mert_geometry.cc error_surface.cc line_optimizer.cc -lo_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a -lz +lo_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a -lz -AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I$(top_srcdir)/utils -I$(top_srcdir)/decoder -I$(top_srcdir)/mteval +AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I$(top_srcdir)/utils -I$(top_srcdir)/decoder -I$(top_srcdir)/mteval |