Merged r10666:10669 from jblum/vlen. Trunk passes distcheck.

[debian/gnuradio] / gnuradio-core / src / lib / gengen / Makefile.gen

diff --git a/gnuradio-core/src/lib/gengen/Makefile.gen b/gnuradio-core/src/lib/gengen/Makefile.gen
index 79b0ef7bd2c8d17bb52dbd07345b032db0253ff1..1c529803c752136f3f7bfd36facdef2c3f31def1 100644 (file)
--- a/gnuradio-core/src/lib/gengen/Makefile.gen
+++ b/gnuradio-core/src/lib/gengen/Makefile.gen
@@ -15,11 +15,10 @@ GENERATED_H = \
        gr_add_ff.h \
        gr_add_ii.h \
        gr_add_ss.h \
-       gr_add_vcc.h \
-       gr_add_vff.h \
-       gr_add_vii.h \
-       gr_add_vss.h \
        gr_and_bb.h \
+       gr_and_const_bb.h \
+       gr_and_const_ii.h \
+       gr_and_const_ss.h \
        gr_and_ii.h \
        gr_and_ss.h \
        gr_argmax_fs.h \
@@ -42,6 +41,10 @@ GENERATED_H = \
        gr_max_ff.h \
        gr_max_ii.h \
        gr_max_ss.h \
+       gr_moving_average_cc.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 \
@@ -54,10 +57,6 @@ GENERATED_H = \
        gr_multiply_ff.h \
        gr_multiply_ii.h \
        gr_multiply_ss.h \
-       gr_multiply_vcc.h \
-       gr_multiply_vff.h \
-       gr_multiply_vii.h \
-       gr_multiply_vss.h \
        gr_mute_cc.h \
        gr_mute_ff.h \
        gr_mute_ii.h \
@@ -121,11 +120,10 @@ GENERATED_I = \
        gr_add_ff.i \
        gr_add_ii.i \
        gr_add_ss.i \
-       gr_add_vcc.i \
-       gr_add_vff.i \
-       gr_add_vii.i \
-       gr_add_vss.i \
        gr_and_bb.i \
+       gr_and_const_bb.i \
+       gr_and_const_ii.i \
+       gr_and_const_ss.i \
        gr_and_ii.i \
        gr_and_ss.i \
        gr_argmax_fs.i \
@@ -148,6 +146,10 @@ GENERATED_I = \
        gr_max_ff.i \
        gr_max_ii.i \
        gr_max_ss.i \
+       gr_moving_average_cc.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 \
@@ -160,10 +162,6 @@ GENERATED_I = \
        gr_multiply_ff.i \
        gr_multiply_ii.i \
        gr_multiply_ss.i \
-       gr_multiply_vcc.i \
-       gr_multiply_vff.i \
-       gr_multiply_vii.i \
-       gr_multiply_vss.i \
        gr_mute_cc.i \
        gr_mute_ff.i \
        gr_mute_ii.i \
@@ -227,11 +225,10 @@ GENERATED_CC = \
        gr_add_ff.cc \
        gr_add_ii.cc \
        gr_add_ss.cc \
-       gr_add_vcc.cc \
-       gr_add_vff.cc \
-       gr_add_vii.cc \
-       gr_add_vss.cc \
        gr_and_bb.cc \
+       gr_and_const_bb.cc \
+       gr_and_const_ii.cc \
+       gr_and_const_ss.cc \
        gr_and_ii.cc \
        gr_and_ss.cc \
        gr_argmax_fs.cc \
@@ -254,6 +251,10 @@ GENERATED_CC = \
        gr_max_ff.cc \
        gr_max_ii.cc \
        gr_max_ss.cc \
+       gr_moving_average_cc.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 \
@@ -266,10 +267,6 @@ GENERATED_CC = \
        gr_multiply_ff.cc \
        gr_multiply_ii.cc \
        gr_multiply_ss.cc \
-       gr_multiply_vcc.cc \
-       gr_multiply_vff.cc \
-       gr_multiply_vii.cc \
-       gr_multiply_vss.cc \
        gr_mute_cc.cc \
        gr_mute_ff.cc \
        gr_mute_ii.cc \