[Commit-gnuradio] r11313 - in gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src: lib/filter python/gnuradio/blks2impl

[trondeau]

Author: trondeau
Date: 2009-06-29 20:26:35 -0600 (Mon, 29 Jun 2009)
New Revision: 11313

Modified:
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/Makefile.am
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/filter.i
   
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
Log:
Makefile updates for new PFB blocks.

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/Makefile.am
  2009-06-30 02:24:48 UTC (rev 11312)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/Makefile.am
  2009-06-30 02:26:35 UTC (rev 11313)
@@ -191,7 +191,10 @@
        ccomplex_dotprod_generic.cc     \
        float_dotprod_generic.c         \
        short_dotprod_generic.c         \
-       gr_pfb_channelizer_ccf.cc
+       gr_pfb_channelizer_ccf.cc       \
+       gr_pfb_decimator_ccf.cc         \
+       gr_pfb_interpolator_ccf.cc      \
+       gr_pfb_arb_resampler_ccf.cc
 
 libfilter_qa_la_common_SOURCES =       \
        qa_filter.cc                    \
@@ -262,7 +265,10 @@
        short_dotprod_generic.h         \
        short_dotprod_x86.h             \
        sse_debug.h                     \
-       gr_pfb_channelizer_ccf.h
+       gr_pfb_channelizer_ccf.h        \
+       gr_pfb_decimator_ccf.h          \
+       gr_pfb_interpolator_ccf.h       \
+       gr_pfb_arb_resampler_ccf.h
 
 noinst_HEADERS =                       \
        assembly.h                      \
@@ -312,6 +318,9 @@
        gr_single_pole_iir_filter_ff.i  \
        gr_single_pole_iir_filter_cc.i  \
        gr_pfb_channelizer_ccf.i        \
+       gr_pfb_decimator_ccf.i          \
+       gr_pfb_interpolator_ccf.i       \
+       gr_pfb_arb_resampler_ccf.i      \
        $(GENERATED_I)
 endif
 

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/filter.i
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/filter.i 
    2009-06-30 02:24:48 UTC (rev 11312)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/lib/filter/filter.i 
    2009-06-30 02:26:35 UTC (rev 11313)
@@ -33,6 +33,9 @@
 #include <gr_goertzel_fc.h>
 #include <gr_cma_equalizer_cc.h>
 #include <gr_pfb_channelizer_ccf.h>
+#include <gr_pfb_decimator_ccf.h>
+#include <gr_pfb_interpolator_ccf.h>
+#include <gr_pfb_arb_resampler_ccf.h>
 %}
 
 %include "gr_iir_filter_ffd.i"
@@ -47,5 +50,11 @@
 %include "gr_goertzel_fc.i"
 %include "gr_cma_equalizer_cc.i"
 %include "gr_pfb_channelizer_ccf.i"
+%include "gr_pfb_decimator_ccf.i"
+%include "gr_pfb_interpolator_ccf.i"
+%include "gr_pfb_arb_resampler_ccf.i"
+%include "gr_pfb_decimator_ccf.i"
+%include "gr_pfb_interpolator_ccf.i"
+%include "gr_pfb_arb_resampler_ccf.i"
 
 %include "filter_generated.i"

Modified: 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
   2009-06-30 02:24:48 UTC (rev 11312)
+++ 
gnuradio/branches/developers/trondeau/pfb/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
   2009-06-30 02:26:35 UTC (rev 11313)
@@ -47,7 +47,10 @@
        ofdm_sync_pn.py         \
        ofdm_sync_pnac.py       \
        ofdm_sync_ml.py         \
+       pfb_arb_resampler.py    \
        pfb_channelizer.py      \
+       pfb_decimator.py        \
+       pfb_interpolator.py     \
        pkt.py                  \
        psk.py                  \
        qam.py                  \