diff options
| author | Kenneth Heafield <kheafiel@cluster01.lti.ece.cmu.local> | 2011-11-18 20:25:45 +0400 |
|---|---|---|
| committer | Kenneth Heafield <kheafiel@cluster01.lti.ece.cmu.local> | 2011-11-18 20:27:57 +0400 |
| commit | f15eee0abf7e1d2795cbffd26b82992f23c1f36b (patch) | |
| tree | 363e56067f157ce0bd1c4037e44412dc985a06c3 /moses | |
| parent | a5dea02f1896d9b742fc7f7e574ba4c6bd2394da (diff) | |
Jam: Clean up boost library handling, assimilate mert
Diffstat (limited to 'moses')
| -rw-r--r-- | moses/src/Jamfile | 6 | ||||
| -rw-r--r-- | moses/src/LM/Jamfile | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/moses/src/Jamfile b/moses/src/Jamfile index a5b0e2210..f2ec7a481 100644 --- a/moses/src/Jamfile +++ b/moses/src/Jamfile @@ -3,6 +3,8 @@ alias headers : ../../util//util : : : <include>. ; lib z ; alias InputFileStream : InputFileStream.cpp z headers ; +alias ThreadPool : ThreadPool.cpp ; + if [ option.get "with-synlm" : no : yes ] = yes { lib m ; @@ -103,7 +105,6 @@ SquareMatrix.cpp StaticData.cpp TargetPhrase.cpp TargetPhraseCollection.cpp -ThreadPool.cpp Timer.cpp TranslationOption.cpp TranslationOptionCollection.cpp @@ -122,5 +123,4 @@ WordsBitmap.cpp WordsRange.cpp XmlOption.cpp -synlm -InputFileStream LM//LM headers ; +synlm ThreadPool InputFileStream LM//LM headers ; diff --git a/moses/src/LM/Jamfile b/moses/src/LM/Jamfile index dd25775a2..0c9fe8c4e 100644 --- a/moses/src/LM/Jamfile +++ b/moses/src/LM/Jamfile @@ -1,16 +1,5 @@ import option ; -# Shell with trailing line removed http://lists.boost.org/boost-build/2007/08/17051.php -rule trim-nl ( str ) -{ - return [ MATCH "([^ -]*)" : $(str) ] ; -} -rule _shell ( cmd ) -{ - return [ trim-nl [ SHELL $(cmd) ] ] ; -} - with-irstlm = [ option.get "with-irstlm" ] ; if $(with-irstlm) != "" { |