summaryrefslogtreecommitdiff
path: root/training/utils
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2013-01-21 12:29:43 +0100
committerPatrick Simianer <p@simianer.de>2013-01-21 12:29:43 +0100
commit50f22047eb1b7f2d60e85cdcf0fcd86342e50523 (patch)
tree730dabaf2fa57b1e4536d40f036b46795d37f289 /training/utils
parent8b399cb09513cd79ed4182be9f75882c1e1b336a (diff)
parent608886384da40aedfabd629c882b8ea9b3f6348e (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'training/utils')
-rw-r--r--training/utils/Makefile.am15
1 files changed, 12 insertions, 3 deletions
diff --git a/training/utils/Makefile.am b/training/utils/Makefile.am
index d708a9f5..156a2462 100644
--- a/training/utils/Makefile.am
+++ b/training/utils/Makefile.am
@@ -9,6 +9,8 @@ noinst_PROGRAMS = \
lbfgs_test \
optimize_test
+EXTRA_DIST = decode-and-evaluate.pl libcall.pl parallelize.pl
+
sentserver_SOURCES = sentserver.c
sentserver_LDFLAGS = -pthread
@@ -18,6 +20,13 @@ sentclient_LDFLAGS = -pthread
TESTS = lbfgs_test optimize_test
libtraining_utils_a_SOURCES = \
+ candidate_set.h \
+ entropy.h \
+ lbfgs.h \
+ online_optimizer.h \
+ optimize.h \
+ risk.h \
+ sentserver.h \
candidate_set.cc \
entropy.cc \
optimize.cc \
@@ -25,13 +34,13 @@ libtraining_utils_a_SOURCES = \
risk.cc
optimize_test_SOURCES = optimize_test.cc
-optimize_test_LDADD = libtraining_utils.a $(top_srcdir)/utils/libutils.a
+optimize_test_LDADD = libtraining_utils.a ../../utils/libutils.a
grammar_convert_SOURCES = grammar_convert.cc
-grammar_convert_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a
+grammar_convert_LDADD = ../../decoder/libcdec.a ../../mteval/libmteval.a ../../utils/libutils.a
lbfgs_test_SOURCES = lbfgs_test.cc
-lbfgs_test_LDADD = $(top_srcdir)/utils/libutils.a
+lbfgs_test_LDADD = ../../utils/libutils.a
AM_CPPFLAGS = -W -Wall -Wno-sign-compare -I$(top_srcdir)/decoder -I$(top_srcdir)/utils -I$(top_srcdir)/mteval -I$(top_srcdir)/klm