diff options
| author | redpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f> | 2010-08-11 02:37:10 +0000 |
|---|---|---|
| committer | redpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f> | 2010-08-11 02:37:10 +0000 |
| commit | 80686d4e567bae579ea39e009826a2de92cd4ace (patch) | |
| tree | c3c35fcba57dde423a248f38aa121ad197c79734 /gi/pyp-topics/src | |
| parent | 3c85c407c333899f6b4bc26632d312b8e568b638 (diff) | |
major refactor, break bad circular deps
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@509 ec762483-ff6d-05da-a07a-a48fb63a330f
Diffstat (limited to 'gi/pyp-topics/src')
| -rw-r--r-- | gi/pyp-topics/src/Makefile.am | 8 | ||||
| -rw-r--r-- | gi/pyp-topics/src/contexts_corpus.hh | 2 | ||||
| -rw-r--r-- | gi/pyp-topics/src/contexts_lexer.h | 2 | ||||
| -rw-r--r-- | gi/pyp-topics/src/contexts_lexer.l | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/gi/pyp-topics/src/Makefile.am b/gi/pyp-topics/src/Makefile.am index c22819db..d3f95d0b 100644 --- a/gi/pyp-topics/src/Makefile.am +++ b/gi/pyp-topics/src/Makefile.am @@ -4,13 +4,13 @@ contexts_lexer.cc: contexts_lexer.l $(LEX) -s -CF -8 -o$@ $< pyp_topics_train_SOURCES = mt19937ar.c corpus.cc gzstream.cc pyp-topics.cc train.cc contexts_lexer.cc contexts_corpus.cc -pyp_topics_train_LDADD = $(top_srcdir)/decoder/libcdec.a -lz +pyp_topics_train_LDADD = $(top_srcdir)/utils/libutils.a -lz pyp_contexts_train_SOURCES = mt19937ar.c corpus.cc gzstream.cc pyp-topics.cc contexts_lexer.cc contexts_corpus.cc train-contexts.cc -pyp_contexts_train_LDADD = $(top_srcdir)/decoder/libcdec.a -lz +pyp_contexts_train_LDADD = $(top_srcdir)/utils/libutils.a -lz #mpi_pyp_contexts_train_SOURCES = mt19937ar.c corpus.cc gzstream.cc mpi-pyp-topics.cc contexts_lexer.cc contexts_corpus.cc mpi-train-contexts.cc -#mpi_pyp_contexts_train_LDADD = $(top_srcdir)/decoder/libcdec.a -lz +#mpi_pyp_contexts_train_LDADD = $(top_srcdir)/utils/libutils.a -lz -AM_CPPFLAGS = -W -Wall -Wno-sign-compare -funroll-loops +AM_CPPFLAGS = -W -Wall -Wno-sign-compare -funroll-loops -I../../../utils diff --git a/gi/pyp-topics/src/contexts_corpus.hh b/gi/pyp-topics/src/contexts_corpus.hh index dd721361..b2d235cb 100644 --- a/gi/pyp-topics/src/contexts_corpus.hh +++ b/gi/pyp-topics/src/contexts_corpus.hh @@ -10,7 +10,7 @@ #include "corpus.hh" #include "contexts_lexer.h" -#include "../../../decoder/dict.h" +#include "dict.h" class BackoffGenerator { diff --git a/gi/pyp-topics/src/contexts_lexer.h b/gi/pyp-topics/src/contexts_lexer.h index 1b79c6fd..66004990 100644 --- a/gi/pyp-topics/src/contexts_lexer.h +++ b/gi/pyp-topics/src/contexts_lexer.h @@ -5,7 +5,7 @@ #include <vector> #include <string> -#include "../../../decoder/dict.h" +#include "dict.h" struct ContextsLexer { typedef std::vector<std::string> Context; diff --git a/gi/pyp-topics/src/contexts_lexer.l b/gi/pyp-topics/src/contexts_lexer.l index 7a5d9460..64cd7ca3 100644 --- a/gi/pyp-topics/src/contexts_lexer.l +++ b/gi/pyp-topics/src/contexts_lexer.l @@ -101,7 +101,7 @@ INT [\-+]?[0-9]+|inf|[\-+]inf %% -#include "../../../decoder/filelib.h" +#include "filelib.h" void ContextsLexer::ReadContexts(std::istream* in, ContextsLexer::ContextsCallback func, void* extra) { lex_line = 1; |