diff options
| author | Patrick Simianer <p@simianer.de> | 2012-04-23 21:44:02 +0200 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2012-04-23 21:44:02 +0200 |
| commit | 2f427278616cbe3fa6f56d6b97c40b3894dbd950 (patch) | |
| tree | 6998435e4677437c474cf0f835ce9f72d70d3945 /Makefile.am | |
| parent | 6d0d0eb6bbfaee6b6998659a55e2195977ccd217 (diff) | |
| parent | 217c4aaeba1c9f19b3420b526235bffd86c7a92b (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
Makefile.am
configure.ac
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e49554d0..855222c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,10 @@ # warning - the subdirectories in the following list should # be kept in topologically sorted order. Also, DO NOT introduce # cyclic dependencies between these directories! -SUBDIRS = utils mteval klm/util klm/lm decoder phrasinator training mira dtrain dpmert pro-train extools gi/pf gi/markov_al +SUBDIRS = utils mteval klm/util klm/lm decoder phrasinator training mira dtrain dpmert pro-train extools gi/pf gi/markov_al rst_parser #gi/pyp-topics/src gi/clda/src gi/posterior-regularisation/prjava AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = -D_GLIBCXX_PARALLEL - |