Updated to ham/gnuradio* to 3.7.10

----------------------------------
ChangeLog is available at
   http://gnuradio.org/redmine/projects/gnuradio/wiki/ChangeLogV3_7_10

8 files changed, 53 insertions, 225 deletions

diff --git a/ham/gnuradio-core/Makefile.version b/ham/gnuradio-core/Makefile.version
index 478df7a63a3..1d2fe149c93 100644
--- a/ham/gnuradio-core/Makefile.version
+++ b/ham/gnuradio-core/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.7 2016/03/07 13:14:31 mef Exp $
+# $NetBSD: Makefile.version,v 1.8 2016/07/12 11:36:46 mef Exp $
 
-VERSION=        3.7.9.1
+VERSION=        3.7.10
diff --git a/ham/gnuradio-core/Nocore.mk b/ham/gnuradio-core/Nocore.mk
index 0fa2394b230..e84507d01ac 100644
--- a/ham/gnuradio-core/Nocore.mk
+++ b/ham/gnuradio-core/Nocore.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Nocore.mk,v 1.8 2015/12/08 01:21:01 wiedi Exp $
+# $NetBSD: Nocore.mk,v 1.9 2016/07/12 11:36:46 mef Exp $
 
 DEPENDS+=	gnuradio-core-[0-9]*:../../ham/gnuradio-core
 
@@ -29,3 +29,11 @@ post-install:
 	> ${WRKDIR}/.PLIST.minus;
 	(cd ${WRKDIR}/.destdir/${PREFIX};			\
 	${RM} -f $$(cat ${WRKDIR}/.PLIST.minus)	);
+# workaround for gnuradio-doxygen
+#  (the same target can't be set on gnuradio-doxygen side
+#
+	(cd ${WRKDIR}/.destdir/${PREFIX};			\
+	${RM} -f share/doc/gnuradio-${PKGVERSION}/html/_formulas.aux; \
+	${RM} -f share/doc/gnuradio-${PKGVERSION}/html/_formulas.log; \
+	${RM} -f share/doc/gnuradio-${PKGVERSION}/html/_formulas.dvi; \
+	)
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index 9cf2ccca339..62527b12daf 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2016/03/19 23:44:13 dbj Exp $
+@comment $NetBSD: PLIST,v 1.24 2016/07/12 11:36:46 mef Exp $
 bin/gnuradio-config-info
 bin/gr_filter_design
 bin/volk-config-info
@@ -158,6 +158,7 @@ include/gnuradio/blocks/moving_average_cc.h
 include/gnuradio/blocks/moving_average_ff.h
 include/gnuradio/blocks/moving_average_ii.h
 include/gnuradio/blocks/moving_average_ss.h
+include/gnuradio/blocks/multiply_by_tag_value_cc.h
 include/gnuradio/blocks/multiply_cc.h
 include/gnuradio/blocks/multiply_conjugate_cc.h
 include/gnuradio/blocks/multiply_const_cc.h
@@ -249,6 +250,7 @@ include/gnuradio/blocks/tagged_stream_multiply_length.h
 include/gnuradio/blocks/tagged_stream_mux.h
 include/gnuradio/blocks/tagged_stream_to_pdu.h
 include/gnuradio/blocks/tags_strobe.h
+include/gnuradio/blocks/test_tag_variable_rate_ff.h
 include/gnuradio/blocks/threshold_ff.h
 include/gnuradio/blocks/throttle.h
 include/gnuradio/blocks/transcendental.h
@@ -493,6 +495,7 @@ include/volk/volk_16i_permute_and_scalar_add.h
 include/volk/volk_16i_s32f_convert_32f.h
 include/volk/volk_16i_x4_quad_max_star_16i.h
 include/volk/volk_16i_x5_add_quad_16i_x4.h
+include/volk/volk_16ic_convert_32fc.h
 include/volk/volk_16ic_deinterleave_16i_x2.h
 include/volk/volk_16ic_deinterleave_real_16i.h
 include/volk/volk_16ic_deinterleave_real_8i.h
@@ -500,6 +503,8 @@ include/volk/volk_16ic_magnitude_16i.h
 include/volk/volk_16ic_s32f_deinterleave_32f_x2.h
 include/volk/volk_16ic_s32f_deinterleave_real_32f.h
 include/volk/volk_16ic_s32f_magnitude_32f.h
+include/volk/volk_16ic_x2_dot_prod_16ic.h
+include/volk/volk_16ic_x2_multiply_16ic.h
 include/volk/volk_16u_byteswap.h
 include/volk/volk_16u_byteswappuppet_16u.h
 include/volk/volk_32f_8u_polarbutterfly_32f.h
@@ -514,6 +519,7 @@ include/volk/volk_32f_convert_64f.h
 include/volk/volk_32f_cos_32f.h
 include/volk/volk_32f_expfast_32f.h
 include/volk/volk_32f_index_max_16u.h
+include/volk/volk_32f_index_max_32u.h
 include/volk/volk_32f_invsqrt_32f.h
 include/volk/volk_32f_log2_32f.h
 include/volk/volk_32f_null_32f.h
@@ -547,12 +553,14 @@ include/volk/volk_32f_x3_sum_of_poly_32f.h
 include/volk/volk_32fc_32f_dot_prod_32fc.h
 include/volk/volk_32fc_32f_multiply_32fc.h
 include/volk/volk_32fc_conjugate_32fc.h
+include/volk/volk_32fc_convert_16ic.h
 include/volk/volk_32fc_deinterleave_32f_x2.h
 include/volk/volk_32fc_deinterleave_64f_x2.h
 include/volk/volk_32fc_deinterleave_imag_32f.h
 include/volk/volk_32fc_deinterleave_real_32f.h
 include/volk/volk_32fc_deinterleave_real_64f.h
 include/volk/volk_32fc_index_max_16u.h
+include/volk/volk_32fc_index_max_32u.h
 include/volk/volk_32fc_magnitude_32f.h
 include/volk/volk_32fc_magnitude_squared_32f.h
 include/volk/volk_32fc_s32f_atan2_32f.h
@@ -565,6 +573,7 @@ include/volk/volk_32fc_s32fc_multiply_32fc.h
 include/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h
 include/volk/volk_32fc_s32fc_x2_rotator_32fc.h
 include/volk/volk_32fc_x2_conjugate_dot_prod_32fc.h
+include/volk/volk_32fc_x2_divide_32fc.h
 include/volk/volk_32fc_x2_dot_prod_32fc.h
 include/volk/volk_32fc_x2_multiply_32fc.h
 include/volk/volk_32fc_x2_multiply_conjugate_32fc.h
@@ -658,7 +667,7 @@ lib/libgnuradio-pmt.so.${PKGVERSION}
 lib/libgnuradio-runtime.so
 lib/libgnuradio-runtime.so.${PKGVERSION}
 lib/libvolk.so
-lib/libvolk.so.1.2.1
+lib/libvolk.so.1.3
 lib/pkgconfig/gnuradio-analog.pc
 lib/pkgconfig/gnuradio-audio.pc
 lib/pkgconfig/gnuradio-blocks.pc
@@ -890,6 +899,21 @@ ${PYSITELIB}/gnuradio/gru/seq_with_cursor.pyo
 ${PYSITELIB}/gnuradio/gru/socket_stuff.py
 ${PYSITELIB}/gnuradio/gru/socket_stuff.pyc
 ${PYSITELIB}/gnuradio/gru/socket_stuff.pyo
+${PYSITELIB}/grc_gnuradio/__init__.py
+${PYSITELIB}/grc_gnuradio/__init__.pyc
+${PYSITELIB}/grc_gnuradio/__init__.pyo
+${PYSITELIB}/grc_gnuradio/blks2/__init__.py
+${PYSITELIB}/grc_gnuradio/blks2/__init__.pyc
+${PYSITELIB}/grc_gnuradio/blks2/__init__.pyo
+${PYSITELIB}/grc_gnuradio/blks2/error_rate.py
+${PYSITELIB}/grc_gnuradio/blks2/error_rate.pyc
+${PYSITELIB}/grc_gnuradio/blks2/error_rate.pyo
+${PYSITELIB}/grc_gnuradio/blks2/selector.py
+${PYSITELIB}/grc_gnuradio/blks2/selector.pyc
+${PYSITELIB}/grc_gnuradio/blks2/selector.pyo
+${PYSITELIB}/grc_gnuradio/blks2/tcp.py
+${PYSITELIB}/grc_gnuradio/blks2/tcp.pyc
+${PYSITELIB}/grc_gnuradio/blks2/tcp.pyo
 ${PYSITELIB}/pmt/__init__.py
 ${PYSITELIB}/pmt/__init__.pyc
 ${PYSITELIB}/pmt/__init__.pyo
@@ -935,6 +959,7 @@ share/gnuradio/examples/audio/spectrum_inversion.py
 share/gnuradio/examples/audio/test_resampler.py
 share/gnuradio/examples/blocks/matrix_multiplexer.grc
 share/gnuradio/examples/blocks/peak_detector2.grc
+share/gnuradio/examples/blocks/test_stream_mux_tags.grc
 share/gnuradio/examples/blocks/vector_source_with_tags.grc
 share/gnuradio/examples/filter/channelize.py
 share/gnuradio/examples/filter/chirp_channelize.py
@@ -955,6 +980,7 @@ share/gnuradio/examples/filter/synth_filter.py
 share/gnuradio/examples/filter/synth_to_chan.py
 share/gnuradio/examples/gnuradio-runtime.conf
 share/gnuradio/examples/gr-audio-jack.conf
+share/gnuradio/examples/gr-audio-oss.conf
 share/gnuradio/examples/gr-audio-portaudio.conf
 share/gnuradio/examples/gr-audio.conf
 share/gnuradio/examples/metadata/file_metadata_sink.grc
@@ -1016,6 +1042,11 @@ share/gnuradio/grc/blocks/analog_wfm_rcv_pll.xml
 share/gnuradio/grc/blocks/analog_wfm_tx.xml
 share/gnuradio/grc/blocks/audio_sink.xml
 share/gnuradio/grc/blocks/audio_source.xml
+share/gnuradio/grc/blocks/blks2_error_rate.xml
+share/gnuradio/grc/blocks/blks2_selector.xml
+share/gnuradio/grc/blocks/blks2_tcp_sink.xml
+share/gnuradio/grc/blocks/blks2_tcp_source.xml
+share/gnuradio/grc/blocks/blks2_valve.xml
 share/gnuradio/grc/blocks/blocks_abs_xx.xml
 share/gnuradio/grc/blocks/blocks_add_const_vxx.xml
 share/gnuradio/grc/blocks/blocks_add_xx.xml
@@ -1075,6 +1106,7 @@ share/gnuradio/grc/blocks/blocks_message_strobe.xml
 share/gnuradio/grc/blocks/blocks_message_strobe_random.xml
 share/gnuradio/grc/blocks/blocks_min_xx.xml
 share/gnuradio/grc/blocks/blocks_moving_average_xx.xml
+share/gnuradio/grc/blocks/blocks_multiply_by_tag_value_cc.xml
 share/gnuradio/grc/blocks/blocks_multiply_conjugate_cc.xml
 share/gnuradio/grc/blocks/blocks_multiply_const_vxx.xml
 share/gnuradio/grc/blocks/blocks_multiply_matrix_xx.xml
@@ -1128,6 +1160,7 @@ share/gnuradio/grc/blocks/blocks_tagged_stream_multiply_length.xml
 share/gnuradio/grc/blocks/blocks_tagged_stream_mux.xml
 share/gnuradio/grc/blocks/blocks_tagged_stream_to_pdu.xml
 share/gnuradio/grc/blocks/blocks_tags_strobe.xml
+share/gnuradio/grc/blocks/blocks_test_tag_variable_rate_ff.xml
 share/gnuradio/grc/blocks/blocks_threshold_ff.xml
 share/gnuradio/grc/blocks/blocks_throttle.xml
 share/gnuradio/grc/blocks/blocks_transcendental.xml
@@ -1184,3 +1217,5 @@ share/gnuradio/grc/blocks/variable_band_reject_filter_taps.xml
 share/gnuradio/grc/blocks/variable_high_pass_filter_taps.xml
 share/gnuradio/grc/blocks/variable_low_pass_filter_taps.xml
 share/gnuradio/grc/blocks/variable_rrc_filter_taps.xml
+share/gnuradio/grc/blocks/xmlrpc_client.xml
+share/gnuradio/grc/blocks/xmlrpc_server.xml
diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index 89471ddc351..c4d07d7bf98 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.24 2016/03/19 23:40:25 dbj Exp $
+$NetBSD: distinfo,v 1.25 2016/07/12 11:36:46 mef Exp $
 
-SHA1 (gnuradio-3.7.9.1.tar.gz) = 6b9960ebed57610e52da2c23ef953674faefb849
-RMD160 (gnuradio-3.7.9.1.tar.gz) = a058199b480db264d2ca6b8b87a7b18d2a876d62
-SHA512 (gnuradio-3.7.9.1.tar.gz) = ee575616bede307e18c3f6c4d039cdf27388796ad17adaf65bd39a74a7754bc5f822b4d18da0dd31587d453d625dfa58d75809c4a37fa0809c4009ac8fe5451d
-Size (gnuradio-3.7.9.1.tar.gz) = 4857025 bytes
+SHA1 (gnuradio-3.7.10.tar.gz) = 829abcf64df6ae76ee6f7643139a9eee9f8fd35a
+RMD160 (gnuradio-3.7.10.tar.gz) = 7b8668117ad672259505c8b48002637503da54f4
+SHA512 (gnuradio-3.7.10.tar.gz) = 11c40d2844e570f55cde8997b3375acdcfe250de4a5048c9db0a451d8fa53bfed44f07a831e3151bd02d892a2cb37bf3a46b4305f0811b58e81a9534fe153e1f
+Size (gnuradio-3.7.10.tar.gz) = 4332494 bytes
 SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c
 SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5
 SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = c05628aa88ac968928f9eabd8c56d4527e258767
 SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 00ff8c14658acd2d1dc8be18ea6a19ace8d12968
 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = d61dcd31058c04a6050479a6e8c321ca15420d49
-SHA1 (patch-grc_script_gnuradio-companion) = 15dde8f3a9e057061e56157533f8af1919240b93
-SHA1 (patch-volk_apps_CMakeLists.txt) = 1523b725fdf83751bd6f8d73d62a8f8b9a618886
-SHA1 (patch-volk_lib_CMakeLists.txt) = 67a1545e138d6472803caa1f601c7b430101b83f
diff --git a/ham/gnuradio-core/files/REPLACE_PYTHON b/ham/gnuradio-core/files/REPLACE_PYTHON
index 43b77540151..6f9ab55a82b 100644
--- a/ham/gnuradio-core/files/REPLACE_PYTHON
+++ b/ham/gnuradio-core/files/REPLACE_PYTHON
@@ -1,35 +1,5 @@
 REPLACE_PYTHON = \
-	grc/base/Platform.py \
-	grc/base/Port.py \
-	grc/base/Constants.py \
-	grc/base/Param.py \
-	grc/base/Connection.py \
-	grc/base/Element.py \
-	grc/base/ParseXML.py \
-	grc/base/FlowGraph.py \
-	grc/base/odict.py \
-	grc/base/__init__.py \
-	grc/base/Block.py \
-	grc/python/Platform.py \
-	grc/python/Port.py \
-	grc/python/Constants.py \
-	grc/python/expr_utils.py \
-	grc/python/flow_graph.tmpl \
-	grc/python/Param.py \
-	grc/python/Connection.py \
-	grc/python/FlowGraph.py \
-	grc/python/__init__.py \
-	grc/python/Generator.py \
-	grc/python/extract_docs.py \
-	grc/python/Block.py \
-	grc/grc_gnuradio/blks2/packet.py \
-	grc/grc_gnuradio/blks2/selector.py \
-	grc/grc_gnuradio/blks2/error_rate.py \
-	grc/grc_gnuradio/blks2/__init__.py \
-	grc/grc_gnuradio/blks2/tcp.py \
-	grc/grc_gnuradio/__init__.py \
 	grc/__init__.py \
-	grc/examples/xmlrpc/xmlrpc_client_script.py \
 	grc/gui/Platform.py \
 	grc/gui/Port.py \
 	grc/gui/NotebookPage.py \
@@ -44,7 +14,6 @@ REPLACE_PYTHON = \
 	grc/gui/Actions.py \
 	grc/gui/MainWindow.py \
 	grc/gui/BlockTreeWindow.py \
-	grc/gui/Messages.py \
 	grc/gui/Connection.py \
 	grc/gui/Dialogs.py \
 	grc/gui/Preferences.py \
@@ -541,8 +510,6 @@ REPLACE_PYTHON = \
 	docs/sphinx/hieroglyph/__init__.py \
 	docs/sphinx/hieroglyph/nodes.py \
 	docs/sphinx/gnuradio_sphinx.py \
-	docs/sphinx/source/analog/get_blocks.py \
-	docs/sphinx/source/blocks/get_blocks.py \
 	docs/doxygen/swig_doc.py \
 	docs/doxygen/doxyxml/generated/indexsuper.py \
 	docs/doxygen/doxyxml/generated/index.py \
diff --git a/ham/gnuradio-core/patches/patch-grc_script_gnuradio-companion b/ham/gnuradio-core/patches/patch-grc_script_gnuradio-companion
deleted file mode 100644
index 076183b795a..00000000000
--- a/ham/gnuradio-core/patches/patch-grc_script_gnuradio-companion
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-grc_script_gnuradio-companion,v 1.3 2015/09/01 04:13:43 mef Exp $
-
-Add message for NetBSD when failed to import gnuradio.
-Or missing gnuradio-core package.
-
---- grc/scripts/gnuradio-companion.orig	2015-08-23 21:36:38.000000000 +0900
-+++ grc/scripts/gnuradio-companion	2015-08-23 21:38:19.000000000 +0900
-@@ -35,6 +35,7 @@ warnings.filterwarnings("always")
- 
- GR_IMPORT_ERROR_MESSAGE = """\
- Cannot import gnuradio.
-+You may be missing gnuradio-core package or
- 
- Is the python path environment variable set correctly?
-     All OS: PYTHONPATH
diff --git a/ham/gnuradio-core/patches/patch-volk_apps_CMakeLists.txt b/ham/gnuradio-core/patches/patch-volk_apps_CMakeLists.txt
deleted file mode 100644
index 89658f6bc42..00000000000
--- a/ham/gnuradio-core/patches/patch-volk_apps_CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-volk_apps_CMakeLists.txt,v 1.1 2016/03/19 23:40:25 dbj Exp $
-
-Fix compilation with cmake 3.5
-upstream: https://github.com/gnuradio/volk/pull/65
-
---- volk/apps/CMakeLists.txt.orig	2016-02-07 17:09:12.000000000 +0000
-+++ volk/apps/CMakeLists.txt
-@@ -19,23 +19,23 @@
- # Setup profiler
- ########################################################################
- if(MSVC)
--    include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
-+    include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
- endif(MSVC)
- 
- include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_CURRENT_BINARY_DIR}
--    ${CMAKE_SOURCE_DIR}/include
--    ${CMAKE_BINARY_DIR}/include
--    ${CMAKE_SOURCE_DIR}/lib
--    ${CMAKE_BINARY_DIR}/lib
-+    ${PROJECT_SOURCE_DIR}/include
-+    ${PROJECT_BINARY_DIR}/include
-+    ${PROJECT_SOURCE_DIR}/lib
-+    ${PROJECT_BINARY_DIR}/lib
-     ${Boost_INCLUDE_DIRS}
- )
- 
- # MAKE volk_profile
- add_executable(volk_profile
-     ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
--    ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
-+    ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc
- )
- 
- 
diff --git a/ham/gnuradio-core/patches/patch-volk_lib_CMakeLists.txt b/ham/gnuradio-core/patches/patch-volk_lib_CMakeLists.txt
deleted file mode 100644
index 97115460dff..00000000000
--- a/ham/gnuradio-core/patches/patch-volk_lib_CMakeLists.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-volk_lib_CMakeLists.txt,v 1.1 2016/03/19 23:40:25 dbj Exp $
-
-Fix compilation with cmake 3.5
-upstream: https://github.com/gnuradio/volk/pull/65
-
---- volk/lib/CMakeLists.txt.orig	2016-02-07 17:09:12.000000000 +0000
-+++ volk/lib/CMakeLists.txt
-@@ -90,7 +90,7 @@ endif()
- ########################################################################
- execute_process(
-     COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
--    ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
-+    ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
-     --mode "arch_flags" --compiler "${COMPILER_NAME}"
-     OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-@@ -278,7 +278,7 @@ message(STATUS "Available architectures:
- ########################################################################
- execute_process(
-     COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
--    ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
-+    ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
-     --mode "machines" --archs "${available_archs}"
-     OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${av
- ########################################################################
- 
- #dependencies are all python, xml, and header implementation files
--file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
--file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
--file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h)
-+file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml)
-+file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py)
-+file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h)
- 
- macro(gen_template tmpl output)
-     list(APPEND volk_gen_sources ${output})
-@@ -320,21 +320,21 @@ macro(gen_template tmpl output)
-         OUTPUT ${output}
-         DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl}
-         COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
--        ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py
-+        ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py
-         --input ${tmpl} --output ${output} ${ARGN}
-     )
- endmacro(gen_template)
- 
--make_directory(${CMAKE_BINARY_DIR}/include/volk)
-+make_directory(${PROJECT_BINARY_DIR}/include/volk)
- 
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h              ${CMAKE_BINARY_DIR}/include/volk/volk.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c              ${CMAKE_BINARY_DIR}/lib/volk.c)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h     ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h          ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c          ${CMAKE_BINARY_DIR}/lib/volk_cpu.c)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h     ${CMAKE_BINARY_DIR}/lib/volk_machines.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c     ${CMAKE_BINARY_DIR}/lib/volk_machines.c)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h              ${PROJECT_BINARY_DIR}/include/volk/volk.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c              ${PROJECT_BINARY_DIR}/lib/volk.c)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h     ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h          ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c          ${PROJECT_BINARY_DIR}/lib/volk_cpu.c)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h     ${PROJECT_BINARY_DIR}/lib/volk_machines.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c     ${PROJECT_BINARY_DIR}/lib/volk_machines.c)
- 
- set(BASE_CFLAGS NONE)
- string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU)
-@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}::
- foreach(machine_name ${available_machines})
-     #generate machine source
-     set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c)
--    gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
-+    gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
- 
-     #determine machine flags
-     execute_process(
-         COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
--        ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
-+        ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
-         --mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}"
-         OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE
-     )
-@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
- # Set local include directories first
- ########################################################################
- include_directories(
--    ${CMAKE_BINARY_DIR}/include
--    ${CMAKE_SOURCE_DIR}/include
--    ${CMAKE_SOURCE_DIR}/kernels
-+    ${PROJECT_BINARY_DIR}/include
-+    ${PROJECT_SOURCE_DIR}/include
-+    ${PROJECT_SOURCE_DIR}/kernels
-     ${CMAKE_CURRENT_BINARY_DIR}
-     ${CMAKE_CURRENT_SOURCE_DIR}
- )
-@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8
-       # setup architecture specific assembler flags
-       set(ARCH_ASM_FLAGS "-mfpu=neon -g")
-       # then add the files
--      include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon)
--      file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
-+      include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon)
-+      file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
-       foreach(asm_file ${asm_files})
-         list(APPEND volk_sources ${asm_file})
-         message(STATUS "Adding source file: ${asm_file}")
-@@ -453,7 +453,7 @@ if(ORC_FOUND)
-     list(APPEND volk_libraries ${ORC_LIBRARIES})
- 
-     #setup orc functions
--    file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
-+    file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
-     foreach(orc_file ${orc_files})
- 
-         #extract the name for the generated c source from the orc file
-@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machin
- 
- if(MSVC)
-     #add compatibility includes for stdint types
--    include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
-+    include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
-     add_definitions(-DHAVE_CONFIG_H)
-     #compile the sources as C++ due to the lack of complex.h under MSVC
-     set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX)