diff options
| author | Chris Dyer <redpony@gmail.com> | 2014-01-20 20:00:16 -0500 |
|---|---|---|
| committer | Chris Dyer <redpony@gmail.com> | 2014-01-20 20:00:16 -0500 |
| commit | 44a54840b888a9cdd6444472da88f480ceafced2 (patch) | |
| tree | e518550aae77a88c4f4078884a3d0648ff00fb4e /extractor | |
| parent | 02a764cc553f238cdd0be4c6dee4ea144cda84ba (diff) | |
fix for build
Diffstat (limited to 'extractor')
| -rw-r--r-- | extractor/Makefile.am | 11 | ||||
| -rw-r--r-- | extractor/extract.cc | 6 | ||||
| -rw-r--r-- | extractor/run_extractor.cc | 4 | ||||
| -rw-r--r-- | extractor/sacompile.cc (renamed from extractor/compile.cc) | 0 |
4 files changed, 13 insertions, 8 deletions
diff --git a/extractor/Makefile.am b/extractor/Makefile.am index e5b439f9..40112e5e 100644 --- a/extractor/Makefile.am +++ b/extractor/Makefile.am @@ -1,7 +1,5 @@ -bin_PROGRAMS = compile run_extractor extract - -if HAVE_CXX11 +bin_PROGRAMS = sacompile run_extractor extract EXTRA_PROGRAMS = alignment_test \ data_array_test \ @@ -114,8 +112,8 @@ vocabulary_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libextractor.a noinst_LIBRARIES = libextractor.a -compile_SOURCES = compile.cc -compile_LDADD = libextractor.a +sacompile_SOURCES = sacompile.cc +sacompile_LDADD = libextractor.a run_extractor_SOURCES = run_extractor.cc run_extractor_LDADD = libextractor.a extract_SOURCES = extract.cc @@ -156,6 +154,5 @@ libextractor_a_SOURCES = \ translation_table.cc \ vocabulary.cc -AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(CXX11_SWITCH) -fopenmp $(GTEST_CPPFLAGS) $(GMOCK_CPPFLAGS) +AM_CPPFLAGS = -W -Wall -Wno-sign-compare -fopenmp $(GTEST_CPPFLAGS) $(GMOCK_CPPFLAGS) AM_LDFLAGS = -fopenmp -endif diff --git a/extractor/extract.cc b/extractor/extract.cc index 387cbe9b..e5b6f6ff 100644 --- a/extractor/extract.cc +++ b/extractor/extract.cc @@ -8,7 +8,11 @@ #include <boost/filesystem.hpp> #include <boost/program_options.hpp> #include <boost/program_options/variables_map.hpp> -#include <omp.h> +#if HAVE_OPEN_MP + #include <omp.h> +#else + const unsigned omp_get_num_threads() { return 1; } +#endif #include "alignment.h" #include "data_array.h" diff --git a/extractor/run_extractor.cc b/extractor/run_extractor.cc index f1aa5e35..00564a36 100644 --- a/extractor/run_extractor.cc +++ b/extractor/run_extractor.cc @@ -8,7 +8,11 @@ #include <boost/filesystem.hpp> #include <boost/program_options.hpp> #include <boost/program_options/variables_map.hpp> +#if HAVE_OPEN_MP #include <omp.h> +#else + const unsigned omp_get_num_threads() { return 1; } +#endif #include "alignment.h" #include "data_array.h" diff --git a/extractor/compile.cc b/extractor/sacompile.cc index 3ee668ce..3ee668ce 100644 --- a/extractor/compile.cc +++ b/extractor/sacompile.cc |