changes from running bootstrap and then make maintainer-clean
[debian/gnuradio] / gnuradio-core / src / lib / general / Makefile.in
index 78f205b90a26856654f5d618ac9f9b2e8bbda29c..26319373e7890b7bd082948663aa55a8ff5ccf59 100644 (file)
@@ -38,7 +38,7 @@
 
 # -*- Makefile -*-
 #
-# Copyright 2004,2006,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -79,9 +79,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-DIST_COMMON = README $(grinclude_HEADERS) $(noinst_HEADERS) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(srcdir)/gr_prefix.cc.in $(swiginclude_HEADERS) \
+DIST_COMMON = README $(am__swiginclude_HEADERS_DIST) \
+       $(grinclude_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \
+       $(srcdir)/Makefile.in $(srcdir)/gr_constants.cc.in \
        $(top_srcdir)/Makefile.common
 subdir = gnuradio-core/src/lib/general
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -96,36 +96,39 @@ am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \
        $(top_srcdir)/config/gr_check_memalign.m4 \
        $(top_srcdir)/config/gr_check_shm_open.m4 \
        $(top_srcdir)/config/gr_doxygen.m4 \
-       $(top_srcdir)/config/gr_fortran.m4 \
+       $(top_srcdir)/config/gr_git.m4 \
        $(top_srcdir)/config/gr_gprof.m4 \
        $(top_srcdir)/config/gr_lib64.m4 \
        $(top_srcdir)/config/gr_libgnuradio_core_extra_ldflags.m4 \
        $(top_srcdir)/config/gr_no_undefined.m4 \
-       $(top_srcdir)/config/gr_omnithread.m4 \
        $(top_srcdir)/config/gr_pwin32.m4 \
        $(top_srcdir)/config/gr_python.m4 \
        $(top_srcdir)/config/gr_qwt.m4 \
        $(top_srcdir)/config/gr_qwtplot3d.m4 \
        $(top_srcdir)/config/gr_scripting.m4 \
        $(top_srcdir)/config/gr_set_md_cpu.m4 \
-       $(top_srcdir)/config/gr_subversion.m4 \
        $(top_srcdir)/config/gr_swig.m4 \
        $(top_srcdir)/config/gr_sysv_shm.m4 \
+       $(top_srcdir)/config/gr_version.m4 \
        $(top_srcdir)/config/grc_build.m4 \
        $(top_srcdir)/config/grc_docs.m4 \
        $(top_srcdir)/config/grc_gcell.m4 \
        $(top_srcdir)/config/grc_gnuradio_core.m4 \
        $(top_srcdir)/config/grc_gnuradio_examples.m4 \
+       $(top_srcdir)/config/grc_gr_atsc.m4 \
        $(top_srcdir)/config/grc_gr_audio_alsa.m4 \
        $(top_srcdir)/config/grc_gr_audio_jack.m4 \
        $(top_srcdir)/config/grc_gr_audio_oss.m4 \
        $(top_srcdir)/config/grc_gr_audio_osx.m4 \
        $(top_srcdir)/config/grc_gr_audio_portaudio.m4 \
        $(top_srcdir)/config/grc_gr_audio_windows.m4 \
+       $(top_srcdir)/config/grc_gr_comedi.m4 \
        $(top_srcdir)/config/grc_gr_cvsd_vocoder.m4 \
        $(top_srcdir)/config/grc_gr_gcell.m4 \
        $(top_srcdir)/config/grc_gr_gpio.m4 \
        $(top_srcdir)/config/grc_gr_gsm_fr_vocoder.m4 \
+       $(top_srcdir)/config/grc_gr_msdd6000.m4 \
+       $(top_srcdir)/config/grc_gr_noaa.m4 \
        $(top_srcdir)/config/grc_gr_pager.m4 \
        $(top_srcdir)/config/grc_gr_qtgui.m4 \
        $(top_srcdir)/config/grc_gr_radar_mono.m4 \
@@ -139,9 +142,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \
        $(top_srcdir)/config/grc_gr_wxgui.m4 \
        $(top_srcdir)/config/grc_grc.m4 \
        $(top_srcdir)/config/grc_gruel.m4 \
-       $(top_srcdir)/config/grc_mblock.m4 \
-       $(top_srcdir)/config/grc_omnithread.m4 \
-       $(top_srcdir)/config/grc_pmt.m4 \
        $(top_srcdir)/config/grc_usrp.m4 \
        $(top_srcdir)/config/grc_usrp2.m4 \
        $(top_srcdir)/config/lf_cc.m4 $(top_srcdir)/config/lf_cxx.m4 \
@@ -162,7 +162,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = gr_prefix.cc
+CONFIG_CLEAN_FILES = gr_constants.cc
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgeneral_qa_la_LIBADD =
@@ -171,25 +171,25 @@ am_libgeneral_qa_la_OBJECTS = qa_general.lo qa_gr_circular_file.lo \
        qa_gr_fxpt_vco.lo qa_gr_math.lo qa_gri_lfsr.lo
 libgeneral_qa_la_OBJECTS = $(am_libgeneral_qa_la_OBJECTS)
 libgeneral_la_LIBADD =
-am_libgeneral_la_OBJECTS = gr_agc_cc.lo gr_agc_ff.lo gr_agc2_cc.lo \
-       gr_agc2_ff.lo gr_align_on_samplenumbers_ss.lo \
-       gr_bin_statistics_f.lo gr_binary_slicer_fb.lo \
-       gr_bytes_to_syms.lo gr_char_to_float.lo gr_check_counting_s.lo \
-       gr_check_lfsr_32k_s.lo gr_circular_file.lo \
-       gr_clock_recovery_mm_cc.lo gr_clock_recovery_mm_ff.lo \
-       gr_complex_to_interleaved_short.lo gr_complex_to_xxx.lo \
-       gr_conjugate_cc.lo gr_constellation_decoder_cb.lo \
-       gr_correlate_access_code_bb.lo gr_costas_loop_cc.lo \
-       gr_count_bits.lo gr_cpfsk_bc.lo gr_crc32.lo \
-       gr_ctcss_squelch_ff.lo gr_dd_mpsk_sync_cc.lo \
-       gr_decode_ccsds_27_fb.lo gr_deinterleave.lo gr_delay.lo \
-       gr_diff_decoder_bb.lo gr_diff_encoder_bb.lo \
-       gr_diff_phasor_cc.lo gr_dpll_bb.lo gr_encode_ccsds_27_bb.lo \
-       gr_fake_channel_coder_pp.lo gr_fast_atan2f.lo \
-       gr_feedforward_agc_cc.lo gr_feval.lo gr_fft_vcc.lo \
-       gr_fft_vcc_fftw.lo gr_fft_vfc.lo gr_firdes.lo \
-       gr_float_to_char.lo gr_float_to_complex.lo \
-       gr_float_to_short.lo gr_float_to_uchar.lo gr_fmdet_cf.lo \
+am_libgeneral_la_OBJECTS = gr_additive_scrambler_bb.lo gr_agc_cc.lo \
+       gr_agc_ff.lo gr_agc2_cc.lo gr_agc2_ff.lo \
+       gr_align_on_samplenumbers_ss.lo gr_bin_statistics_f.lo \
+       gr_binary_slicer_fb.lo gr_bytes_to_syms.lo gr_char_to_float.lo \
+       gr_check_counting_s.lo gr_check_lfsr_32k_s.lo \
+       gr_circular_file.lo gr_clock_recovery_mm_cc.lo \
+       gr_clock_recovery_mm_ff.lo gr_complex_to_interleaved_short.lo \
+       gr_complex_to_xxx.lo gr_conjugate_cc.lo gr_copy.lo \
+       gr_constellation_decoder_cb.lo gr_correlate_access_code_bb.lo \
+       gr_costas_loop_cc.lo gr_count_bits.lo gr_cpfsk_bc.lo \
+       gr_crc32.lo gr_ctcss_squelch_ff.lo gr_decode_ccsds_27_fb.lo \
+       gr_deinterleave.lo gr_delay.lo gr_diff_decoder_bb.lo \
+       gr_diff_encoder_bb.lo gr_diff_phasor_cc.lo gr_dpll_bb.lo \
+       gr_encode_ccsds_27_bb.lo gr_fake_channel_coder_pp.lo \
+       gr_fast_atan2f.lo gr_feedforward_agc_cc.lo gr_feval.lo \
+       gr_fft_vcc.lo gr_fft_vcc_fftw.lo gr_fft_vfc.lo gr_firdes.lo \
+       gr_fll_band_edge_cc.lo gr_float_to_char.lo \
+       gr_float_to_complex.lo gr_float_to_short.lo \
+       gr_float_to_uchar.lo gr_fmdet_cf.lo \
        gr_frequency_modulator_fc.lo gr_fxpt.lo gr_framer_sink_1.lo \
        gr_glfsr_source_b.lo gr_glfsr_source_f.lo gr_head.lo \
        gr_interleave.lo gr_interleaved_short_to_complex.lo \
@@ -204,7 +204,7 @@ am_libgeneral_la_OBJECTS = gr_agc_cc.lo gr_agc_ff.lo gr_agc2_cc.lo \
        gr_packet_sink.lo gr_peak_detector2_fb.lo \
        gr_phase_modulator_fc.lo gr_pll_carriertracking_cc.lo \
        gr_pll_freqdet_cf.lo gr_pll_refout_cc.lo \
-       gr_pn_correlator_cc.lo gr_prefix.lo gr_prefs.lo \
+       gr_pn_correlator_cc.lo gr_constants.lo gr_prefs.lo \
        gr_probe_avg_mag_sqrd_c.lo gr_probe_avg_mag_sqrd_cf.lo \
        gr_probe_avg_mag_sqrd_f.lo gr_probe_signal_f.lo \
        gr_pwr_squelch_cc.lo gr_pwr_squelch_ff.lo \
@@ -274,6 +274,52 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(grincludedir)" \
        "$(DESTDIR)$(swigincludedir)"
+am__swiginclude_HEADERS_DIST = general.i gr_additive_scrambler_bb.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_binary_slicer_fb.i gr_bytes_to_syms.i gr_char_to_float.i \
+       gr_check_counting_s.i gr_check_lfsr_32k_s.i \
+       gr_clock_recovery_mm_cc.i gr_clock_recovery_mm_ff.i \
+       gr_complex_to_interleaved_short.i gr_complex_to_xxx.i \
+       gr_conjugate_cc.i gr_constellation_decoder_cb.i gr_copy.i \
+       gr_correlate_access_code_bb.i gr_costas_loop_cc.i \
+       gr_cpfsk_bc.i gr_crc32.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_fll_band_edge_cc.i \
+       gr_float_to_char.i gr_float_to_complex.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_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_lms_dfe_cc.i gr_lms_dfe_ff.i \
+       gr_map_bb.i gr_mpsk_receiver_cc.i gr_nlog10_ff.i gr_nop.i \
+       gr_null_sink.i gr_null_source.i gr_ofdm_frame_acquisition.i \
+       gr_ofdm_cyclic_prefixer.i gr_ofdm_demapper_vcb.i \
+       gr_ofdm_mapper_bcv.i gr_ofdm_frame_sink.i \
+       gr_ofdm_insert_preamble.i gr_ofdm_sampler.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_probe_signal_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_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_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 \
+       gr_descrambler_bb.i gr_scrambler_bb.i gr_probe_mpsk_snr_c.i \
+       gr_probe_density_b.i
 HEADERS = $(grinclude_HEADERS) $(noinst_HEADERS) \
        $(swiginclude_HEADERS)
 ETAGS = etags
@@ -298,6 +344,7 @@ BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@
 BOOST_LDFLAGS = @BOOST_LDFLAGS@
 BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
 BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
+BUILD_DATE = @BUILD_DATE@
 CBLAS_LIBS = @CBLAS_LIBS@
 CC = @CC@
 CCAS = @CCAS@
@@ -305,6 +352,10 @@ CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COMEDI_CFLAGS = @COMEDI_CFLAGS@
+COMEDI_CPPFLAGS = @COMEDI_CPPFLAGS@
+COMEDI_INCLUDEDIR = @COMEDI_INCLUDEDIR@
+COMEDI_LIBS = @COMEDI_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
@@ -323,6 +374,7 @@ DEFINES = @DEFINES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
+DOCVER = @DOCVER@
 DOT = @DOT@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
@@ -332,20 +384,23 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFTW3F_CFLAGS = @FFTW3F_CFLAGS@
 FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@
 FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@
 FFTW3F_LIBS = @FFTW3F_LIBS@
 FGREP = @FGREP@
-FLIBS = @FLIBS@
 FUSB_TECH = @FUSB_TECH@
+GIT = @GIT@
+GIT_COMMIT = @GIT_COMMIT@
+GIT_DESCRIBE = @GIT_DESCRIBE@
+GIT_SEQNO = @GIT_SEQNO@
+GIT_TAG = @GIT_TAG@
 GREP = @GREP@
 GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@
 GR_HAVE_ARPA_INET = @GR_HAVE_ARPA_INET@
 GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@
 GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@
+GR_PREFSDIR = @GR_PREFSDIR@
 GSL_CFLAGS = @GSL_CFLAGS@
 GSL_CPPFLAGS = @GSL_CPPFLAGS@
 GSL_INCLUDEDIR = @GSL_INCLUDEDIR@
@@ -368,6 +423,8 @@ LIBGNURADIO_CORE_EXTRA_LDFLAGS = @LIBGNURADIO_CORE_EXTRA_LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_PKG_CONFIG_NAME = @LIBUSB_PKG_CONFIG_NAME@
+LIBVER = @LIBVER@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -429,6 +486,7 @@ QWTPLOT3D_LIBS = @QWTPLOT3D_LIBS@
 QWT_CFLAGS = @QWT_CFLAGS@
 QWT_LIBS = @QWT_LIBS@
 RANLIB = @RANLIB@
+RELEASE = @RELEASE@
 RM_PROG = @RM_PROG@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
@@ -441,17 +499,17 @@ SHELL = @SHELL@
 SHM_OPEN_LIBS = @SHM_OPEN_LIBS@
 SPU_GCC_PROG = @SPU_GCC_PROG@
 STRIP = @STRIP@
-SVN = @SVN@
-SVNDATE = @SVNDATE@
-SVNVERSION = @SVNVERSION@
 SWIG = @SWIG@
 SWIG_PYTHON_CPPFLAGS = @SWIG_PYTHON_CPPFLAGS@
 SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@
 SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@
+SYSCONFDIR = @SYSCONFDIR@
 USB_CFLAGS = @USB_CFLAGS@
 USB_CPPFLAGS = @USB_CPPFLAGS@
 USB_INCLUDEDIR = @USB_INCLUDEDIR@
+USB_INCLUDES = @USB_INCLUDES@
 USB_LIBS = @USB_LIBS@
+USE_LIBUSB1 = @USE_LIBUSB1@
 USRP2_INCLUDES = @USRP2_INCLUDES@
 USRP2_LA = @USRP2_LA@
 VERSION = @VERSION@
@@ -467,7 +525,6 @@ abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 = @ac_ct_F77@
 acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -519,6 +576,11 @@ gnuradio_examples_INCLUDES = @gnuradio_examples_INCLUDES@
 gnuradio_examples_LA = @gnuradio_examples_LA@
 gnuradio_examples_LDFLAG = @gnuradio_examples_LDFLAG@
 gnuradio_examples_LIBDIRPATH = @gnuradio_examples_LIBDIRPATH@
+gr_atsc_INCLUDEDIR = @gr_atsc_INCLUDEDIR@
+gr_atsc_INCLUDES = @gr_atsc_INCLUDES@
+gr_atsc_LA = @gr_atsc_LA@
+gr_atsc_LDFLAG = @gr_atsc_LDFLAG@
+gr_atsc_LIBDIRPATH = @gr_atsc_LIBDIRPATH@
 gr_audio_alsa_INCLUDEDIR = @gr_audio_alsa_INCLUDEDIR@
 gr_audio_alsa_INCLUDES = @gr_audio_alsa_INCLUDES@
 gr_audio_alsa_LA = @gr_audio_alsa_LA@
@@ -549,6 +611,11 @@ gr_audio_windows_INCLUDES = @gr_audio_windows_INCLUDES@
 gr_audio_windows_LA = @gr_audio_windows_LA@
 gr_audio_windows_LDFLAG = @gr_audio_windows_LDFLAG@
 gr_audio_windows_LIBDIRPATH = @gr_audio_windows_LIBDIRPATH@
+gr_comedi_INCLUDEDIR = @gr_comedi_INCLUDEDIR@
+gr_comedi_INCLUDES = @gr_comedi_INCLUDES@
+gr_comedi_LA = @gr_comedi_LA@
+gr_comedi_LDFLAG = @gr_comedi_LDFLAG@
+gr_comedi_LIBDIRPATH = @gr_comedi_LIBDIRPATH@
 gr_cvsd_vocoder_INCLUDEDIR = @gr_cvsd_vocoder_INCLUDEDIR@
 gr_cvsd_vocoder_INCLUDES = @gr_cvsd_vocoder_INCLUDES@
 gr_cvsd_vocoder_LA = @gr_cvsd_vocoder_LA@
@@ -570,6 +637,16 @@ gr_gsm_fr_vocoder_LA = @gr_gsm_fr_vocoder_LA@
 gr_gsm_fr_vocoder_LDFLAG = @gr_gsm_fr_vocoder_LDFLAG@
 gr_gsm_fr_vocoder_LIBDIRPATH = @gr_gsm_fr_vocoder_LIBDIRPATH@
 gr_libdir_suffix = @gr_libdir_suffix@
+gr_msdd6000_INCLUDEDIR = @gr_msdd6000_INCLUDEDIR@
+gr_msdd6000_INCLUDES = @gr_msdd6000_INCLUDES@
+gr_msdd6000_LA = @gr_msdd6000_LA@
+gr_msdd6000_LDFLAG = @gr_msdd6000_LDFLAG@
+gr_msdd6000_LIBDIRPATH = @gr_msdd6000_LIBDIRPATH@
+gr_noaa_INCLUDEDIR = @gr_noaa_INCLUDEDIR@
+gr_noaa_INCLUDES = @gr_noaa_INCLUDES@
+gr_noaa_LA = @gr_noaa_LA@
+gr_noaa_LDFLAG = @gr_noaa_LDFLAG@
+gr_noaa_LIBDIRPATH = @gr_noaa_LIBDIRPATH@
 gr_pager_INCLUDEDIR = @gr_pager_INCLUDEDIR@
 gr_pager_INCLUDES = @gr_pager_INCLUDES@
 gr_pager_LA = @gr_pager_LA@
@@ -652,26 +729,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
 mandir = @mandir@
-mblock_INCLUDEDIR = @mblock_INCLUDEDIR@
-mblock_INCLUDES = @mblock_INCLUDES@
-mblock_LA = @mblock_LA@
-mblock_LDFLAG = @mblock_LDFLAG@
-mblock_LIBDIRPATH = @mblock_LIBDIRPATH@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-omnithread_INCLUDEDIR = @omnithread_INCLUDEDIR@
-omnithread_INCLUDES = @omnithread_INCLUDES@
-omnithread_LA = @omnithread_LA@
-omnithread_LDFLAG = @omnithread_LDFLAG@
-omnithread_LIBDIRPATH = @omnithread_LIBDIRPATH@
 pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
-pmt_INCLUDEDIR = @pmt_INCLUDEDIR@
-pmt_INCLUDES = @pmt_INCLUDES@
-pmt_LA = @pmt_LA@
-pmt_LDFLAG = @pmt_LDFLAG@
-pmt_LIBDIRPATH = @pmt_LIBDIRPATH@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -702,7 +764,6 @@ usrp_INCLUDES = @usrp_INCLUDES@
 usrp_LA = @usrp_LA@
 usrp_LDFLAG = @usrp_LDFLAG@
 usrp_LIBDIRPATH = @usrp_LIBDIRPATH@
-usrp_darwin_omnithread_pc_requires = @usrp_darwin_omnithread_pc_requires@
 with_INCLUDES = @with_INCLUDES@
 with_LIBDIRPATH = @with_LIBDIRPATH@
 with_PYDIRPATH = @with_PYDIRPATH@
@@ -712,23 +773,26 @@ with_dirs = @with_dirs@
 AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@
 AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@
 
+# Sets ABI version in SONAME and appends -LIBVER to filename
+LTVERSIONFLAGS = -version-info 0:0:0 -release $(LIBVER)
+
 # includes
 grincludedir = $(includedir)/gnuradio
 
 # swig includes
-swigincludedir = $(grincludedir)/swig
+@PYTHON_TRUE@swigincludedir = $(grincludedir)/swig
 
 # Install the gnuradio stuff in the appropriate subdirectory
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-grpythondir = $(pythondir)/gnuradio
-grpyexecdir = $(pyexecdir)/gnuradio
+@PYTHON_TRUE@grpythondir = $(pythondir)/gnuradio
+@PYTHON_TRUE@grpyexecdir = $(pyexecdir)/gnuradio
 
 # Install the non-gnuradio usrp stuff in the appropriate subdirectory
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/usrpm
-usrppythondir = $(pythondir)/usrpm
-usrppyexecdir = $(pyexecdir)/usrpm
+@PYTHON_TRUE@usrppythondir = $(pythondir)/usrpm
+@PYTHON_TRUE@usrppyexecdir = $(pyexecdir)/usrpm
 
 # gcell includes
 gcellincludedir = $(includedir)/gcell
@@ -740,7 +804,7 @@ libspudir = $(libdir)spu
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
 STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
-       $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
+       $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
 
 
 # when including for compilation from pre-installed libraries and such,
@@ -748,10 +812,6 @@ STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
 WITH_INCLUDES = @with_INCLUDES@
 WITH_SWIG_INCLUDES = @with_SWIG_INCLUDES@
 
-# How to link in the top-level omnithreads library from inside the tree
-OMNITHREAD_INCLUDES = @omnithread_INCLUDES@
-OMNITHREAD_LA = @omnithread_LA@
-
 # Where to find gnuradio include files in the current build tree
 # top_srcdir for original stuff, top_builddir for generated files
 GNURADIO_INCLUDES = @gnuradio_core_INCLUDES@
@@ -767,18 +827,6 @@ GRUEL_LA = @gruel_LA@
 USRP_INCLUDES = @usrp_INCLUDES@
 USRP_LA = @usrp_LA@
 
-# How to link in usrp-inband library from inside the tree
-USRP_INBAND_INCLUDES = @usrp_inband_INCLUDES@
-USRP_INBAND_LA = @usrp_inband_LA@
-
-# How to link the PMT library from inside the tree
-PMT_INCLUDES = @pmt_INCLUDES@
-PMT_LA = @pmt_LA@
-
-# How to link the mblock library from inside the tree
-MBLOCK_INCLUDES = @mblock_INCLUDES@
-MBLOCK_LA = @mblock_LA@
-
 # How to link the gcell library from inside the tree (the PPU part)
 GCELL_INCLUDES = @gcell_INCLUDES@
 GCELL_LA = @gcell_LA@
@@ -793,15 +841,17 @@ GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libto
 # Fix for BSD make not defining $(RM).  We define it now in configure.ac
 # using AM_PATH_PROG, but now here have to add a -f to be like GNU make
 RM = $(RM_PROG) -f
-RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/pmt/src/scheme:@abs_top_srcdir@/mblock/src/scheme" @GUILE@ -e main -s
-COMPILE_MBH = $(RUN_GUILE) $(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.scm
+RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/gruel/src/scheme" @GUILE@ -e main -s
 
 # Base directory for example applications
 exampledir = $(datadir)/gnuradio/examples
-gr_docdir = $(docdir)-$(VERSION)
+gr_docdir = $(docdir)-$(DOCVER)
 
 # System configuration files
-gr_sysconfdir = $(sysconfdir)/$(PACKAGE)/conf.d
+gr_prefsdir = $(GR_PREFSDIR)
+
+# Data directory for grc block wrappers
+grc_blocksdir = $(pkgdatadir)/grc/blocks
 
 # Other common defines; use "+=" to add to these
 STAMPS = 
@@ -813,9 +863,10 @@ BUILT_SOURCES =
 # ----------------------------------------------------------------
 EXTRA_DIST = \
        gen_sine_table.py               \
-       gr_prefix.cc.in                 
+       gr_constants.cc.in                      
 
 libgeneral_la_SOURCES = \
+       gr_additive_scrambler_bb.cc     \
        gr_agc_cc.cc                    \
        gr_agc_ff.cc                    \
        gr_agc2_cc.cc                   \
@@ -833,6 +884,7 @@ libgeneral_la_SOURCES = \
        gr_complex_to_interleaved_short.cc \
        gr_complex_to_xxx.cc            \
        gr_conjugate_cc.cc              \
+       gr_copy.cc                      \
        gr_constellation_decoder_cb.cc  \
        gr_correlate_access_code_bb.cc  \
        gr_costas_loop_cc.cc            \
@@ -840,7 +892,6 @@ libgeneral_la_SOURCES = \
        gr_cpfsk_bc.cc                  \
        gr_crc32.cc                     \
        gr_ctcss_squelch_ff.cc          \
-       gr_dd_mpsk_sync_cc.cc           \
        gr_decode_ccsds_27_fb.cc        \
        gr_deinterleave.cc              \
        gr_delay.cc                     \
@@ -857,6 +908,7 @@ libgeneral_la_SOURCES = \
        gr_fft_vcc_fftw.cc              \
        gr_fft_vfc.cc                   \
        gr_firdes.cc                    \
+       gr_fll_band_edge_cc.cc          \
        gr_float_to_char.cc             \
        gr_float_to_complex.cc          \
        gr_float_to_short.cc            \
@@ -899,7 +951,7 @@ libgeneral_la_SOURCES = \
        gr_pll_freqdet_cf.cc            \
        gr_pll_refout_cc.cc             \
        gr_pn_correlator_cc.cc          \
-       gr_prefix.cc                    \
+       gr_constants.cc                 \
        gr_prefs.cc                     \
        gr_probe_avg_mag_sqrd_c.cc      \
        gr_probe_avg_mag_sqrd_cf.cc     \
@@ -968,6 +1020,7 @@ libgeneral_qa_la_SOURCES = \
        qa_gri_lfsr.cc
 
 grinclude_HEADERS = \
+       gr_additive_scrambler_bb.h      \
        gr_agc_cc.h                     \
        gr_agc_ff.h                     \
        gr_agc2_cc.h                    \
@@ -986,13 +1039,13 @@ grinclude_HEADERS = \
        gr_complex_to_xxx.h             \
        gr_conjugate_cc.h               \
        gr_constellation_decoder_cb.h   \
+       gr_copy.h                       \
        gr_correlate_access_code_bb.h   \
        gr_costas_loop_cc.h             \
        gr_count_bits.h                 \
        gr_cpfsk_bc.h                   \
        gr_crc32.h                      \
        gr_ctcss_squelch_ff.h           \
-       gr_dd_mpsk_sync_cc.h            \
        gr_decode_ccsds_27_fb.h         \
        gr_diff_decoder_bb.h            \
        gr_diff_encoder_bb.h            \
@@ -1009,6 +1062,7 @@ grinclude_HEADERS = \
        gr_fft_vcc_fftw.h               \
        gr_fft_vfc.h                    \
        gr_firdes.h                     \
+       gr_fll_band_edge_cc.h           \
        gr_float_to_char.h              \
        gr_float_to_complex.h           \
        gr_float_to_short.h             \
@@ -1055,7 +1109,7 @@ grinclude_HEADERS = \
        gr_pll_freqdet_cf.h             \
        gr_pll_refout_cc.h              \
        gr_pn_correlator_cc.h           \
-       gr_prefix.h                     \
+       gr_constants.h                  \
        gr_prefs.h                      \
        gr_probe_avg_mag_sqrd_c.h       \
        gr_probe_avg_mag_sqrd_cf.h      \
@@ -1135,131 +1189,133 @@ noinst_HEADERS = \
        sine_table.h                    \
        qa_gr_math.h
 
-swiginclude_HEADERS = \
-       general.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_binary_slicer_fb.i           \
-       gr_bytes_to_syms.i              \
-       gr_char_to_float.i              \
-       gr_check_counting_s.i           \
-       gr_check_lfsr_32k_s.i           \
-       gr_clock_recovery_mm_cc.i       \
-       gr_clock_recovery_mm_ff.i       \
-       gr_complex_to_interleaved_short.i \
-       gr_complex_to_xxx.i             \
-       gr_conjugate_cc.i               \
-       gr_constellation_decoder_cb.i   \
-       gr_correlate_access_code_bb.i   \
-       gr_costas_loop_cc.i             \
-       gr_cpfsk_bc.i                   \
-       gr_crc32.i                      \
-       gr_ctcss_squelch_ff.i           \
-       gr_dd_mpsk_sync_cc.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_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_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_lms_dfe_cc.i                 \
-       gr_lms_dfe_ff.i                 \
-       gr_map_bb.i                     \
-       gr_mpsk_receiver_cc.i           \
-       gr_nlog10_ff.i                  \
-       gr_nop.i                        \
-       gr_null_sink.i                  \
-       gr_null_source.i                \
-       gr_ofdm_frame_acquisition.i     \
-        gr_ofdm_cyclic_prefixer.i       \
-        gr_ofdm_demapper_vcb.i          \
-        gr_ofdm_mapper_bcv.i            \
-        gr_ofdm_frame_sink.i           \
-       gr_ofdm_insert_preamble.i       \
-       gr_ofdm_sampler.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_prefix.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_probe_signal_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_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_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                   \
-       gr_descrambler_bb.i             \
-       gr_scrambler_bb.i               \
-       gr_probe_mpsk_snr_c.i           \
-       gr_probe_density_b.i
+@PYTHON_TRUE@swiginclude_HEADERS = \
+@PYTHON_TRUE@  general.i                       \
+@PYTHON_TRUE@  gr_additive_scrambler_bb.i      \
+@PYTHON_TRUE@  gr_agc_cc.i                     \
+@PYTHON_TRUE@  gr_agc_ff.i                     \
+@PYTHON_TRUE@  gr_agc2_cc.i                    \
+@PYTHON_TRUE@  gr_agc2_ff.i                    \
+@PYTHON_TRUE@  gr_align_on_samplenumbers_ss.i  \
+@PYTHON_TRUE@  gr_bin_statistics_f.i           \
+@PYTHON_TRUE@  gr_binary_slicer_fb.i           \
+@PYTHON_TRUE@  gr_bytes_to_syms.i              \
+@PYTHON_TRUE@  gr_char_to_float.i              \
+@PYTHON_TRUE@  gr_check_counting_s.i           \
+@PYTHON_TRUE@  gr_check_lfsr_32k_s.i           \
+@PYTHON_TRUE@  gr_clock_recovery_mm_cc.i       \
+@PYTHON_TRUE@  gr_clock_recovery_mm_ff.i       \
+@PYTHON_TRUE@  gr_complex_to_interleaved_short.i \
+@PYTHON_TRUE@  gr_complex_to_xxx.i             \
+@PYTHON_TRUE@  gr_conjugate_cc.i               \
+@PYTHON_TRUE@  gr_constellation_decoder_cb.i   \
+@PYTHON_TRUE@  gr_copy.i                       \
+@PYTHON_TRUE@  gr_correlate_access_code_bb.i   \
+@PYTHON_TRUE@  gr_costas_loop_cc.i             \
+@PYTHON_TRUE@  gr_cpfsk_bc.i                   \
+@PYTHON_TRUE@  gr_crc32.i                      \
+@PYTHON_TRUE@  gr_ctcss_squelch_ff.i           \
+@PYTHON_TRUE@  gr_decode_ccsds_27_fb.i         \
+@PYTHON_TRUE@  gr_diff_decoder_bb.i            \
+@PYTHON_TRUE@  gr_diff_encoder_bb.i            \
+@PYTHON_TRUE@  gr_diff_phasor_cc.i             \
+@PYTHON_TRUE@  gr_dpll_bb.i                    \
+@PYTHON_TRUE@  gr_deinterleave.i               \
+@PYTHON_TRUE@  gr_delay.i                      \
+@PYTHON_TRUE@  gr_encode_ccsds_27_bb.i         \
+@PYTHON_TRUE@  gr_fake_channel_coder_pp.i      \
+@PYTHON_TRUE@  gr_feedforward_agc_cc.i         \
+@PYTHON_TRUE@  gr_feval.i                      \
+@PYTHON_TRUE@  gr_fft_vcc.i                    \
+@PYTHON_TRUE@  gr_fft_vfc.i                    \
+@PYTHON_TRUE@  gr_firdes.i                     \
+@PYTHON_TRUE@  gr_fll_band_edge_cc.i           \
+@PYTHON_TRUE@  gr_float_to_char.i              \
+@PYTHON_TRUE@  gr_float_to_complex.i           \
+@PYTHON_TRUE@  gr_float_to_short.i             \
+@PYTHON_TRUE@  gr_float_to_uchar.i             \
+@PYTHON_TRUE@  gr_fmdet_cf.i                   \
+@PYTHON_TRUE@  gr_frequency_modulator_fc.i     \
+@PYTHON_TRUE@  gr_framer_sink_1.i              \
+@PYTHON_TRUE@  gr_glfsr_source_b.i             \
+@PYTHON_TRUE@  gr_glfsr_source_f.i             \
+@PYTHON_TRUE@  gr_head.i                       \
+@PYTHON_TRUE@  gr_interleave.i                 \
+@PYTHON_TRUE@  gr_interleaved_short_to_complex.i \
+@PYTHON_TRUE@  gr_iqcomp_cc.i                  \
+@PYTHON_TRUE@  gr_keep_one_in_n.i              \
+@PYTHON_TRUE@  gr_kludge_copy.i                \
+@PYTHON_TRUE@  gr_lfsr_32k_source_s.i          \
+@PYTHON_TRUE@  gr_lms_dfe_cc.i                 \
+@PYTHON_TRUE@  gr_lms_dfe_ff.i                 \
+@PYTHON_TRUE@  gr_map_bb.i                     \
+@PYTHON_TRUE@  gr_mpsk_receiver_cc.i           \
+@PYTHON_TRUE@  gr_nlog10_ff.i                  \
+@PYTHON_TRUE@  gr_nop.i                        \
+@PYTHON_TRUE@  gr_null_sink.i                  \
+@PYTHON_TRUE@  gr_null_source.i                \
+@PYTHON_TRUE@  gr_ofdm_frame_acquisition.i     \
+@PYTHON_TRUE@        gr_ofdm_cyclic_prefixer.i       \
+@PYTHON_TRUE@        gr_ofdm_demapper_vcb.i          \
+@PYTHON_TRUE@        gr_ofdm_mapper_bcv.i            \
+@PYTHON_TRUE@        gr_ofdm_frame_sink.i              \
+@PYTHON_TRUE@  gr_ofdm_insert_preamble.i       \
+@PYTHON_TRUE@  gr_ofdm_sampler.i               \
+@PYTHON_TRUE@  gr_pa_2x2_phase_combiner.i      \
+@PYTHON_TRUE@  gr_packet_sink.i                \
+@PYTHON_TRUE@  gr_peak_detector2_fb.i          \
+@PYTHON_TRUE@  gr_phase_modulator_fc.i         \
+@PYTHON_TRUE@  gr_pll_carriertracking_cc.i     \
+@PYTHON_TRUE@  gr_pll_freqdet_cf.i             \
+@PYTHON_TRUE@  gr_pll_refout_cc.i              \
+@PYTHON_TRUE@  gr_pn_correlator_cc.i           \
+@PYTHON_TRUE@  gr_constants.i                  \
+@PYTHON_TRUE@  gr_prefs.i                      \
+@PYTHON_TRUE@  gr_probe_avg_mag_sqrd_c.i       \
+@PYTHON_TRUE@  gr_probe_avg_mag_sqrd_cf.i      \
+@PYTHON_TRUE@  gr_probe_avg_mag_sqrd_f.i       \
+@PYTHON_TRUE@  gr_probe_signal_f.i             \
+@PYTHON_TRUE@  gr_pwr_squelch_cc.i             \
+@PYTHON_TRUE@  gr_pwr_squelch_ff.i             \
+@PYTHON_TRUE@  gr_quadrature_demod_cf.i        \
+@PYTHON_TRUE@  gr_rail_ff.i                    \
+@PYTHON_TRUE@  gr_regenerate_bb.i              \
+@PYTHON_TRUE@  gr_remez.i                      \
+@PYTHON_TRUE@  gr_rms_cf.i                     \
+@PYTHON_TRUE@  gr_rms_ff.i                     \
+@PYTHON_TRUE@  gr_repeat.i                     \
+@PYTHON_TRUE@  gr_short_to_float.i             \
+@PYTHON_TRUE@  gr_simple_correlator.i          \
+@PYTHON_TRUE@  gr_simple_framer.i              \
+@PYTHON_TRUE@  gr_simple_squelch_cc.i          \
+@PYTHON_TRUE@  gr_skiphead.i                   \
+@PYTHON_TRUE@  gr_squash_ff.i                  \
+@PYTHON_TRUE@  gr_squelch_base_cc.i            \
+@PYTHON_TRUE@  gr_squelch_base_ff.i            \
+@PYTHON_TRUE@  gr_stream_mux.i                 \
+@PYTHON_TRUE@  gr_stream_to_streams.i          \
+@PYTHON_TRUE@  gr_stream_to_vector.i           \
+@PYTHON_TRUE@  gr_streams_to_stream.i          \
+@PYTHON_TRUE@  gr_streams_to_vector.i          \
+@PYTHON_TRUE@  gr_stretch_ff.i                 \
+@PYTHON_TRUE@        gr_test.i                 \
+@PYTHON_TRUE@  gr_threshold_ff.i               \
+@PYTHON_TRUE@  gr_throttle.i                   \
+@PYTHON_TRUE@  gr_uchar_to_float.i             \
+@PYTHON_TRUE@  gr_vco_f.i                      \
+@PYTHON_TRUE@  gr_vector_to_stream.i           \
+@PYTHON_TRUE@  gr_vector_to_streams.i          \
+@PYTHON_TRUE@  gr_unpack_k_bits_bb.i           \
+@PYTHON_TRUE@  gr_wavelet_ff.i                 \
+@PYTHON_TRUE@  gr_wvps_ff.i                    \
+@PYTHON_TRUE@  gri_agc_cc.i                    \
+@PYTHON_TRUE@  gri_agc_ff.i                    \
+@PYTHON_TRUE@  gri_agc2_cc.i                   \
+@PYTHON_TRUE@  gri_agc2_ff.i                   \
+@PYTHON_TRUE@  gr_descrambler_bb.i             \
+@PYTHON_TRUE@  gr_scrambler_bb.i               \
+@PYTHON_TRUE@  gr_probe_mpsk_snr_c.i           \
+@PYTHON_TRUE@  gr_probe_density_b.i
 
 all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1296,7 +1352,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-gr_prefix.cc: $(top_builddir)/config.status $(srcdir)/gr_prefix.cc.in
+gr_constants.cc: $(top_builddir)/config.status $(srcdir)/gr_constants.cc.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 clean-noinstLTLIBRARIES:
@@ -1318,6 +1374,7 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_additive_scrambler_bb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_agc2_cc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_agc2_ff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_agc_cc.Plo@am__quote@
@@ -1335,14 +1392,15 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_complex_to_interleaved_short.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_complex_to_xxx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_conjugate_cc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_constants.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_constellation_decoder_cb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_copy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_correlate_access_code_bb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_costas_loop_cc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_count_bits.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_cpfsk_bc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_crc32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_ctcss_squelch_ff.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_dd_mpsk_sync_cc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_decode_ccsds_27_fb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_deinterleave.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_delay.Plo@am__quote@
@@ -1360,6 +1418,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fft_vcc_fftw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fft_vfc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_firdes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fll_band_edge_cc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_float_to_char.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_float_to_complex.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_float_to_short.Plo@am__quote@
@@ -1402,7 +1461,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pll_freqdet_cf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pll_refout_cc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pn_correlator_cc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_prefix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_prefs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_probe_avg_mag_sqrd_c.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_probe_avg_mag_sqrd_cf.Plo@am__quote@