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

diff --git a/Jamroot b/Jamroot
deleted file mode 100644
index 8f6629ea..00000000
--- a/Jamroot
+++ /dev/null
@@ -1,45 +0,0 @@
-#cdec compilation with bjam
-#
-#--with-boost=/usr/include
-#--with-google-hash=/usr/include so that $with-google-hash/google/dense_hash_map exists
-#
-#-a forces the build to run from scratch
-#-jN parallelizes just like make
-#
-#Respects CXXFLAGS, CFLAGS, and LDFLAGS environment variables.  
-
-path-constant TOP : . ;
-include $(TOP)/jam-files/sanity.jam ;
-boost 104200 ;
-external-lib z ;
-
-with-google-hash = [ option.get "with-google-hash" ] ;
-if [ test_header sparsehash/dense_hash_map ] || $(with-google-hash) {
-  requirements += <define>HAVE_SPARSEHASH <include>$(with-google-hash) ;
-}
-
-if [ test_header cmph.h ] || $(with-cmph) {
-  requirements += <define>HAVE_CMPH <include>$(with-cmph) ;
-}
-
-if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serialization ] {
-  requirements += <define>HAVE_BOOST_ARCHIVE_TEXT_OARCHIVE_HPP ;
-}
-
-project : requirements $(requirements) <toolset>darwin:<link>static <library>boost_system ;
-project : default-build <warnings>on <variant>release ;
-
-install-bin-libs dpmert//programs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec phrasinator//programs mira//kbest_mira ;
-
-install perl-scripts : dpmert//dpmert.pl : <location>$(bindir) ;
-
-build-projects mteval decoder dpmert klm/lm training/liblbfgs ;
-
-#Compile everything ending with _test.cc into a test and run it.
-rule all_tests ( targets * : dependencies : properties * ) {
-  targets ?= [ glob *_test.cc ] ;
-  for t in $(targets) {
-    local base = [ MATCH "^(.*).cc$" : $(t) ] ;
-    unit-test $(base) : $(t) $(dependencies) /top//boost_unit_test_framework : $(properties) ;
-  }
-}