4 files changed, 28 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index 98c2561e..08d1a5b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,9 @@
-SUBDIRS = utils mteval decoder training vest extools gi/pyp-topics/src gi/clda/src gi/posterior-regularisation/prjava
-AUTOMAKE_OPTIONS = foreign
+# warning - the subdirectories in the following list should
+# be kept in topologically sorted order. Also, DO NOT introduce
+# cyclic dependencies between these directories!
+SUBDIRS = utils mteval klm/util klm/lm decoder training vest extools gi/pyp-topics/src gi/clda/src gi/posterior-regularisation/prjava
 
+AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS =  -D_GLIBCXX_PARALLEL
 
diff --git a/configure.ac b/configure.ac
index d143f33d..51583c81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,4 +86,4 @@ then
   AM_CONDITIONAL([RAND_LM], true)
 fi
 
-AC_OUTPUT(Makefile utils/Makefile mteval/Makefile extools/Makefile decoder/Makefile training/Makefile vest/Makefile gi/pyp-topics/src/Makefile gi/clda/src/Makefile)
+AC_OUTPUT(Makefile utils/Makefile mteval/Makefile extools/Makefile decoder/Makefile training/Makefile vest/Makefile klm/util/Makefile klm/lm/Makefile gi/pyp-topics/src/Makefile gi/clda/src/Makefile)
diff --git a/klm/lm/Makefile.am b/klm/lm/Makefile.am
index a0c49eb4..48f9889e 100644
--- a/klm/lm/Makefile.am
+++ b/klm/lm/Makefile.am
@@ -1,8 +1,8 @@
-if HAVE_GTEST
-noinst_PROGRAMS = \
-  ngram_test
-TESTS = ngram_test
-endif
+#noinst_PROGRAMS = \
+#  ngram_test
+#TESTS = ngram_test
+#ngram_test_SOURCES = ngram_test.cc
+#ngram_test_LDADD = ../util/libklm_util.a
 
 noinst_LIBRARIES = libklm.a
 
@@ -13,8 +13,5 @@ libklm_a_SOURCES = \
   ngram_query.cc \
   virtual_interface.cc
 
-ngram_test_SOURCES = ngram_test.cc
-ngram_test_LDADD = ../util/libklm_util.a
-
 AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I..
 
diff --git a/klm/util/Makefile.am b/klm/util/Makefile.am
index d3aea6b7..be84736c 100644
--- a/klm/util/Makefile.am
+++ b/klm/util/Makefile.am
@@ -1,8 +1,20 @@
-if HAVE_GTEST
-noinst_PROGRAMS = \
-  scorer_test
-TESTS = scorer_test
-endif
+
+#noinst_PROGRAMS = \
+#  file_piece_test \
+#  joint_sort_test \
+#  key_value_packing_test \
+#  probing_hash_table_test \
+#  sorted_uniform_test
+
+#TESTS = \
+#  file_piece_test \
+#  joint_sort_test \
+#  key_value_packing_test \
+#  probing_hash_table_test \
+#  sorted_uniform_test
+
+#file_piece_test_SOURCES = file_piece_test.cc
+#file_piece_test_LDADD = libklm_util.a
 
 noinst_LIBRARIES = libklm_util.a