Merge remote-tracking branch 'upstream/master'

2 files changed, 30 insertions, 16 deletions

diff --git a/klm/search/Makefile.am b/klm/search/Makefile.am
index b8c8a050..b7f01c24 100644
--- a/klm/search/Makefile.am
+++ b/klm/search/Makefile.am
@@ -1,10 +1,22 @@
 noinst_LIBRARIES = libksearch.a
 
 libksearch_a_SOURCES = \
+  applied.hh \
+  config.hh \
+  context.hh \
+  dedupe.hh \
+  edge.hh \
   edge_generator.cc \
-	nbest.cc \
+  edge_generator.hh \
+  header.hh \
+  nbest.cc \
+  nbest.hh \
   rule.cc \
-  vertex.cc
+  rule.hh \
+  types.hh \
+  vertex.cc \
+  vertex.hh \
+  vertex_generator.hh
 
-AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I..
+AM_CPPFLAGS = -W -Wall -Wno-sign-compare -I..
 
diff --git a/klm/util/Makefile.am b/klm/util/Makefile.am
index 7f873e96..5e650af7 100644
--- a/klm/util/Makefile.am
+++ b/klm/util/Makefile.am
@@ -19,40 +19,42 @@
 noinst_LIBRARIES = libklm_util.a
 
 libklm_util_a_SOURCES = \
+  bit_packing.cc \
   bit_packing.hh \
+  ersatz_progress.cc \
   ersatz_progress.hh \
+  exception.cc \
   exception.hh \
+  fake_ofstream.hh \
+  file.cc \
   file.hh \
+  file_piece.cc \
   file_piece.hh \
   getopt.hh \
   have.hh \
   joint_sort.hh \
+  mmap.cc \
   mmap.hh \
+  multi_intersection.hh \
+  murmur_hash.cc \
   murmur_hash.hh \
   pcqueue.hh \
+  pool.cc \
   pool.hh \
   probing_hash_table.hh \
   proxy_iterator.hh \
+  read_compressed.cc \
   read_compressed.hh \
+  scoped.cc \
   scoped.hh \
   sized_iterator.hh \
   sorted_uniform.hh \
+  string_piece.cc \
   string_piece.hh \
   string_piece_hash.hh \
   thread_pool.hh \
   tokenize_piece.hh \
-  usage.hh \
-  ersatz_progress.cc \
-  bit_packing.cc \
-  exception.cc \
-	file.cc \
-  file_piece.cc \
-  mmap.cc \
-  murmur_hash.cc \
-  pool.cc \
-	read_compressed.cc \
-  scoped.cc \
-  string_piece.cc \
-	usage.cc
+  usage.cc \
+  usage.hh
 
 AM_CPPFLAGS = -W -Wall -I$(top_srcdir)/klm -I$(top_srcdir)/klm/util/double-conversion