diff options
| author | Nick Foster | 2010-12-14 01:00:29 -0800 |
|---|---|---|
| committer | Nick Foster | 2010-12-14 01:00:29 -0800 |
| commit | 611526f9dfba0df4a1a49d47916706438ac194b3 (patch) | |
| tree | 15172fe0bfed1dfd4c6afe492f660d58f67e2c2a /volk | |
| parent | e826eb0462dd7eae7248147ea2fe47c6340bbcf0 (diff) | |
| download | gnuradio-611526f9dfba0df4a1a49d47916706438ac194b3.tar.gz gnuradio-611526f9dfba0df4a1a49d47916706438ac194b3.tar.bz2 gnuradio-611526f9dfba0df4a1a49d47916706438ac194b3.zip | |
Volk: Automated more automake for orc. Brought orcc generation in. Shared library libvolk_orc.la.
Linking is hackery right now with specified -lorc-0.4 flags; this should change. Otherwise pretty much OK.
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/Makefile.am | 1 | ||||
| -rw-r--r-- | volk/config/lv_configure.m4 | 4 | ||||
| -rw-r--r-- | volk/config/orc.m4 | 2 | ||||
| -rw-r--r-- | volk/lib/Makefile.am | 10 | ||||
| -rw-r--r-- | volk/orc/Makefile.am | 14 |
5 files changed, 23 insertions, 8 deletions
diff --git a/volk/Makefile.am b/volk/Makefile.am index c1cd9aace..608aa2e27 100644 --- a/volk/Makefile.am +++ b/volk/Makefile.am @@ -55,3 +55,4 @@ distclean-local: -rm -f python/Makefile.in -rm -f configure -rm -f orc/Makefile.in + -rm -f orc/*.c diff --git a/volk/config/lv_configure.m4 b/volk/config/lv_configure.m4 index f98b2dc5b..47ad543f8 100644 --- a/volk/config/lv_configure.m4 +++ b/volk/config/lv_configure.m4 @@ -104,6 +104,10 @@ dnl AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes]) ORC_CHECK LDFLAGS="$LDFLAGS $LIBGNURADIO_CORE_EXTRA_LDFLAGS" + + if test HAVE_ORC = true; then + LDFLAGS="$LDFLAGS $ORC_LDFLAGS" + fi AC_CHECK_PROG([XMLTO],[xmlto],[yes],[]) AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) diff --git a/volk/config/orc.m4 b/volk/config/orc.m4 index 3c501762d..03c12a8f9 100644 --- a/volk/config/orc.m4 +++ b/volk/config/orc.m4 @@ -26,6 +26,7 @@ AC_DEFUN([ORC_CHECK], fi AC_SUBST(ORCC) ORCC_FLAGS="--compat $ORC_REQ" + ORC_LDFLAGS="-lorc-0.4" AC_SUBST(ORCC_FLAGS) HAVE_ORC=yes HAVE_ORCC=yes @@ -44,6 +45,7 @@ AC_DEFUN([ORC_CHECK], AC_DEFINE(DISABLE_ORC, 1, [Disable Orc]) HAVE_ORC=no HAVE_ORCC=no + ORC_LDFLAGS="" fi AM_CONDITIONAL(HAVE_ORC, [test "x$HAVE_ORC" = "xyes"]) AM_CONDITIONAL(HAVE_ORCC, [test "x$HAVE_ORCC" = "xyes"]) diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am index 1291b01cd..649d461e0 100644 --- a/volk/lib/Makefile.am +++ b/volk/lib/Makefile.am @@ -138,9 +138,9 @@ endif -libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -lorc-0.4 -libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -lorc-0.4 -libvolk_la_LIBADD = ../orc/libvolk_orc.a +libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(ORC_LDFLAGS) -lorc-0.4 +libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(ORC_LDFLAGS) -lorc-0.4 +libvolk_la_LIBADD = ../orc/libvolk_orc.la @@ -237,12 +237,12 @@ libvolk_qa_la_SOURCES = \ qa_32f_stddev_aligned16.cc \ qa_32f_stddev_and_mean_aligned16.cc -libvolk_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -lorc-0.4 +libvolk_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(ORC_LDFLAGS) -lorc-0.4 libvolk_qa_la_LIBADD = \ libvolk.la \ libvolk_runtime.la \ - ../orc/libvolk_orc.a \ + ../orc/libvolk_orc.la \ $(CPPUNIT_LIBS) # ---------------------------------------------------------------- diff --git a/volk/orc/Makefile.am b/volk/orc/Makefile.am index f5aa7d45c..092e66534 100644 --- a/volk/orc/Makefile.am +++ b/volk/orc/Makefile.am @@ -19,7 +19,15 @@ # include $(top_srcdir)/Makefile.common +lib_LTLIBRARIES = libvolk_orc.la +libvolk_orc_la_LDFLAGS = $(ORC_LDFLAGS) -libvolk_orc_a_SOURCES = volk_32f_sqrt_aligned16_orc_impl.c -libvolk_orc_a_LDFLAGS = -lorc-0.4 -lib_LIBRARIES = libvolk_orc.a +libvolk_orc_la_SOURCES = \ +volk_32f_sqrt_aligned16_orc_impl.orc + + + +ORCC_FLAGS = --implementation --lazy-init + +.orc.c: + $(ORCC) $(ORCC_FLAGS) -o $@ $< |