From 9e36263f64d6f5150f1b552dd77bde971d605376 Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@Chriss-MacBook-Air.local>
Date: Sat, 19 Jan 2013 19:09:48 -0500
Subject: updated version of boost.m4 and automatically build kenneth's LM
 builder

---
 klm/lm/builder/Makefile.am | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 klm/lm/builder/Makefile.am

(limited to 'klm/lm/builder/Makefile.am')

diff --git a/klm/lm/builder/Makefile.am b/klm/lm/builder/Makefile.am
new file mode 100644
index 00000000..00444256
--- /dev/null
+++ b/klm/lm/builder/Makefile.am
@@ -0,0 +1,28 @@
+bin_PROGRAMS = builder
+
+builder_SOURCES = \
+  main.cc \
+  adjust_counts.cc \
+  adjust_counts.hh \
+  corpus_count.cc \
+  corpus_count.hh \
+  discount.hh \
+  header_info.hh \
+  initial_probabilities.cc \
+  initial_probabilities.hh \
+  interpolate.cc \
+  interpolate.hh \
+  joint_order.hh \
+  multi_stream.hh \
+  ngram.hh \
+  ngram_stream.hh \
+  pipeline.cc \
+  pipeline.hh \
+  print.cc \
+  print.hh \
+  sort.hh
+
+builder_LDADD = ../libklm.a ../../util/double-conversion/libklm_util_double.a ../../util/stream/libklm_util_stream.a ../../util/libklm_util.a $(BOOST_TIMER_LIBS) $(BOOST_CHRONO_LIBS) $(BOOST_THREAD_LIBS)
+
+AM_CPPFLAGS = -W -Wall -I$(top_srcdir)/klm
+
-- 
cgit v1.2.3


From 608886384da40aedfabd629c882b8ea9b3f6348e Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@Chriss-MacBook-Air.local>
Date: Sun, 20 Jan 2013 10:08:57 -0500
Subject: remove dependency on timer/chrono

---
 .travis.yml                | 2 --
 configure.ac               | 4 ----
 klm/lm/builder/Makefile.am | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'klm/lm/builder/Makefile.am')

diff --git a/.travis.yml b/.travis.yml
index c67c5b43..d2d25903 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ before_script:
  - sudo apt-get install libboost-regex1.48-dev
  - sudo apt-get install libboost-test1.48-dev
  - sudo apt-get install libboost-system1.48-dev
- - sudo apt-get install libboost-timer1.48-dev
- - sudo apt-get install libboost-chrono1.48-dev
  - sudo apt-get install libboost-thread1.48-dev
  - sudo apt-get install flex
  - autoreconf -ifv
diff --git a/configure.ac b/configure.ac
index c474c050..402ddd0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,10 +15,6 @@ BOOST_REQUIRE([1.44])
 BOOST_PROGRAM_OPTIONS
 BOOST_SYSTEM
 BOOST_SERIALIZATION
-if test $boost_major_version -ge 148; then
-  BOOST_CHRONO
-  BOOST_TIMER
-fi 
 BOOST_TEST
 BOOST_THREADS
 AM_PATH_PYTHON
diff --git a/klm/lm/builder/Makefile.am b/klm/lm/builder/Makefile.am
index 00444256..b5c147fd 100644
--- a/klm/lm/builder/Makefile.am
+++ b/klm/lm/builder/Makefile.am
@@ -22,7 +22,7 @@ builder_SOURCES = \
   print.hh \
   sort.hh
 
-builder_LDADD = ../libklm.a ../../util/double-conversion/libklm_util_double.a ../../util/stream/libklm_util_stream.a ../../util/libklm_util.a $(BOOST_TIMER_LIBS) $(BOOST_CHRONO_LIBS) $(BOOST_THREAD_LIBS)
+builder_LDADD = ../libklm.a ../../util/double-conversion/libklm_util_double.a ../../util/stream/libklm_util_stream.a ../../util/libklm_util.a $(BOOST_THREAD_LIBS)
 
 AM_CPPFLAGS = -W -Wall -I$(top_srcdir)/klm
 
-- 
cgit v1.2.3