Merge branch 'master' of https://github.com/moses-smt/mosesdecoder

1 files changed, 16 insertions, 6 deletions

diff --git a/Jamroot b/Jamroot
index 9b28e8cac..5ee4965df 100644
--- a/Jamroot
+++ b/Jamroot
@@ -244,27 +244,36 @@ project : requirements
 build-projects lm util phrase-extract phrase-extract/syntax-common search moses moses/LM mert moses-cmd scripts regression-testing ;
 # contrib/mira
 
-if [ option.get "with-mm" : : "yes" ]
+if [ option.get "with-mm-extras" : : "yes" ]
 {
- alias mm :  
+  alias mm-extras :
   moses/TranslationModel/UG//bitext-find 
   moses/TranslationModel/UG//ptable-describe-features 
   moses/TranslationModel/UG//count-ptable-features 
   moses/TranslationModel/UG//ptable-lookup 
   moses/TranslationModel/UG//check-coverage 
   moses/TranslationModel/UG/mm//mtt-demo1 
-  moses/TranslationModel/UG/mm//mtt-build 
   moses/TranslationModel/UG/mm//mtt-dump 
-  moses/TranslationModel/UG/mm//symal2mam 
   moses/TranslationModel/UG/mm//mam2symal 
   moses/TranslationModel/UG/mm//mam_verify 
-  moses/TranslationModel/UG/mm//mmlex-build 
   moses/TranslationModel/UG/mm//mmlex-lookup 
   moses/TranslationModel/UG/mm//mtt-count-words 
   moses/TranslationModel/UG/mm//calc-coverage 
-  moses/TranslationModel/UG//check-coverage 
   moses/TranslationModel/UG//try-align 
   ;
+} 
+else
+{
+  alias mm-extras ;
+}
+
+if [ option.get "with-mm" : : "yes" ]
+{
+ alias mm :  
+  moses/TranslationModel/UG/mm//mtt-build 
+  moses/TranslationModel/UG/mm//symal2mam 
+  moses/TranslationModel/UG/mm//mmlex-build 
+  ;
 }
 else
 {
@@ -303,6 +312,7 @@ biconcor
 # contrib/mira//mira 
 contrib/server//mosesserver 
 mm
+mm-extras
 rephraser
 contrib/c++tokenizer//tokenizer
 contrib/expected-bleu-training//train-expected-bleu