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/lib | |
| 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/lib')
| -rw-r--r-- | volk/lib/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
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) # ---------------------------------------------------------------- |