summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Dyer <cdyer@cs.cmu.edu>2012-02-10 13:18:59 -0500
committerChris Dyer <cdyer@cs.cmu.edu>2012-02-10 13:18:59 -0500
commit50105660d8c18889e8908cf3e4c583b551dc05af (patch)
tree42a2dcbcc59a812d6a1e385a4b16dbe4ec15b268
parent21a4b6629fedae575583f0d1e34c97dba8de2511 (diff)
move atools to utils directory
-rw-r--r--training/Makefile.am4
-rw-r--r--utils/Makefile.am4
-rw-r--r--utils/atools.cc (renamed from training/atools.cc)2
3 files changed, 4 insertions, 6 deletions
diff --git a/training/Makefile.am b/training/Makefile.am
index 2a11ae52..d2f1ccc5 100644
--- a/training/Makefile.am
+++ b/training/Makefile.am
@@ -6,7 +6,6 @@ bin_PROGRAMS = \
mr_reduce_to_weights \
mr_optimize_reduce \
grammar_convert \
- atools \
plftools \
collapse_weights \
mpi_extract_reachable \
@@ -47,9 +46,6 @@ augment_grammar_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/lib
test_ngram_SOURCES = test_ngram.cc
test_ngram_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a -lz
-atools_SOURCES = atools.cc
-atools_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/utils/libutils.a -lz
-
model1_SOURCES = model1.cc ttables.cc
model1_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/utils/libutils.a -lz
diff --git a/utils/Makefile.am b/utils/Makefile.am
index a1ea8270..6e0678de 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,5 +1,5 @@
-bin_PROGRAMS = reconstruct_weights
+bin_PROGRAMS = reconstruct_weights atools
noinst_PROGRAMS = ts phmt mfcr_test
TESTS = ts phmt mfcr_test
@@ -17,6 +17,8 @@ endif
reconstruct_weights_SOURCES = reconstruct_weights.cc
+atools_SOURCES = atools.cc
+
noinst_LIBRARIES = libutils.a
libutils_a_SOURCES = \
diff --git a/training/atools.cc b/utils/atools.cc
index 82e30c38..c0a91731 100644
--- a/training/atools.cc
+++ b/utils/atools.cc
@@ -267,7 +267,7 @@ map<string, boost::shared_ptr<Command> > commands;
void InitCommandLine(int argc, char** argv, po::variables_map* conf) {
po::options_description opts("Configuration options");
ostringstream os;
- os << "[REQ] Operation to perform:";
+ os << "Operation to perform:";
for (map<string, boost::shared_ptr<Command> >::iterator it = commands.begin();
it != commands.end(); ++it) {
os << ' ' << it->first;