build: fix autotools for gnuradio-core volkification

7 files changed, 11 insertions, 22 deletions

diff --git a/config/grc_volk.m4 b/config/grc_volk.m4
index f349d5e99..cc6d75649 100644
--- a/config/grc_volk.m4
+++ b/config/grc_volk.m4
@@ -26,11 +26,10 @@ AC_DEFUN([GRC_VOLK],[
     dnl Test if $enable_volk is:
     dnl   yes  : if the --enable code passed muster and all dependencies are met
     dnl   no   : otherwise, then do not set variables
-    if test $passed != with && test x$enable_volk == xyes; then
+    if test $passed != with && test x$enable_volk != xno; then
     	dnl how and where to find INCLUDES and LA
-	volk_INCLUDES="-I\${abs_top_srcdir}/volk/include"
-	volk_LA="\${abs_top_builddir}/volk/lib/libvolk.la \
-	         \${abs_top_builddir}/volk/lib/libvolk_runtime.la"
+	volk_INCLUDES="-I\${abs_top_srcdir}/volk/gen/include -I\${abs_top_srcdir}/volk/include"
+	volk_LA="\${abs_top_builddir}/volk/lib/libvolk.la"
     fi
 
     dnl volk uses a subsidiary configure.ac
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index fc1b7917b..21e721073 100644
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -51,6 +51,7 @@ libgnuradio_core_la_LIBADD  = 		\
 	runtime/libruntime.la		\
 	hier/libhier.la			\
 	$(GRUEL_LA)			\
+	$(VOLK_LA)			\
 	$(FFTW3F_LIBS)			\
 	$(GSL_LIBS)			\
 	$(CBLAS_LIBS)			\
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index ea3b31fd3..5b4a702e1 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -129,8 +129,8 @@ libgeneral_la_SOURCES = 		\
 	gr_reverse.cc			\
 	gr_rms_cf.cc			\
 	gr_rms_ff.cc			\
+	gr_short_to_char.cc		\
 	gr_short_to_float.cc		\
-	gr_short_to_int.cc		\
 	gr_int_to_float.cc		\
 	gr_simple_correlator.cc		\
 	gr_simple_framer.cc		\
@@ -194,8 +194,8 @@ libgeneral_qa_la_SOURCES = 		\
 grinclude_HEADERS = 			\
 	gr_core_api.h			\
 	complex_vec_test.h		\
-	gr_add.h			\
 	gr_additive_scrambler_bb.h	\
+	gr_add_ff.h			\
 	gr_agc_cc.h                 	\
 	gr_agc_ff.h                 	\
 	gr_agc2_cc.h                	\
@@ -339,7 +339,7 @@ grinclude_HEADERS = 			\
 	gri_int_to_float.h		\
 	gri_lfsr_15_1_0.h		\
 	gri_lfsr_32k.h			\
-	gri_short_to_char.h		\
+	gri_short_to_float.h		\
 	gri_uchar_to_float.h		\
 	malloc16.h			\
 	random.h			\
@@ -368,8 +368,8 @@ noinst_HEADERS = 			\
 swiginclude_HEADERS =			\
 	complex_vec_test.i		\
 	general.i			\
-	gr_add.i			\
 	gr_additive_scrambler_bb.i	\
+	gr_add_ff.i			\
 	gr_agc_cc.i                 	\
 	gr_agc_ff.i                 	\
 	gr_agc2_cc.i                 	\
diff --git a/gnuradio-core/src/lib/gengen/Makefile.gen b/gnuradio-core/src/lib/gengen/Makefile.gen
index fb7b21e24..db260585f 100644
--- a/gnuradio-core/src/lib/gengen/Makefile.gen
+++ b/gnuradio-core/src/lib/gengen/Makefile.gen
@@ -12,7 +12,6 @@ GENERATED_H = \
 	gr_add_const_vff.h \
 	gr_add_const_vii.h \
 	gr_add_const_vss.h \
-	gr_add_ff.h \
 	gr_add_ii.h \
 	gr_add_ss.h \
 	gr_and_bb.h \
@@ -45,14 +44,12 @@ GENERATED_H = \
 	gr_moving_average_ff.h \
 	gr_moving_average_ii.h \
 	gr_moving_average_ss.h \
-	gr_multiply_const_ff.h \
 	gr_multiply_const_ii.h \
 	gr_multiply_const_ss.h \
 	gr_multiply_const_vcc.h \
 	gr_multiply_const_vff.h \
 	gr_multiply_const_vii.h \
 	gr_multiply_const_vss.h \
-	gr_multiply_ff.h \
 	gr_multiply_ii.h \
 	gr_multiply_ss.h \
 	gr_mute_cc.h \
@@ -115,7 +112,6 @@ GENERATED_I = \
 	gr_add_const_vff.i \
 	gr_add_const_vii.i \
 	gr_add_const_vss.i \
-	gr_add_ff.i \
 	gr_add_ii.i \
 	gr_add_ss.i \
 	gr_and_bb.i \
@@ -148,14 +144,12 @@ GENERATED_I = \
 	gr_moving_average_ff.i \
 	gr_moving_average_ii.i \
 	gr_moving_average_ss.i \
-	gr_multiply_const_ff.i \
 	gr_multiply_const_ii.i \
 	gr_multiply_const_ss.i \
 	gr_multiply_const_vcc.i \
 	gr_multiply_const_vff.i \
 	gr_multiply_const_vii.i \
 	gr_multiply_const_vss.i \
-	gr_multiply_ff.i \
 	gr_multiply_ii.i \
 	gr_multiply_ss.i \
 	gr_mute_cc.i \
@@ -218,7 +212,6 @@ GENERATED_CC = \
 	gr_add_const_vff.cc \
 	gr_add_const_vii.cc \
 	gr_add_const_vss.cc \
-	gr_add_ff.cc \
 	gr_add_ii.cc \
 	gr_add_ss.cc \
 	gr_and_bb.cc \
@@ -251,14 +244,12 @@ GENERATED_CC = \
 	gr_moving_average_ff.cc \
 	gr_moving_average_ii.cc \
 	gr_moving_average_ss.cc \
-	gr_multiply_const_ff.cc \
 	gr_multiply_const_ii.cc \
 	gr_multiply_const_ss.cc \
 	gr_multiply_const_vcc.cc \
 	gr_multiply_const_vff.cc \
 	gr_multiply_const_vii.cc \
 	gr_multiply_const_vss.cc \
-	gr_multiply_ff.cc \
 	gr_multiply_ii.cc \
 	gr_multiply_ss.cc \
 	gr_mute_cc.cc \
diff --git a/gnuradio-core/src/lib/gengen/generate_common.py b/gnuradio-core/src/lib/gengen/generate_common.py
index 616cc4b06..6da2044e0 100755
--- a/gnuradio-core/src/lib/gengen/generate_common.py
+++ b/gnuradio-core/src/lib/gengen/generate_common.py
@@ -66,7 +66,7 @@ others = (
     ('gr_peak_detector_XX',         ('fb','ib','sb')),
     ('gr_multiply_XX',              ('ss','ii')),
     ('gr_multiply_const_XX',        ('ss','ii')),
-    ('gr_add_XX',                   ('ss','cc'))
+    ('gr_add_XX',                   ('ss','cc','ii'))
     )
 
 
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 738e79f24..104ba8062 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -28,8 +28,6 @@ dist_ourdata_DATA = \
 	band_reject_filter.xml \
 	blks2_am_demod_cf.xml \
 	blks2_analysis_filterbank.xml \
-	blks2_cvsd_encode.xml \
-	blks2_cvsd_decode.xml \
 	blks2_error_rate.xml \
 	blks2_fm_deemph.xml \
 	blks2_fm_demod_cf.xml \
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am
index f6b5835b1..a01ddf193 100644
--- a/volk/include/volk/Makefile.am
+++ b/volk/include/volk/Makefile.am
@@ -59,8 +59,8 @@ volkinclude_HEADERS = \
 	volk_32fc_32f_multiply_32fc_a.h \
 	volk_32fc_s32fc_multiply_32fc_a.h \
 	volk_32fc_s32fc_multiply_32fc_u.h \
-	volk_32fc_s32fc_multiply_conjugate_32fc_a.h \
-	volk_32fc_s32fc_multiply_conjugate_32fc_u.h \
+	volk_32fc_x2_multiply_conjugate_32fc_a.h \
+	volk_32fc_x2_multiply_conjugate_32fc_u.h \
 	volk_32fc_s32f_power_32fc_a.h \
 	volk_32f_s32f_calc_spectral_noise_floor_32f_a.h \
 	volk_32fc_s32f_atan2_32f_a.h \