small fixes, learning to use git...

4 files changed, 15 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 76307998..c18342b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,5 +42,5 @@ then
   AM_CONDITIONAL([SRI_LM], true)
 fi
 
-AC_OUTPUT(Makefile src/Makefile vest/Makefile)
+AC_OUTPUT(Makefile src/Makefile training/Makefile vest/Makefile)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 2af6cab7..dbc18194 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,6 @@ libhg_a_SOURCES = \
   hg_io.cc \
   viterbi.cc \
   lattice.cc \
-  logging.cc \
   aligner.cc \
   gzstream.cc \
   apply_models.cc \
diff --git a/src/grammar.cc b/src/grammar.cc
index 69e38320..e0b2a09e 100644
--- a/src/grammar.cc
+++ b/src/grammar.cc
@@ -36,7 +36,7 @@ struct TextRuleBin : public RuleBin {
   }
   void Dump() const {
     for (int i = 0; i < rules_.size(); ++i)
-      VLOG(1) << rules_[i]->AsString() << endl;
+      cerr << rules_[i]->AsString() << endl;
   }
  private:
   vector<TRulePtr> rules_;
diff --git a/training/Makefile.am b/training/Makefile.am
index a2888f7a..c4c22fa2 100644
--- a/training/Makefile.am
+++ b/training/Makefile.am
@@ -10,30 +10,32 @@ bin_PROGRAMS = \
   optimize_test
 
 atools_SOURCES = atools.cc
+atools_LDADD = $(top_srcdir)/src/libhg.a -lz
 
 model1_SOURCES = model1.cc
-model1_LDADD = libhg.a
+model1_LDADD = $(top_srcdir)/src/libhg.a -lz
 
 grammar_convert_SOURCES = grammar_convert.cc
+grammar_convert_LDADD = $(top_srcdir)/src/libhg.a -lz
 
-optimize_test_SOURCES = optimize_test.cc
+optimize_test_SOURCES = optimize_test.cc optimize.cc
+optimize_test_LDADD = $(top_srcdir)/src/libhg.a -lz
 
 collapse_weights_SOURCES = collapse_weights.cc
+collapse_weights_LDADD = $(top_srcdir)/src/libhg.a -lz
 
 lbfgs_test_SOURCES = lbfgs_test.cc
+lbfgs_test_LDADD = $(top_srcdir)/src/libhg.a -lz
 
-mr_optimize_reduce_SOURCES = mr_optimize_reduce.cc
-mr_optimize_reduce_LDADD = libhg.a
+mr_optimize_reduce_SOURCES = mr_optimize_reduce.cc optimize.cc
+mr_optimize_reduce_LDADD = $(top_srcdir)/src/libhg.a -lz
 
 mr_em_train_SOURCES = mr_em_train.cc
-mr_em_train_LDADD = libhg.a
+mr_em_train_LDADD = $(top_srcdir)/src/libhg.a -lz
 
 plftools_SOURCES = plftools.cc
-plftools_LDADD = libhg.a
+plftools_LDADD = $(top_srcdir)/src/libhg.a -lz
 
-LDADD = libhg.a
+AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(BOOST_CPPFLAGS) $(GTEST_CPPFLAGS) -I$(top_srcdir)/src
+AM_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB)
 
-AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS)
-AM_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) -lz
-
-noinst_LIBRARIES = libhg.a