diff options
| author | redpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f> | 2010-08-11 03:19:10 +0000 |
|---|---|---|
| committer | redpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f> | 2010-08-11 03:19:10 +0000 |
| commit | 37cb42aaa0a043fa8cf27a36846dcac7c6180e62 (patch) | |
| tree | d0ab4f1322435674f1441823e679c0dedc981350 | |
| parent | 3c5a49564698b86ba186f7295057ef934ec4047b (diff) | |
more link lne fixes
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@521 ec762483-ff6d-05da-a07a-a48fb63a330f
| -rw-r--r-- | decoder/Makefile.am | 17 | ||||
| -rwxr-xr-x | vest/dist-vest.pl | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/decoder/Makefile.am b/decoder/Makefile.am index f514b340..a3c359ec 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -10,23 +10,20 @@ noinst_PROGRAMS = \ endif cdec_SOURCES = cdec.cc forest_writer.cc maxtrans_blunsom.cc cdec_ff.cc +cdec_LDADD = libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz + parser_test_SOURCES = parser_test.cc -parser_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a +parser_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz ff_test_SOURCES = ff_test.cc -ff_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a +ff_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz grammar_test_SOURCES = grammar_test.cc -grammar_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a +grammar_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz hg_test_SOURCES = hg_test.cc -hg_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a +hg_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz trule_test_SOURCES = trule_test.cc -trule_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a - -LDADD = libcdec.a ../mteval/libmteval.a ../utils/libutils.a - +trule_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I.. -I../mteval -I../utils -AM_LDFLAGS = ../utils/libutils.a -lz - rule_lexer.cc: rule_lexer.l $(LEX) -s -CF -8 -o$@ $< diff --git a/vest/dist-vest.pl b/vest/dist-vest.pl index 8f7f2053..d9f46f07 100755 --- a/vest/dist-vest.pl +++ b/vest/dist-vest.pl @@ -16,7 +16,7 @@ my $srcFile; my $refFiles; my $bin_dir = $SCRIPT_DIR; die "Bin directory $bin_dir missing/inaccessible" unless -d $bin_dir; -my $FAST_SCORE="$bin_dir/fast_score"; +my $FAST_SCORE="$bin_dir/../mteval/fast_score"; die "Can't execute $FAST_SCORE" unless -x $FAST_SCORE; my $MAPINPUT = "$bin_dir/mr_vest_generate_mapper_input"; my $MAPPER = "$bin_dir/mr_vest_map"; |