2 files changed, 31 insertions, 34 deletions
diff --git a/klm/lm/builder/CMakeLists.txt b/klm/lm/builder/CMakeLists.txt
new file mode 100644
index 00000000..5fb1b2d2
--- /dev/null
+++ b/klm/lm/builder/CMakeLists.txt
@@ -0,0 +1,31 @@
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../..)
+
+set(lmplz_SRCS
+    lmplz_main.cc
+    adjust_counts.cc
+    adjust_counts.hh
+    corpus_count.cc
+    corpus_count.hh
+    discount.hh
+    hash_gamma.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)
+
+add_executable(lmplz ${lmplz_SRCS})
+target_link_libraries(lmplz klm klm_util_double klm_util_stream klm_util ${Boost_LIBRARIES})
+
+set(dump_counts_SRCS print.cc dump_counts_main.cc)
+add_executable(dump_counts ${dump_counts_SRCS})
+target_link_libraries(dump_counts klm klm_util_double klm_util_stream klm_util ${Boost_LIBRARIES})
diff --git a/klm/lm/builder/Makefile.am b/klm/lm/builder/Makefile.am
deleted file mode 100644
index bb15ff04..00000000
--- a/klm/lm/builder/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-bin_PROGRAMS = lmplz dump_counts
-
-dump_counts_SOURCES = \
-  print.cc \
-  dump_counts_main.cc
-
-lmplz_SOURCES = \
-  lmplz_main.cc \
-  adjust_counts.cc \
-  adjust_counts.hh \
-  corpus_count.cc \
-  corpus_count.hh \
-  discount.hh \
-  hash_gamma.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
-
-dump_counts_LDADD = ../libklm.a ../../util/double-conversion/libklm_util_double.a ../../util/stream/libklm_util_stream.a ../../util/libklm_util.a $(BOOST_THREAD_LIBS)
-lmplz_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
-