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, 32 deletions

diff --git a/utils/Jamfile b/utils/Jamfile
deleted file mode 100644
index 4444b25f..00000000
--- a/utils/Jamfile
+++ /dev/null
@@ -1,32 +0,0 @@
-import testing ;
-import option ;
-
-additional = ;
-if [ option.get with-cmph ] {
-  additional += perfect_hash.cc ;
-}
-
-lib utils :
-  alignment_io.cc 
-  b64tools.cc 
-  corpus_tools.cc 
-  dict.cc 
-  tdict.cc 
-  fdict.cc 
-  gzstream.cc 
-  filelib.cc 
-  stringlib.cc 
-  sparse_vector.cc 
-  timing_stats.cc 
-  verbose.cc 
-  weights.cc
-  $(additional)
-  ..//z
-  : <include>.. <include>. : : <include>.. <include>. ;
-
-exe atools : atools.cc utils ..//boost_program_options ;
-exe reconstruct_weights : reconstruct_weights.cc utils ..//boost_program_options ;
-
-alias programs : reconstruct_weights atools ;
-
-all_tests [ glob *_test.cc phmt.cc ts.cc ] : utils : <testing.arg>$(TOP)/utils/test_data ;