From 2ca345d3612c5a3dcf4af6f320200b4bfecbe1e9 Mon Sep 17 00:00:00 2001
From: "jon.h.clark" <jon.h.clark@ec762483-ff6d-05da-a07a-a48fb63a330f>
Date: Fri, 12 Nov 2010 20:22:56 +0000
Subject: Gross hack for compiling GLC as a library. Currently has hardcoded
 path, but shouldn't break the build.

git-svn-id: https://ws10smt.googlecode.com/svn/trunk@716 ec762483-ff6d-05da-a07a-a48fb63a330f
---
 decoder/Makefile.am | 7 ++++++-
 decoder/cdec_ff.cc  | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'decoder')

diff --git a/decoder/Makefile.am b/decoder/Makefile.am
index ea01a4da..4c688180 100644
--- a/decoder/Makefile.am
+++ b/decoder/Makefile.am
@@ -26,7 +26,6 @@ hg_test_SOURCES = hg_test.cc
 hg_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz
 trule_test_SOURCES = trule_test.cc
 trule_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz
-
 AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I.. -I../mteval -I../utils -I../klm
 
 rule_lexer.cc: rule_lexer.l
@@ -58,6 +57,7 @@ libcdec_a_SOURCES = \
   phrasetable_fst.cc \
   trule.cc \
   ff.cc \
+  ff_wordset.cc \
   ff_lm.cc \
   ff_klm.cc \
   ff_ruleshape.cc \
@@ -75,3 +75,8 @@ libcdec_a_SOURCES = \
   JSON_parser.c \
   json_parse.cc \
   grammar.cc
+
+if GLC
+  # Until we build GLC as a library...
+  libcdec_a_SOURCES += ff_glc.cc
+endif
\ No newline at end of file
diff --git a/decoder/cdec_ff.cc b/decoder/cdec_ff.cc
index 09a19a7b..3953118c 100644
--- a/decoder/cdec_ff.cc
+++ b/decoder/cdec_ff.cc
@@ -12,6 +12,11 @@
 #include "ff_lm_fsa.h"
 #include "ff_sample_fsa.h"
 #include "ff_register.h"
+#include "ff_wordset.h"
+
+#ifdef HAVE_GLC
+#include <cdec/ff_glc.h>
+#endif
 
 void register_feature_functions() {
   static bool registered = false;
@@ -59,5 +64,9 @@ void register_feature_functions() {
   ff_registry.Register("OutputIdentity", new FFFactory<OutputIdentity>);
   ff_registry.Register("InputIdentity", new FFFactory<InputIdentity>);
   ff_registry.Register("LexicalTranslationTrigger", new FFFactory<LexicalTranslationTrigger>);
+  ff_registry.Register("WordSet", new FFFactory<WordSet>);
+#ifdef HAVE_GLC
+  ff_registry.Register("ContextCRF", new FFFactory<Model1Features>);
+#endif
 }
 
-- 
cgit v1.2.3