From bc52c53ec2872a0e41b830308f11400d77b38e76 Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <github@kheafield.com>
Date: Sun, 20 May 2012 13:32:39 -0400
Subject: Rename decoder library, assimilate mira directory

---
 Jamroot          | 2 +-
 decoder/Jamfile  | 7 ++++---
 mira/Jamfile     | 1 +
 training/Jamfile | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 mira/Jamfile

diff --git a/Jamroot b/Jamroot
index fff11d56..8be59e5a 100644
--- a/Jamroot
+++ b/Jamroot
@@ -30,7 +30,7 @@ if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serializa
 project : requirements $(requirements) <toolset>darwin:<link>static ;
 project : default-build <threading>single <warnings>on <variant>release ;
 
-install-bin-libs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec creg//creg phrasinator//programs ;
+install-bin-libs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec creg//creg phrasinator//programs mira//kbest_mira ;
 
 build-projects mteval decoder klm/lm training/liblbfgs creg ;
 
diff --git a/decoder/Jamfile b/decoder/Jamfile
index 871da4f6..06c5bfda 100644
--- a/decoder/Jamfile
+++ b/decoder/Jamfile
@@ -6,7 +6,7 @@ if [ option.get "with-glc" ] {
   glc = ff_glc.cc string_util.cc feature-factory.cc ;
 }
 
-lib cdec_lib : 
+lib decoder : 
   forest_writer.cc
   maxtrans_blunsom.cc
   cdec_ff.cc
@@ -66,11 +66,12 @@ lib cdec_lib :
   <library>..//mteval
   <library>../klm/lm//kenlm
   <library>..//boost_program_options
+  <include>.
   ;
 
-exe cdec : cdec.cc cdec_lib ..//utils ..//mteval ../klm/lm//kenlm ..//boost_program_options ;
+exe cdec : cdec.cc decoder ..//utils ..//mteval ../klm/lm//kenlm ..//boost_program_options ;
 
-all_tests [ glob *_test.cc : cfg_test.cc ] : cdec_lib : <testing.arg>$(TOP)/decoder/test_data ;
+all_tests [ glob *_test.cc : cfg_test.cc ] : decoder : <testing.arg>$(TOP)/decoder/test_data ;
 
 install legacy : cdec
   : <location>$(TOP)/cdec <install-type>EXE <install-dependencies>on <link>shared:<dll-path>$(TOP)/cdec <link>shared:<install-type>LIB ;
diff --git a/mira/Jamfile b/mira/Jamfile
new file mode 100644
index 00000000..8825b887
--- /dev/null
+++ b/mira/Jamfile
@@ -0,0 +1 @@
+exe kbest_mira : kbest_mira.cc ..//decoder ;
diff --git a/training/Jamfile b/training/Jamfile
index b28a13e3..073451fa 100644
--- a/training/Jamfile
+++ b/training/Jamfile
@@ -19,7 +19,7 @@ lib training :
 
 exe model1 : model1.cc : <include>../decoder ;
 
-# // all_tests [ glob *_test.cc ] : cdec_lib : <testing.arg>$(TOP)/decoder/test_data ;
+# // all_tests [ glob *_test.cc ] : ..//decoder : <testing.arg>$(TOP)/decoder/test_data ;
 
 alias programs : model1 ;
 
-- 
cgit v1.2.3