summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Dyer <cdyer@Chriss-MacBook-Air.local>2013-11-10 13:52:41 -0500
committerChris Dyer <cdyer@Chriss-MacBook-Air.local>2013-11-10 13:52:41 -0500
commitbb00ca99c527239ca163b209a599873fc9013072 (patch)
tree1a8c3fce34b4b021779443833ff201b1e2c850d7
parent73a5e89074c7a531caee6faa72cfd9c22dafa43e (diff)
mav fixes
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac2
-rw-r--r--python/setup.py.in2
3 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 3438c0a4..008dc704 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,9 +18,7 @@ SUBDIRS = \
# extractor
-#gi/pyp-topics/src gi/clda/src gi/posterior-regularisation/prjava
-
-EXTRA_DIST = corpus tests python/tests python/examples compound-split environment
+EXTRA_DIST = corpus tests python/cdec python/tests python/examples compound-split environment
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -D_GLIBCXX_PARALLEL -march=native -mtune=native -O2 -pipe -fomit-frame-pointer -Wall
diff --git a/configure.ac b/configure.ac
index 9c3e692b..03bae25c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@ AC_CONFIG_FILES([mteval/Makefile])
AC_CONFIG_FILES([mteval/meteor_jar.cc])
AC_CONFIG_FILES([decoder/Makefile])
AC_CONFIG_FILES([python/setup.py])
-# AC_CONFIG_FILES([extractor/Makefile])
+#AC_CONFIG_FILES([extractor/Makefile])
AC_CONFIG_FILES([word-aligner/Makefile])
# KenLM stuff
diff --git a/python/setup.py.in b/python/setup.py.in
index 8ed0b100..cdde696e 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -7,7 +7,7 @@ LIB = ['../decoder', '../utils', '../mteval', '../training/utils', '../klm/lm',
# Set automatically by configure
LIBS = re.findall('-l([^\s]+)', '@LIBS@')
-CPPFLAGS = re.findall('-[^\s]+', '@CPPFLAGS@')
+CPPFLAGS = re.findall('-[^\s]+', '@CPPFLAGS@ @CXXFLAGS@')
LDFLAGS = re.findall('-[^\s]+', '@LDFLAGS@')
# Make sure linker flags go only to the linker
LDFLAGS = [opt.replace('-R', '-Wl,-rpath,') for opt in LDFLAGS]