summaryrefslogtreecommitdiff
path: root/volk/lib
diff options
context:
space:
mode:
authorTom Rondeau2011-01-30 12:35:07 -0500
committerTom Rondeau2011-01-30 12:35:07 -0500
commit6503e3b21978b71908400c994148836bec4a97b9 (patch)
tree75aec6950e532f489b954d7f757149b1d8f67b54 /volk/lib
parenta3ee5073e1035154a3331ec7ab4f1842095b7ed4 (diff)
downloadgnuradio-6503e3b21978b71908400c994148836bec4a97b9.tar.gz
gnuradio-6503e3b21978b71908400c994148836bec4a97b9.tar.bz2
gnuradio-6503e3b21978b71908400c994148836bec4a97b9.zip
volk: Updating build structure to work when orc is not installed.
Distcheck passes for me if liborc is installed or not.
Diffstat (limited to 'volk/lib')
-rw-r--r--volk/lib/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am
index 6f3d7fd86..af7c7f335 100644
--- a/volk/lib/Makefile.am
+++ b/volk/lib/Makefile.am
@@ -45,7 +45,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \
# list of programs run by "make check" and "make distcheck"
-TESTS = testqa
+#TESTS = testqa
#orc stuff gets built in the ORC directory conditional to ORC being enabled.
#it gets linked in during the build of libvolk as an added library.
#there might be a better way to do this.
@@ -77,7 +77,7 @@ libvolk_la_SOURCES = \
volk_orc_LDFLAGS = \
$(ORC_LDFLAGS) \
-lorc-0.4
-
+
volk_orc_LIBADD = \
../orc/libvolk_orc.la
@@ -103,7 +103,6 @@ endif
#libvolk_qa_la_LIBADD = \
# libvolk.la \
# libvolk_runtime.la
-
# ----------------------------------------------------------------
# headers that don't get installed