13 files changed, 0 insertions, 1397 deletions

diff --git a/gnuradio-core/src/lib/general/.gitignore b/gnuradio-core/src/lib/general/.gitignore
deleted file mode 100644
index 795dc793c..000000000
--- a/gnuradio-core/src/lib/general/.gitignore
+++ /dev/null
@@ -1,308 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/generate-stamp
-/gr_constants.cc
-/GrFIRfilterCCC.cc
-/GrFIRfilterCCC.h
-/GrFIRfilterCCF.cc
-/GrFIRfilterCCF.h
-/GrFIRfilterFCC.cc
-/GrFIRfilterFCC.h
-/GrFIRfilterFFF.cc
-/GrFIRfilterFFF.h
-/GrFIRfilterFSF.cc
-/GrFIRfilterFSF.h
-/GrFIRfilterSCC.cc
-/GrFIRfilterSCC.h
-/GrFIRfilterSIS.cc
-/GrFIRfilterSIS.h
-/GrFreqXlatingFIRfilterCCC.cc
-/GrFreqXlatingFIRfilterCCC.h
-/GrFreqXlatingFIRfilterCCF.cc
-/GrFreqXlatingFIRfilterCCF.h
-/GrFreqXlatingFIRfilterFCC.cc
-/GrFreqXlatingFIRfilterFCC.h
-/GrFreqXlatingFIRfilterFCF.cc
-/GrFreqXlatingFIRfilterFCF.h
-/GrFreqXlatingFIRfilterSCC.cc
-/GrFreqXlatingFIRfilterSCC.h
-/GrFreqXlatingFIRfilterSCF.cc
-/GrFreqXlatingFIRfilterSCF.h
-/gr_fir_CCC.cc
-/gr_fir_CCC.h
-/gr_fir_CCC_generic.cc
-/gr_fir_CCC_generic.h
-/gr_fir_CCF.cc
-/gr_fir_CCF.h
-/gr_fir_CCF_generic.cc
-/gr_fir_CCF_generic.h
-/gr_fir_FCC.cc
-/gr_fir_FCC.h
-/gr_fir_FCC_generic.cc
-/gr_fir_FCC_generic.h
-/gr_fir_FFF.cc
-/gr_fir_FFF.h
-/gr_fir_FFF_generic.cc
-/gr_fir_FFF_generic.h
-/gr_fir_FSF.cc
-/gr_fir_FSF.h
-/gr_fir_FSF_generic.cc
-/gr_fir_FSF_generic.h
-/gr_fir_SCC.cc
-/gr_fir_SCC.h
-/gr_fir_SCC_generic.cc
-/gr_fir_SCC_generic.h
-/gr_fir_SIS.cc
-/gr_fir_SIS.h
-/gr_fir_SIS_generic.cc
-/gr_fir_SIS_generic.h
-/gr_fir_sysconfig.cc
-/gr_fir_sysconfig.h
-/gr_fir_sysconfig_generic.cc
-/gr_fir_sysconfig_generic.h
-/gr_fir_util.cc
-/gr_fir_util.h
-/GrFIRfilterCCC.i
-/GrFIRfilterCCF.i
-/GrFIRfilterFCC.i
-/GrFIRfilterFFF.i
-/GrFIRfilterFSF.i
-/GrFIRfilterSCC.i
-/GrFIRfilterSIS.i
-/GrFreqXlatingFIRfilterCCC.i
-/GrFreqXlatingFIRfilterCCF.i
-/GrFreqXlatingFIRfilterFCC.i
-/GrFreqXlatingFIRfilterFCF.i
-/GrFreqXlatingFIRfilterSCC.i
-/GrFreqXlatingFIRfilterSCF.i
-/# --- generated files ---
-/gr_add_cc.cc
-/gr_add_cc.h
-/gr_add_cc.i
-/gr_add_const_c.cc
-/gr_add_const_c.h
-/gr_add_const_c.i
-/gr_add_const_cc.cc
-/gr_add_const_cc.h
-/gr_add_const_cc.i
-/gr_add_const_f.cc
-/gr_add_const_f.h
-/gr_add_const_f.i
-/gr_add_const_ff.cc
-/gr_add_const_ff.h
-/gr_add_const_ff.i
-/gr_add_const_i.cc
-/gr_add_const_i.h
-/gr_add_const_i.i
-/gr_add_const_ii.cc
-/gr_add_const_ii.h
-/gr_add_const_ii.i
-/gr_add_const_s.cc
-/gr_add_const_s.h
-/gr_add_const_s.i
-/gr_add_const_sf.cc
-/gr_add_const_sf.h
-/gr_add_const_sf.i
-/gr_add_const_ss.cc
-/gr_add_const_ss.h
-/gr_add_const_ss.i
-/gr_add_const_vcc.cc
-/gr_add_const_vcc.h
-/gr_add_const_vcc.i
-/gr_add_const_vff.cc
-/gr_add_const_vff.h
-/gr_add_const_vff.i
-/gr_add_const_vii.cc
-/gr_add_const_vii.h
-/gr_add_const_vii.i
-/gr_add_const_vss.cc
-/gr_add_const_vss.h
-/gr_add_const_vss.i
-/gr_add_ii.cc
-/gr_add_ii.h
-/gr_add_ii.i
-/gr_add_ss.cc
-/gr_add_ss.h
-/gr_add_ss.i
-/gr_add_vcc.cc
-/gr_add_vcc.h
-/gr_add_vcc.i
-/gr_add_vff.cc
-/gr_add_vff.h
-/gr_add_vff.i
-/gr_add_vii.cc
-/gr_add_vii.h
-/gr_add_vii.i
-/gr_add_vss.cc
-/gr_add_vss.h
-/gr_add_vss.i
-/gr_divide_cc.cc
-/gr_divide_cc.h
-/gr_divide_cc.i
-/gr_divide_ff.cc
-/gr_divide_ff.h
-/gr_divide_ff.i
-/gr_divide_ii.cc
-/gr_divide_ii.h
-/gr_divide_ii.i
-/gr_divide_ss.cc
-/gr_divide_ss.h
-/gr_divide_ss.i
-/gr_multiply_const_ii.cc
-/gr_multiply_const_ii.h
-/gr_multiply_const_ii.i
-/gr_multiply_const_ss.cc
-/gr_multiply_const_ss.h
-/gr_multiply_const_ss.i
-/gr_multiply_ii.cc
-/gr_multiply_ii.h
-/gr_multiply_ii.i
-/gr_multiply_ss.cc
-/gr_multiply_ss.h
-/gr_multiply_ss.i
-/gr_multiply_vcc.cc
-/gr_multiply_vcc.h
-/gr_multiply_vcc.i
-/gr_multiply_vff.cc
-/gr_multiply_vff.h
-/gr_multiply_vff.i
-/gr_multiply_vii.cc
-/gr_multiply_vii.h
-/gr_multiply_vii.i
-/gr_multiply_vss.cc
-/gr_multiply_vss.h
-/gr_multiply_vss.i
-/gr_multiply_const_vcc.cc
-/gr_multiply_const_vcc.h
-/gr_multiply_const_vcc.i
-/gr_multiply_const_vff.cc
-/gr_multiply_const_vff.h
-/gr_multiply_const_vff.i
-/gr_multiply_const_vii.cc
-/gr_multiply_const_vii.h
-/gr_multiply_const_vii.i
-/gr_multiply_const_vss.cc
-/gr_multiply_const_vss.h
-/gr_multiply_const_vss.i
-/gr_noise_source_c.cc
-/gr_noise_source_c.h
-/gr_noise_source_c.i
-/gr_noise_source_f.cc
-/gr_noise_source_f.h
-/gr_noise_source_f.i
-/gr_noise_source_i.cc
-/gr_noise_source_i.h
-/gr_noise_source_i.i
-/gr_noise_source_s.cc
-/gr_noise_source_s.h
-/gr_noise_source_s.i
-/gr_sig_source_c.cc
-/gr_sig_source_c.h
-/gr_sig_source_c.i
-/gr_sig_source_f.cc
-/gr_sig_source_f.h
-/gr_sig_source_f.i
-/gr_sig_source_i.cc
-/gr_sig_source_i.h
-/gr_sig_source_i.i
-/gr_sig_source_s.cc
-/gr_sig_source_s.h
-/gr_sig_source_s.i
-/gr_sub_cc.cc
-/gr_sub_cc.h
-/gr_sub_cc.i
-/gr_sub_ff.cc
-/gr_sub_ff.h
-/gr_sub_ff.i
-/gr_sub_ii.cc
-/gr_sub_ii.h
-/gr_sub_ii.i
-/gr_sub_ss.cc
-/gr_sub_ss.h
-/gr_sub_ss.i
-/gr_vector_sink_b.cc
-/gr_vector_sink_b.h
-/gr_vector_sink_b.i
-/gr_vector_sink_c.cc
-/gr_vector_sink_c.h
-/gr_vector_sink_c.i
-/gr_vector_sink_f.cc
-/gr_vector_sink_f.h
-/gr_vector_sink_f.i
-/gr_vector_sink_i.cc
-/gr_vector_sink_i.h
-/gr_vector_sink_i.i
-/gr_vector_sink_s.cc
-/gr_vector_sink_s.h
-/gr_vector_sink_s.i
-/gr_vector_source_b.cc
-/gr_vector_source_b.h
-/gr_vector_source_b.i
-/gr_vector_source_c.cc
-/gr_vector_source_c.h
-/gr_vector_source_c.i
-/gr_vector_source_f.cc
-/gr_vector_source_f.h
-/gr_vector_source_f.i
-/gr_vector_source_i.cc
-/gr_vector_source_i.h
-/gr_vector_source_i.i
-/gr_vector_source_s.cc
-/gr_vector_source_s.h
-/gr_vector_source_s.i
-/gr_mute_cc.cc
-/gr_mute_cc.h
-/gr_mute_cc.i
-/gr_mute_ff.cc
-/gr_mute_ff.h
-/gr_mute_ff.i
-/gr_mute_ii.cc
-/gr_mute_ii.h
-/gr_mute_ii.i
-/gr_mute_ss.cc
-/gr_mute_ss.h
-/gr_mute_ss.i
-/gr_chunks_to_symbols_bc.cc
-/gr_chunks_to_symbols_bc.h
-/gr_chunks_to_symbols_bc.i
-/gr_chunks_to_symbols_bf.cc
-/gr_chunks_to_symbols_bf.h
-/gr_chunks_to_symbols_bf.i
-/gr_chunks_to_symbols_ic.cc
-/gr_chunks_to_symbols_ic.h
-/gr_chunks_to_symbols_ic.i
-/gr_chunks_to_symbols_if.cc
-/gr_chunks_to_symbols_if.h
-/gr_chunks_to_symbols_if.i
-/gr_chunks_to_symbols_sc.cc
-/gr_chunks_to_symbols_sc.h
-/gr_chunks_to_symbols_sc.i
-/gr_chunks_to_symbols_sf.cc
-/gr_chunks_to_symbols_sf.h
-/gr_chunks_to_symbols_sf.i
-/gr_packed_to_unpacked_bb.cc
-/gr_packed_to_unpacked_bb.h
-/gr_packed_to_unpacked_bb.i
-/gr_packed_to_unpacked_ii.cc
-/gr_packed_to_unpacked_ii.h
-/gr_packed_to_unpacked_ii.i
-/gr_packed_to_unpacked_ss.cc
-/gr_packed_to_unpacked_ss.h
-/gr_packed_to_unpacked_ss.i
-/gr_unpacked_to_packed_bb.cc
-/gr_unpacked_to_packed_bb.h
-/gr_unpacked_to_packed_bb.i
-/gr_unpacked_to_packed_ii.cc
-/gr_unpacked_to_packed_ii.h
-/gr_unpacked_to_packed_ii.i
-/gr_unpacked_to_packed_ss.cc
-/gr_unpacked_to_packed_ss.h
-/gr_unpacked_to_packed_ss.i
-/# --- end generated files ---
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index ee6e4c4e6..1d1da247c 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -267,7 +267,6 @@ set(gr_core_general_triple_threats
     gr_simple_framer
     gr_simple_squelch_cc
     gr_skiphead
-    gr_squash_ff
     gr_squelch_base_cc
     gr_squelch_base_ff
     gr_stream_mux
@@ -285,8 +284,6 @@ set(gr_core_general_triple_threats
     gr_vector_to_stream
     gr_vector_to_streams
     gr_unpack_k_bits_bb
-    gr_wavelet_ff
-    gr_wvps_ff
     gr_descrambler_bb
     gr_scrambler_bb
     gr_probe_mpsk_snr_c
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
deleted file mode 100644
index ba1f686ab..000000000
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ /dev/null
@@ -1,491 +0,0 @@
-#
-# Copyright 2001,2002,2004,2006-2012 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# $(WITH_INCLUDES) must _always_ be last
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) \
-	$(FFTW3F_CPPFLAGS) $(GSL_CPPFLAGS) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libgeneral.la libgeneral-qa.la
-
-BUILT_SOURCES = 
-
-# ----------------------------------------------------------------
-
-EXTRA_DIST += \
-	gen_sine_table.py		\
-	gr_constants.cc.in			
-
-libgeneral_la_SOURCES = 		\
-	complex_vec_test.cc		\
-	gr_add_ff.cc			\
-	gr_additive_scrambler_bb.cc	\
-	gr_agc_cc.cc                	\
-	gr_agc_ff.cc                	\
-	gr_agc2_cc.cc                	\
-	gr_agc2_ff.cc                	\
-	gr_align_on_samplenumbers_ss.cc	\
-	gr_bin_statistics_f.cc		\
-	gr_bytes_to_syms.cc		\
-	gr_char_to_float.cc		\
-	gr_char_to_short.cc		\
-	gr_check_counting_s.cc		\
-	gr_check_lfsr_32k_s.cc		\
-	gr_circular_file.cc		\
-	gr_complex_to_interleaved_short.cc \
-	gr_complex_to_xxx.cc		\
-	gr_conjugate_cc.cc		\
-	gr_copy.cc			\
-	gr_count_bits.cc		\
-	gr_cpfsk_bc.cc			\
-	gr_cpm.cc			\
-	gr_ctcss_squelch_ff.cc		\
-	gr_decode_ccsds_27_fb.cc	\
-	gr_deinterleave.cc		\
-	gr_delay.cc			\
-	gr_diff_decoder_bb.cc		\
-	gr_diff_encoder_bb.cc		\
-	gr_diff_phasor_cc.cc		\
-	gr_dpll_bb.cc			\
-	gr_encode_ccsds_27_bb.cc	\
-	gr_fake_channel_coder_pp.cc	\
-	gr_fast_atan2f.cc		\
-	gr_feedforward_agc_cc.cc	\
-	gr_feval.cc			\
-	gr_fft_vcc.cc			\
-	gr_fft_vcc_fftw.cc		\
-	gr_fft_vfc.cc			\
-	gr_firdes.cc			\
-	gr_float_to_char.cc		\
-	gr_float_to_complex.cc		\
-	gr_float_to_int.cc		\
-	gr_float_to_short.cc		\
-	gr_float_to_uchar.cc		\
-	gr_fmdet_cf.cc			\
-	gr_frequency_modulator_fc.cc	\
-	gr_fxpt.cc			\
-	gr_framer_sink_1.cc		\
-	gr_glfsr_source_b.cc		\
-	gr_glfsr_source_f.cc		\
-	gr_head.cc			\
-	gr_interleave.cc		\
-	gr_interleaved_short_to_complex.cc \
-	gr_iqcomp_cc.cc			\
-	gr_keep_one_in_n.cc		\
-	gr_kludge_copy.cc		\
-	gr_lfsr_32k_source_s.cc		\
-	gr_map_bb.cc			\
-	gr_misc.cc			\
-	gr_multiply_cc.cc		\
-	gr_multiply_ff.cc		\
-	gr_multiply_const_cc.cc		\
-	gr_multiply_const_ff.cc		\
-	gr_multiply_conjugate_cc.cc	\
-	gr_nlog10_ff.cc			\
-	gr_nop.cc			\
-	gr_null_sink.cc			\
-	gr_null_source.cc		\
-	gr_pa_2x2_phase_combiner.cc	\
-	gr_packet_sink.cc		\
-	gr_peak_detector2_fb.cc		\
-	gr_phase_modulator_fc.cc	\
-	gr_pll_carriertracking_cc.cc	\
-	gr_pll_freqdet_cf.cc		\
-	gr_pll_refout_cc.cc		\
-	gr_pn_correlator_cc.cc		\
-	gr_constants.cc			\
-	gr_prefs.cc			\
-	gr_probe_avg_mag_sqrd_c.cc	\
-	gr_probe_avg_mag_sqrd_cf.cc	\
-	gr_probe_avg_mag_sqrd_f.cc	\
-	gr_pwr_squelch_cc.cc		\
-	gr_pwr_squelch_ff.cc		\
-	gr_quadrature_demod_cf.cc	\
-	gr_rail_ff.cc			\
-	gr_random.cc			\
-	gr_regenerate_bb.cc		\
-	gr_remez.cc			\
-	gr_repeat.cc			\
-	gr_reverse.cc			\
-	gr_rms_cf.cc			\
-	gr_rms_ff.cc			\
-	gr_short_to_char.cc		\
-	gr_short_to_float.cc		\
-	gr_int_to_float.cc		\
-	gr_simple_correlator.cc		\
-	gr_simple_framer.cc		\
-	gr_simple_squelch_cc.cc		\
-	gr_skiphead.cc			\
-	gr_squash_ff.cc			\
-	gr_squelch_base_cc.cc		\
-	gr_squelch_base_ff.cc		\
-	gr_stream_mux.cc		\
-	gr_stream_to_streams.cc		\
-	gr_stream_to_vector.cc		\
-	gr_streams_to_stream.cc		\
-	gr_streams_to_vector.cc		\
-	gr_stretch_ff.cc		\
-        gr_test.cc                      \
-	gr_threshold_ff.cc		\
-	gr_throttle.cc			\
-	gr_transcendental.cc		\
-	gr_uchar_to_float.cc		\
-	gr_vco_f.cc			\
-	gr_vector_to_stream.cc		\
-	gr_vector_to_streams.cc		\
-	gr_wavelet_ff.cc		\
-	gr_wvps_ff.cc			\
-	gri_add_const_ss_generic.cc	\
-	gri_char_to_float.cc		\
-	gri_control_loop.cc		\
-	gri_debugger_hook.cc		\
-	gri_fft.cc			\
-	gri_float_to_char.cc		\
-	gri_float_to_int.cc		\
-	gri_float_to_short.cc		\
-	gri_float_to_uchar.cc		\
-	gri_glfsr.cc			\
-	gri_interleaved_short_to_complex.cc \
-	gri_int_to_float.cc		\
-	gri_short_to_float.cc		\
-	gri_uchar_to_float.cc		\
-	malloc16.c			\
-	gr_unpack_k_bits_bb.cc		\
-	gr_descrambler_bb.cc		\
-	gr_scrambler_bb.cc		\
-	gr_probe_mpsk_snr_c.cc		\
-	gr_probe_density_b.cc		\
-	gr_annotator_alltoall.cc	\
-	gr_annotator_1to1.cc		\
-	gr_burst_tagger.cc \
-	gr_correlate_access_code_tag_bb.cc
-
-libgeneral_qa_la_SOURCES = 		\
-	qa_general.cc			\
-	qa_gr_circular_file.cc		\
-	qa_gr_cpm.cc			\
-	qa_gr_firdes.cc			\
-	qa_gr_fxpt.cc			\
-	qa_gr_fxpt_nco.cc		\
-	qa_gr_fxpt_vco.cc		\
-	qa_gr_math.cc			\
-	qa_gri_lfsr.cc
-
-grinclude_HEADERS = 			\
-	gr_core_api.h			\
-	complex_vec_test.h		\
-	gr_additive_scrambler_bb.h	\
-	gr_add_ff.h			\
-	gr_agc_cc.h                 	\
-	gr_agc_ff.h                 	\
-	gr_agc2_cc.h                	\
-	gr_agc2_ff.h                	\
-	gr_align_on_samplenumbers_ss.h	\
-	gr_bin_statistics_f.h		\
-	gr_bytes_to_syms.h		\
-	gr_char_to_float.h		\
-	gr_char_to_short.h		\
-	gr_check_counting_s.h		\
-	gr_check_lfsr_32k_s.h		\
-	gr_circular_file.h		\
-	gr_complex_to_interleaved_short.h \
-	gr_complex_to_xxx.h		\
-	gr_conjugate_cc.h		\
-	gr_copy.h			\
-	gr_count_bits.h			\
-	gr_cpfsk_bc.h			\
-	gr_cpm.h			\
-	gr_ctcss_squelch_ff.h		\
-	gr_decode_ccsds_27_fb.h		\
-	gr_diff_decoder_bb.h		\
-	gr_diff_encoder_bb.h		\
-	gr_deinterleave.h		\
-	gr_delay.h			\
-	gr_diff_phasor_cc.h		\
-	gr_dpll_bb.h			\
-	gr_encode_ccsds_27_bb.h		\
-	gr_expj.h			\
-	gr_fake_channel_coder_pp.h	\
-	gr_feedforward_agc_cc.h		\
-	gr_feval.h			\
-	gr_fft_vcc.h			\
-	gr_fft_vcc_fftw.h		\
-	gr_fft_vfc.h			\
-	gr_firdes.h			\
-	gr_float_to_char.h		\
-	gr_float_to_complex.h		\
-	gr_float_to_int.h		\
-	gr_float_to_short.h		\
-	gr_float_to_uchar.h		\
-	gr_fmdet_cf.h			\
-	gr_framer_sink_1.h		\
-	gr_frequency_modulator_fc.h	\
-	gr_fxpt.h			\
-	gr_fxpt_nco.h			\
-	gr_fxpt_vco.h			\
-	gr_glfsr_source_b.h		\
-	gr_glfsr_source_f.h		\
-	gr_head.h			\
-	gr_interleave.h			\
-	gr_interleaved_short_to_complex.h \
-	gr_iqcomp_cc.h			\
-	gr_keep_one_in_n.h		\
-	gr_kludge_copy.h		\
-	gr_lfsr_32k_source_s.h		\
-	gr_log2_const.h			\
-	gr_map_bb.h			\
-	gr_math.h			\
-	gr_misc.h			\
-	gr_multiply_cc.h		\
-	gr_multiply_ff.h		\
-	gr_multiply_const_cc.h		\
-	gr_multiply_const_ff.h		\
-	gr_multiply_conjugate_cc.h	\
-	gr_nco.h			\
-	gr_nlog10_ff.h			\
-	gr_nop.h			\
-	gr_null_sink.h			\
-	gr_null_source.h		\
-	gr_pa_2x2_phase_combiner.h	\
-	gr_packet_sink.h		\
-	gr_peak_detector2_fb.h		\
-	gr_phase_modulator_fc.h		\
-	gr_pll_carriertracking_cc.h	\
-	gr_pll_freqdet_cf.h		\
-	gr_pll_refout_cc.h		\
-	gr_pn_correlator_cc.h		\
-	gr_constants.h			\
-	gr_prefs.h			\
-	gr_probe_avg_mag_sqrd_c.h	\
-	gr_probe_avg_mag_sqrd_cf.h	\
-	gr_probe_avg_mag_sqrd_f.h	\
-	gr_pwr_squelch_cc.h		\
-	gr_pwr_squelch_ff.h		\
-	gr_quadrature_demod_cf.h	\
-	gr_rail_ff.h			\
-	gr_random.h			\
-	gr_regenerate_bb.h		\
-	gr_remez.h			\
-	gr_repeat.h			\
-	gr_reverse.h			\
-	gr_rms_cf.h			\
-	gr_rms_ff.h			\
-	gr_short_to_char.h		\
-	gr_short_to_float.h		\
-	gr_int_to_float.h		\
-	gr_simple_correlator.h		\
-	gr_simple_framer.h		\
-	gr_simple_framer_sync.h		\
-	gr_simple_squelch_cc.h		\
-	gr_squash_ff.h			\
-	gr_skiphead.h			\
-	gr_squelch_base_cc.h		\
-	gr_squelch_base_ff.h		\
-	gr_stream_mux.h			\
-	gr_stream_to_streams.h		\
-	gr_stream_to_vector.h		\
-	gr_streams_to_stream.h		\
-	gr_streams_to_vector.h		\
-	gr_stretch_ff.h			\
-        gr_test_types.h			\
-        gr_test.h			\
-	gr_threshold_ff.h		\
-	gr_throttle.h			\
-	gr_transcendental.h		\
-	gr_uchar_to_float.h		\
-	gr_vco.h			\
-	gr_vco_f.h			\
-	gr_vector_to_stream.h		\
-	gr_vector_to_streams.h		\
-	gr_wavelet_ff.h			\
-	gr_wvps_ff.h			\
-	gri_add_const_ss.h		\
-	gri_agc_cc.h			\
-	gri_agc_ff.h			\
-	gri_agc2_cc.h			\
-	gri_agc2_ff.h			\
-	gri_char_to_float.h		\
-	gri_control_loop.h		\
-	gri_debugger_hook.h		\
-	gri_fft.h			\
-	gri_float_to_char.h		\
-	gri_float_to_int.h		\
-	gri_float_to_short.h		\
-	gri_float_to_uchar.h		\
-	gri_lfsr.h			\
-	gri_glfsr.h			\
-	gri_interleaved_short_to_complex.h \
-	gri_int_to_float.h		\
-	gri_lfsr_15_1_0.h		\
-	gri_lfsr_32k.h			\
-	gri_short_to_float.h		\
-	gri_uchar_to_float.h		\
-	malloc16.h			\
-	random.h			\
-	gr_unpack_k_bits_bb.h		\
-	gr_descrambler_bb.h		\
-	gr_scrambler_bb.h		\
-	gr_probe_mpsk_snr_c.h		\
-	gr_probe_density_b.h		\
-	gr_annotator_alltoall.h		\
-	gr_annotator_1to1.h		\
-	gr_burst_tagger.h	\
-	gr_correlate_access_code_tag_bb.h
-
-noinst_HEADERS = 			\
-	qa_general.h			\
-	qa_gr_circular_file.h		\
-	qa_gr_cpm.h			\
-	qa_gr_firdes.h			\
-	qa_gr_fxpt.h			\
-	qa_gr_fxpt_nco.h		\
-	qa_gr_fxpt_vco.h		\
-	qa_gri_lfsr.h                   \
-	sine_table.h			\
-	qa_gr_math.h
-
-swiginclude_HEADERS =			\
-	complex_vec_test.i		\
-	general.i			\
-	gr_additive_scrambler_bb.i	\
-	gr_add_ff.i			\
-	gr_agc_cc.i                 	\
-	gr_agc_ff.i                 	\
-	gr_agc2_cc.i                 	\
-	gr_agc2_ff.i                 	\
-	gr_align_on_samplenumbers_ss.i	\
-	gr_bin_statistics_f.i		\
-	gr_bytes_to_syms.i		\
-	gr_char_to_float.i		\
-	gr_char_to_short.i		\
-	gr_check_counting_s.i		\
-	gr_check_lfsr_32k_s.i		\
-	gr_complex_to_interleaved_short.i \
-	gr_complex_to_xxx.i		\
-	gr_conjugate_cc.i		\
-	gr_copy.i			\
-	gr_cpfsk_bc.i			\
-	gr_cpm.i			\
-	gr_ctcss_squelch_ff.i		\
-	gr_decode_ccsds_27_fb.i		\
-	gr_diff_decoder_bb.i		\
-	gr_diff_encoder_bb.i		\
-	gr_diff_phasor_cc.i		\
-	gr_dpll_bb.i			\
-	gr_deinterleave.i		\
-	gr_delay.i			\
-	gr_encode_ccsds_27_bb.i		\
-	gr_fake_channel_coder_pp.i	\
-	gr_feedforward_agc_cc.i		\
-	gr_feval.i			\
-	gr_fft_vcc.i			\
-	gr_fft_vfc.i			\
-	gr_firdes.i			\
-	gr_float_to_char.i		\
-	gr_float_to_complex.i		\
-	gr_float_to_int.i		\
-	gr_float_to_short.i		\
-	gr_float_to_uchar.i		\
-	gr_fmdet_cf.i			\
-	gr_frequency_modulator_fc.i	\
-	gr_framer_sink_1.i		\
-	gr_glfsr_source_b.i		\
-	gr_glfsr_source_f.i		\
-	gr_head.i			\
-	gr_int_to_float.i		\
-	gr_interleave.i 		\
-	gr_interleaved_short_to_complex.i \
-	gr_iqcomp_cc.i			\
-	gr_keep_one_in_n.i		\
-	gr_kludge_copy.i		\
-	gr_lfsr_32k_source_s.i		\
-	gr_map_bb.i			\
-	gr_multiply_cc.i		\
-	gr_multiply_ff.i		\
-	gr_multiply_const_cc.i		\
-	gr_multiply_const_ff.i		\
-	gr_multiply_conjugate_cc.i	\
-	gr_nlog10_ff.i			\
-	gr_nop.i			\
-	gr_null_sink.i			\
-	gr_null_source.i		\
-	gr_pa_2x2_phase_combiner.i	\
-	gr_packet_sink.i		\
-	gr_peak_detector2_fb.i		\
-	gr_phase_modulator_fc.i		\
-	gr_pll_carriertracking_cc.i	\
-	gr_pll_freqdet_cf.i		\
-	gr_pll_refout_cc.i		\
-	gr_pn_correlator_cc.i		\
-	gr_constants.i			\
-	gr_prefs.i			\
-	gr_probe_avg_mag_sqrd_c.i	\
-	gr_probe_avg_mag_sqrd_cf.i	\
-	gr_probe_avg_mag_sqrd_f.i	\
-	gr_pwr_squelch_cc.i		\
-	gr_pwr_squelch_ff.i		\
-	gr_quadrature_demod_cf.i	\
-	gr_rail_ff.i			\
-	gr_regenerate_bb.i		\
-	gr_remez.i			\
-	gr_rms_cf.i			\
-	gr_rms_ff.i			\
-	gr_repeat.i			\
-	gr_short_to_char.i		\
-	gr_short_to_float.i		\
-	gr_simple_correlator.i		\
-	gr_simple_framer.i		\
-	gr_simple_squelch_cc.i		\
-	gr_skiphead.i			\
-	gr_squash_ff.i			\
-	gr_squelch_base_cc.i		\
-	gr_squelch_base_ff.i		\
-	gr_stream_mux.i			\
-	gr_stream_to_streams.i		\
-	gr_stream_to_vector.i		\
-	gr_streams_to_stream.i		\
-	gr_streams_to_vector.i		\
-	gr_stretch_ff.i			\
-        gr_test.i			\
-	gr_threshold_ff.i		\
-	gr_throttle.i			\
-	gr_transcendental.i		\
-	gr_uchar_to_float.i		\
-	gr_vco_f.i			\
-	gr_vector_to_stream.i		\
-	gr_vector_to_streams.i		\
-	gr_unpack_k_bits_bb.i		\
-	gr_wavelet_ff.i			\
-	gr_wvps_ff.i			\
-	gri_agc_cc.i			\
-	gri_agc_ff.i			\
-	gri_agc2_cc.i			\
-	gri_agc2_ff.i			\
-	gri_control_loop.i		\
-	gr_descrambler_bb.i		\
-	gr_scrambler_bb.i		\
-	gr_probe_mpsk_snr_c.i		\
-	gr_probe_density_b.i		\
-	gr_annotator_alltoall.i		\
-	gr_annotator_1to1.i		\
-	gr_burst_tagger.i	\
-	gr_correlate_access_code_tag_bb.i
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index fcf60c927..bf8bc163f 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -128,10 +128,7 @@
 #include <gr_probe_mpsk_snr_c.h>
 #include <gr_probe_density_b.h>
 #include <gr_rail_ff.h>
-#include <gr_squash_ff.h>
 #include <gr_stretch_ff.h>
-#include <gr_wavelet_ff.h>
-#include <gr_wvps_ff.h>
 #include <gr_copy.h>
 #include <gr_additive_scrambler_bb.h>
 #include <complex_vec_test.h>
@@ -249,10 +246,7 @@
 %include "gr_probe_mpsk_snr_c.i"
 %include "gr_probe_density_b.i"
 %include "gr_rail_ff.i"
-%include "gr_squash_ff.i"
 %include "gr_stretch_ff.i"
-%include "gr_wavelet_ff.i"
-%include "gr_wvps_ff.i"
 %include "gr_copy.i"
 %include "gr_additive_scrambler_bb.i"
 %include "complex_vec_test.i"
diff --git a/gnuradio-core/src/lib/general/gr_squash_ff.cc b/gnuradio-core/src/lib/general/gr_squash_ff.cc
deleted file mode 100644
index 479204fdb..000000000
--- a/gnuradio-core/src/lib/general/gr_squash_ff.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2010 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdexcept>
-#include <gr_squash_ff.h>
-#include <gr_io_signature.h>
-
-// expect input vector of igrid.size y-values,
-// produce output vector of ogrid.size y-values
-
-gr_squash_ff_sptr
-gr_make_squash_ff(const std::vector<float> &igrid,
-		  const std::vector<float> &ogrid)
-{
-  return gnuradio::get_initial_sptr(new gr_squash_ff(igrid, ogrid));
-}
-
-gr_squash_ff::gr_squash_ff(const std::vector<float> &igrid,
-			   const std::vector<float> &ogrid)
-  : gr_sync_block("squash_ff",
-		  gr_make_io_signature(1, 1, sizeof(float) * igrid.size()),
-		  gr_make_io_signature(1, 1, sizeof(float) * ogrid.size()))
-{
-  d_inum  = igrid.size();
-  d_onum  = ogrid.size();
-  d_igrid = (double *) malloc(d_inum * sizeof(double));
-  d_iwork = (double *) malloc(d_inum * sizeof(double));
-  d_ogrid = (double *) malloc(d_onum * sizeof(double));
-  for (unsigned int i = 0; i < d_inum; i++)
-    d_igrid[i] = igrid[i];
-  for (unsigned int i = 0; i < d_onum; i++)
-    d_ogrid[i] = ogrid[i];
-
-  d_accel = gsl_interp_accel_alloc();
-  d_spline = gsl_spline_alloc(gsl_interp_cspline, d_inum);	// FIXME check w/ Frank
-}
-
-gr_squash_ff::~gr_squash_ff()
-{
-  free((char *) d_igrid);
-  free((char *) d_iwork);
-  free((char *) d_ogrid);
-  gsl_interp_accel_free(d_accel);
-  gsl_spline_free(d_spline);
-}
-
-int
-gr_squash_ff::work(int noutput_items,
-		    gr_vector_const_void_star &input_items,
-		    gr_vector_void_star &output_items)
-{
-  const float *in  = (const float *) input_items[0];
-  float       *out = (float *) output_items[0];
-
-  for (int count = 0; count < noutput_items; count++) {
-
-    for (unsigned int i = 0; i < d_inum; i++)
-      d_iwork[i] = in[i];
-
-    gsl_spline_init(d_spline, d_igrid, d_iwork, d_inum);
-    
-    for (unsigned int i = 0; i < d_onum; i++)
-      out[i] = gsl_spline_eval(d_spline, d_ogrid[i], d_accel);
-
-    in  += d_inum;
-    out += d_onum;
-  }
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_squash_ff.h b/gnuradio-core/src/lib/general/gr_squash_ff.h
deleted file mode 100644
index f7fea1648..000000000
--- a/gnuradio-core/src/lib/general/gr_squash_ff.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef   	INCLUDED_GR_SQUASH_FF_H_
-# define   	INCLUDED_GR_SQUASH_FF_H_
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <gsl/gsl_errno.h>
-#include <gsl/gsl_interp.h>
-#include <gsl/gsl_spline.h>
-/*!
- * \brief implements cheap resampling of spectrum directly from
- * spectral points, using gsl interpolation
- * \ingroup misc
- */
-
-class gr_squash_ff;
-typedef boost::shared_ptr<gr_squash_ff> gr_squash_ff_sptr;
-
-GR_CORE_API gr_squash_ff_sptr gr_make_squash_ff(const std::vector<float> &igrid,
-				    const std::vector<float> &ogrid);
-
-class GR_CORE_API gr_squash_ff : public gr_sync_block
-{
-  friend GR_CORE_API gr_squash_ff_sptr gr_make_squash_ff(const std::vector<float> &igrid,
-					     const std::vector<float> &ogrid);
-  
-  size_t  d_inum;
-  size_t  d_onum;
-  double *d_igrid;
-  double *d_iwork;
-  double *d_ogrid;
-
-  gsl_interp_accel *d_accel;
-  gsl_spline       *d_spline;
-  
-  gr_squash_ff(const std::vector<float> &igrid,
-	       const std::vector<float> &ogrid);
-
- public:
-  ~gr_squash_ff();
-
-  int work(int noutput_items,
-	   gr_vector_const_void_star &input_items,
-	   gr_vector_void_star &output_items);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_squash_ff.i b/gnuradio-core/src/lib/general/gr_squash_ff.i
deleted file mode 100644
index c89b1c28d..000000000
--- a/gnuradio-core/src/lib/general/gr_squash_ff.i
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,squash_ff);
-
-gr_squash_ff_sptr gr_make_squash_ff(const std::vector<float> &igrid,
-				    const std::vector<float> &ogrid);
-
-class gr_squash_ff : public gr_sync_block
-{
-private:
-  gr_squash_ff(const std::vector<float> &igrid,
-	       const std::vector<float> &ogrid);
-
-};
-
diff --git a/gnuradio-core/src/lib/general/gr_wavelet_ff.cc b/gnuradio-core/src/lib/general/gr_wavelet_ff.cc
deleted file mode 100644
index f77c96e99..000000000
--- a/gnuradio-core/src/lib/general/gr_wavelet_ff.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2010 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the tewavelet of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdexcept>
-#include <gr_wavelet_ff.h>
-#include <gr_io_signature.h>
-
-#include <stdio.h>
-
-// NB in this version, only Daubechies wavelets
-// order is wavelet length, even, 2...20
-
-gr_wavelet_ff_sptr
-gr_make_wavelet_ff(int size,
-		   int order,
-		   bool forward)
-{
-  return gnuradio::get_initial_sptr(new gr_wavelet_ff(size,
-					      order,
-					      forward));
-}
-
-gr_wavelet_ff::gr_wavelet_ff(int size,
-			     int order,
-			     bool forward)
-  : gr_sync_block("wavelet_ff",
-		  gr_make_io_signature(1, 1, size * sizeof(float)),
-		  gr_make_io_signature(1, 1, size * sizeof(float))),
-    d_size(size),
-    d_order(order),
-    d_forward(forward)
-{
-  d_wavelet = gsl_wavelet_alloc(gsl_wavelet_daubechies, d_order);
-  if (d_wavelet == NULL)
-    throw std::runtime_error("can't allocate wavelet");
-  d_workspace = gsl_wavelet_workspace_alloc(d_size);
-  if (d_workspace == NULL)
-    throw std::runtime_error("can't allocate wavelet workspace");
-  d_temp = (double *) malloc(d_size*sizeof(double));
-  if (d_workspace == NULL)
-    throw std::runtime_error("can't allocate wavelet double conversion temp");
-}
-
-gr_wavelet_ff::~gr_wavelet_ff()
-{
-  gsl_wavelet_free(d_wavelet);
-  gsl_wavelet_workspace_free(d_workspace);
-  free((char *) d_temp);
-}
-
-int
-gr_wavelet_ff::work(int noutput_items,
-		    gr_vector_const_void_star &input_items,
-		    gr_vector_void_star &output_items)
-{
-  const float *in  = (const float *) input_items[0];
-  float       *out = (float *) output_items[0];
-
-  for (int count = 0; count < noutput_items; count++) {
-    for (int i = 0; i < d_size; i++)
-      d_temp[i] = in[i];
-    
-    if (d_forward)
-      gsl_wavelet_transform_forward(d_wavelet,
-				    d_temp,
-				    1,
-				    d_size,
-				    d_workspace);
-    else
-      gsl_wavelet_transform_inverse(d_wavelet,
-				    d_temp,
-				    1,
-				    d_size,
-				    d_workspace);
-    
-    for (int i = 0; i < d_size; i++)
-      out[i] = d_temp[i];
-
-    in  += d_size;
-    out += d_size;
-  }
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_wavelet_ff.h b/gnuradio-core/src/lib/general/gr_wavelet_ff.h
deleted file mode 100644
index 107a50fe2..000000000
--- a/gnuradio-core/src/lib/general/gr_wavelet_ff.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_WAVELET_FF_H
-#define INCLUDED_GR_WAVELET_FF_H
-
-#include <gr_core_api.h>
-#include <iostream>
-#include <gr_sync_block.h>
-
-#include <gsl/gsl_errno.h>
-#include <gsl/gsl_wavelet.h>
-
-class gr_wavelet_ff;
-typedef boost::shared_ptr<gr_wavelet_ff> gr_wavelet_ff_sptr;
-
-GR_CORE_API gr_wavelet_ff_sptr
-gr_make_wavelet_ff(int size = 1024,
-		   int order = 20,
-		   bool forward = true);
-
-/*!
- * \brief compute wavelet transform using gsl routines
- * \ingroup wavelet_blk
- */
-
-class GR_CORE_API gr_wavelet_ff : public gr_sync_block
-{
-  int                    d_size;
-  int                    d_order;
-  bool			 d_forward;
-  gsl_wavelet           *d_wavelet;
-  gsl_wavelet_workspace *d_workspace;
-  double                *d_temp;
-
-  friend GR_CORE_API gr_wavelet_ff_sptr
-    gr_make_wavelet_ff(int size,
-		       int order,
-		       bool forward);
-
-  gr_wavelet_ff(int size,
-		int order,
-		bool forward);
-
-public:
-  ~gr_wavelet_ff();
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_GR_WAVELET_FF_H */
diff --git a/gnuradio-core/src/lib/general/gr_wavelet_ff.i b/gnuradio-core/src/lib/general/gr_wavelet_ff.i
deleted file mode 100644
index 9d4264170..000000000
--- a/gnuradio-core/src/lib/general/gr_wavelet_ff.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,wavelet_ff);
-
-gr_wavelet_ff_sptr gr_make_wavelet_ff(int size, int order, bool forward);
-
-class gr_wavelet_ff : public gr_sync_block
-{
-private:
-  gr_wavelet_ff(int size, int order, bool forward);
-};
-
diff --git a/gnuradio-core/src/lib/general/gr_wvps_ff.cc b/gnuradio-core/src/lib/general/gr_wvps_ff.cc
deleted file mode 100644
index 8a8dc56ac..000000000
--- a/gnuradio-core/src/lib/general/gr_wvps_ff.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_wvps_ff.h>
-#include <gr_io_signature.h>
-#include <string.h>
-
-static int
-ceil_log2(int k)
-{
-  int m = 0;
-  for (int n = k-1; n > 0; n >>= 1) m++;
-  return m;
-}
-
-gr_wvps_ff_sptr
-gr_make_wvps_ff(int ilen)
-{
-  return gnuradio::get_initial_sptr(new gr_wvps_ff(ilen));
-}
-
-gr_wvps_ff::gr_wvps_ff(int ilen)
-  : gr_sync_block("wvps_ff",
-		  gr_make_io_signature(1, 1, sizeof(float) * ilen),
-		  gr_make_io_signature(1, 1, sizeof(float) * ceil_log2(ilen))),
-    d_ilen(ilen), d_olen(ceil_log2(ilen))
-{
-}
-
-// input vector assumed to be output from gsl wavelet computation
-
-int
-gr_wvps_ff::work(int noutput_items,
-		 gr_vector_const_void_star &input_items,
-		 gr_vector_void_star &output_items)
-{
-  const float *in  = (const float *) input_items[0];
-  float       *out = (float *) output_items[0];
-
-  for (int count = 0; count < noutput_items; count++) {
-
-    // any power?
-
-    if (in[0] == 0.0) {
-      for (int i = 0; i < d_olen; i++)
-	out[i] = 0.0;
-
-    } else {
-      
-      // get power normalization from 0-th wavelet coefficient
-
-      float scl = 1.0/(in[0]*in[0]);
-      int k = 1;
-      
-      // sum powers over sequences of bins,
-      // sequence lengths in increasing powers of 2
-      
-      for (int e = 0; e < d_olen; e++) {
-	int m = 01<<e;
-	float sum = 0.0;
-	
-	for (int l = 0; l < m; l++)
-	  sum += (in[k+l]*in[k+l]);
-	
-	out[e] = scl*sum;
-	k += m;
-      }
-    }
-
-    in  += d_ilen;
-    out += d_olen;
-  }
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_wvps_ff.h b/gnuradio-core/src/lib/general/gr_wvps_ff.h
deleted file mode 100644
index 7c8f26066..000000000
--- a/gnuradio-core/src/lib/general/gr_wvps_ff.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_WVPS_FF_H
-#define INCLUDED_GR_WVPS_FF_H
-
-#include <gr_core_api.h>
-#include <gr_sync_decimator.h>
-
-class gr_wvps_ff;
-typedef boost::shared_ptr<gr_wvps_ff> gr_wvps_ff_sptr;
-
-GR_CORE_API gr_wvps_ff_sptr 
-gr_make_wvps_ff(int ilen);
-
-
-/*!
- * \brief computes the Wavelet Power Spectrum from a set of wavelet coefficients
- * \ingroup wavelet_blk
- */
-class GR_CORE_API gr_wvps_ff : public gr_sync_block
-{
-  friend GR_CORE_API gr_wvps_ff_sptr
-  gr_make_wvps_ff(int ilen);
-
-  int d_ilen;
-  int d_olen;
-
- protected:
-  gr_wvps_ff(int ilen);
-
- public:
-  int work(int noutput_items,
-	   gr_vector_const_void_star &input_items,
-	   gr_vector_void_star &output_items);
-
-};
-
-#endif /* INCLUDED_GR_WVPS_FF_H */
diff --git a/gnuradio-core/src/lib/general/gr_wvps_ff.i b/gnuradio-core/src/lib/general/gr_wvps_ff.i
deleted file mode 100644
index 877126fb2..000000000
--- a/gnuradio-core/src/lib/general/gr_wvps_ff.i
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-GR_SWIG_BLOCK_MAGIC(gr,wvps_ff);
-
-gr_wvps_ff_sptr gr_make_wvps_ff(int ilen);
-
-class gr_wvps_ff : public gr_sync_block
-{
-private:
-  gr_wvps_ff(int ilen);
-};