diff options
| author | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
|---|---|---|
| committer | Avneesh Saluja <asaluja@gmail.com> | 2013-03-28 18:28:16 -0700 |
| commit | 3d8d656fa7911524e0e6885647173474524e0784 (patch) | |
| tree | 81b1ee2fcb67980376d03f0aa48e42e53abff222 /Makefile.am | |
| parent | be7f57fdd484e063775d7abf083b9fa4c403b610 (diff) | |
| parent | 96fedabebafe7a38a6d5928be8fff767e411d705 (diff) | |
fixed conflicts
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index b16fc90f..e017fba7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,26 +4,22 @@ SUBDIRS = \ utils \ mteval \ + klm/util/double-conversion \ klm/util \ + klm/util/stream \ klm/lm \ + klm/lm/builder \ + klm/search \ decoder \ - phrasinator \ training \ training/liblbfgs \ - mira \ - latent_svm \ - dtrain \ - dpmert \ - pro-train \ - rampion \ - minrisk \ - gi/pf \ - gi/markov_al \ - rst_parser + word-aligner \ + example_extff #gi/pyp-topics/src gi/clda/src gi/posterior-regularisation/prjava +EXTRA_DIST = corpus tests python/pkg python/src python/tests python/examples compound-split environment AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -AM_CPPFLAGS = -D_GLIBCXX_PARALLEL +AM_CPPFLAGS = -D_GLIBCXX_PARALLEL -march=native -mtune=native -O2 -pipe -fomit-frame-pointer -Wall |