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 | 6f29f345dc06c1a1033475eac1d1340781d1d603 (patch) | |
tree | 6fa4cdd7aefd7d54c9585c2c6274db61bb8b159a /Makefile.am | |
parent | b510da2e562c695c90d565eb295c749569c59be8 (diff) | |
parent | c615c37501fa8576584a510a9d2bfe2fdd5bace7 (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 + |