diff options
| author | bhaddow <bhaddow@1f5c12ca-751b-0410-a591-d2e778427230> | 2009-08-07 20:47:54 +0400 |
|---|---|---|
| committer | bhaddow <bhaddow@1f5c12ca-751b-0410-a591-d2e778427230> | 2009-08-07 20:47:54 +0400 |
| commit | c5d39f039fcf63b894e78c7bb73fcbc7247d3d89 (patch) | |
| tree | 90fb8f669360fcb9f84330f8fb9627d98cb3cc86 /misc | |
| parent | f75e3993acefb6fa5f996bb255ddb4cb47d252b3 (diff) | |
Merge moses-server branch (includes mt moses) into trunk.
Plain (single-thread) moses should configure and build as before.
Multi-thread and server only available if appropriate options are selected
at configure/compile time.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@2477 1f5c12ca-751b-0410-a591-d2e778427230
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am index 05704062e..91e5bbf45 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -4,13 +4,13 @@ processPhraseTable_SOURCES = GenerateTuples.cpp processPhraseTable.cpp processLexicalTable_SOURCES = processLexicalTable.cpp queryLexicalTable_SOURCES = queryLexicalTable.cpp -AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -I$(top_srcdir)/moses/src +AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -I$(top_srcdir)/moses/src $(BOOST_CPPFLAGS) -processPhraseTable_LDADD = -L$(top_srcdir)/moses/src -lmoses -processPhraseTable_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a +processPhraseTable_LDADD = -L$(top_srcdir)/moses/src -lmoses $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) +processPhraseTable_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a -processLexicalTable_LDADD = -L$(top_srcdir)/moses/src -lmoses +processLexicalTable_LDADD = -L$(top_srcdir)/moses/src -lmoses $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) processLexicalTable_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a -queryLexicalTable_LDADD = -L$(top_srcdir)/moses/src -lmoses +queryLexicalTable_LDADD = -L$(top_srcdir)/moses/src -lmoses $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) queryLexicalTable_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a |