summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-08-26 19:23:56 +0000
committerredpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-08-26 19:23:56 +0000
commit2484876aaf430b479ee5aa71bda7e812fa61430f (patch)
treebb042593e7a7276dff914094eacad177e42b92b6
parent8b1ada6ce9050532cca416ecb3736203ec234d59 (diff)
few fixes for stricter ld in gcc 4.5.1
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@624 ec762483-ff6d-05da-a07a-a48fb63a330f
-rw-r--r--gi/clda/src/Makefile.am2
-rw-r--r--vest/Makefile.am2
2 files changed, 3 insertions, 1 deletions
diff --git a/gi/clda/src/Makefile.am b/gi/clda/src/Makefile.am
index 6a76fc93..3aab17da 100644
--- a/gi/clda/src/Makefile.am
+++ b/gi/clda/src/Makefile.am
@@ -13,5 +13,5 @@ bin_PROGRAMS = clda
clda_SOURCES = clda.cc
-AM_CPPFLAGS = -W -Wall -Wno-sign-compare -funroll-loops -I$(top_srcdir)/utils
+AM_CPPFLAGS = -W -Wall -Wno-sign-compare -funroll-loops -I$(top_srcdir)/utils $(GTEST_CPPFLAGS)
AM_LDFLAGS = $(top_srcdir)/utils/libutils.a -lz
diff --git a/vest/Makefile.am b/vest/Makefile.am
index aff9cda5..297f37fa 100644
--- a/vest/Makefile.am
+++ b/vest/Makefile.am
@@ -12,8 +12,10 @@ TESTS = lo_test
endif
sentserver_SOURCES = sentserver.c
+sentserver_LDFLAGS = -all-static
sentclient_SOURCES = sentclient.c
+sentclient_LDFLAGS = -all-static
mr_vest_generate_mapper_input_SOURCES = mr_vest_generate_mapper_input.cc line_optimizer.cc
mr_vest_generate_mapper_input_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a -lz