diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2011-11-17 21:46:17 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2011-11-17 21:46:17 +0400 |
| commit | d57d0c0656608fe3df65ebe17858bd125cb2d263 (patch) | |
| tree | e33357177cb31b4ba0fc50d8623ac73c1687ca1c /moses-cmd | |
| parent | 4d01fec50843fc59a0ca9c5878aa1129904810ab (diff) | |
| parent | ba5633c7b57b8843f9befc836db78989f3d15652 (diff) | |
Merge branch 'master' into miramerge
Conflicts:
Makefile.am
config.h.in
configure.in
kenlm
moses-chart-cmd/src/IOWrapper.cpp
moses/src/Parameter.cpp
scripts/Makefile
Diffstat (limited to 'moses-cmd')
| -rw-r--r-- | moses-cmd/moses-cmd.vcxproj | 4 | ||||
| -rw-r--r-- | moses-cmd/moses-cmd.xcodeproj/project.pbxproj | 21 | ||||
| -rw-r--r-- | moses-cmd/src/Makefile.am | 6 |
3 files changed, 14 insertions, 17 deletions
diff --git a/moses-cmd/moses-cmd.vcxproj b/moses-cmd/moses-cmd.vcxproj index b82da9e79..0d3126b98 100644 --- a/moses-cmd/moses-cmd.vcxproj +++ b/moses-cmd/moses-cmd.vcxproj @@ -58,7 +58,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>zlib.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zdll.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -78,7 +78,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>zlib.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zdll.lib;$(SolutionDir)$(Configuration)\moses.lib;$(SolutionDir)$(Configuration)\kenlm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
diff --git a/moses-cmd/moses-cmd.xcodeproj/project.pbxproj b/moses-cmd/moses-cmd.xcodeproj/project.pbxproj index 39179390d..8fb7c5e04 100644 --- a/moses-cmd/moses-cmd.xcodeproj/project.pbxproj +++ b/moses-cmd/moses-cmd.xcodeproj/project.pbxproj @@ -319,13 +319,13 @@ HEADER_SEARCH_PATHS = ( ../moses/src, ../kenlm, + /opt/local/include, ); INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ( - ../irstlm/lib/, + ../irstlm/lib, ../srilm/lib/macosx, - ../kenlm/lm, - ../randlm/lib, + ../kenlm, ); OTHER_LDFLAGS = ( "-lflm", @@ -334,7 +334,6 @@ "-ldstruct", "-lz", "-lirstlm", - "-lrandlm", ); PREBINDING = NO; PRODUCT_NAME = "moses-cmd"; @@ -360,13 +359,13 @@ HEADER_SEARCH_PATHS = ( ../moses/src, ../kenlm, + /opt/local/include, ); INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ( - ../irstlm/lib/, + ../irstlm/lib, ../srilm/lib/macosx, - ../kenlm/lm, - ../randlm/lib, + ../kenlm, ); OTHER_LDFLAGS = ( "-lflm", @@ -375,7 +374,6 @@ "-ldstruct", "-lz", "-lirstlm", - "-lrandlm", ); PREBINDING = NO; PRODUCT_NAME = "moses-cmd"; @@ -393,13 +391,13 @@ HEADER_SEARCH_PATHS = ( ../moses/src, ../kenlm, + /opt/local/include, ); INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ( - ../irstlm/lib/, + ../irstlm/lib, ../srilm/lib/macosx, - ../kenlm/lm, - ../randlm/lib, + ../kenlm, ); OTHER_LDFLAGS = ( "-lflm", @@ -408,7 +406,6 @@ "-ldstruct", "-lz", "-lirstlm", - "-lrandlm", ); PREBINDING = NO; PRODUCT_NAME = "moses-cmd"; diff --git a/moses-cmd/src/Makefile.am b/moses-cmd/src/Makefile.am index 2563d0e6d..055277ce4 100644 --- a/moses-cmd/src/Makefile.am +++ b/moses-cmd/src/Makefile.am @@ -3,11 +3,11 @@ bin_PROGRAMS = moses lmbrgrid checkplf AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DUSE_HYPO_POOL -I$(top_srcdir)/moses/src $(BOOST_CPPFLAGS) checkplf_SOURCES = checkplf.cpp -checkplf_LDADD = $(top_builddir)/moses/src/libmoses.la -L$(top_srcdir)/OnDiskPt/src -lOnDiskPt @KENLM_LDFLAGS@ $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) +checkplf_LDADD = $(top_builddir)/moses/src/libmoses.la -L$(top_srcdir)/OnDiskPt/src -lOnDiskPt $(top_srcdir)/util/libkenutil.la $(top_srcdir)/lm/libkenlm.la $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) moses_SOURCES = Main.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp LatticeMBR.cpp -moses_LDADD = $(top_builddir)/moses/src/libmoses.la -L$(top_srcdir)/OnDiskPt/src -lOnDiskPt @KENLM_LDFLAGS@ $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) +moses_LDADD = $(top_builddir)/moses/src/libmoses.la -L$(top_srcdir)/OnDiskPt/src -lOnDiskPt $(top_srcdir)/util/libkenutil.la $(top_srcdir)/lm/libkenlm.la $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) lmbrgrid_SOURCES = LatticeMBRGrid.cpp LatticeMBR.cpp IOWrapper.cpp -lmbrgrid_LDADD = $(top_builddir)/moses/src/libmoses.la -L$(top_srcdir)/OnDiskPt/src -lOnDiskPt @KENLM_LDFLAGS@ $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) +lmbrgrid_LDADD = $(top_builddir)/moses/src/libmoses.la -L$(top_srcdir)/OnDiskPt/src -lOnDiskPt $(top_srcdir)/util/libkenutil.la $(top_srcdir)/lm/libkenlm.la $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) |