diff options
author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-11-05 15:29:46 +0100 |
---|---|---|
committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-11-05 15:29:46 +0100 |
commit | 1db70a45d59946560fbd5db6487b55a8674ef973 (patch) | |
tree | 172585dafe4d1462f22d8200e733d52dddb55b1e /Makefile.am | |
parent | 4dd5216d3afa9ab72b150e250a3c30a5f223ce53 (diff) | |
parent | 6bbf03ac46bd57400aa9e65a321a304a234af935 (diff) |
merge upstream/master
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 332542c4..fefc470d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,8 @@ SUBDIRS = \ mteval \ klm/util \ klm/lm \ + klm/search \ decoder \ - phrasinator \ training \ training/liblbfgs \ mira \ @@ -16,13 +16,11 @@ SUBDIRS = \ pro-train \ rampion \ minrisk \ - extools \ - gi/pf \ - gi/markov_al \ - rst_parser + example_extff #gi/pyp-topics/src gi/clda/src gi/posterior-regularisation/prjava AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -AM_CPPFLAGS = -D_GLIBCXX_PARALLEL -march=native -mtune=native -O2 -pipe -fomit-frame-pointer -Wall +AM_CPPFLAGS = -D_GLIBCXX_PARALLEL + |