From a53461650fbdcd3cfe7543d28af9647ac3e5e47e Mon Sep 17 00:00:00 2001 From: redpony Date: Wed, 11 Aug 2010 02:37:10 +0000 Subject: major refactor, break bad circular deps git-svn-id: https://ws10smt.googlecode.com/svn/trunk@509 ec762483-ff6d-05da-a07a-a48fb63a330f --- extools/Makefile.am | 12 ++++++------ extools/sg_lexer.l | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'extools') diff --git a/extools/Makefile.am b/extools/Makefile.am index 1e82287d..ee363264 100644 --- a/extools/Makefile.am +++ b/extools/Makefile.am @@ -11,20 +11,20 @@ sg_lexer.cc: sg_lexer.l $(LEX) -s -CF -8 -o$@ $< filter_grammar_SOURCES = filter_grammar.cc extract.cc sentence_pair.cc striped_grammar.cc sg_lexer.cc -filter_grammar_LDADD = $(top_srcdir)/decoder/libcdec.a -lz +filter_grammar_LDADD = $(top_srcdir)/utils/libutils.a -lz #filter_grammar_LDFLAGS = -all-static featurize_grammar_SOURCES = featurize_grammar.cc extract.cc sentence_pair.cc sg_lexer.cc striped_grammar.cc -featurize_grammar_LDADD = $(top_srcdir)/decoder/libcdec.a -lz +featurize_grammar_LDADD = $(top_srcdir)/utils/libutils.a -lz mr_stripe_rule_reduce_SOURCES = mr_stripe_rule_reduce.cc extract.cc sentence_pair.cc striped_grammar.cc sg_lexer.cc -mr_stripe_rule_reduce_LDADD = $(top_srcdir)/decoder/libcdec.a -lz +mr_stripe_rule_reduce_LDADD = $(top_srcdir)/utils/libutils.a -lz extractor_SOURCES = sentence_pair.cc extract.cc extractor.cc striped_grammar.cc -extractor_LDADD = $(top_srcdir)/decoder/libcdec.a -lz +extractor_LDADD = $(top_srcdir)/utils/libutils.a -lz extractor_monolingual_SOURCES = extractor_monolingual.cc -extractor_monolingual_LDADD = $(top_srcdir)/decoder/libcdec.a -lz +extractor_monolingual_LDADD = $(top_srcdir)/utils/libutils.a -lz -AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I$(top_srcdir)/decoder +AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I$(top_srcdir)/utils diff --git a/extools/sg_lexer.l b/extools/sg_lexer.l index 168b835a..d60bd0fc 100644 --- a/extools/sg_lexer.l +++ b/extools/sg_lexer.l @@ -1,6 +1,4 @@ %{ -#include "rule_lexer.h" - #include #include #include @@ -8,7 +6,6 @@ #include #include "tdict.h" #include "fdict.h" -#include "trule.h" #include "striped_grammar.h" int lex_line = 0; -- cgit v1.2.3