From d217901e91943e9295973499ccee07ec4341ede5 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Thu, 3 Dec 2009 17:15:37 -0500 Subject: small fixes, learning to use git... --- training/Makefile.am | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'training') 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 -- cgit v1.2.3