Merge branch 'master' into next

Conflicts:
	config/grc_volk.m4
	gnuradio-core/src/guile/tests/gengen_ctors.test
	gnuradio-core/src/lib/Makefile.am
	gnuradio-core/src/lib/general/.gitignore
	gnuradio-core/src/lib/general/Makefile.am
	gnuradio-core/src/lib/gengen/.gitignore
	gnuradio-core/src/python/gnuradio/gr/Makefile.am
	volk/include/volk/Makefile.am

3 files changed, 7 insertions, 22 deletions

diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt
index a7292f131..98b149e97 100644
--- a/gnuradio-core/src/lib/gengen/CMakeLists.txt
+++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt
@@ -86,10 +86,10 @@ expand_h_cc_i(gr_noise_source_X      s i f c)
 expand_h_cc_i(gr_sig_source_X        s i f c)
 
 expand_h_cc_i(gr_add_const_XX           ss ii ff cc sf)
-expand_h_cc_i(gr_multiply_const_XX      ss ii ff cc)
-expand_h_cc_i(gr_add_XX                 ss ii ff cc)
+expand_h_cc_i(gr_multiply_const_XX      ss ii)
+expand_h_cc_i(gr_add_XX                 ss ii cc)
 expand_h_cc_i(gr_sub_XX                 ss ii ff cc)
-expand_h_cc_i(gr_multiply_XX            ss ii ff cc)
+expand_h_cc_i(gr_multiply_XX            ss ii)
 expand_h_cc_i(gr_divide_XX              ss ii ff cc)
 expand_h_cc_i(gr_mute_XX                ss ii ff cc)
 expand_h_cc_i(gr_add_const_vXX          ss ii ff cc)
diff --git a/gnuradio-core/src/lib/gengen/Makefile.gen b/gnuradio-core/src/lib/gengen/Makefile.gen
index 1c529803c..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,16 +44,12 @@ GENERATED_H = \
 	gr_moving_average_ff.h \
 	gr_moving_average_ii.h \
 	gr_moving_average_ss.h \
-	gr_multiply_cc.h \
-	gr_multiply_const_cc.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 \
@@ -117,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 \
@@ -150,16 +144,12 @@ GENERATED_I = \
 	gr_moving_average_ff.i \
 	gr_moving_average_ii.i \
 	gr_moving_average_ss.i \
-	gr_multiply_cc.i \
-	gr_multiply_const_cc.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 \
@@ -222,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 \
@@ -255,16 +244,12 @@ GENERATED_CC = \
 	gr_moving_average_ff.cc \
 	gr_moving_average_ii.cc \
 	gr_moving_average_ss.cc \
-	gr_multiply_cc.cc \
-	gr_multiply_const_cc.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 9bd6bcc9c..6da2044e0 100755
--- a/gnuradio-core/src/lib/gengen/generate_common.py
+++ b/gnuradio-core/src/lib/gengen/generate_common.py
@@ -41,10 +41,7 @@ reg_signatures = ['ss', 'ii', 'ff', 'cc']
 
 reg_roots = [
     'gr_add_const_XX',
-    'gr_multiply_const_XX',
-    'gr_add_XX',
     'gr_sub_XX',
-    'gr_multiply_XX',
     'gr_divide_XX',
     'gr_mute_XX',
     'gr_add_const_vXX',
@@ -66,7 +63,10 @@ others = (
     ('gr_sample_and_hold_XX',       ('bb','ss','ii','ff')),
     ('gr_argmax_XX',                ('fs','is','ss')),
     ('gr_max_XX',                   ('ff','ii','ss')),
-    ('gr_peak_detector_XX',         ('fb','ib','sb'))
+    ('gr_peak_detector_XX',         ('fb','ib','sb')),
+    ('gr_multiply_XX',              ('ss','ii')),
+    ('gr_multiply_const_XX',        ('ss','ii')),
+    ('gr_add_XX',                   ('ss','cc','ii'))
     )