Merge remote branch 'upstream/master'

Conflicts:
	Jamroot
	bjam
	decoder/Jamfile
	decoder/cdec.cc
	dpmert/Jamfile
	jam-files/sanity.jam
	klm/lm/Jamfile
	klm/util/Jamfile
	mira/Jamfile

1 files changed, 0 insertions, 33 deletions

diff --git a/dpmert/Jamfile b/dpmert/Jamfile
deleted file mode 100644
index 6f6a3d40..00000000
--- a/dpmert/Jamfile
+++ /dev/null
@@ -1,33 +0,0 @@
-import testing ;
-import lex ;
-import option ;
-
-lib dpmert : 
-  ces.cc
-  error_surface.cc
-  line_optimizer.cc
-  mert_geometry.cc
-  ..//utils
-  ..//mteval
-  ../decoder//decoder
-  ../klm/lm//kenlm
-  ..//boost_program_options
-  : <include>.
-  : :
-  <library>..//utils
-  <library>..//mteval
-  <library>../decoder//decoder
-  <library>../klm/lm//kenlm
-  <library>..//boost_program_options
-  <include>.
-  ;
-
-all_tests [ glob *_test.cc ] : dpmert : <testing.arg>$(TOP)/dpmert/test_data ;
-
-exe sentserver : sentserver.c : <threading>multi ;
-exe sentclient : sentclient.c ;
-exe mr_dpmert_generate_mapper_input : mr_dpmert_generate_mapper_input.cc dpmert ..//boost_program_options ;
-exe mr_dpmert_map : mr_dpmert_map.cc dpmert ..//boost_program_options ;
-exe mr_dpmert_reduce : mr_dpmert_reduce.cc dpmert ..//boost_program_options ;
-
-alias programs : sentserver sentclient mr_dpmert_generate_mapper_input mr_dpmert_map mr_dpmert_reduce ;