Merge branch 'dfsg-orig'

[debian/gnuradio] / grc / blocks / Makefile.am

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 025c261f4fe420ca3cadddd8c5704591bce7e6ec..2596eae45600c74013af035c18b07594c1368f67 100644 (file)
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
 
 ourdatadir = $(grc_blocksdir)
 dist_ourdata_DATA = \
@@ -30,8 +30,12 @@ dist_ourdata_DATA = \
        band_reject_filter.xml \
        blks2_am_demod_cf.xml \
        blks2_analysis_filterbank.xml \
+       blks2_cvsd_encode.xml \
+       blks2_cvsd_decode.xml \
        blks2_dxpsk_demod.xml \
        blks2_dxpsk_mod.xml \
+       blks2_dxpsk2_demod.xml \
+       blks2_dxpsk2_mod.xml \
        blks2_error_rate.xml \
        blks2_fm_deemph.xml \
        blks2_fm_demod_cf.xml \
@@ -45,6 +49,7 @@ dist_ourdata_DATA = \
        blks2_ofdm_mod.xml \
        blks2_packet_decoder.xml \
        blks2_packet_encoder.xml \
+       blks2_pfb_arb_resampler.xml \
        blks2_qamx_demod.xml \
        blks2_qamx_mod.xml \
        blks2_rational_resampler_xxx.xml \
@@ -62,6 +67,7 @@ dist_ourdata_DATA = \
        const_source_x.xml \
        gr_add_const_vxx.xml \
        gr_add_xx.xml \
+       gr_additive_scrambler_bb.xml \
        gr_agc2_xx.xml \
        gr_agc_xx.xml \
        gr_and_xx.xml \
@@ -81,10 +87,10 @@ dist_ourdata_DATA = \
        gr_complex_to_real.xml \
        gr_conjugate_cc.xml \
        gr_constellation_decoder_cb.xml \
+       gr_copy.xml \
        gr_correlate_access_code_bb.xml \
        gr_costas_loop_cc.xml \
        gr_cpfsk_bc.xml \
-       gr_dd_mpsk_sync_cc.xml \
        gr_decode_ccsds_27_fb.xml \
        gr_deinterleave.xml \
        gr_delay.xml \
@@ -102,6 +108,7 @@ dist_ourdata_DATA = \
        gr_file_source.xml \
        gr_filter_delay_fc.xml \
        gr_fir_filter_xxx.xml \
+       gr_fll_band_edge_cc.xml \
        gr_float_to_char.xml \
        gr_float_to_complex.xml \
        gr_float_to_short.xml \
@@ -123,6 +130,8 @@ dist_ourdata_DATA = \
        gr_kludge_copy.xml \
        gr_map_bb.xml \
        gr_max_xx.xml \
+       gr_message_sink.xml \
+       gr_message_source.xml \
        gr_moving_average_xx.xml \
        gr_mpsk_receiver_cc.xml \
        gr_mpsk_sync_cc.xml \
@@ -139,6 +148,7 @@ dist_ourdata_DATA = \
        gr_packed_to_unpacked_xx.xml \
        gr_peak_detector2_fb.xml \
        gr_peak_detector_xb.xml \
+       gr_pfb_clock_sync.xml \
        gr_phase_modulator_fc.xml \
        gr_pll_carriertracking_cc.xml \
        gr_pll_freqdet_cf.xml \
@@ -161,6 +171,7 @@ dist_ourdata_DATA = \
        gr_simple_squelch_cc.xml \
        gr_single_pole_iir_filter_xx.xml \
        gr_skiphead.xml \
+       gr_stream_mux.xml \
        gr_stream_to_streams.xml \
        gr_stream_to_vector.xml \
        gr_streams_to_stream.xml \
@@ -215,11 +226,14 @@ dist_ourdata_DATA = \
        variable_slider.xml \
        variable_static_text.xml \
        variable_text_box.xml \
+       virtual_sink.xml \
+       virtual_source.xml \
        wxgui_constellationsink2.xml \
        wxgui_fftsink2.xml \
        wxgui_histosink2.xml \
        wxgui_numbersink2.xml \
        wxgui_scopesink2.xml \
+       wxgui_termsink.xml \
        wxgui_waterfallsink2.xml \
        xmlrpc_client.xml \
        xmlrpc_server.xml