diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-12-14 16:41:14 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-12-14 16:41:14 -0800 |
| commit | d8031649fa3186d7e6b000dcfaa349deacf51262 (patch) | |
| tree | f6db7a23fd70c2a2a6ad2cd3aff6b8d197951d3f | |
| parent | ebcfe1a6507d37a29890d5b29aae308fd02d6716 (diff) | |
Volk: patch via Nick M.
| -rw-r--r-- | volk/config/orc.m4 | 5 | ||||
| -rw-r--r-- | volk/lib/Makefile.am | 5 | ||||
| -rw-r--r-- | volk/orc/Makefile.am | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/volk/config/orc.m4 b/volk/config/orc.m4 index fa48b10df8..7845a940c8 100644 --- a/volk/config/orc.m4 +++ b/volk/config/orc.m4 @@ -26,8 +26,11 @@ AC_DEFUN([ORC_CHECK], fi AC_SUBST(ORCC) ORCC_FLAGS="--compat $ORC_REQ" - ORC_LDFLAGS="-lorc-0.4" + ORC_LDFLAGS=`$PKG_CONFIG --libs orc-0.4` + ORC_CFLAGS=`$PKG_CONFIG --cflags orc-0.4` AC_SUBST(ORCC_FLAGS) + AC_SUBST(ORC_LDFLAGS) + AC_SUBST(ORC_CFLAGS) HAVE_ORC=yes HAVE_ORCC=yes if test "x$cross_compiling" = "xyes" ; then diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am index 385401ae13..d38004f2ab 100644 --- a/volk/lib/Makefile.am +++ b/volk/lib/Makefile.am @@ -74,9 +74,6 @@ universal_CODE = \ generic_CODE = \ volk_cpu_generic.c - -orc_CODE = \ - volk_cpu_orc.c x86_CODE = \ volk_cpu_x86.c @@ -356,7 +353,7 @@ noinst_PROGRAMS = \ test_all test_all_SOURCES = test_all.cc -test_all_LDADD = libvolk_qa.la +test_all_LDADD = libvolk_qa.la ../orc/libvolk_orc.la distclean-local: diff --git a/volk/orc/Makefile.am b/volk/orc/Makefile.am index dcde630837..5d82f540f9 100644 --- a/volk/orc/Makefile.am +++ b/volk/orc/Makefile.am @@ -18,6 +18,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(ORC_CFLAGS) + include $(top_srcdir)/Makefile.common lib_LTLIBRARIES = libvolk_orc.la libvolk_orc_la_LDFLAGS = $(ORC_LDFLAGS) @@ -31,7 +33,7 @@ volk_32f_add_aligned16_orc_impl.orc -ORCC_FLAGS = --implementation --lazy-init +my_ORCC_FLAGS = --implementation --lazy-init $(ORCC_FLAGS) .orc.c: - $(ORCC) $(ORCC_FLAGS) -o $@ $< + $(ORCC) $(my_ORCC_FLAGS) -o $@ $< |