From 50d7e320946d6ca23eaf55d491247cc0cb1f04f5 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 13 Dec 2010 09:08:00 -0700 Subject: [PATCH] changes from running bootstrap and then make maintainer-clean --- Makefile.in | 154 +- aclocal.m4 | 33 +- config.h.in | 15 +- config/Makefile.in | 124 +- configure | 20076 +++++++--------- debian/changelog | 3 +- debian/rules | 9 +- docs/Makefile.in | 116 +- docs/doxygen/Makefile.in | 116 +- docs/doxygen/other/Makefile.in | 121 +- docs/doxygen/xml-swig/Makefile.in | 73 +- gcell/Makefile.in | 116 +- gcell/apps/Makefile.in | 120 +- gcell/apps/spu/Makefile.in | 116 +- gcell/ibm/Makefile.in | 116 +- gcell/include/Makefile.in | 116 +- gcell/include/gcell/Makefile.in | 116 +- gcell/include/gcell/spu/Makefile.in | 116 +- gcell/lib/Makefile.in | 124 +- gcell/lib/general/Makefile.in | 116 +- gcell/lib/runtime/Makefile.in | 120 +- gcell/lib/spu/Makefile.in | 116 +- gcell/lib/wrapper/Makefile.in | 116 +- gnuradio-core/Makefile.in | 118 +- gnuradio-core/src/Makefile.in | 121 +- .../src/gen_interpolator_taps/Makefile.in | 307 +- gnuradio-core/src/lib/Makefile.in | 252 +- gnuradio-core/src/lib/filter/Makefile.in | 321 +- .../src/lib/filter/filter_generated.i | 54 - gnuradio-core/src/lib/filter/gr_fir_ccc.cc | 30 - gnuradio-core/src/lib/filter/gr_fir_ccc.h | 123 - .../src/lib/filter/gr_fir_ccc_generic.cc | 103 - .../src/lib/filter/gr_fir_ccc_generic.h | 77 - gnuradio-core/src/lib/filter/gr_fir_ccf.cc | 30 - gnuradio-core/src/lib/filter/gr_fir_ccf.h | 123 - .../src/lib/filter/gr_fir_ccf_generic.cc | 103 - .../src/lib/filter/gr_fir_ccf_generic.h | 77 - gnuradio-core/src/lib/filter/gr_fir_fcc.cc | 30 - gnuradio-core/src/lib/filter/gr_fir_fcc.h | 123 - .../src/lib/filter/gr_fir_fcc_generic.cc | 103 - .../src/lib/filter/gr_fir_fcc_generic.h | 77 - gnuradio-core/src/lib/filter/gr_fir_fff.cc | 30 - gnuradio-core/src/lib/filter/gr_fir_fff.h | 123 - .../src/lib/filter/gr_fir_fff_generic.cc | 103 - .../src/lib/filter/gr_fir_fff_generic.h | 77 - .../src/lib/filter/gr_fir_filter_ccc.cc | 88 - .../src/lib/filter/gr_fir_filter_ccc.h | 67 - .../src/lib/filter/gr_fir_filter_ccc.i | 41 - .../src/lib/filter/gr_fir_filter_ccf.cc | 88 - .../src/lib/filter/gr_fir_filter_ccf.h | 67 - .../src/lib/filter/gr_fir_filter_ccf.i | 41 - .../src/lib/filter/gr_fir_filter_fcc.cc | 88 - .../src/lib/filter/gr_fir_filter_fcc.h | 67 - .../src/lib/filter/gr_fir_filter_fcc.i | 41 - .../src/lib/filter/gr_fir_filter_fff.cc | 88 - .../src/lib/filter/gr_fir_filter_fff.h | 67 - .../src/lib/filter/gr_fir_filter_fff.i | 41 - .../src/lib/filter/gr_fir_filter_fsf.cc | 88 - .../src/lib/filter/gr_fir_filter_fsf.h | 67 - .../src/lib/filter/gr_fir_filter_fsf.i | 41 - .../src/lib/filter/gr_fir_filter_scc.cc | 88 - .../src/lib/filter/gr_fir_filter_scc.h | 67 - .../src/lib/filter/gr_fir_filter_scc.i | 41 - gnuradio-core/src/lib/filter/gr_fir_fsf.cc | 30 - gnuradio-core/src/lib/filter/gr_fir_fsf.h | 123 - .../src/lib/filter/gr_fir_fsf_generic.cc | 103 - .../src/lib/filter/gr_fir_fsf_generic.h | 77 - gnuradio-core/src/lib/filter/gr_fir_scc.cc | 30 - gnuradio-core/src/lib/filter/gr_fir_scc.h | 123 - .../src/lib/filter/gr_fir_scc_generic.cc | 103 - .../src/lib/filter/gr_fir_scc_generic.h | 77 - .../src/lib/filter/gr_fir_sysconfig.cc | 35 - .../src/lib/filter/gr_fir_sysconfig.h | 71 - .../lib/filter/gr_fir_sysconfig_generic.cc | 180 - .../src/lib/filter/gr_fir_sysconfig_generic.h | 55 - gnuradio-core/src/lib/filter/gr_fir_util.cc | 111 - gnuradio-core/src/lib/filter/gr_fir_util.h | 117 - .../filter/gr_freq_xlating_fir_filter_ccc.cc | 123 - .../filter/gr_freq_xlating_fir_filter_ccc.h | 100 - .../filter/gr_freq_xlating_fir_filter_ccc.i | 47 - .../filter/gr_freq_xlating_fir_filter_ccf.cc | 123 - .../filter/gr_freq_xlating_fir_filter_ccf.h | 100 - .../filter/gr_freq_xlating_fir_filter_ccf.i | 47 - .../filter/gr_freq_xlating_fir_filter_fcc.cc | 123 - .../filter/gr_freq_xlating_fir_filter_fcc.h | 100 - .../filter/gr_freq_xlating_fir_filter_fcc.i | 47 - .../filter/gr_freq_xlating_fir_filter_fcf.cc | 123 - .../filter/gr_freq_xlating_fir_filter_fcf.h | 100 - .../filter/gr_freq_xlating_fir_filter_fcf.i | 47 - .../filter/gr_freq_xlating_fir_filter_scc.cc | 123 - .../filter/gr_freq_xlating_fir_filter_scc.h | 100 - .../filter/gr_freq_xlating_fir_filter_scc.i | 47 - .../filter/gr_freq_xlating_fir_filter_scf.cc | 123 - .../filter/gr_freq_xlating_fir_filter_scf.h | 100 - .../filter/gr_freq_xlating_fir_filter_scf.i | 47 - .../lib/filter/gr_interp_fir_filter_ccc.cc | 146 - .../src/lib/filter/gr_interp_fir_filter_ccc.h | 69 - .../src/lib/filter/gr_interp_fir_filter_ccc.i | 41 - .../lib/filter/gr_interp_fir_filter_ccf.cc | 146 - .../src/lib/filter/gr_interp_fir_filter_ccf.h | 69 - .../src/lib/filter/gr_interp_fir_filter_ccf.i | 41 - .../lib/filter/gr_interp_fir_filter_fcc.cc | 146 - .../src/lib/filter/gr_interp_fir_filter_fcc.h | 69 - .../src/lib/filter/gr_interp_fir_filter_fcc.i | 41 - .../lib/filter/gr_interp_fir_filter_fff.cc | 146 - .../src/lib/filter/gr_interp_fir_filter_fff.h | 69 - .../src/lib/filter/gr_interp_fir_filter_fff.i | 41 - .../lib/filter/gr_interp_fir_filter_fsf.cc | 146 - .../src/lib/filter/gr_interp_fir_filter_fsf.h | 69 - .../src/lib/filter/gr_interp_fir_filter_fsf.i | 41 - .../lib/filter/gr_interp_fir_filter_scc.cc | 146 - .../src/lib/filter/gr_interp_fir_filter_scc.h | 69 - .../src/lib/filter/gr_interp_fir_filter_scc.i | 41 - .../filter/gr_rational_resampler_base_ccc.cc | 172 - .../filter/gr_rational_resampler_base_ccc.h | 87 - .../filter/gr_rational_resampler_base_ccc.i | 42 - .../filter/gr_rational_resampler_base_ccf.cc | 172 - .../filter/gr_rational_resampler_base_ccf.h | 87 - .../filter/gr_rational_resampler_base_ccf.i | 42 - .../filter/gr_rational_resampler_base_fcc.cc | 172 - .../filter/gr_rational_resampler_base_fcc.h | 87 - .../filter/gr_rational_resampler_base_fcc.i | 42 - .../filter/gr_rational_resampler_base_fff.cc | 172 - .../filter/gr_rational_resampler_base_fff.h | 87 - .../filter/gr_rational_resampler_base_fff.i | 42 - .../filter/gr_rational_resampler_base_fsf.cc | 172 - .../filter/gr_rational_resampler_base_fsf.h | 87 - .../filter/gr_rational_resampler_base_fsf.i | 42 - .../filter/gr_rational_resampler_base_scc.cc | 172 - .../filter/gr_rational_resampler_base_scc.h | 87 - .../filter/gr_rational_resampler_base_scc.i | 42 - .../src/lib/filter/stamp-sources-generate | 0 gnuradio-core/src/lib/g72x/Makefile.in | 116 +- gnuradio-core/src/lib/general/Makefile.in | 484 +- gnuradio-core/src/lib/gengen/Makefile.in | 169 +- .../src/lib/gengen/gengen_generated.i | 212 - gnuradio-core/src/lib/gengen/gr_add_cc.cc | 63 - gnuradio-core/src/lib/gengen/gr_add_cc.h | 56 - gnuradio-core/src/lib/gengen/gr_add_cc.i | 33 - .../src/lib/gengen/gr_add_const_cc.cc | 72 - .../src/lib/gengen/gr_add_const_cc.h | 55 - .../src/lib/gengen/gr_add_const_cc.i | 37 - .../src/lib/gengen/gr_add_const_ff.cc | 72 - .../src/lib/gengen/gr_add_const_ff.h | 55 - .../src/lib/gengen/gr_add_const_ff.i | 37 - .../src/lib/gengen/gr_add_const_ii.cc | 72 - .../src/lib/gengen/gr_add_const_ii.h | 55 - .../src/lib/gengen/gr_add_const_ii.i | 37 - .../src/lib/gengen/gr_add_const_sf.cc | 72 - .../src/lib/gengen/gr_add_const_sf.h | 55 - .../src/lib/gengen/gr_add_const_sf.i | 37 - .../src/lib/gengen/gr_add_const_ss.cc | 72 - .../src/lib/gengen/gr_add_const_ss.h | 55 - .../src/lib/gengen/gr_add_const_ss.i | 37 - .../src/lib/gengen/gr_add_const_vcc.cc | 61 - .../src/lib/gengen/gr_add_const_vcc.h | 55 - .../src/lib/gengen/gr_add_const_vcc.i | 37 - .../src/lib/gengen/gr_add_const_vff.cc | 61 - .../src/lib/gengen/gr_add_const_vff.h | 55 - .../src/lib/gengen/gr_add_const_vff.i | 37 - .../src/lib/gengen/gr_add_const_vii.cc | 61 - .../src/lib/gengen/gr_add_const_vii.h | 55 - .../src/lib/gengen/gr_add_const_vii.i | 37 - .../src/lib/gengen/gr_add_const_vss.cc | 61 - .../src/lib/gengen/gr_add_const_vss.h | 55 - .../src/lib/gengen/gr_add_const_vss.i | 37 - gnuradio-core/src/lib/gengen/gr_add_ff.cc | 63 - gnuradio-core/src/lib/gengen/gr_add_ff.h | 56 - gnuradio-core/src/lib/gengen/gr_add_ff.i | 33 - gnuradio-core/src/lib/gengen/gr_add_ii.cc | 63 - gnuradio-core/src/lib/gengen/gr_add_ii.h | 56 - gnuradio-core/src/lib/gengen/gr_add_ii.i | 33 - gnuradio-core/src/lib/gengen/gr_add_ss.cc | 63 - gnuradio-core/src/lib/gengen/gr_add_ss.h | 56 - gnuradio-core/src/lib/gengen/gr_add_ss.i | 33 - gnuradio-core/src/lib/gengen/gr_and_bb.cc | 62 - gnuradio-core/src/lib/gengen/gr_and_bb.h | 54 - gnuradio-core/src/lib/gengen/gr_and_bb.i | 33 - .../src/lib/gengen/gr_and_const_bb.cc | 72 - .../src/lib/gengen/gr_and_const_bb.h | 57 - .../src/lib/gengen/gr_and_const_bb.i | 37 - .../src/lib/gengen/gr_and_const_ii.cc | 72 - .../src/lib/gengen/gr_and_const_ii.h | 57 - .../src/lib/gengen/gr_and_const_ii.i | 37 - .../src/lib/gengen/gr_and_const_ss.cc | 72 - .../src/lib/gengen/gr_and_const_ss.h | 57 - .../src/lib/gengen/gr_and_const_ss.i | 37 - gnuradio-core/src/lib/gengen/gr_and_ii.cc | 62 - gnuradio-core/src/lib/gengen/gr_and_ii.h | 54 - gnuradio-core/src/lib/gengen/gr_and_ii.i | 33 - gnuradio-core/src/lib/gengen/gr_and_ss.cc | 62 - gnuradio-core/src/lib/gengen/gr_and_ss.h | 54 - gnuradio-core/src/lib/gengen/gr_and_ss.i | 33 - gnuradio-core/src/lib/gengen/gr_argmax_fs.cc | 79 - gnuradio-core/src/lib/gengen/gr_argmax_fs.h | 51 - gnuradio-core/src/lib/gengen/gr_argmax_fs.i | 34 - gnuradio-core/src/lib/gengen/gr_argmax_is.cc | 79 - gnuradio-core/src/lib/gengen/gr_argmax_is.h | 51 - gnuradio-core/src/lib/gengen/gr_argmax_is.i | 34 - gnuradio-core/src/lib/gengen/gr_argmax_ss.cc | 79 - gnuradio-core/src/lib/gengen/gr_argmax_ss.h | 51 - gnuradio-core/src/lib/gengen/gr_argmax_ss.i | 34 - .../src/lib/gengen/gr_chunks_to_symbols_bc.cc | 74 - .../src/lib/gengen/gr_chunks_to_symbols_bc.h | 72 - .../src/lib/gengen/gr_chunks_to_symbols_bc.i | 37 - .../src/lib/gengen/gr_chunks_to_symbols_bf.cc | 74 - .../src/lib/gengen/gr_chunks_to_symbols_bf.h | 72 - .../src/lib/gengen/gr_chunks_to_symbols_bf.i | 37 - .../src/lib/gengen/gr_chunks_to_symbols_ic.cc | 74 - .../src/lib/gengen/gr_chunks_to_symbols_ic.h | 72 - .../src/lib/gengen/gr_chunks_to_symbols_ic.i | 37 - .../src/lib/gengen/gr_chunks_to_symbols_if.cc | 74 - .../src/lib/gengen/gr_chunks_to_symbols_if.h | 72 - .../src/lib/gengen/gr_chunks_to_symbols_if.i | 37 - .../src/lib/gengen/gr_chunks_to_symbols_sc.cc | 74 - .../src/lib/gengen/gr_chunks_to_symbols_sc.h | 72 - .../src/lib/gengen/gr_chunks_to_symbols_sc.i | 37 - .../src/lib/gengen/gr_chunks_to_symbols_sf.cc | 74 - .../src/lib/gengen/gr_chunks_to_symbols_sf.h | 72 - .../src/lib/gengen/gr_chunks_to_symbols_sf.i | 37 - gnuradio-core/src/lib/gengen/gr_divide_cc.cc | 72 - gnuradio-core/src/lib/gengen/gr_divide_cc.h | 56 - gnuradio-core/src/lib/gengen/gr_divide_cc.i | 33 - gnuradio-core/src/lib/gengen/gr_divide_ff.cc | 72 - gnuradio-core/src/lib/gengen/gr_divide_ff.h | 56 - gnuradio-core/src/lib/gengen/gr_divide_ff.i | 33 - gnuradio-core/src/lib/gengen/gr_divide_ii.cc | 72 - gnuradio-core/src/lib/gengen/gr_divide_ii.h | 56 - gnuradio-core/src/lib/gengen/gr_divide_ii.i | 33 - gnuradio-core/src/lib/gengen/gr_divide_ss.cc | 72 - gnuradio-core/src/lib/gengen/gr_divide_ss.h | 56 - gnuradio-core/src/lib/gengen/gr_divide_ss.i | 33 - .../src/lib/gengen/gr_integrate_cc.cc | 67 - .../src/lib/gengen/gr_integrate_cc.h | 60 - .../src/lib/gengen/gr_integrate_cc.i | 33 - .../src/lib/gengen/gr_integrate_ff.cc | 67 - .../src/lib/gengen/gr_integrate_ff.h | 60 - .../src/lib/gengen/gr_integrate_ff.i | 33 - .../src/lib/gengen/gr_integrate_ii.cc | 67 - .../src/lib/gengen/gr_integrate_ii.h | 60 - .../src/lib/gengen/gr_integrate_ii.i | 33 - .../src/lib/gengen/gr_integrate_ss.cc | 67 - .../src/lib/gengen/gr_integrate_ss.h | 60 - .../src/lib/gengen/gr_integrate_ss.i | 33 - gnuradio-core/src/lib/gengen/gr_max_ff.cc | 71 - gnuradio-core/src/lib/gengen/gr_max_ff.h | 51 - gnuradio-core/src/lib/gengen/gr_max_ff.i | 34 - gnuradio-core/src/lib/gengen/gr_max_ii.cc | 71 - gnuradio-core/src/lib/gengen/gr_max_ii.h | 51 - gnuradio-core/src/lib/gengen/gr_max_ii.i | 34 - gnuradio-core/src/lib/gengen/gr_max_ss.cc | 71 - gnuradio-core/src/lib/gengen/gr_max_ss.h | 51 - gnuradio-core/src/lib/gengen/gr_max_ss.i | 34 - .../src/lib/gengen/gr_moving_average_cc.cc | 93 - .../src/lib/gengen/gr_moving_average_cc.h | 71 - .../src/lib/gengen/gr_moving_average_cc.i | 38 - .../src/lib/gengen/gr_moving_average_ff.cc | 93 - .../src/lib/gengen/gr_moving_average_ff.h | 71 - .../src/lib/gengen/gr_moving_average_ff.i | 38 - .../src/lib/gengen/gr_moving_average_ii.cc | 93 - .../src/lib/gengen/gr_moving_average_ii.h | 71 - .../src/lib/gengen/gr_moving_average_ii.i | 38 - .../src/lib/gengen/gr_moving_average_ss.cc | 93 - .../src/lib/gengen/gr_moving_average_ss.h | 71 - .../src/lib/gengen/gr_moving_average_ss.i | 38 - .../src/lib/gengen/gr_multiply_cc.cc | 63 - gnuradio-core/src/lib/gengen/gr_multiply_cc.h | 56 - gnuradio-core/src/lib/gengen/gr_multiply_cc.i | 33 - .../src/lib/gengen/gr_multiply_const_cc.cc | 72 - .../src/lib/gengen/gr_multiply_const_cc.h | 55 - .../src/lib/gengen/gr_multiply_const_cc.i | 37 - .../src/lib/gengen/gr_multiply_const_ff.cc | 72 - .../src/lib/gengen/gr_multiply_const_ff.h | 55 - .../src/lib/gengen/gr_multiply_const_ff.i | 37 - .../src/lib/gengen/gr_multiply_const_ii.cc | 72 - .../src/lib/gengen/gr_multiply_const_ii.h | 55 - .../src/lib/gengen/gr_multiply_const_ii.i | 37 - .../src/lib/gengen/gr_multiply_const_ss.cc | 72 - .../src/lib/gengen/gr_multiply_const_ss.h | 55 - .../src/lib/gengen/gr_multiply_const_ss.i | 37 - .../src/lib/gengen/gr_multiply_const_vcc.cc | 61 - .../src/lib/gengen/gr_multiply_const_vcc.h | 55 - .../src/lib/gengen/gr_multiply_const_vcc.i | 37 - .../src/lib/gengen/gr_multiply_const_vff.cc | 61 - .../src/lib/gengen/gr_multiply_const_vff.h | 55 - .../src/lib/gengen/gr_multiply_const_vff.i | 37 - .../src/lib/gengen/gr_multiply_const_vii.cc | 61 - .../src/lib/gengen/gr_multiply_const_vii.h | 55 - .../src/lib/gengen/gr_multiply_const_vii.i | 37 - .../src/lib/gengen/gr_multiply_const_vss.cc | 61 - .../src/lib/gengen/gr_multiply_const_vss.h | 55 - .../src/lib/gengen/gr_multiply_const_vss.i | 37 - .../src/lib/gengen/gr_multiply_ff.cc | 63 - gnuradio-core/src/lib/gengen/gr_multiply_ff.h | 56 - gnuradio-core/src/lib/gengen/gr_multiply_ff.i | 33 - .../src/lib/gengen/gr_multiply_ii.cc | 63 - gnuradio-core/src/lib/gengen/gr_multiply_ii.h | 56 - gnuradio-core/src/lib/gengen/gr_multiply_ii.i | 33 - .../src/lib/gengen/gr_multiply_ss.cc | 63 - gnuradio-core/src/lib/gengen/gr_multiply_ss.h | 56 - gnuradio-core/src/lib/gengen/gr_multiply_ss.i | 33 - gnuradio-core/src/lib/gengen/gr_mute_cc.cc | 79 - gnuradio-core/src/lib/gengen/gr_mute_cc.h | 55 - gnuradio-core/src/lib/gengen/gr_mute_cc.i | 37 - gnuradio-core/src/lib/gengen/gr_mute_ff.cc | 79 - gnuradio-core/src/lib/gengen/gr_mute_ff.h | 55 - gnuradio-core/src/lib/gengen/gr_mute_ff.i | 37 - gnuradio-core/src/lib/gengen/gr_mute_ii.cc | 79 - gnuradio-core/src/lib/gengen/gr_mute_ii.h | 55 - gnuradio-core/src/lib/gengen/gr_mute_ii.i | 37 - gnuradio-core/src/lib/gengen/gr_mute_ss.cc | 79 - gnuradio-core/src/lib/gengen/gr_mute_ss.h | 55 - gnuradio-core/src/lib/gengen/gr_mute_ss.i | 37 - .../src/lib/gengen/gr_noise_source_c.cc | 99 - .../src/lib/gengen/gr_noise_source_c.h | 63 - .../src/lib/gengen/gr_noise_source_c.i | 37 - .../src/lib/gengen/gr_noise_source_f.cc | 99 - .../src/lib/gengen/gr_noise_source_f.h | 63 - .../src/lib/gengen/gr_noise_source_f.i | 37 - .../src/lib/gengen/gr_noise_source_i.cc | 99 - .../src/lib/gengen/gr_noise_source_i.h | 63 - .../src/lib/gengen/gr_noise_source_i.i | 37 - .../src/lib/gengen/gr_noise_source_s.cc | 99 - .../src/lib/gengen/gr_noise_source_s.h | 63 - .../src/lib/gengen/gr_noise_source_s.i | 37 - gnuradio-core/src/lib/gengen/gr_not_bb.cc | 58 - gnuradio-core/src/lib/gengen/gr_not_bb.h | 54 - gnuradio-core/src/lib/gengen/gr_not_bb.i | 33 - gnuradio-core/src/lib/gengen/gr_not_ii.cc | 58 - gnuradio-core/src/lib/gengen/gr_not_ii.h | 54 - gnuradio-core/src/lib/gengen/gr_not_ii.i | 33 - gnuradio-core/src/lib/gengen/gr_not_ss.cc | 58 - gnuradio-core/src/lib/gengen/gr_not_ss.h | 54 - gnuradio-core/src/lib/gengen/gr_not_ss.i | 33 - gnuradio-core/src/lib/gengen/gr_or_bb.cc | 62 - gnuradio-core/src/lib/gengen/gr_or_bb.h | 54 - gnuradio-core/src/lib/gengen/gr_or_bb.i | 33 - gnuradio-core/src/lib/gengen/gr_or_ii.cc | 62 - gnuradio-core/src/lib/gengen/gr_or_ii.h | 54 - gnuradio-core/src/lib/gengen/gr_or_ii.i | 33 - gnuradio-core/src/lib/gengen/gr_or_ss.cc | 62 - gnuradio-core/src/lib/gengen/gr_or_ss.h | 54 - gnuradio-core/src/lib/gengen/gr_or_ss.i | 33 - .../lib/gengen/gr_packed_to_unpacked_bb.cc | 137 - .../src/lib/gengen/gr_packed_to_unpacked_bb.h | 84 - .../src/lib/gengen/gr_packed_to_unpacked_bb.i | 33 - .../lib/gengen/gr_packed_to_unpacked_ii.cc | 137 - .../src/lib/gengen/gr_packed_to_unpacked_ii.h | 84 - .../src/lib/gengen/gr_packed_to_unpacked_ii.i | 33 - .../lib/gengen/gr_packed_to_unpacked_ss.cc | 137 - .../src/lib/gengen/gr_packed_to_unpacked_ss.h | 84 - .../src/lib/gengen/gr_packed_to_unpacked_ss.i | 33 - .../src/lib/gengen/gr_peak_detector_fb.cc | 111 - .../src/lib/gengen/gr_peak_detector_fb.h | 125 - .../src/lib/gengen/gr_peak_detector_fb.i | 49 - .../src/lib/gengen/gr_peak_detector_ib.cc | 111 - .../src/lib/gengen/gr_peak_detector_ib.h | 125 - .../src/lib/gengen/gr_peak_detector_ib.i | 49 - .../src/lib/gengen/gr_peak_detector_sb.cc | 111 - .../src/lib/gengen/gr_peak_detector_sb.h | 125 - .../src/lib/gengen/gr_peak_detector_sb.i | 49 - .../src/lib/gengen/gr_sample_and_hold_bb.cc | 62 - .../src/lib/gengen/gr_sample_and_hold_bb.h | 57 - .../src/lib/gengen/gr_sample_and_hold_bb.i | 33 - .../src/lib/gengen/gr_sample_and_hold_ff.cc | 62 - .../src/lib/gengen/gr_sample_and_hold_ff.h | 57 - .../src/lib/gengen/gr_sample_and_hold_ff.i | 33 - .../src/lib/gengen/gr_sample_and_hold_ii.cc | 62 - .../src/lib/gengen/gr_sample_and_hold_ii.h | 57 - .../src/lib/gengen/gr_sample_and_hold_ii.i | 33 - .../src/lib/gengen/gr_sample_and_hold_ss.cc | 62 - .../src/lib/gengen/gr_sample_and_hold_ss.h | 57 - .../src/lib/gengen/gr_sample_and_hold_ss.i | 33 - .../src/lib/gengen/gr_sig_source_c.cc | 242 - .../src/lib/gengen/gr_sig_source_c.h | 81 - .../src/lib/gengen/gr_sig_source_c.i | 52 - .../src/lib/gengen/gr_sig_source_f.cc | 242 - .../src/lib/gengen/gr_sig_source_f.h | 81 - .../src/lib/gengen/gr_sig_source_f.i | 52 - .../src/lib/gengen/gr_sig_source_i.cc | 242 - .../src/lib/gengen/gr_sig_source_i.h | 81 - .../src/lib/gengen/gr_sig_source_i.i | 52 - .../src/lib/gengen/gr_sig_source_s.cc | 242 - .../src/lib/gengen/gr_sig_source_s.h | 81 - .../src/lib/gengen/gr_sig_source_s.i | 52 - gnuradio-core/src/lib/gengen/gr_sub_cc.cc | 71 - gnuradio-core/src/lib/gengen/gr_sub_cc.h | 56 - gnuradio-core/src/lib/gengen/gr_sub_cc.i | 33 - gnuradio-core/src/lib/gengen/gr_sub_ff.cc | 71 - gnuradio-core/src/lib/gengen/gr_sub_ff.h | 56 - gnuradio-core/src/lib/gengen/gr_sub_ff.i | 33 - gnuradio-core/src/lib/gengen/gr_sub_ii.cc | 71 - gnuradio-core/src/lib/gengen/gr_sub_ii.h | 56 - gnuradio-core/src/lib/gengen/gr_sub_ii.i | 33 - gnuradio-core/src/lib/gengen/gr_sub_ss.cc | 71 - gnuradio-core/src/lib/gengen/gr_sub_ss.h | 56 - gnuradio-core/src/lib/gengen/gr_sub_ss.i | 33 - .../lib/gengen/gr_unpacked_to_packed_bb.cc | 129 - .../src/lib/gengen/gr_unpacked_to_packed_bb.h | 81 - .../src/lib/gengen/gr_unpacked_to_packed_bb.i | 33 - .../lib/gengen/gr_unpacked_to_packed_ii.cc | 129 - .../src/lib/gengen/gr_unpacked_to_packed_ii.h | 81 - .../src/lib/gengen/gr_unpacked_to_packed_ii.i | 33 - .../lib/gengen/gr_unpacked_to_packed_ss.cc | 129 - .../src/lib/gengen/gr_unpacked_to_packed_ss.h | 81 - .../src/lib/gengen/gr_unpacked_to_packed_ss.i | 33 - .../src/lib/gengen/gr_vector_sink_b.cc | 64 - .../src/lib/gengen/gr_vector_sink_b.h | 57 - .../src/lib/gengen/gr_vector_sink_b.i | 38 - .../src/lib/gengen/gr_vector_sink_c.cc | 64 - .../src/lib/gengen/gr_vector_sink_c.h | 57 - .../src/lib/gengen/gr_vector_sink_c.i | 38 - .../src/lib/gengen/gr_vector_sink_f.cc | 64 - .../src/lib/gengen/gr_vector_sink_f.h | 57 - .../src/lib/gengen/gr_vector_sink_f.i | 38 - .../src/lib/gengen/gr_vector_sink_i.cc | 64 - .../src/lib/gengen/gr_vector_sink_i.h | 57 - .../src/lib/gengen/gr_vector_sink_i.i | 38 - .../src/lib/gengen/gr_vector_sink_s.cc | 64 - .../src/lib/gengen/gr_vector_sink_s.h | 57 - .../src/lib/gengen/gr_vector_sink_s.i | 38 - .../src/lib/gengen/gr_vector_source_b.cc | 89 - .../src/lib/gengen/gr_vector_source_b.h | 59 - .../src/lib/gengen/gr_vector_source_b.i | 36 - .../src/lib/gengen/gr_vector_source_c.cc | 89 - .../src/lib/gengen/gr_vector_source_c.h | 59 - .../src/lib/gengen/gr_vector_source_c.i | 36 - .../src/lib/gengen/gr_vector_source_f.cc | 89 - .../src/lib/gengen/gr_vector_source_f.h | 59 - .../src/lib/gengen/gr_vector_source_f.i | 36 - .../src/lib/gengen/gr_vector_source_i.cc | 89 - .../src/lib/gengen/gr_vector_source_i.h | 59 - .../src/lib/gengen/gr_vector_source_i.i | 36 - .../src/lib/gengen/gr_vector_source_s.cc | 89 - .../src/lib/gengen/gr_vector_source_s.h | 59 - .../src/lib/gengen/gr_vector_source_s.i | 36 - gnuradio-core/src/lib/gengen/gr_xor_bb.cc | 62 - gnuradio-core/src/lib/gengen/gr_xor_bb.h | 54 - gnuradio-core/src/lib/gengen/gr_xor_bb.i | 33 - gnuradio-core/src/lib/gengen/gr_xor_ii.cc | 62 - gnuradio-core/src/lib/gengen/gr_xor_ii.h | 54 - gnuradio-core/src/lib/gengen/gr_xor_ii.i | 33 - gnuradio-core/src/lib/gengen/gr_xor_ss.cc | 62 - gnuradio-core/src/lib/gengen/gr_xor_ss.h | 54 - gnuradio-core/src/lib/gengen/gr_xor_ss.i | 33 - .../src/lib/gengen/stamp-sources-generate | 0 gnuradio-core/src/lib/hier/Makefile.in | 127 +- gnuradio-core/src/lib/io/Makefile.in | 183 +- gnuradio-core/src/lib/missing/Makefile.in | 136 +- .../src/lib/reed-solomon/Makefile.in | 116 +- gnuradio-core/src/lib/runtime/Makefile.in | 190 +- gnuradio-core/src/lib/swig/Makefile.in | 1303 +- .../lib/swig/gnuradio_swig_bug_workaround.h | 45 - gnuradio-core/src/lib/viterbi/Makefile.in | 116 +- gnuradio-core/src/python/Makefile.in | 116 +- gnuradio-core/src/python/bin/Makefile.in | 116 +- gnuradio-core/src/python/gnuradio/Makefile.in | 150 +- .../src/python/gnuradio/blks2/Makefile.in | 116 +- .../src/python/gnuradio/blks2impl/Makefile.in | 125 +- .../src/python/gnuradio/gr/Makefile.in | 120 +- .../src/python/gnuradio/gru/Makefile.in | 116 +- .../src/python/gnuradio/gruimpl/Makefile.in | 116 +- .../src/python/gnuradio/vocoder/Makefile.in | 116 +- gnuradio-core/src/tests/Makefile.in | 116 +- gnuradio-core/src/utils/Makefile.in | 116 +- gnuradio-examples/Makefile.in | 123 +- gnuradio-examples/c++/Makefile.in | 116 +- gnuradio-examples/python/Makefile.in | 117 +- gnuradio-examples/python/apps/Makefile.in | 73 +- .../python/apps/hf_explorer/Makefile.in | 116 +- .../python/apps/hf_radio/Makefile.in | 116 +- gnuradio-examples/python/audio/Makefile.in | 116 +- .../python/digital-bert/Makefile.in | 116 +- gnuradio-examples/python/digital/Makefile.in | 118 +- .../python/digital_voice/Makefile.in | 116 +- gnuradio-examples/python/mp-sched/Makefile.in | 116 +- .../python/multi-antenna/Makefile.in | 116 +- .../python/multi_usrp/Makefile.in | 116 +- gnuradio-examples/python/network/Makefile.in | 116 +- gnuradio-examples/python/ofdm/Makefile.in | 116 +- gnuradio-examples/python/usrp/Makefile.in | 116 +- gnuradio-examples/python/usrp2/Makefile.in | 116 +- gr-audio-alsa/Makefile.in | 166 +- gr-audio-alsa/src/Makefile.in | 412 +- gr-audio-jack/Makefile.in | 179 +- gr-audio-jack/src/Makefile.in | 542 +- gr-audio-oss/Makefile.in | 179 +- gr-audio-oss/src/Makefile.in | 525 +- gr-audio-osx/Makefile.in | 116 +- gr-audio-osx/src/Makefile.in | 538 +- gr-audio-portaudio/Makefile.in | 179 +- gr-audio-portaudio/src/Makefile.in | 544 +- gr-audio-windows/Makefile.in | 116 +- gr-audio-windows/src/Makefile.in | 541 +- gr-cvsd-vocoder/Makefile.in | 197 +- gr-cvsd-vocoder/src/Makefile.in | 78 +- gr-cvsd-vocoder/src/lib/Makefile.in | 522 +- gr-cvsd-vocoder/src/python/Makefile.in | 116 +- gr-gcell/Makefile.in | 116 +- gr-gcell/src/Makefile.in | 441 +- gr-gcell/src/examples/Makefile.in | 116 +- gr-gpio/Makefile.in | 116 +- gr-gpio/src/Makefile.in | 78 +- gr-gpio/src/fpga/Makefile.in | 73 +- gr-gpio/src/fpga/include/Makefile.in | 73 +- gr-gpio/src/fpga/lib/Makefile.in | 73 +- gr-gpio/src/fpga/rbf/Makefile.in | 116 +- gr-gpio/src/fpga/top/Makefile.in | 116 +- gr-gpio/src/python/Makefile.in | 116 +- gr-gsm-fr-vocoder/Makefile.in | 199 +- gr-gsm-fr-vocoder/src/Makefile.in | 78 +- gr-gsm-fr-vocoder/src/lib/Makefile.in | 529 +- gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in | 116 +- gr-gsm-fr-vocoder/src/python/Makefile.in | 116 +- gr-pager/Makefile.in | 200 +- gr-qtgui/Makefile.in | 116 +- gr-qtgui/src/Makefile.in | 78 +- gr-qtgui/src/lib/Makefile.in | 472 +- gr-qtgui/src/lib/spectrumdisplayform_ui.h | 363 - gr-qtgui/src/python/Makefile.in | 116 +- gr-radar-mono/Makefile.in | 116 +- gr-radar-mono/doc/Makefile.in | 116 +- gr-radar-mono/src/Makefile.in | 121 +- gr-radar-mono/src/fpga/Makefile.in | 116 +- gr-radar-mono/src/fpga/lib/Makefile.in | 116 +- gr-radar-mono/src/fpga/models/Makefile.in | 116 +- gr-radar-mono/src/fpga/tb/Makefile.in | 116 +- gr-radar-mono/src/fpga/top/Makefile.in | 116 +- gr-radar-mono/src/lib/Makefile.in | 116 +- gr-radar-mono/src/python/Makefile.in | 116 +- gr-radio-astronomy/Makefile.in | 116 +- gr-radio-astronomy/src/Makefile.in | 78 +- gr-radio-astronomy/src/lib/Makefile.in | 394 +- gr-radio-astronomy/src/python/Makefile.in | 116 +- gr-sounder/Makefile.in | 116 +- gr-sounder/doc/Makefile.in | 116 +- gr-sounder/src/Makefile.in | 121 +- gr-sounder/src/fpga/Makefile.in | 116 +- gr-sounder/src/fpga/lib/Makefile.in | 116 +- gr-sounder/src/fpga/tb/Makefile.in | 116 +- gr-sounder/src/fpga/top/Makefile.in | 116 +- gr-sounder/src/lib/Makefile.in | 116 +- gr-sounder/src/python/Makefile.in | 116 +- gr-trellis/Makefile.in | 195 +- gr-trellis/doc/Makefile.in | 116 +- gr-trellis/src/Makefile.in | 78 +- gr-trellis/src/examples/Makefile.in | 116 +- gr-trellis/src/examples/fsm_files/Makefile.in | 116 +- gr-trellis/src/lib/Makefile.in | 1197 +- gr-trellis/src/lib/stamp-sources-generate | 0 gr-trellis/src/lib/trellis_encoder_bb.cc | 76 - gr-trellis/src/lib/trellis_encoder_bb.h | 57 - gr-trellis/src/lib/trellis_encoder_bb.i | 36 - gr-trellis/src/lib/trellis_encoder_bi.cc | 76 - gr-trellis/src/lib/trellis_encoder_bi.h | 57 - gr-trellis/src/lib/trellis_encoder_bi.i | 36 - gr-trellis/src/lib/trellis_encoder_bs.cc | 76 - gr-trellis/src/lib/trellis_encoder_bs.h | 57 - gr-trellis/src/lib/trellis_encoder_bs.i | 36 - gr-trellis/src/lib/trellis_encoder_ii.cc | 76 - gr-trellis/src/lib/trellis_encoder_ii.h | 57 - gr-trellis/src/lib/trellis_encoder_ii.i | 36 - gr-trellis/src/lib/trellis_encoder_si.cc | 76 - gr-trellis/src/lib/trellis_encoder_si.h | 57 - gr-trellis/src/lib/trellis_encoder_si.i | 36 - gr-trellis/src/lib/trellis_encoder_ss.cc | 76 - gr-trellis/src/lib/trellis_encoder_ss.h | 57 - gr-trellis/src/lib/trellis_encoder_ss.i | 36 - gr-trellis/src/lib/trellis_generated.i | 56 - gr-trellis/src/lib/trellis_metrics_c.cc | 97 - gr-trellis/src/lib/trellis_metrics_c.h | 65 - gr-trellis/src/lib/trellis_metrics_c.i | 40 - gr-trellis/src/lib/trellis_metrics_f.cc | 97 - gr-trellis/src/lib/trellis_metrics_f.h | 65 - gr-trellis/src/lib/trellis_metrics_f.i | 40 - gr-trellis/src/lib/trellis_metrics_i.cc | 97 - gr-trellis/src/lib/trellis_metrics_i.h | 65 - gr-trellis/src/lib/trellis_metrics_i.i | 40 - gr-trellis/src/lib/trellis_metrics_s.cc | 97 - gr-trellis/src/lib/trellis_metrics_s.h | 65 - gr-trellis/src/lib/trellis_metrics_s.i | 40 - gr-trellis/src/lib/trellis_viterbi_b.cc | 170 - gr-trellis/src/lib/trellis_viterbi_b.h | 81 - gr-trellis/src/lib/trellis_viterbi_b.i | 49 - .../src/lib/trellis_viterbi_combined_cb.cc | 190 - .../src/lib/trellis_viterbi_combined_cb.h | 97 - .../src/lib/trellis_viterbi_combined_cb.i | 59 - .../src/lib/trellis_viterbi_combined_ci.cc | 190 - .../src/lib/trellis_viterbi_combined_ci.h | 97 - .../src/lib/trellis_viterbi_combined_ci.i | 59 - .../src/lib/trellis_viterbi_combined_cs.cc | 190 - .../src/lib/trellis_viterbi_combined_cs.h | 97 - .../src/lib/trellis_viterbi_combined_cs.i | 59 - .../src/lib/trellis_viterbi_combined_fb.cc | 190 - .../src/lib/trellis_viterbi_combined_fb.h | 97 - .../src/lib/trellis_viterbi_combined_fb.i | 59 - .../src/lib/trellis_viterbi_combined_fi.cc | 190 - .../src/lib/trellis_viterbi_combined_fi.h | 97 - .../src/lib/trellis_viterbi_combined_fi.i | 59 - .../src/lib/trellis_viterbi_combined_fs.cc | 190 - .../src/lib/trellis_viterbi_combined_fs.h | 97 - .../src/lib/trellis_viterbi_combined_fs.i | 59 - .../src/lib/trellis_viterbi_combined_ib.cc | 190 - .../src/lib/trellis_viterbi_combined_ib.h | 97 - .../src/lib/trellis_viterbi_combined_ib.i | 59 - .../src/lib/trellis_viterbi_combined_ii.cc | 190 - .../src/lib/trellis_viterbi_combined_ii.h | 97 - .../src/lib/trellis_viterbi_combined_ii.i | 59 - .../src/lib/trellis_viterbi_combined_is.cc | 190 - .../src/lib/trellis_viterbi_combined_is.h | 97 - .../src/lib/trellis_viterbi_combined_is.i | 59 - .../src/lib/trellis_viterbi_combined_sb.cc | 190 - .../src/lib/trellis_viterbi_combined_sb.h | 97 - .../src/lib/trellis_viterbi_combined_sb.i | 59 - .../src/lib/trellis_viterbi_combined_si.cc | 190 - .../src/lib/trellis_viterbi_combined_si.h | 97 - .../src/lib/trellis_viterbi_combined_si.i | 59 - .../src/lib/trellis_viterbi_combined_ss.cc | 190 - .../src/lib/trellis_viterbi_combined_ss.h | 97 - .../src/lib/trellis_viterbi_combined_ss.i | 59 - gr-trellis/src/lib/trellis_viterbi_i.cc | 170 - gr-trellis/src/lib/trellis_viterbi_i.h | 81 - gr-trellis/src/lib/trellis_viterbi_i.i | 49 - gr-trellis/src/lib/trellis_viterbi_s.cc | 170 - gr-trellis/src/lib/trellis_viterbi_s.h | 81 - gr-trellis/src/lib/trellis_viterbi_s.i | 49 - gr-trellis/src/python/Makefile.in | 116 +- gr-usrp/Makefile.in | 116 +- gr-usrp/apps/Makefile.in | 120 +- gr-usrp/src/Makefile.in | 434 +- gr-usrp2/Makefile.in | 116 +- gr-usrp2/src/Makefile.in | 415 +- gr-utils/Makefile.in | 73 +- gr-utils/src/Makefile.in | 78 +- gr-utils/src/lib/Makefile.in | 73 +- gr-utils/src/python/Makefile.in | 132 +- gr-video-sdl/Makefile.in | 195 +- gr-video-sdl/src/Makefile.in | 530 +- gr-wxgui/Makefile.in | 131 +- gr-wxgui/src/Makefile.in | 116 +- gr-wxgui/src/python/Makefile.in | 129 +- gr-wxgui/src/python/plotter/Makefile.in | 116 +- grc/Makefile.in | 191 +- grc/base/Makefile.in | 147 +- grc/blocks/Makefile.in | 160 +- grc/freedesktop/Makefile.in | 143 +- grc/freedesktop/grc_setup_freedesktop | 58 - grc/grc.conf | 9 - grc/grc_gnuradio/Makefile.in | 116 +- grc/gui/Makefile.in | 148 +- grc/python/Makefile.in | 147 +- grc/scripts/Makefile.in | 146 +- gruel/Makefile.in | 116 +- gruel/src/Makefile.in | 75 +- gruel/src/include/Makefile.in | 73 +- gruel/src/include/gruel/Makefile.in | 129 +- gruel/src/include/gruel/inet.h | 68 - gruel/src/lib/Makefile.in | 506 +- usrp/Makefile.in | 73 +- usrp/doc/Makefile.in | 118 +- usrp/doc/other/Makefile.in | 116 +- usrp/firmware/Makefile.in | 73 +- usrp/firmware/include/Makefile.in | 119 +- usrp/firmware/lib/Makefile.in | 73 +- usrp/firmware/src/Makefile.in | 73 +- usrp/firmware/src/common/Makefile.in | 73 +- usrp/firmware/src/usrp2/Makefile.in | 77 +- usrp/firmware/src/usrp2/usrp_gpif.c | 206 - usrp/fpga/Makefile.in | 260 +- usrp/fpga/rbf/Makefile.in | 73 +- usrp/fpga/rbf/rev2/Makefile.in | 116 +- usrp/fpga/rbf/rev4/Makefile.in | 116 +- usrp/host/Makefile.in | 80 +- usrp/host/apps/Makefile.in | 120 +- usrp/host/lib/Makefile.in | 848 +- usrp/host/misc/Makefile.in | 116 +- usrp/host/swig/Makefile.in | 117 +- usrp2/Makefile.in | 116 +- usrp2/firmware/Makefile.in | 3 +- usrp2/firmware/aclocal.m4 | 4 +- usrp2/firmware/apps/Makefile.in | 30 +- usrp2/firmware/configure | 326 +- usrp2/firmware/lib/Makefile.in | 95 +- usrp2/host/Makefile.in | 116 +- usrp2/host/apps/Makefile.in | 139 +- usrp2/host/include/Makefile.in | 116 +- usrp2/host/include/usrp2/Makefile.in | 116 +- usrp2/host/lib/Makefile.in | 137 +- 688 files changed, 25393 insertions(+), 61421 deletions(-) delete mode 100644 gnuradio-core/src/lib/filter/filter_generated.i delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_ccc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_ccc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_ccc_generic.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_ccc_generic.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_ccf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_ccf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_ccf_generic.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_ccf_generic.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fcc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fcc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fcc_generic.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fcc_generic.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fff.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fff.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fff_generic.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fff_generic.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_ccc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_ccc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_ccc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_ccf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_ccf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_ccf.i delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_fcc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_fcc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_fcc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_fff.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_fff.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_fff.i delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_fsf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_fsf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_fsf.i delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_scc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_scc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_filter_scc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fsf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fsf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fsf_generic.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_fsf_generic.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_scc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_scc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_scc_generic.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_scc_generic.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_sysconfig.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_sysconfig.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_sysconfig_generic.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_sysconfig_generic.h delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_util.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_fir_util.h delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.i delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.i delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.i delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.i delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.h delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.i delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.i delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.i delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.i delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.h delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.i delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.h delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.i delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.cc delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.h delete mode 100644 gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.i delete mode 100644 gnuradio-core/src/lib/filter/stamp-sources-generate delete mode 100644 gnuradio-core/src/lib/gengen/gengen_generated.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_cc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_cc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_cc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_cc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_cc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_cc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_sf.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_sf.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_sf.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vcc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vcc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vcc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_const_vss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_add_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_bb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_bb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_bb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_const_bb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_const_bb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_const_bb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_const_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_const_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_const_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_const_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_const_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_const_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_and_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_fs.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_fs.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_fs.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_is.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_is.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_is.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_argmax_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_cc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_cc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_cc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_divide_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_cc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_cc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_cc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_integrate_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_max_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_cc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_cc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_cc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_moving_average_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_cc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_cc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_cc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_cc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_cc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_cc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_const_vss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_multiply_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_cc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_cc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_cc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_mute_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_c.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_c.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_c.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_f.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_f.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_f.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_i.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_i.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_i.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_s.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_s.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_noise_source_s.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_not_bb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_not_bb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_not_bb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_not_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_not_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_not_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_not_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_not_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_not_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_or_bb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_or_bb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_or_bb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_or_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_or_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_or_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_or_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_or_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_or_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_peak_detector_fb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_peak_detector_fb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_peak_detector_ib.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_peak_detector_ib.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_peak_detector_sb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_peak_detector_sb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_c.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_c.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_c.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_f.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_f.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_f.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_i.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_i.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_i.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_s.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_s.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sig_source_s.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_cc.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_cc.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_cc.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_ff.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_ff.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_ff.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_sub_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_b.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_b.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_b.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_c.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_c.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_c.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_f.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_f.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_f.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_i.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_i.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_i.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_s.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_s.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_sink_s.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_b.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_b.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_b.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_c.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_c.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_c.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_f.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_f.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_f.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_i.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_i.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_i.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_s.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_s.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_vector_source_s.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_xor_bb.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_xor_bb.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_xor_bb.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_xor_ii.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_xor_ii.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_xor_ii.i delete mode 100644 gnuradio-core/src/lib/gengen/gr_xor_ss.cc delete mode 100644 gnuradio-core/src/lib/gengen/gr_xor_ss.h delete mode 100644 gnuradio-core/src/lib/gengen/gr_xor_ss.i delete mode 100644 gnuradio-core/src/lib/gengen/stamp-sources-generate delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h delete mode 100644 gr-qtgui/src/lib/spectrumdisplayform_ui.h delete mode 100644 gr-trellis/src/lib/stamp-sources-generate delete mode 100644 gr-trellis/src/lib/trellis_encoder_bb.cc delete mode 100644 gr-trellis/src/lib/trellis_encoder_bb.h delete mode 100644 gr-trellis/src/lib/trellis_encoder_bb.i delete mode 100644 gr-trellis/src/lib/trellis_encoder_bi.cc delete mode 100644 gr-trellis/src/lib/trellis_encoder_bi.h delete mode 100644 gr-trellis/src/lib/trellis_encoder_bi.i delete mode 100644 gr-trellis/src/lib/trellis_encoder_bs.cc delete mode 100644 gr-trellis/src/lib/trellis_encoder_bs.h delete mode 100644 gr-trellis/src/lib/trellis_encoder_bs.i delete mode 100644 gr-trellis/src/lib/trellis_encoder_ii.cc delete mode 100644 gr-trellis/src/lib/trellis_encoder_ii.h delete mode 100644 gr-trellis/src/lib/trellis_encoder_ii.i delete mode 100644 gr-trellis/src/lib/trellis_encoder_si.cc delete mode 100644 gr-trellis/src/lib/trellis_encoder_si.h delete mode 100644 gr-trellis/src/lib/trellis_encoder_si.i delete mode 100644 gr-trellis/src/lib/trellis_encoder_ss.cc delete mode 100644 gr-trellis/src/lib/trellis_encoder_ss.h delete mode 100644 gr-trellis/src/lib/trellis_encoder_ss.i delete mode 100644 gr-trellis/src/lib/trellis_generated.i delete mode 100644 gr-trellis/src/lib/trellis_metrics_c.cc delete mode 100644 gr-trellis/src/lib/trellis_metrics_c.h delete mode 100644 gr-trellis/src/lib/trellis_metrics_c.i delete mode 100644 gr-trellis/src/lib/trellis_metrics_f.cc delete mode 100644 gr-trellis/src/lib/trellis_metrics_f.h delete mode 100644 gr-trellis/src/lib/trellis_metrics_f.i delete mode 100644 gr-trellis/src/lib/trellis_metrics_i.cc delete mode 100644 gr-trellis/src/lib/trellis_metrics_i.h delete mode 100644 gr-trellis/src/lib/trellis_metrics_i.i delete mode 100644 gr-trellis/src/lib/trellis_metrics_s.cc delete mode 100644 gr-trellis/src/lib/trellis_metrics_s.h delete mode 100644 gr-trellis/src/lib/trellis_metrics_s.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_b.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_b.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_b.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_cb.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_cb.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_cb.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ci.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ci.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ci.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_cs.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_cs.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_cs.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_fb.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_fb.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_fb.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_fi.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_fi.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_fi.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_fs.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_fs.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_fs.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ib.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ib.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ib.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ii.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ii.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ii.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_is.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_is.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_is.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_sb.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_sb.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_sb.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_si.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_si.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_si.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ss.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ss.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_combined_ss.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_i.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_i.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_i.i delete mode 100644 gr-trellis/src/lib/trellis_viterbi_s.cc delete mode 100644 gr-trellis/src/lib/trellis_viterbi_s.h delete mode 100644 gr-trellis/src/lib/trellis_viterbi_s.i delete mode 100644 grc/freedesktop/grc_setup_freedesktop delete mode 100644 grc/grc.conf delete mode 100644 gruel/src/include/gruel/inet.h delete mode 100644 usrp/firmware/src/usrp2/usrp_gpif.c diff --git a/Makefile.in b/Makefile.in index f11fe2c0..a31c7d4a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 # @@ -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 \ @@ -237,6 +237,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@ @@ -244,6 +245,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@ @@ -262,6 +267,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -271,20 +277,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@ @@ -307,6 +316,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@ @@ -368,6 +379,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@ @@ -380,17 +392,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@ @@ -406,7 +418,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@ @@ -458,6 +469,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@ @@ -488,6 +504,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@ @@ -509,6 +530,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@ @@ -591,26 +622,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@ @@ -641,7 +657,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@ @@ -652,23 +667,26 @@ ACLOCAL_AMFLAGS = -I config 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 @@ -680,7 +698,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, @@ -688,10 +706,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@ @@ -707,18 +721,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@ @@ -733,15 +735,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 = @@ -755,10 +759,12 @@ EXTRA_DIST = \ Makefile.swig \ Makefile.swig.gen.t \ Makefile.par.gen \ - Makefile.gen.gen + Makefile.gen.gen \ + version.sh SUBDIRS = @build_dirs@ DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@ +DISTCLEANFILES = gnuradio*.tar.gz all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1166,10 +1172,12 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@PYTHON_FALSE@install-data-hook: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -1193,7 +1201,8 @@ info: info-recursive info-am: install-data-am: - + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive install-dvi-am: @@ -1241,7 +1250,8 @@ ps-am: uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive + ctags-recursive install-am install-data-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ @@ -1250,14 +1260,15 @@ uninstall-am: dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1270,6 +1281,15 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; +@PYTHON_TRUE@export pythondir + +@PYTHON_TRUE@install-data-hook: +@PYTHON_TRUE@ @if ! python -c "import gnuradio" > /dev/null 2>&1; then\ +@PYTHON_TRUE@ printf "\n*** Post-Install Message ***\ +@PYTHON_TRUE@ \nWarning: python could not find the gnuradio module.\ +@PYTHON_TRUE@ \nMake sure that $${pythondir} is in your PYTHONPATH\n\n";\ +@PYTHON_TRUE@ fi + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/aclocal.m4 b/aclocal.m4 index 1aa9740e..76605cac 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -980,6 +980,23 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 @@ -1199,36 +1216,39 @@ m4_include([config/gr_check_createfilemapping.m4]) m4_include([config/gr_check_memalign.m4]) m4_include([config/gr_check_shm_open.m4]) m4_include([config/gr_doxygen.m4]) -m4_include([config/gr_fortran.m4]) +m4_include([config/gr_git.m4]) m4_include([config/gr_gprof.m4]) m4_include([config/gr_lib64.m4]) m4_include([config/gr_libgnuradio_core_extra_ldflags.m4]) m4_include([config/gr_no_undefined.m4]) -m4_include([config/gr_omnithread.m4]) m4_include([config/gr_pwin32.m4]) m4_include([config/gr_python.m4]) m4_include([config/gr_qwt.m4]) m4_include([config/gr_qwtplot3d.m4]) m4_include([config/gr_scripting.m4]) m4_include([config/gr_set_md_cpu.m4]) -m4_include([config/gr_subversion.m4]) m4_include([config/gr_swig.m4]) m4_include([config/gr_sysv_shm.m4]) +m4_include([config/gr_version.m4]) m4_include([config/grc_build.m4]) m4_include([config/grc_docs.m4]) m4_include([config/grc_gcell.m4]) m4_include([config/grc_gnuradio_core.m4]) m4_include([config/grc_gnuradio_examples.m4]) +m4_include([config/grc_gr_atsc.m4]) m4_include([config/grc_gr_audio_alsa.m4]) m4_include([config/grc_gr_audio_jack.m4]) m4_include([config/grc_gr_audio_oss.m4]) m4_include([config/grc_gr_audio_osx.m4]) m4_include([config/grc_gr_audio_portaudio.m4]) m4_include([config/grc_gr_audio_windows.m4]) +m4_include([config/grc_gr_comedi.m4]) m4_include([config/grc_gr_cvsd_vocoder.m4]) m4_include([config/grc_gr_gcell.m4]) m4_include([config/grc_gr_gpio.m4]) m4_include([config/grc_gr_gsm_fr_vocoder.m4]) +m4_include([config/grc_gr_msdd6000.m4]) +m4_include([config/grc_gr_noaa.m4]) m4_include([config/grc_gr_pager.m4]) m4_include([config/grc_gr_qtgui.m4]) m4_include([config/grc_gr_radar_mono.m4]) @@ -1242,9 +1262,6 @@ m4_include([config/grc_gr_video_sdl.m4]) m4_include([config/grc_gr_wxgui.m4]) m4_include([config/grc_grc.m4]) m4_include([config/grc_gruel.m4]) -m4_include([config/grc_mblock.m4]) -m4_include([config/grc_omnithread.m4]) -m4_include([config/grc_pmt.m4]) m4_include([config/grc_usrp.m4]) m4_include([config/grc_usrp2.m4]) m4_include([config/lf_cc.m4]) diff --git a/config.h.in b/config.h.in index 51f756b4..cf6c437b 100644 --- a/config.h.in +++ b/config.h.in @@ -51,9 +51,6 @@ /* Define if you have a CBLAS library. */ #undef HAVE_CBLAS -/* Define to 1 if you have the `clock_gettime' function. */ -#undef HAVE_CLOCK_GETTIME - /* Define to 1 if your system has `cosf'. */ #undef HAVE_COSF @@ -142,6 +139,9 @@ /* Define to 1 if you have the `nanosleep' function. */ #undef HAVE_NANOSLEEP +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_IN_H @@ -313,9 +313,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the header file. */ -#undef HAVE_USB_H - /* Define to 1 if you have the `usleep' function. */ #undef HAVE_USLEEP @@ -372,6 +369,9 @@ your system. */ #undef PTHREAD_CREATE_JOINABLE +/* The size of `void*', as computed by sizeof. */ +#undef SIZEOF_VOIDP + /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. @@ -502,6 +502,9 @@ struct timespec { long tv_nsec; }; #endif +#if HAVE_UNISTD_H +#include +#endif static inline int nanosleep(const struct timespec *req, struct timespec *rem) { return usleep(req->tv_sec*1000000+req->tv_nsec/1000); } #endif diff --git a/config/Makefile.in b/config/Makefile.in index ba4c1d9e..c772dc8e 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2001,2006,2008 Free Software Foundation, Inc. +# Copyright 2001,2006,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = @@ -731,6 +735,7 @@ m4macros = \ grc_gr_gcell.m4 \ grc_gr_gpio.m4 \ grc_gr_gsm_fr_vocoder.m4 \ + grc_gr_noaa.m4 \ grc_gr_radar_mono.m4 \ grc_gr_radio_astronomy.m4 \ grc_gr_sounder.m4 \ @@ -738,24 +743,22 @@ m4macros = \ grc_gr_usrp.m4 \ grc_gr_video_sdl.m4 \ grc_gr_wxgui.m4 \ - grc_mblock.m4 \ grc_gruel.m4 \ gr_check_createfilemapping.m4 \ gr_check_mc4020.m4 \ gr_check_shm_open.m4 \ gr_check_usrp.m4 \ - grc_pmt.m4 \ grc_usrp.m4 \ grc_usrp2.m4 \ grc_gr_msdd6000.m4 \ gr_doxygen.m4 \ gr_fortran.m4 \ gr_gcell.m4 \ + gr_git.m4 \ gr_gprof.m4 \ gr_lib64.m4 \ gr_libgnuradio_core_extra_ldflags.m4 \ gr_no_undefined.m4 \ - gr_omnithread.m4 \ gr_pwin32.m4 \ gr_python.m4 \ gr_require_mc4020.m4 \ @@ -765,6 +768,7 @@ m4macros = \ gr_subversion.m4 \ gr_swig.m4 \ gr_sysv_shm.m4 \ + gr_version.m4 \ lf_cc.m4 \ lf_cxx.m4 \ lf_warnings.m4 \ diff --git a/configure b/configure index c8ed5fc2..218364b5 100755 --- a/configure +++ b/configure @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.67. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -316,7 +316,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -356,19 +356,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -679,7 +679,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -788,8 +788,6 @@ gr_qtgui_LIBDIRPATH gr_qtgui_INCLUDEDIR gr_qtgui_LA gr_qtgui_INCLUDES -BUILD_QT_FALSE -BUILD_QT_TRUE QT_UIC_EXEC QT_MOC_EXEC QT_LIBS @@ -846,6 +844,11 @@ gr_pager_LIBDIRPATH gr_pager_INCLUDEDIR gr_pager_LA gr_pager_INCLUDES +gr_noaa_LDFLAG +gr_noaa_LIBDIRPATH +gr_noaa_INCLUDEDIR +gr_noaa_LA +gr_noaa_INCLUDES gr_gsm_fr_vocoder_LDFLAG gr_gsm_fr_vocoder_LIBDIRPATH gr_gsm_fr_vocoder_INCLUDEDIR @@ -861,6 +864,20 @@ gr_cvsd_vocoder_LIBDIRPATH gr_cvsd_vocoder_INCLUDEDIR gr_cvsd_vocoder_LA gr_cvsd_vocoder_INCLUDES +gr_comedi_LDFLAG +gr_comedi_LIBDIRPATH +gr_comedi_INCLUDEDIR +gr_comedi_LA +gr_comedi_INCLUDES +COMEDI_CPPFLAGS +COMEDI_INCLUDEDIR +COMEDI_LIBS +COMEDI_CFLAGS +gr_atsc_LDFLAG +gr_atsc_LIBDIRPATH +gr_atsc_INCLUDEDIR +gr_atsc_LA +gr_atsc_INCLUDES gr_audio_windows_LDFLAG gr_audio_windows_LIBDIRPATH gr_audio_windows_INCLUDEDIR @@ -905,6 +922,11 @@ ALSA_CPPFLAGS ALSA_INCLUDEDIR ALSA_LIBS ALSA_CFLAGS +gr_msdd6000_LDFLAG +gr_msdd6000_LIBDIRPATH +gr_msdd6000_INCLUDEDIR +gr_msdd6000_LA +gr_msdd6000_INCLUDES gr_gcell_LDFLAG gr_gcell_LIBDIRPATH gr_gcell_INCLUDEDIR @@ -933,15 +955,19 @@ usrp_LIBDIRPATH usrp_INCLUDEDIR usrp_LA usrp_INCLUDES -usrp_darwin_omnithread_pc_requires XAS XCC +USB_INCLUDES +LIBUSB_PKG_CONFIG_NAME USB_CPPFLAGS USB_INCLUDEDIR USB_LIBS USB_CFLAGS +USE_LIBUSB1 FUSB_TECH_ra_wb_FALSE FUSB_TECH_ra_wb_TRUE +FUSB_TECH_libusb1_FALSE +FUSB_TECH_libusb1_TRUE FUSB_TECH_linux_FALSE FUSB_TECH_linux_TRUE FUSB_TECH_generic_FALSE @@ -951,16 +977,6 @@ FUSB_TECH_win32_TRUE FUSB_TECH_darwin_FALSE FUSB_TECH_darwin_TRUE FUSB_TECH -mblock_LDFLAG -mblock_LIBDIRPATH -mblock_INCLUDEDIR -mblock_LA -mblock_INCLUDES -pmt_LDFLAG -pmt_LIBDIRPATH -pmt_INCLUDEDIR -pmt_LA -pmt_INCLUDES gnuradio_core_LDFLAG gnuradio_core_LIBDIRPATH gnuradio_core_INCLUDEDIR @@ -982,11 +998,6 @@ gcell_INCLUDES gcell_spu_LA gcell_spu_INCLUDES SPU_GCC_PROG -omnithread_LDFLAG -omnithread_LIBDIRPATH -omnithread_INCLUDEDIR -omnithread_LA -omnithread_INCLUDES gruel_LDFLAG gruel_LIBDIRPATH gruel_INCLUDEDIR @@ -995,13 +1006,17 @@ gruel_INCLUDES GR_HAVE_BYTESWAP GR_HAVE_NETINET_IN GR_HAVE_ARPA_INET -SVNDATE -SVNVERSION -SVN +GR_PREFSDIR +SYSCONFDIR +BUILD_DATE BOOST_PROGRAM_OPTIONS_LIB BOOST_DATE_TIME_LIB BOOST_THREAD_LIB BOOST_CXXFLAGS +PTHREAD_CFLAGS +PTHREAD_LIBS +PTHREAD_CC +acx_pthread_config BOOST_LDFLAGS BOOST_CPPFLAGS GUILE @@ -1013,6 +1028,10 @@ CPPUNIT_LIBS CPPUNIT_CFLAGS MD_CPU_generic_FALSE MD_CPU_generic_TRUE +MD_CPU_armv7_a_FALSE +MD_CPU_armv7_a_TRUE +MD_CPU_armv5_FALSE +MD_CPU_armv5_TRUE MD_CPU_powerpc_FALSE MD_CPU_powerpc_TRUE MD_SUBCPU_x86_64_FALSE @@ -1045,17 +1064,11 @@ ALLOCA GR_ARCH_BIGENDIAN IPC_LIBS CXX_FOR_BUILD -OMNITHREAD_NT_FALSE -OMNITHREAD_NT_TRUE -OMNITHREAD_POSIX_FALSE -OMNITHREAD_POSIX_TRUE -PTHREAD_CFLAGS -PTHREAD_LIBS -PTHREAD_CC -acx_pthread_config HAS_XMLTO_FALSE HAS_XMLTO_TRUE XMLTO +PYTHON_FALSE +PYTHON_TRUE SWIG_PYTHON_CPPFLAGS SWIG_PYTHON_OPT SWIG_PYTHON_LIB @@ -1072,12 +1085,6 @@ PYTHON_VERSION PYTHON SWIG NO_UNDEFINED -FLIBS -ac_ct_F77 -FFLAGS -F77 -ENABLE_FORTRAN_FALSE -ENABLE_FORTRAN_TRUE OTOOL64 OTOOL LIPO @@ -1159,6 +1166,14 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +LIBVER +DOCVER +RELEASE +GIT_COMMIT +GIT_SEQNO +GIT_TAG +GIT_DESCRIBE +GIT target_os target_vendor target_cpu @@ -1221,8 +1236,8 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock -enable_fortran with_pythondir +enable_python enable_doxygen enable_dot with_md_cpu @@ -1237,16 +1252,10 @@ with_boost_program_options enable_all_components enable_gruel with_gruel -enable_omnithread -with_omnithread enable_gcell enable_gnuradio_core with_gnuradio_core with_cblas -enable_pmt -with_pmt -enable_mblock -with_mblock enable_usrp with_usrp with_fusb_tech @@ -1254,15 +1263,19 @@ enable_usrp2 enable_gr_usrp enable_gr_usrp2 enable_gr_gcell +enable_gr_msdd6000 enable_gr_audio_alsa enable_gr_audio_jack enable_gr_audio_oss enable_gr_audio_osx enable_gr_audio_portaudio enable_gr_audio_windows +enable_gr_atsc +enable_gr_comedi enable_gr_cvsd_vocoder enable_gr_gpio enable_gr_gsm_fr_vocoder +enable_gr_noaa enable_gr_pager enable_gr_radar_mono enable_gr_radio_astronomy @@ -1301,8 +1314,6 @@ CCC CXXCPP CCAS CCASFLAGS -F77 -FFLAGS PKG_CONFIG FFTW3F_CFLAGS FFTW3F_LIBS @@ -1325,6 +1336,9 @@ JACK_INCLUDEDIR PORTAUDIO_CFLAGS PORTAUDIO_LIBS PORTAUDIO_INCLUDEDIR +COMEDI_CFLAGS +COMEDI_LIBS +COMEDI_INCLUDEDIR SDL_CFLAGS SDL_LIBS SDL_INCLUDEDIR @@ -1399,8 +1413,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1445,7 +1460,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1471,7 +1486,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1675,7 +1690,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1691,7 +1706,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1721,8 +1736,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1730,7 +1745,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1748,13 +1763,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1777,7 +1792,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1791,8 +1806,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1807,9 +1822,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1848,11 +1863,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1892,7 +1907,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1962,23 +1977,21 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-fortran enable fortran (no) + --enable-python generate SWIG/Python components (default is yes) --enable-doxygen enable documentation generation with doxygen (auto) --enable-dot use 'dot' to generate graphs in doxygen (auto) --enable-altivec enable altivec on PowerPC (yes) --enable-all-components Build all configurable components (default), or stop on failed dependencies --enable-gruel Stop if gruel fails configuration - --enable-omnithread Stop if omnithread fails configuration --enable-gcell Stop if gcell fails configuration --enable-gnuradio-core Stop if gnuradio-core fails configuration - --enable-pmt Stop if pmt fails configuration - --enable-mblock Stop if mblock fails configuration --enable-usrp Stop if usrp fails configuration --enable-usrp2 Stop if usrp2 fails configuration --enable-gr-usrp Stop if gr-usrp fails configuration --enable-gr-usrp2 Stop if gr-usrp2 fails configuration --enable-gr-gcell Stop if gr-gcell fails configuration + --enable-gr-msdd6000 Stop if gr-msdd6000 fails configuration --enable-gr-audio-alsa Stop if gr-audio-alsa fails configuration --enable-gr-audio-jack Stop if gr-audio-jack fails configuration --enable-gr-audio-oss Stop if gr-audio-oss fails configuration @@ -1987,11 +2000,14 @@ Optional Features: Stop if gr-audio-portaudio fails configuration --enable-gr-audio-windows Stop if gr-audio-windows fails configuration + --enable-gr-atsc Stop if gr-atsc fails configuration + --enable-gr-comedi Stop if gr-comedi fails configuration --enable-gr-cvsd-vocoder Stop if gr-cvsd-vocoder fails configuration --enable-gr-gpio Stop if gr-gpio fails configuration --enable-gr-gsm-fr-vocoder Stop if gr-gsm-fr-vocoder fails configuration + --enable-gr-noaa Stop if gr-noaa fails configuration --enable-gr-pager Stop if gr-pager fails configuration --enable-gr-radar-mono Stop if gr-radar-mono fails configuration --enable-gr-radio-astronomy @@ -2047,21 +2063,11 @@ Optional Packages: --with-gruel[=PATH] Use package gruel if installed in PATH (if specified) or PKG_CONFIG_PATH (if PATH not specified); stop if gruel not found - --with-omnithread[=PATH] - Use package omnithread if installed in PATH (if - specified) or PKG_CONFIG_PATH (if PATH not - specified); stop if omnithread not found --with-gnuradio-core[=PATH] Use package gnuradio-core if installed in PATH (if specified) or PKG_CONFIG_PATH (if PATH not specified); stop if gnuradio-core not found --with-cblas= use CBLAS library - --with-pmt[=PATH] Use package pmt if installed in PATH (if specified) - or PKG_CONFIG_PATH (if PATH not specified); stop if - pmt not found - --with-mblock[=PATH] Use package mblock if installed in PATH (if - specified) or PKG_CONFIG_PATH (if PATH not - specified); stop if mblock not found --with-usrp[=PATH] Use package usrp if installed in PATH (if specified) or PKG_CONFIG_PATH (if PATH not specified); stop if usrp not found @@ -2092,8 +2098,6 @@ Some influential environment variables: CXXCPP C++ preprocessor CCAS assembler compiler command (defaults to CC) CCASFLAGS assembler compiler flags (defaults to CFLAGS) - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags PKG_CONFIG path to pkg-config utility FFTW3F_CFLAGS C compiler flags for FFTW3F, overriding pkg-config @@ -2128,6 +2132,11 @@ Some influential environment variables: linker flags for PORTAUDIO, overriding pkg-config PORTAUDIO_INCLUDEDIR includedir for PORTAUDIO, overriding pkg-config + COMEDI_CFLAGS + C compiler flags for COMEDI, overriding pkg-config + COMEDI_LIBS linker flags for COMEDI, overriding pkg-config + COMEDI_INCLUDEDIR + includedir for COMEDI, overriding pkg-config SDL_CFLAGS C compiler flags for SDL, overriding pkg-config SDL_LIBS linker flags for SDL, overriding pkg-config SDL_INCLUDEDIR @@ -2216,9 +2225,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2288,7 +2297,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -2312,10 +2321,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2351,7 +2360,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -2378,7 +2387,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2442,7 +2451,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2569,7 +2578,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : @@ -2593,7 +2602,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2698,90 +2707,6 @@ fi } # ac_fn_cxx_try_link -# ac_fn_f77_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_f77_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval - -} # ac_fn_f77_try_compile - -# ac_fn_f77_try_link LINENO -# ------------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_f77_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval - -} # ac_fn_f77_try_link - # ac_fn_c_check_type LINENO TYPE VAR INCLUDES # ------------------------------------------- # Tests whether TYPE exists after having included INCLUDES, setting cache @@ -2791,7 +2716,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -2836,15 +2761,196 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_type -# ac_fn_c_check_decl LINENO SYMBOL VAR -# ------------------------------------ -# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 &5 -$as_echo_n "checking whether $2 is declared... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2853,8 +2959,12 @@ $4 int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -2884,7 +2994,7 @@ ac_fn_c_check_member () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 $as_echo_n "checking for $2.$3... " >&6; } -if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$4+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2940,10 +3050,10 @@ $as_echo "$ac_res" >&6; } ac_fn_cxx_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2979,7 +3089,7 @@ if ac_fn_cxx_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -3006,7 +3116,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -3023,7 +3133,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -3133,11 +3243,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -3171,11 +3279,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -3188,11 +3294,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -3206,11 +3310,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -3265,7 +3367,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -3280,7 +3387,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -3356,7 +3467,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -3376,16 +3487,22 @@ ac_config_headers="$ac_config_headers config.h" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3399,7 +3516,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -3410,16 +3527,16 @@ else test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -3444,7 +3561,7 @@ else ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -3452,7 +3569,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3477,7 +3594,7 @@ else ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi @@ -3485,7 +3602,7 @@ fi $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -3508,6 +3625,123 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- + + . $srcdir/version.sh + + + # Extract the first word of "git", so it can be a program name with args. +set dummy git; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GIT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $GIT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GIT="$GIT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GIT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GIT=$ac_cv_path_GIT +if test -n "$GIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 +$as_echo "$GIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + if test x$GIT != x ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking existence of git version control directory" >&5 +$as_echo_n "checking existence of git version control directory... " >&6; } + if test -d $srcdir/.git ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking git description of current commit" >&5 +$as_echo_n "checking git description of current commit... " >&6; } + if (cd $srcdir && $GIT describe >/dev/null 2>&1); then + GIT_DESCRIBE=`cd $srcdir && $GIT describe --abbrev=8 --long` + # Release candidate tags create an extra -rcX field + case $GIT_DESCRIBE in + *-*-*-*) + GIT_TAG=`echo $GIT_DESCRIBE | cut -f -2 -d '-'` + GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 3 -d '-'` + GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 4 -d '-' | cut -f 2- -d 'g'` + ;; + *-*-*) + GIT_TAG=`echo $GIT_DESCRIBE | cut -f 1 -d '-'` + GIT_SEQNO=`echo $GIT_DESCRIBE | cut -f 2 -d '-'` + GIT_COMMIT=`echo $GIT_DESCRIBE | cut -f 3 -d '-' | cut -f 2- -d 'g'` + ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT_DESCRIBE" >&5 +$as_echo "$GIT_DESCRIBE" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no tag in history, using current commit" >&5 +$as_echo "no tag in history, using current commit" >&6; } + GIT_TAG='' + GIT_SEQNO='' + GIT_COMMIT=`cd $srcdir && $GIT describe --always --abbrev=8` + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + fi + + + + + + fi + + + if test "$MINOR_VERSION" == "git"; then + RELEASE=$GIT_DESCRIBE + DOCVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION + LIBVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION + else + if test "$MAINT_VERSION" == "git" ; then + RELEASE=$GIT_DESCRIBE + DOCVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION + LIBVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION + else + RELEASE=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION + if test "$MAINT_VERSION" != "0"; then + RELEASE=$RELEASE.$MAINT_VERSION + fi + + DOCVER=$RELEASE + LIBVER=$RELEASE + fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: GNU Radio Release $RELEASE" >&5 +$as_echo "$as_me: GNU Radio Release $RELEASE" >&6;} + + + + + am__api_version='1.11' # Find a good install program. We prefer a C program (faster), @@ -3614,11 +3848,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -3640,7 +3874,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -3650,7 +3884,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -3888,7 +4122,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -3896,7 +4130,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -3930,7 +4164,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -3946,7 +4180,7 @@ fi # Define the identity of the package. PACKAGE=gnuradio - VERSION=3.2.2 + VERSION=$RELEASE cat >>confdefs.h <<_ACEOF @@ -3980,7 +4214,88 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +_am_tools=${am_cv_prog_tar_ustar-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +if test "${am_cv_prog_tar_ustar+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_ustar=$_am_tool +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -4360,8 +4675,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4475,9 +4790,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -4519,8 +4833,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -4577,9 +4891,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -4630,8 +4944,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -5020,7 +5334,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5036,11 +5350,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -5079,7 +5393,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5095,18 +5409,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -5168,7 +5482,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -5234,7 +5548,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -5366,8 +5680,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -5919,7 +6232,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5935,11 +6248,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -5978,7 +6291,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5994,18 +6307,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -6471,7 +6784,7 @@ fi $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -6479,7 +6792,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -6918,8 +7231,8 @@ esac -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -6992,7 +7305,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -7071,7 +7384,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -7187,7 +7500,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -7389,13 +7702,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7392: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7705: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7395: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7708: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7398: output\"" >&5) + (eval echo "\"\$as_me:7711: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8586,7 +8899,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8589 "configure"' > conftest.$ac_ext + echo '#line 8902 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9773,7 +10086,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -9789,11 +10102,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -9832,7 +10145,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -9848,11 +10161,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else @@ -10312,11 +10625,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10315: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10628: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10319: \$? = $ac_status" >&5 + echo "$as_me:10632: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10651,11 +10964,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10654: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10967: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10658: \$? = $ac_status" >&5 + echo "$as_me:10971: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10756,11 +11069,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10759: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11072: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10763: \$? = $ac_status" >&5 + echo "$as_me:11076: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10811,11 +11124,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10814: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11127: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10818: \$? = $ac_status" >&5 + echo "$as_me:11131: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13191,7 +13504,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13194 "configure" +#line 13507 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13287,7 +13600,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13290 "configure" +#line 13603 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13702,7 +14015,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -15243,11 +15556,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15246: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15559: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15250: \$? = $ac_status" >&5 + echo "$as_me:15563: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15342,11 +15655,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15345: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15658: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15349: \$? = $ac_status" >&5 + echo "$as_me:15662: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15394,11 +15707,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15397: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15710: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15401: \$? = $ac_status" >&5 + echo "$as_me:15714: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16363,75 +16676,46 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_F77+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 -$as_echo "$F77" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + no_undefined="" + case "${host_os}" in + *mingw* | *cygwin*) + # on MinGW/Cygwin extra LDFLAGS are required + no_undefined="-no-undefined" + ;; + esac + NO_UNDEFINED=$no_undefined - test -n "$F77" && break - done -fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + + + + + + # Find any Python interpreter. + if test -z "$PYTHON"; then + for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then : +if test "${ac_cv_path_PYTHON+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_F77="$ac_prog" + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -16439,162 +16723,290 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$ac_ct_F77" && break + test -n "$PYTHON" && break done +test -n "$PYTHON" || PYTHON=":" + + fi + am_display_PYTHON=python + - if test "x$ac_ct_F77" = x; then - F77="" + if test "$PYTHON" = :; then + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - F77=$ac_ct_F77 - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -if test "${ac_cv_f77_compiler_gnu+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +if test "${am_cv_python_version+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version - end -_ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : - ac_compiler_gnu=yes + + + PYTHON_PREFIX='${prefix}' + + PYTHON_EXEC_PREFIX='${exec_prefix}' + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +if test "${am_cv_python_platform+set}" = set; then : + $as_echo_n "(cached) " >&6 else - ac_compiler_gnu=no + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } -ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} -ac_save_FFLAGS=$FFLAGS -FFLAGS= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } -if test "${ac_cv_prog_f77_g+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +if test "${am_cv_python_pythondir+set}" = set; then : $as_echo_n "(cached) " >&6 else - FFLAGS=-g -cat > conftest.$ac_ext <<_ACEOF - program main + if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac - end -_ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : - ac_cv_prog_f77_g=yes -else - ac_cv_prog_f77_g=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +$as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + + + + pkgpythondir=\${pythondir}/$PACKAGE + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +if test "${am_cv_python_pyexecdir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +$as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + + + + pkgpyexecdir=\${pyexecdir}/$PACKAGE + + + fi + + + + + + + +# Check whether --with-pythondir was given. +if test "${with_pythondir+set}" = set; then : + withval=$with_pythondir; with_pythondir=${withval} else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi + with_pythondir=${prefix}/lib/python2.5/site-packages fi -if test $ac_compiler_gnu = yes; then - G77=yes + + # if we're cross-compiling, asking the host python about any of + # this is completely useless... + + if test x$cross_compiling != xno + then + pythondir=$with_pythondir + pyexecdir=$with_pythondir + + + else + + # For Fedora Core 5 and 6, see ticket:39 in Trac + if test -f '/etc/redhat-release'; then + if (echo $pyexecdir | grep -q lib64); then + pythondir="$pyexecdir" + fi + fi + + # Check for Python include path + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5 +$as_echo_n "checking for Python include path... " >&6; } + if test -z "$PYTHON" ; then + as_fn_error $? "cannot find Python path" "$LINENO" 5 + fi + + # ask distutils which include path we should use + python_cmd=' +import distutils.sysconfig +import os +path = distutils.sysconfig.get_python_inc(plat_specific=False) +if os.sep == "\\": + path = path.replace("\\", "/") +print path +' + python_path=`$PYTHON -c "$python_cmd"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_path" >&5 +$as_echo "$python_path" >&6; } + if test -z "$python_path" ; then + as_fn_error $? "cannot find Python include path" "$LINENO" 5 + fi + + PYTHON_CPPFLAGS=-I$python_path + + + # Check for Python headers usability + python_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" + for ac_header in Python.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default" +if test "x$ac_cv_header_Python_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PYTHON_H 1 +_ACEOF + else - G77= + as_fn_error $? "cannot find usable Python headers" "$LINENO" 5 fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi +done + + CPPFLAGS="$python_save_CPPFLAGS" + # Only set this on mingw and cygwin hosts, (only implemented + # for mingw host, for crosscompiling you need to trick this) -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + PYTHON_LDFLAGS="" + case $host_os in + *mingw* | *cygwin* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python LDFLAGS" >&5 +$as_echo_n "checking for Python LDFLAGS... " >&6; } + + python_cmd=' +import distutils.sysconfig +import os +path = distutils.sysconfig.get_config_var("LIBPL") +if path == None: + path = distutils.sysconfig.PREFIX + "/libs" +if os.sep == "\\": + path = path.replace("\\", "/") +print path +' + python_stdlib_path=`$PYTHON -c "$python_cmd"` + + python_version_nodot=`echo $PYTHON_VERSION | sed "s,\.,,"` + libpython_name="python$PYTHON_VERSION" + + # Standard install of python for win32 has libpython24.a + # instead of libpython2.4.a so we check for the library + # without the dot in the version number. + + python_stdlib_filename=`find $python_stdlib_path -type f -name libpython$python_version_nodot.* -print | sed "1q"` + if test -n "$python_stdlib_filename" ; then + libpython_name="python$python_version_nodot" + fi + + PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LDFLAGS" >&5 +$as_echo "$PYTHON_LDFLAGS" >&6; } + # Replace all backslashes in PYTHON Paths with forward slashes + pythondir=`echo $pythondir |sed 's,\\\\,/,g'` + pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'` + pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'` + pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'` + ;; + esac + + case $host_os in + *mingw* ) + # Python 2.5 requires ".pyd" instead of ".dll" for extensions + PYTHON_LDFLAGS="-shrext .pyd ${PYTHON_LDFLAGS}" + esac + + + fi + + + + + + + + + # Extract the first word of "swig", so it can be a program name with args. +set dummy swig; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_F77+set}" = set; then : +if test "${ac_cv_prog_SWIG+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. + if test -n "$SWIG"; then + ac_cv_prog_SWIG="$SWIG" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -16603,7 +17015,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + ac_cv_prog_SWIG="`which swig`" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -16613,32 +17025,92 @@ IFS=$as_save_IFS fi fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 -$as_echo "$F77" >&6; } +SWIG=$ac_cv_prog_SWIG +if test -n "$SWIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5 +$as_echo "$SWIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$F77" && break - done + if test -z "$SWIG" ; then + as_fn_error $? "Cannot find 'swig' program. SWIG version >= 1.3.31 required" "$LINENO" 5 + SWIG=false + elif test -n "1.3.31" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWIG version" >&5 +$as_echo_n "checking for SWIG version... " >&6; } + swig_version=`$SWIG -version 2>&1 | \ + awk '/^SWIG Version [0-9]+\.[0-9]+\.[0-9]+.*$/ { split($3,a,"[^.0-9]"); print a[1] }'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $swig_version" >&5 +$as_echo "$swig_version" >&6; } + if test -n "$swig_version" ; then + swig_version=`echo $swig_version | \ + awk '{ split($1,a,"\."); print a[1]*1000000+a[2]*1000+a[3] }' 2>/dev/null` + swig_required_version=`echo 1.3.31 | \ + awk '{ split($1,a,"\."); print a[1]*1000000+a[2]*1000+a[3] }' 2>/dev/null` + if test $swig_required_version -gt $swig_version ; then + as_fn_error $? "SWIG version >= 1.3.31 required" "$LINENO" 5 + fi + else + as_fn_error $? "cannot determine SWIG version" "$LINENO" 5 + fi + fi + + + + + if test "$SWIG" != "false" ; then + SWIG="$SWIG -c++" + fi + + + + + if test "$SWIG" != "false" ; then + SWIG_PYTHON_LIB=-lswigpy + + SWIG_PYTHON_OPT=-python + + fi + SWIG_PYTHON_CPPFLAGS=$PYTHON_CPPFLAGS + + + + +# Allow user to choose whether to generate SWIG/Python +# Default is enabled +# Check whether --enable-python was given. +if test "${enable_python+set}" = set; then : + enableval=$enable_python; case "${enableval}" in + yes) enable_python=yes ;; + no) enable_python=no ;; + *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; + esac +else + enable_python=yes + fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 + + if test x$enable_python = xyes; then + PYTHON_TRUE= + PYTHON_FALSE='#' +else + PYTHON_TRUE='#' + PYTHON_FALSE= +fi + + +# Extract the first word of "xmlto", so it can be a program name with args. +set dummy xmlto; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then : +if test "${ac_cv_prog_XMLTO+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. + if test -n "$XMLTO"; then + ac_cv_prog_XMLTO="$XMLTO" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -16647,7 +17119,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_F77="$ac_prog" + ac_cv_prog_XMLTO="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -16657,3481 +17129,1943 @@ IFS=$as_save_IFS fi fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } +XMLTO=$ac_cv_prog_XMLTO +if test -n "$XMLTO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 +$as_echo "$XMLTO" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$ac_ct_F77" && break -done - - if test "x$ac_ct_F77" = x; then - F77="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - F77=$ac_ct_F77 - fi + if test x$XMLTO = xyes; then + HAS_XMLTO_TRUE= + HAS_XMLTO_FALSE='#' +else + HAS_XMLTO_TRUE='#' + HAS_XMLTO_FALSE= fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -if test "${ac_cv_f77_compiler_gnu+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 +$as_echo_n "checking for socket in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_socket+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - end +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char socket (); +int +main () +{ +return socket (); + ; + return 0; +} _ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : - ac_compiler_gnu=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_socket=yes else - ac_compiler_gnu=no + ac_cv_lib_socket_socket=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } -ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} -ac_save_FFLAGS=$FFLAGS -FFLAGS= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } -if test "${ac_cv_prog_f77_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - FFLAGS=-g -cat > conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : - ac_cv_prog_f77_g=yes -else - ac_cv_prog_f77_g=no +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 +$as_echo "$ac_cv_lib_socket_socket" >&6; } +if test "x$ac_cv_lib_socket_socket" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSOCKET 1 +_ACEOF + + LIBS="-lsocket $LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - fi -else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" + + +if test x$CXX_FOR_BUILD = x +then + if test x$cross_compiling = xno; then + CXX_FOR_BUILD=${CXX} else - FFLAGS= + CXX_FOR_BUILD=g++ fi fi -if test $ac_compiler_gnu = yes; then - G77=yes -else - G77= -fi -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu - - # Check whether --enable-fortran was given. -if test "${enable_fortran+set}" = set; then : - enableval=$enable_fortran; -else - enable_fortran=no -fi - if test "x$enable_fortran" = xyes; then - ENABLE_FORTRAN_TRUE= - ENABLE_FORTRAN_FALSE='#' -else - ENABLE_FORTRAN_TRUE='#' - ENABLE_FORTRAN_FALSE= -fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$enable_fortran" = xyes - then - ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_F77+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + for ac_header in sys/ipc.h sys/shm.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -fi -fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 -$as_echo "$F77" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } fi +done - test -n "$F77" && break - done -fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then : + + save_LIBS="$LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shmat" >&5 +$as_echo_n "checking for library containing shmat... " >&6; } +if test "${ac_cv_search_shmat+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_F77="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shmat (); +int +main () +{ +return shmat (); + ; + return 0; +} +_ACEOF +for ac_lib in '' cygipc ipc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_shmat=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_shmat+set}" = set; then : + break +fi done - done -IFS=$as_save_IFS +if test "${ac_cv_search_shmat+set}" = set; then : +else + ac_cv_search_shmat=no fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shmat" >&5 +$as_echo "$ac_cv_search_shmat" >&6; } +ac_res=$ac_cv_search_shmat +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + IPC_LIBS="$LIBS" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SystemV IPC support not found. " >&5 +$as_echo "$as_me: WARNING: SystemV IPC support not found. " >&2;} + fi + LIBS="$save_LIBS" - test -n "$ac_ct_F77" && break -done + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$ac_ct_F77" = x; then - F77="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - F77=$ac_ct_F77 - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -if test "${ac_cv_f77_compiler_gnu+set}" = set; then : + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ - end + ; + return 0; +} _ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : - ac_compiler_gnu=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes else - ac_compiler_gnu=no + ac_cv_header_stdc=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } -ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} -ac_save_FFLAGS=$FFLAGS -FFLAGS= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } -if test "${ac_cv_prog_f77_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - FFLAGS=-g -cat > conftest.$ac_ext <<_ACEOF - program main - end +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + _ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : - ac_cv_prog_f77_g=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + else - ac_cv_prog_f77_g=no + ac_cv_header_stdc=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi + ac_cv_header_stdc=no fi +rm -f conftest* -if test $ac_compiler_gnu = yes; then - G77=yes -else - G77= fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu - - -archive_cmds_need_lc_F77=no -allow_undefined_flag_F77= -always_export_symbols_F77=no -archive_expsym_cmds_F77= -export_dynamic_flag_spec_F77= -hardcode_direct_F77=no -hardcode_direct_absolute_F77=no -hardcode_libdir_flag_spec_F77= -hardcode_libdir_flag_spec_ld_F77= -hardcode_libdir_separator_F77= -hardcode_minus_L_F77=no -hardcode_automatic_F77=no -inherit_rpath_F77=no -module_cmds_F77= -module_expsym_cmds_F77= -link_all_deplibs_F77=unknown -old_archive_cmds_F77=$old_archive_cmds -no_undefined_flag_F77= -whole_archive_flag_spec_F77= -enable_shared_with_static_runtimes_F77=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -objext_F77=$objext -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : - # ltmain only uses $CC for tagged configurations so make sure $CC is set. +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then +$as_echo "#define STDC_HEADERS 1" >>confdefs.h +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 +$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if test "${ac_cv_header_sys_wait_h+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) +#endif +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif +int +main () +{ + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_sys_wait_h=yes +else + ac_cv_header_sys_wait_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 +$as_echo "$ac_cv_header_sys_wait_h" >&6; } +if test $ac_cv_header_sys_wait_h = yes; then -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +fi -# Allow CC to be a program name with arguments. -compiler=$CC +for ac_header in fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF +fi - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* +done - ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* +for ac_header in linux/ppdev.h dev/ppbus/ppi.h sys/mman.h sys/select.h sys/types.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF +fi - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - CC=${F77-"f77"} - compiler=$CC - compiler_F77=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - GCC=$G77 - if test -n "$compiler"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } +for ac_header in sys/resource.h stdint.h sched.h signal.h sys/syscall.h malloc.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } +fi - GCC_F77="$G77" - LD_F77="$LD" +done - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - lt_prog_compiler_wl_F77= -lt_prog_compiler_pic_F77= -lt_prog_compiler_static_F77= +for ac_header in windows.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINDOWS_H 1 +_ACEOF -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +fi - if test "$GCC" = yes; then - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_static_F77='-static' +done - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; +for ac_header in vec_types.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "vec_types.h" "ac_cv_header_vec_types_h" "$ac_includes_default" +if test "x$ac_cv_header_vec_types_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VEC_TYPES_H 1 +_ACEOF - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic_F77='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; +fi - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; +done - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; +for ac_header in netdb.h netinet/in.h arpa/inet.h sys/types.h sys/socket.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_F77='-fno-common' - ;; +fi - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - ;; +done - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared_F77=no - enable_shared=no - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_F77='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_F77=-Kconform_pic - fi - ;; - - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_F77='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - else - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_F77='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static_F77='-non_shared' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-fPIC' - lt_prog_compiler_static_F77='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='--shared' - lt_prog_compiler_static_F77='--static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-fpic' - lt_prog_compiler_static_F77='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl_F77='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - xl*) - # IBM XL C 8.0/Fortran 10.1 on PPC - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-qpic' - lt_prog_compiler_static_F77='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='' - ;; - esac - ;; - esac - ;; - - newsos6) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_F77='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_F77='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static_F77='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_F77='-Qoption ld ';; - *) - lt_prog_compiler_wl_F77='-Wl,';; - esac - ;; +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset cs; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; - sunos4*) - lt_prog_compiler_wl_F77='-Qoption ld ' - lt_prog_compiler_pic_F77='-PIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes +else + ac_cv_c_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_F77='-Kconform_pic' - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; +$as_echo "#define const /**/" >>confdefs.h - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; +fi - unicos*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_can_build_shared_F77=no - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if test "${ac_cv_c_inline+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif - uts4*) - lt_prog_compiler_pic_F77='-pic' - lt_prog_compiler_static_F77='-Bstatic' - ;; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done - *) - lt_prog_compiler_can_build_shared_F77=no - ;; - esac - fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_F77= - ;; +case $ac_cv_c_inline in + inline | yes) ;; *) - lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_F77" >&5 -$as_echo "$lt_prog_compiler_pic_F77" >&6; } - +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then : - $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17468: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:17472: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_F77=yes - fi - fi - $RM conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; - esac -else - lt_prog_compiler_pic_F77= - lt_prog_compiler_can_build_shared_F77=no -fi +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF fi - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if test "${ac_cv_header_time+set}" = set; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_F77=yes - fi - else - lt_cv_prog_compiler_static_works_F77=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_F77" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include -if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_time=yes else - lt_prog_compiler_static_F77= + ac_cv_header_time=no fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_F77=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17567: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:17571: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_F77=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } +if test $ac_cv_header_time = yes; then +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_c_o_F77=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17619: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:17623: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_F77=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes else - need_locks=no + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag_F77= - always_export_symbols_F77=no - archive_cmds_F77= - archive_expsym_cmds_F77= - compiler_needs_object_F77=no - enable_shared_with_static_runtimes_F77=no - export_dynamic_flag_spec_F77= - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic_F77=no - hardcode_direct_F77=no - hardcode_direct_absolute_F77=no - hardcode_libdir_flag_spec_F77= - hardcode_libdir_flag_spec_ld_F77= - hardcode_libdir_separator_F77= - hardcode_minus_L_F77=no - hardcode_shlibpath_var_F77=unsupported - inherit_rpath_F77=no - link_all_deplibs_F77=unknown - module_cmds_F77= - module_expsym_cmds_F77= - old_archive_from_new_cmds_F77= - old_archive_from_expsyms_cmds_F77= - thread_safe_flag_spec_F77= - whole_archive_flag_spec_F77= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_F77= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs_F77=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='' - ;; - m68k) - archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_F77=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_F77='-L$libdir' - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_F77=no - fi - ;; +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ - interix[3-9]*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; - gnu* | linux* | tpf* | k*bsd*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag= - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec_F77= - tmp_sharedflag='--shared' ;; - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object_F77=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_bigendian=no +else + ac_cv_c_bigendian=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + GR_ARCH_BIGENDIAN=1;; #( + no) + GR_ARCH_BIGENDIAN=0 ;; #( + universal) - case $cc_basename in - xlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec_F77='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec_F77= - hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' - archive_cmds_F77='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - ld_shlibs_F77=no - fi - ;; +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; + ;; #( + *) + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs_F77=no - cat <<_LT_EOF 1>&2 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +if test "${ac_cv_struct_tm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; +int +main () +{ +struct tm tm; + int *p = &tm.tm_sec; + return !p; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_tm=time.h +else + ac_cv_struct_tm=sys/time.h +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 +$as_echo "$ac_cv_struct_tm" >&6; } +if test $ac_cv_struct_tm = sys/time.h; then - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_F77=no - cat <<_LT_EOF 1>&2 +$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +fi -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - ;; - sunos4*) - archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +$as_echo_n "checking for working alloca.h... " >&6; } +if test "${ac_cv_working_alloca_h+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +char *p = (char *) alloca (2 * sizeof (int)); + if (p) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_working_alloca_h=yes +else + ac_cv_working_alloca_h=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 +$as_echo "$ac_cv_working_alloca_h" >&6; } +if test $ac_cv_working_alloca_h = yes; then - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h - if test "$ld_shlibs_F77" = no; then - runpath_var= - hardcode_libdir_flag_spec_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=yes - archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_F77=unsupported - fi - ;; +fi - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 +$as_echo_n "checking for alloca... " >&6; } +if test "${ac_cv_func_alloca_works+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __GNUC__ +# define alloca __builtin_alloca +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# ifdef HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif +#endif - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac +int +main () +{ +char *p = (char *) alloca (1); + if (p) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_func_alloca_works=yes +else + ac_cv_func_alloca_works=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 +$as_echo "$ac_cv_func_alloca_works" >&6; } - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +if test $ac_cv_func_alloca_works = yes; then - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h - archive_cmds_F77='' - hardcode_direct_F77=yes - hardcode_direct_absolute_F77=yes - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - file_list_spec_F77='${wl}-f,' +else + # The SVR3 libPW and SVR4 libucb both contain incompatible functions +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_F77=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_F77=yes - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_libdir_separator_F77= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - link_all_deplibs_F77=no - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec_F77='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_F77=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_F77='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - cat > conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -if ac_fn_f77_try_link "$LINENO"; then : - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_F77='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - cat > conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -if ac_fn_f77_try_link "$LINENO"; then : - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_F77=' ${wl}-bernotok' - allow_undefined_flag_F77=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77='$convenience' - archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='' - ;; - m68k) - archive_cmds_F77='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - ;; - esac - ;; - - bsdi[45]*) - export_dynamic_flag_spec_F77=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_F77=' ' - allow_undefined_flag_F77=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_F77='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_F77=yes - ;; - - darwin* | rhapsody*) - - - archive_cmds_need_lc_F77=no - hardcode_direct_F77=no - hardcode_automatic_F77=yes - hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='' - link_all_deplibs_F77=yes - allow_undefined_flag_F77="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo - archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - - else - ld_shlibs_F77=no - fi - - ;; - - dgux*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - - freebsd1*) - ld_shlibs_F77=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds_F77='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld_F77='+b $libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=yes - hardcode_direct_absolute_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - ;; - *) - hardcode_direct_F77=yes - hardcode_direct_absolute_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat > conftest.$ac_ext <<_ACEOF -int foo(void) {} -_ACEOF -if ac_fn_f77_try_link "$LINENO"; then : - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - else - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc_F77='no' - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - inherit_rpath_F77=yes - link_all_deplibs_F77=yes - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - newsos6) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_shlibpath_var_F77=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - hardcode_direct_absolute_F77=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs_F77=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - allow_undefined_flag_F77=unsupported - archive_cmds_F77='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc_F77='no' - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_F77='-rpath $libdir' - fi - archive_cmds_need_lc_F77='no' - hardcode_libdir_separator_F77=: - ;; - - solaris*) - no_undefined_flag_F77=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds_F77='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - archive_cmds_F77='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_shlibpath_var_F77=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs_F77=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_F77='$CC -r -o $output$reload_objs' - hardcode_direct_F77=no - ;; - motorola) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no - ;; - - sysv4.3*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_F77=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_F77='${wl}-z,text' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_F77='${wl}-z,text' - allow_undefined_flag_F77='${wl}-z,nodefs' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-R,$libdir' - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - - *) - ld_shlibs_F77=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec_F77='${wl}-Blargedynsym' - ;; - esac - fi - fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_F77" >&5 -$as_echo "$ld_shlibs_F77" >&6; } -test "$ld_shlibs_F77" = no && can_build_shared=no - -with_gnu_ld_F77=$with_gnu_ld - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_F77" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_F77=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_F77 in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_F77 - pic_flag=$lt_prog_compiler_pic_F77 - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_F77 - allow_undefined_flag_F77= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds_F77 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - archive_cmds_need_lc_F77=no - else - archive_cmds_need_lc_F77=yes - fi - allow_undefined_flag_F77=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_F77" >&5 -$as_echo "$archive_cmds_need_lc_F77" >&6; } - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; +$as_echo "#define C_ALLOCA 1" >>confdefs.h -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_F77\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_F77\"" - cat > conftest.$ac_ext <<_ACEOF - program main +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 +$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } +if test "${ac_cv_os_cray+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined CRAY && ! defined CRAY2 +webecray +#else +wenotbecray +#endif - end _ACEOF -if ac_fn_f77_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - shlibpath_overrides_runpath=yes -fi +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "webecray" >/dev/null 2>&1; then : + ac_cv_os_cray=yes +else + ac_cv_os_cray=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir +rm -f conftest* - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 +$as_echo "$ac_cv_os_cray" >&6; } +if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi +cat >>confdefs.h <<_ACEOF +#define CRAY_STACKSEG_END $ac_func +_ACEOF - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; + break +fi -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; + done +fi -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 +$as_echo_n "checking stack direction for C alloca... " >&6; } +if test "${ac_cv_c_stack_direction+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_c_stack_direction=0 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +find_stack_direction () +{ + static char *addr = 0; + auto char dummy; + if (addr == 0) + { + addr = &dummy; + return find_stack_direction (); + } else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; + return (&dummy > addr) ? 1 : -1; +} -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +int +main () +{ + return find_stack_direction () < 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_stack_direction=1 +else + ac_cv_c_stack_direction=-1 +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 +$as_echo "$ac_cv_c_stack_direction" >&6; } +cat >>confdefs.h <<_ACEOF +#define STACK_DIRECTION $ac_cv_c_stack_direction +_ACEOF -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; +fi -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; -rdos*) - dynamic_linker=no - ;; -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; + # Check for allocing memory alignment functions + # If 'posix_memalign' is available, use it solely. + for ac_func in posix_memalign +do : + ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign" +if test "x$ac_cv_func_posix_memalign" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_POSIX_MEMALIGN 1 +_ACEOF -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; +else -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; + # Otherwise, check for valloc and the + # (a-priori known) alignment of 'malloc' + for ac_func in valloc +do : + ac_fn_c_check_func "$LINENO" "valloc" "ac_cv_func_valloc" +if test "x$ac_cv_func_valloc" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VALLOC 1 +_ACEOF -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; +fi +done -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; + aligned_malloc=0 + # 'malloc' is 16-byte aligned on (at least) Darwin 8 and 9 + case "$host_os" in + darwin8*) aligned_malloc=16 ;; + darwin9*) aligned_malloc=16 ;; + *) ;; + esac + if test $aligned_malloc = 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: malloc has unknown alignment." >&5 +$as_echo "malloc has unknown alignment." >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: malloc is $aligned_malloc-byte aligned." >&5 +$as_echo "malloc is $aligned_malloc-byte aligned." >&6; } + fi -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; +cat >>confdefs.h <<_ACEOF +#define ALIGNED_MALLOC $aligned_malloc +_ACEOF -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi +done -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test "${ac_cv_func_setvbuf_reversed+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_func_setvbuf_reversed=no fi +for ac_func in vprintf +do : + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" +if test "x$ac_cv_func_vprintf" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VPRINTF 1 +_ACEOF + +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" +if test "x$ac_cv_func__doprnt" = x""yes; then : +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h +fi +fi +done +for ac_func in mmap select socket strcspn strerror strspn getpagesize sysconf +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done +for ac_func in snprintf gettimeofday nanosleep sched_setscheduler +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done +for ac_func in modf sqrt sigaction sigprocmask pthread_sigmask +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done +for ac_func in sched_setaffinity +do : + ac_fn_c_check_func "$LINENO" "sched_setaffinity" "ac_cv_func_sched_setaffinity" +if test "x$ac_cv_func_sched_setaffinity" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SCHED_SETAFFINITY 1 +_ACEOF +fi +done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincos in -lm" >&5 +$as_echo_n "checking for sincos in -lm... " >&6; } +if test "${ac_cv_lib_m_sincos+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sincos (); +int +main () +{ +return sincos (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_sincos=yes +else + ac_cv_lib_m_sincos=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sincos" >&5 +$as_echo "$ac_cv_lib_m_sincos" >&6; } +if test "x$ac_cv_lib_m_sincos" = x""yes; then : +$as_echo "#define HAVE_SINCOS 1" >>confdefs.h +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincosf in -lm" >&5 +$as_echo_n "checking for sincosf in -lm... " >&6; } +if test "${ac_cv_lib_m_sincosf+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sincosf (); +int +main () +{ +return sincosf (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_sincosf=yes +else + ac_cv_lib_m_sincosf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sincosf" >&5 +$as_echo "$ac_cv_lib_m_sincosf" >&6; } +if test "x$ac_cv_lib_m_sincosf" = x""yes; then : +$as_echo "#define HAVE_SINCOSF 1" >>confdefs.h +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sinf in -lm" >&5 +$as_echo_n "checking for sinf in -lm... " >&6; } +if test "${ac_cv_lib_m_sinf+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sinf (); +int +main () +{ +return sinf (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_sinf=yes +else + ac_cv_lib_m_sinf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sinf" >&5 +$as_echo "$ac_cv_lib_m_sinf" >&6; } +if test "x$ac_cv_lib_m_sinf" = x""yes; then : +$as_echo "#define HAVE_SINF 1" >>confdefs.h +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cosf in -lm" >&5 +$as_echo_n "checking for cosf in -lm... " >&6; } +if test "${ac_cv_lib_m_cosf+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cosf (); +int +main () +{ +return cosf (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_cosf=yes +else + ac_cv_lib_m_cosf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cosf" >&5 +$as_echo "$ac_cv_lib_m_cosf" >&6; } +if test "x$ac_cv_lib_m_cosf" = x""yes; then : +$as_echo "#define HAVE_COSF 1" >>confdefs.h +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for trunc in -lm" >&5 +$as_echo_n "checking for trunc in -lm... " >&6; } +if test "${ac_cv_lib_m_trunc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char trunc (); +int +main () +{ +return trunc (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_trunc=yes +else + ac_cv_lib_m_trunc=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_trunc" >&5 +$as_echo "$ac_cv_lib_m_trunc" >&6; } +if test "x$ac_cv_lib_m_trunc" = x""yes; then : +$as_echo "#define HAVE_TRUNC 1" >>confdefs.h +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || - test -n "$runpath_var_F77" || - test "X$hardcode_automatic_F77" = "Xyes" ; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exp10 in -lm" >&5 +$as_echo_n "checking for exp10 in -lm... " >&6; } +if test "${ac_cv_lib_m_exp10+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - # We can hardcode non-existent directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exp10 (); +int +main () +{ +return exp10 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_exp10=yes else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported + ac_cv_lib_m_exp10=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_F77" >&5 -$as_echo "$hardcode_action_F77" >&6; } - -if test "$hardcode_action_F77" = relink || - test "$inherit_rpath_F77" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_exp10" >&5 +$as_echo "$ac_cv_lib_m_exp10" >&6; } +if test "x$ac_cv_lib_m_exp10" = x""yes; then : +$as_echo "#define HAVE_EXP10 1" >>confdefs.h +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5 +$as_echo_n "checking for log2 in -lm... " >&6; } +if test "${ac_cv_lib_m_log2+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char log2 (); +int +main () +{ +return log2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_log2=yes +else + ac_cv_lib_m_log2=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_log2" >&5 +$as_echo "$ac_cv_lib_m_log2" >&6; } +if test "x$ac_cv_lib_m_log2" = x""yes; then : +$as_echo "#define HAVE_LOG2 1" >>confdefs.h +fi - fi # test -n "$compiler" +#AC_FUNC_MKTIME - GCC=$lt_save_GCC - CC="$lt_save_CC" -fi # test "$_lt_disable_F77" != yes -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5 -$as_echo_n "checking how to get verbose linking output from $F77... " >&6; } -if test "${ac_cv_prog_f77_v+set}" = set; then : + SHM_OPEN_LIBS="" + save_LIBS="$LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 +$as_echo_n "checking for library containing shm_open... " >&6; } +if test "${ac_cv_search_shm_open+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat > conftest.$ac_ext <<_ACEOF - program main + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - end -_ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : - ac_cv_prog_f77_v= -# Try some options frequently used verbose output -for ac_verb in -v -verbose --verbose -V -\#\#\#; do - cat > conftest.$ac_ext <<_ACEOF - program main - - end +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shm_open (); +int +main () +{ +return shm_open (); + ; + return 0; +} _ACEOF - -# Compile and link our simple test program by passing a flag (argument -# 1 to this macro) to the Fortran compiler in order to get -# "verbose" output that we can then parse for the Fortran linker -# flags. -ac_save_FFLAGS=$FFLAGS -FFLAGS="$FFLAGS $ac_verb" -eval "set x $ac_link" -shift -$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 -# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, -# LIBRARY_PATH; skip all such settings. -ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | - grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="` -$as_echo "$ac_f77_v_output" >&5 -FFLAGS=$ac_save_FFLAGS - -rm -rf conftest* - -# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where -# /foo, /bar, and /baz are search directories for the Fortran linker. -# Here, we change these into -L/foo -L/bar -L/baz (and put it first): -ac_f77_v_output="`echo $ac_f77_v_output | - grep 'LPATH is:' | - sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_f77_v_output" - -# FIXME: we keep getting bitten by quoted arguments; a more general fix -# that detects unbalanced quotes in FLIBS should be implemented -# and (ugh) tested at some point. -case $ac_f77_v_output in - # If we are using xlf then replace all the commas with spaces. - *xlfentry*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/,/ /g'` ;; - - # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted - # $LIBS confuse us, and the libraries appear later in the output anyway). - *mGLOB_options_string*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"-mGLOB[^"]*"/ /g'` ;; - - # Portland Group compiler has singly- or doubly-quoted -cmdline argument - # Singly-quoted arguments were reported for versions 5.2-4 and 6.0-4. - # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". - *-cmdline\ * | *-ignore\ * | *-def\ *) - ac_f77_v_output=`echo $ac_f77_v_output | sed "\ - s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g - s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g - s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; - - # If we are using Cray Fortran then delete quotes. - *cft90*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"//g'` ;; -esac - - - # look for -l* and *.a constructs in the output - for ac_arg in $ac_f77_v_output; do - case $ac_arg in - [\\/]*.a | ?:[\\/]*.a | -[lLRu]*) - ac_cv_prog_f77_v=$ac_verb - break 2 ;; - esac - done -done -if test -z "$ac_cv_prog_f77_v"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $F77" >&5 -$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_shm_open=$ac_res fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5 -$as_echo "$as_me: WARNING: compilation failed" >&2;} +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_shm_open+set}" = set; then : + break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +if test "${ac_cv_search_shm_open+set}" = set; then : -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_v" >&5 -$as_echo "$ac_cv_prog_f77_v" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5 -$as_echo_n "checking for Fortran 77 libraries of $F77... " >&6; } -if test "${ac_cv_f77_libs+set}" = set; then : - $as_echo_n "(cached) " >&6 else - if test "x$FLIBS" != "x"; then - ac_cv_f77_libs="$FLIBS" # Let the user override the test. -else - -cat > conftest.$ac_ext <<_ACEOF - program main + ac_cv_search_shm_open=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5 +$as_echo "$ac_cv_search_shm_open" >&6; } +ac_res=$ac_cv_search_shm_open +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + SHM_OPEN_LIBS="$LIBS" +fi - end + for ac_func in shm_open +do : + ac_fn_c_check_func "$LINENO" "shm_open" "ac_cv_func_shm_open" +if test "x$ac_cv_func_shm_open" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SHM_OPEN 1 _ACEOF -# Compile and link our simple test program by passing a flag (argument -# 1 to this macro) to the Fortran compiler in order to get -# "verbose" output that we can then parse for the Fortran linker -# flags. -ac_save_FFLAGS=$FFLAGS -FFLAGS="$FFLAGS $ac_cv_prog_f77_v" -eval "set x $ac_link" -shift -$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 -# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, -# LIBRARY_PATH; skip all such settings. -ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | - grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="` -$as_echo "$ac_f77_v_output" >&5 -FFLAGS=$ac_save_FFLAGS - -rm -rf conftest* - -# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where -# /foo, /bar, and /baz are search directories for the Fortran linker. -# Here, we change these into -L/foo -L/bar -L/baz (and put it first): -ac_f77_v_output="`echo $ac_f77_v_output | - grep 'LPATH is:' | - sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_f77_v_output" - -# FIXME: we keep getting bitten by quoted arguments; a more general fix -# that detects unbalanced quotes in FLIBS should be implemented -# and (ugh) tested at some point. -case $ac_f77_v_output in - # If we are using xlf then replace all the commas with spaces. - *xlfentry*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/,/ /g'` ;; - - # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted - # $LIBS confuse us, and the libraries appear later in the output anyway). - *mGLOB_options_string*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"-mGLOB[^"]*"/ /g'` ;; - - # Portland Group compiler has singly- or doubly-quoted -cmdline argument - # Singly-quoted arguments were reported for versions 5.2-4 and 6.0-4. - # Doubly-quoted arguments were reported for "PGF90/x86 Linux/x86 5.0-2". - *-cmdline\ * | *-ignore\ * | *-def\ *) - ac_f77_v_output=`echo $ac_f77_v_output | sed "\ - s/-cmdline *'[^']*'/ /g; s/-cmdline *\"[^\"]*\"/ /g - s/-ignore *'[^']*'/ /g; s/-ignore *\"[^\"]*\"/ /g - s/-def *'[^']*'/ /g; s/-def *\"[^\"]*\"/ /g"` ;; - - # If we are using Cray Fortran then delete quotes. - *cft90*) - ac_f77_v_output=`echo $ac_f77_v_output | sed 's/"//g'` ;; -esac - - +fi +done -ac_cv_f77_libs= + LIBS="$save_LIBS" -# Save positional arguments (if any) -ac_save_positional="$@" -set X $ac_f77_v_output -while test $# != 1; do - shift - ac_arg=$1 - case $ac_arg in - [\\/]*.a | ?:[\\/]*.a) - ac_exists=false - for ac_i in $ac_cv_f77_libs; do - if test x"$ac_arg" = x"$ac_i"; then - ac_exists=true - break - fi - done - if test x"$ac_exists" = xtrue; then : +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" + with_gnu_ld=no fi - ;; - -bI:*) - ac_exists=false - for ac_i in $ac_cv_f77_libs; do - if test x"$ac_arg" = x"$ac_i"; then - ac_exists=true - break - fi - done - if test x"$ac_exists" = xtrue; then : - -else - if test "$ac_compiler_gnu" = yes; then - for ac_link_opt in $ac_arg; do - ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" - done +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi - ;; - # Ignore these flags. - -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \ - |-LANG:=* | -LIST:* | -LNO:*) - ;; - -lkernel32) - test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" - ;; - -[LRuYz]) - # These flags, when seen by themselves, take an argument. - # We remove the space between option and argument and re-iterate - # unless we find an empty arg or a new option (starting with -) - case $2 in - "" | -*);; - *) - ac_arg="$ac_arg$2" - shift; shift - set X $ac_arg "$@" - ;; - esac - ;; - -YP,*) - for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do - ac_exists=false - for ac_i in $ac_cv_f77_libs; do - if test x"$ac_j" = x"$ac_i"; then - ac_exists=true - break - fi - done - - if test x"$ac_exists" = xtrue; then : - +if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 else - ac_arg="$ac_arg $ac_j" - ac_cv_f77_libs="$ac_cv_f77_libs $ac_j" -fi - done - ;; - -[lLR]*) - ac_exists=false - for ac_i in $ac_cv_f77_libs; do - if test x"$ac_arg" = x"$ac_i"; then - ac_exists=true - break + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 /dev/null` in - "SunOS 5"*) - ac_ld_run_path=`$as_echo "$ac_f77_v_output" | - sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` - test "x$ac_ld_run_path" != x && - if test "$ac_compiler_gnu" = yes; then - for ac_link_opt in $ac_ld_run_path; do - ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" - done -else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_ld_run_path" fi - ;; -esac -fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" +LD="$lt_cv_path_LD" +if test -n "$LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_libs" >&5 -$as_echo "$ac_cv_f77_libs" >&6; } -FLIBS="$ac_cv_f77_libs" - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - fi - - - - - no_undefined="" - case "${host_os}" in - *mingw* | *cygwin*) - - # on MinGW/Cygwin extra LDFLAGS are required - no_undefined="-no-undefined" - ;; - esac - NO_UNDEFINED=$no_undefined - - - - - - - # Find any Python interpreter. - if test -z "$PYTHON"; then - for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then : +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 - break 2 - fi -done - done -IFS=$as_save_IFS - +*) + lt_cv_prog_gnu_ld=no ;; esac fi -PYTHON=$ac_cv_path_PYTHON -if test -n "$PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -$as_echo "$PYTHON" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld - test -n "$PYTHON" && break -done -test -n "$PYTHON" || PYTHON=":" - fi - am_display_PYTHON=python - if test "$PYTHON" = :; then - as_fn_error "no suitable Python interpreter found" "$LINENO" 5 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 -$as_echo_n "checking for $am_display_PYTHON version... " >&6; } -if test "${am_cv_python_version+set}" = set; then : - $as_echo_n "(cached) " >&6 + +# on Mingw32 extra LDFLAGS are required to ease global variable linking +LIBGNURADIO_CORE_EXTRA_LDFLAGS="" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --enable-runtime-pseudo-reloc" >&5 +$as_echo_n "checking whether $LD accepts --enable-runtime-pseudo-reloc... " >&6; } +if ${LD} --enable-runtime-pseudo-reloc --version >/dev/null 2>&1 +then + # libtool requires the quotes + LIBGNURADIO_CORE_EXTRA_LDFLAGS="\"-Wl,--enable-runtime-pseudo-reloc\"" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -$as_echo "$am_cv_python_version" >&6; } - PYTHON_VERSION=$am_cv_python_version - PYTHON_PREFIX='${prefix}' - PYTHON_EXEC_PREFIX='${exec_prefix}' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CreateFileMapping function" >&5 +$as_echo_n "checking for CreateFileMapping function... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +int main (int argc, char **argv) +{ + HANDLE handle; + int size; + char seg_name[1024]; + handle = CreateFileMapping( + INVALID_HANDLE_VALUE, // use paging file + NULL, // default security + PAGE_READWRITE, // read/write access + 0, // max. object size + size, // buffer size + seg_name); // name of mapping object + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + HAVE_CREATEFILEMAPPING=yes +$as_echo "#define HAVE_CREATEFILEMAPPING 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 -$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } -if test "${am_cv_python_platform+set}" = set; then : - $as_echo_n "(cached) " >&6 else - am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` + HAVE_CREATEFILEMAPPING=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 -$as_echo "$am_cv_python_platform" >&6; } - PYTHON_PLATFORM=$am_cv_python_platform +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_CREATEFILEMAPPING" >&5 +$as_echo "$HAVE_CREATEFILEMAPPING" >&6; } + if test x$HAVE_CREATEFILEMAPPING = xyes; then + HAVE_CREATEFILEMAPPING_TRUE= + HAVE_CREATEFILEMAPPING_FALSE='#' +else + HAVE_CREATEFILEMAPPING_TRUE='#' + HAVE_CREATEFILEMAPPING_FALSE= +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 -$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } -if test "${am_cv_python_pythondir+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "x$prefix" = xNONE - then - am_py_prefix=$ac_default_prefix - else - am_py_prefix=$prefix - fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` - am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` - ;; - *) - case $am_py_prefix in - /usr|/System*) ;; - *) - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac + + +for ac_header in sys/types.h fcntl.h io.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 -$as_echo "$am_cv_python_pythondir" >&6; } - pythondir=$am_cv_python_pythondir +done +for ac_header in windows.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINDOWS_H 1 +_ACEOF - pkgpythondir=\${pythondir}/$PACKAGE +fi +done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 -$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } -if test "${am_cv_python_pyexecdir+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "x$exec_prefix" = xNONE - then - am_py_exec_prefix=$am_py_prefix - else - am_py_exec_prefix=$exec_prefix - fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` - am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` - ;; - *) - case $am_py_exec_prefix in - /usr|/System*) ;; - *) - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac +for ac_header in winioctl.h winbase.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " + #if HAVE_WINDOWS_H + #include + #endif + +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 -$as_echo "$am_cv_python_pyexecdir" >&6; } - pyexecdir=$am_cv_python_pyexecdir +done - pkgpyexecdir=\${pyexecdir}/$PACKAGE +for ac_func in getopt usleep gettimeofday nanosleep rand srand random srandom sleep sigaction +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done +ac_fn_c_check_type "$LINENO" "struct timezone" "ac_cv_type_struct_timezone" " + #if HAVE_SYS_TYPES_H + # include + #endif + #if TIME_WITH_SYS_TIME + # include + # include + #else + # if HAVE_SYS_TIME_H + # include + # else + # include + # endif + #endif - fi +" +if test "x$ac_cv_type_struct_timezone" = x""yes; then : +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_TIMEZONE 1 +_ACEOF +fi +ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" " + #if HAVE_SYS_TYPES_H + # include + #endif + #if TIME_WITH_SYS_TIME + # include + # include + #else + # if HAVE_SYS_TIME_H + # include + # else + # include + # endif + #endif +" +if test "x$ac_cv_type_struct_timespec" = x""yes; then : +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_TIMESPEC 1 +_ACEOF -# Check whether --with-pythondir was given. -if test "${with_pythondir+set}" = set; then : - withval=$with_pythondir; with_pythondir=${withval} -else - with_pythondir=${prefix}/lib/python2.5/site-packages fi +ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" " + #if HAVE_SYS_TYPES_H + # include + #endif + #if TIME_WITH_SYS_TIME + # include + # include + #else + # if HAVE_SYS_TIME_H + # include + # else + # include + # endif + #endif +" +if test "x$ac_cv_type_ssize_t" = x""yes; then : - # if we're cross-compiling, asking the host python about any of - # this is completely useless... +cat >>confdefs.h <<_ACEOF +#define HAVE_SSIZE_T 1 +_ACEOF - if test x$cross_compiling != xno - then - pythondir=$with_pythondir - pyexecdir=$with_pythondir +fi - else - # For Fedora Core 5 and 6, see ticket:39 in Trac - if test -f '/etc/redhat-release'; then - if (echo $pyexecdir | grep -q lib64); then - pythondir="$pyexecdir" - fi - fi +ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt" +if test "x$ac_cv_func_getopt" = x""yes; then : + $as_echo "#define HAVE_GETOPT 1" >>confdefs.h - # Check for Python include path - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include path" >&5 -$as_echo_n "checking for Python include path... " >&6; } - if test -z "$PYTHON" ; then - as_fn_error "cannot find Python path" "$LINENO" 5 - fi +else + case " $LIBOBJS " in + *" getopt.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS getopt.$ac_objext" + ;; +esac - # ask distutils which include path we should use - python_cmd=' -import distutils.sysconfig -import os -path = distutils.sysconfig.get_python_inc(plat_specific=False) -if os.sep == "\\": - path = path.replace("\\", "/") -print path -' - python_path=`$PYTHON -c "$python_cmd"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_path" >&5 -$as_echo "$python_path" >&6; } - if test -z "$python_path" ; then - as_fn_error "cannot find Python include path" "$LINENO" 5 - fi +fi - PYTHON_CPPFLAGS=-I$python_path +ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep" +if test "x$ac_cv_func_usleep" = x""yes; then : + $as_echo "#define HAVE_USLEEP 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" usleep.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS usleep.$ac_objext" + ;; +esac +fi - # Check for Python headers usability - python_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" - for ac_header in Python.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default" -if test "x$ac_cv_header_Python_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_PYTHON_H 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = x""yes; then : + $as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h else - as_fn_error "cannot find usable Python headers" "$LINENO" 5 + case " $LIBOBJS " in + *" gettimeofday.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS gettimeofday.$ac_objext" + ;; +esac + fi -done - CPPFLAGS="$python_save_CPPFLAGS" - # Only set this on mingw and cygwin hosts, (only implemented - # for mingw host, for crosscompiling you need to trick this) - PYTHON_LDFLAGS="" - case $host_os in - *mingw* | *cygwin* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python LDFLAGS" >&5 -$as_echo_n "checking for Python LDFLAGS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sleep" >&5 +$as_echo_n "checking for Sleep... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include + #include - python_cmd=' -import distutils.sysconfig -import os -path = distutils.sysconfig.get_config_var("LIBPL") -if path == None: - path = distutils.sysconfig.PREFIX + "/libs" -if os.sep == "\\": - path = path.replace("\\", "/") -print path -' - python_stdlib_path=`$PYTHON -c "$python_cmd"` +int +main () +{ + Sleep(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : - python_version_nodot=`echo $PYTHON_VERSION | sed "s,\.,,"` - libpython_name="python$PYTHON_VERSION" +$as_echo "#define HAVE_SSLEEP 1" >>confdefs.h - # Standard install of python for win32 has libpython24.a - # instead of libpython2.4.a so we check for the library - # without the dot in the version number. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - python_stdlib_filename=`find $python_stdlib_path -type f -name libpython$python_version_nodot.* -print | sed "1q"` - if test -n "$python_stdlib_filename" ; then - libpython_name="python$python_version_nodot" - fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext - PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LDFLAGS" >&5 -$as_echo "$PYTHON_LDFLAGS" >&6; } - # Replace all backslashes in PYTHON Paths with forward slashes - pythondir=`echo $pythondir |sed 's,\\\\,/,g'` - pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'` - pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'` - pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'` - ;; - esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir accepts only one arg" >&5 +$as_echo_n "checking whether mkdir accepts only one arg... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include +int +main () +{ + mkdir("") - fi + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define MKDIR_TAKES_ONE_ARG /**/" >>confdefs.h +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # Extract the first word of "swig", so it can be a program name with args. -set dummy swig; ac_word=$2 +# Extract the first word of "dot", so it can be a program name with args. +set dummy dot; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_SWIG+set}" = set; then : +if test "${ac_cv_prog_HAVE_DOT+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$SWIG"; then - ac_cv_prog_SWIG="$SWIG" # Let the user override the test. + if test -n "$HAVE_DOT"; then + ac_cv_prog_HAVE_DOT="$HAVE_DOT" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -20140,7 +19074,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_SWIG="`which swig`" + ac_cv_prog_HAVE_DOT="YES" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20148,80 +19082,87 @@ done done IFS=$as_save_IFS + test -z "$ac_cv_prog_HAVE_DOT" && ac_cv_prog_HAVE_DOT="NO" fi fi -SWIG=$ac_cv_prog_SWIG -if test -n "$SWIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5 -$as_echo "$SWIG" >&6; } +HAVE_DOT=$ac_cv_prog_HAVE_DOT +if test -n "$HAVE_DOT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOT" >&5 +$as_echo "$HAVE_DOT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test -z "$SWIG" ; then - as_fn_error "Cannot find 'swig' program. SWIG version >= 1.3.31 required" "$LINENO" 5 - SWIG=false - elif test -n "1.3.31" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWIG version" >&5 -$as_echo_n "checking for SWIG version... " >&6; } - swig_version=`$SWIG -version 2>&1 | \ - awk '/^SWIG Version [0-9]+\.[0-9]+\.[0-9]+.*$/ { split($3,a,"[^.0-9]"); print a[1] }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $swig_version" >&5 -$as_echo "$swig_version" >&6; } - if test -n "$swig_version" ; then - swig_version=`echo $swig_version | \ - awk '{ split($1,a,"\."); print a[1]*1000000+a[2]*1000+a[3] }' 2>/dev/null` - swig_required_version=`echo 1.3.31 | \ - awk '{ split($1,a,"\."); print a[1]*1000000+a[2]*1000+a[3] }' 2>/dev/null` - if test $swig_required_version -gt $swig_version ; then - as_fn_error "SWIG version >= 1.3.31 required" "$LINENO" 5 - fi - else - as_fn_error "cannot determine SWIG version" "$LINENO" 5 - fi - fi - - - - - if test "$SWIG" != "false" ; then - SWIG="$SWIG -c++" - fi - - - - - if test "$SWIG" != "false" ; then - SWIG_PYTHON_LIB=-lswigpy - SWIG_PYTHON_OPT=-python - fi - SWIG_PYTHON_CPPFLAGS=$PYTHON_CPPFLAGS +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Extract the first word of "xmlto", so it can be a program name with args. -set dummy xmlto; ac_word=$2 +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_XMLTO+set}" = set; then : +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$XMLTO"; then - ac_cv_prog_XMLTO="$XMLTO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_XMLTO="yes" + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20229,214 +19170,239 @@ done done IFS=$as_save_IFS + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.18 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi + fi + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFTW3F" >&5 +$as_echo_n "checking for FFTW3F... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$FFTW3F_CFLAGS"; then + pkg_cv_FFTW3F_CFLAGS="$FFTW3F_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FFTW3F_CFLAGS=`$PKG_CONFIG --cflags "fftw3f >= 3.0" 2>/dev/null` +else + pkg_failed=yes fi -XMLTO=$ac_cv_prog_XMLTO -if test -n "$XMLTO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 -$as_echo "$XMLTO" >&6; } + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + pkg_failed=untried fi - - if test x$XMLTO = xyes; then - HAS_XMLTO_TRUE= - HAS_XMLTO_FALSE='#' +if test x$cross_compiling = xyes +then + if test -n "$PKG_CONFIG"; then + if test -n "$FFTW3F_LIBS"; then + pkg_cv_FFTW3F_LIBS="$FFTW3F_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FFTW3F_LIBS=`$PKG_CONFIG --libs --static "fftw3f >= 3.0" 2>/dev/null` else - HAS_XMLTO_TRUE='#' - HAS_XMLTO_FALSE= + pkg_failed=yes fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 -$as_echo_n "checking for socket in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_socket+set}" = set; then : - $as_echo_n "(cached) " >&6 + fi else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char socket (); -int -main () -{ -return socket (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_socket_socket=yes + pkg_failed=untried +fi + _pkg_tmp= + for flag in $pkg_cv_FFTW3F_LIBS; do + case $flag in + (-L/lib* | -L/usr/lib* ) ;; # ignore + (*) _pkg_tmp="$_pkg_tmp $flag" ;; + esac + done + pkg_cv_FFTW3F_LIBS="$_pkg_tmp" else - ac_cv_lib_socket_socket=no + if test -n "$PKG_CONFIG"; then + if test -n "$FFTW3F_LIBS"; then + pkg_cv_FFTW3F_LIBS="$FFTW3F_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FFTW3F_LIBS=`$PKG_CONFIG --libs --static "fftw3f >= 3.0" 2>/dev/null` +else + pkg_failed=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + fi +else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 -$as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF - - LIBS="-lsocket $LIBS" - fi +if test -n "$PKG_CONFIG"; then + if test -n "$FFTW3F_INCLUDEDIR"; then + pkg_cv_FFTW3F_INCLUDEDIR="$FFTW3F_INCLUDEDIR" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FFTW3F_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "fftw3f >= 3.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi - # Check first for POSIX - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test $pkg_failed = yes; then -acx_pthread_ok=no +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + FFTW3F_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fftw3f >= 3.0"` + else + FFTW3F_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fftw3f >= 3.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$FFTW3F_PKG_ERRORS" >&5 -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. + as_fn_error $? "Package requirements (fftw3f >= 3.0) were not met: -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +$FFTW3F_PKG_ERRORS -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_join (); -int -main () -{ -return pthread_join (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - acx_pthread_ok=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 -$as_echo "$acx_pthread_ok" >&6; } - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). +Alternatively, you may set the environment variables FFTW3F_CFLAGS +and FFTW3F_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. +Alternatively, you may set the environment variables FFTW3F_CFLAGS +and FFTW3F_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5 ; } +else + FFTW3F_CFLAGS=$pkg_cv_FFTW3F_CFLAGS + FFTW3F_LIBS=$pkg_cv_FFTW3F_LIBS + FFTW3F_INCLUDEDIR=$pkg_cv_FFTW3F_INCLUDEDIR -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: + FFTW3F_CPPFLAGS="" + for flag in $FFTW3F_CFLAGS; do + case $flag in + -I* | -D* | -U*) FFTW3F_CPPFLAGS="$FFTW3F_CPPFLAGS $flag" ;; + esac + done + pkg_cv_FFTW3F_CPPFLAGS=$FFTW3F_CPPFLAGS -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) -case "${host_cpu}-${host_os}" in - *solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" - ;; -esac -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do + # Check whether --enable-doxygen was given. +if test "${enable_doxygen+set}" = set; then : + enableval=$enable_doxygen; +fi - case $flag in - none) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -$as_echo_n "checking whether pthreads work without any flags... " >&6; } - ;; + # Check whether --enable-dot was given. +if test "${enable_dot+set}" = set; then : + enableval=$enable_dot; +fi - -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 -$as_echo_n "checking whether pthreads work with $flag... " >&6; } - PTHREAD_CFLAGS="$flag" - ;; - pthread-config) - # Extract the first word of "pthread-config", so it can be a program name with args. -set dummy pthread-config; ac_word=$2 + if test "x$enable_doxygen" = xno; then + enable_doc=no + else + # Extract the first word of "doxygen", so it can be a program name with args. +set dummy doxygen; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_acx_pthread_config+set}" = set; then : +if test "${ac_cv_path_DOXYGEN+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$acx_pthread_config"; then - ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $DOXYGEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_acx_pthread_config="yes" + ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20444,155 +19410,48 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" -fi + ;; +esac fi -acx_pthread_config=$ac_cv_prog_acx_pthread_config -if test -n "$acx_pthread_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 -$as_echo "$acx_pthread_config" >&6; } +DOXYGEN=$ac_cv_path_DOXYGEN +if test -n "$DOXYGEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 +$as_echo "$DOXYGEN" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 -$as_echo_n "checking for the pthreads library -l$flag... " >&6; } - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - acx_pthread_ok=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 -$as_echo "$acx_pthread_ok" >&6; } - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 -$as_echo_n "checking for joinable pthread attribute... " >&6; } - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int attr=$attr; return attr; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - attr_name=$attr; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 -$as_echo "$attr_name" >&6; } - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - -cat >>confdefs.h <<_ACEOF -#define PTHREAD_CREATE_JOINABLE $attr_name -_ACEOF - - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 -$as_echo_n "checking if more special flags are required for pthreads... " >&6; } - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 -$as_echo "${flag}" >&6; } - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then - for ac_prog in xlc_r cc_r -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 + if test x$DOXYGEN = x; then + if test "x$enable_doxygen" = xyes; then + as_fn_error $? "could not find doxygen" "$LINENO" 5 + fi + enable_doc=no + generate_docs= + else + enable_doc=yes + generate_docs=docs + # Extract the first word of "dot", so it can be a program name with args. +set dummy dot; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : +if test "${ac_cv_path_DOT+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$PTHREAD_CC"; then - ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $DOT in + [\\/]* | ?:[\\/]*) + ac_cv_path_DOT="$DOT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_PTHREAD_CC="$ac_prog" + ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20600,1391 +19459,1136 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -PTHREAD_CC=$ac_cv_prog_PTHREAD_CC -if test -n "$PTHREAD_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 -$as_echo "$PTHREAD_CC" >&6; } +DOT=$ac_cv_path_DOT +if test -n "$DOT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5 +$as_echo "$DOT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$PTHREAD_CC" && break -done -test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" + fi + fi - else - PTHREAD_CC=$CC - fi + if test x$enable_doc = xyes; then + DOC_TRUE= + DOC_FALSE='#' else - PTHREAD_CC="$CC" + DOC_TRUE='#' + DOC_FALSE= fi + if test x$DOT = x; then + if test "x$enable_dot" = xyes; then + as_fn_error $? "could not find dot" "$LINENO" 5 + fi + enable_dot=no + else + enable_dot=yes + fi + + enable_xml_docs=YES + + enable_html_docs=YES + + enable_latex_docs=NO + + -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then -$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h +# Check whether --with-md-cpu was given. +if test "${with_md_cpu+set}" = set; then : + withval=$with_md_cpu; cf_with_md_cpu="$withval" +else - ot_posix="yes" - DEFINES="$DEFINES -DOMNITHREAD_POSIX=1" + if test "$cross_compiling" != no; then + cf_with_md_cpu="$host_cpu" + else + case "$host_os" in + *darwin*10*) + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5 +$as_echo_n "checking size of void*... " >&6; } +if test "${ac_cv_sizeof_voidp+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then : - : else - acx_pthread_ok=no + if test "$ac_cv_type_voidp" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (void*) +See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_voidp=0 + fi +fi - # If no POSIX support found, then check for NT threads - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NT threads" >&5 -$as_echo_n "checking for NT threads... " >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5 +$as_echo "$ac_cv_sizeof_voidp" >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - #include - #include - int main() { InitializeCriticalSection(NULL); return 0; } +cat >>confdefs.h <<_ACEOF +#define SIZEOF_VOIDP $ac_cv_sizeof_voidp _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ot_nt="yes" - DEFINES="$DEFINES -DOMNITHREAD_NT=1" -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "GNU Radio requires POSIX threads. pthreads not found. -See \`config.log' for more details." "$LINENO" 5; } + if test "$ac_cv_sizeof_voidp" = 4; then + cf_with_md_cpu="i386" + else + cf_with_md_cpu="x86_64" + fi + ;; + *) + cf_with_md_cpu="$host_cpu" + ;; + esac + fi fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + case "$cf_with_md_cpu" in + x86 | i[3-7]86) MD_CPU=x86 MD_SUBCPU=x86 ;; + x86_64) MD_CPU=x86 MD_SUBCPU=x86_64 ;; + powerpc*) MD_CPU=powerpc ;; + arm*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __ARM_ARCH_5__ + #error "Not armv5" + #endif - if test "x$ot_posix" = xyes; then - OMNITHREAD_POSIX_TRUE= - OMNITHREAD_POSIX_FALSE='#' -else - OMNITHREAD_POSIX_TRUE='#' - OMNITHREAD_POSIX_FALSE= -fi +int +main () +{ - if test "x$ot_nt" = xyes; then - OMNITHREAD_NT_TRUE= - OMNITHREAD_NT_FALSE='#' + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + is_armv5=yes else - OMNITHREAD_NT_TRUE='#' - OMNITHREAD_NT_FALSE= + is_armv5=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - save_LIBS="$LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 -$as_echo_n "checking for library containing clock_gettime... " >&6; } -if test "${ac_cv_search_clock_gettime+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#ifndef __ARM_ARCH_7A__ + #error "Not armv7-a" + #endif -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char clock_gettime (); int main () { -return clock_gettime (); + ; return 0; } _ACEOF -for ac_lib in '' rt; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_clock_gettime=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_clock_gettime+set}" = set; then : - break -fi -done -if test "${ac_cv_search_clock_gettime+set}" = set; then : - +if ac_fn_c_try_compile "$LINENO"; then : + is_armv7_a=yes else - ac_cv_search_clock_gettime=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 -$as_echo "$ac_cv_search_clock_gettime" >&6; } -ac_res=$ac_cv_search_clock_gettime -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - PTHREAD_LIBS="$PTHREAD_LIBS $LIBS" -fi - - for ac_func in clock_gettime gettimeofday nanosleep -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - + is_armv7_a=no fi -done - - LIBS="$save_LIBS" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test x$CXX_FOR_BUILD = x -then - if test x$cross_compiling = xno; then - CXX_FOR_BUILD=${CXX} - else - CXX_FOR_BUILD=g++ - fi -fi + if test $is_armv5 = yes; then MD_CPU=armv5; + elif test $is_armv7_a = yes; then MD_CPU=armv7_a; + else MD_CPU=generic; fi + ;; + *) MD_CPU=generic ;; + esac + # Check whether --enable-altivec was given. +if test "${enable_altivec+set}" = set; then : + enableval=$enable_altivec; if test $MD_CPU = powerpc; then + case "$enableval" in + (no) MD_CPU=generic ;; + (yes) + echo 'void f(){}' > conftest.c + for i in -mabi=altivec -maltivec + do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts $i" >&5 +$as_echo_n "checking whether $CC accepts $i... " >&6; } + if test -z "`${CC} $i -c conftest.c 2>&1`" + then + lf_CFLAGS="${lf_CFLAGS} $i" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + done + rm -f conftest.c conftest.o - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + echo 'void f(){}' > conftest.cc + for i in -mabi=altivec -maltivec + do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $i" >&5 +$as_echo_n "checking whether $CXX accepts $i... " >&6; } + if test -z "`${CXX} $i -c conftest.cc 2>&1`" + then + lf_CXXFLAGS="${lf_CXXFLAGS} $i" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + done + rm -f conftest.cc conftest.o - for ac_header in sys/ipc.h sys/shm.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi + ;; + (*) as_fn_error $? "Invalid argument ($enableval) to --enable-altivec" "$LINENO" 5 ;; + esac + fi +else + if test $MD_CPU = powerpc; then -done + echo 'void f(){}' > conftest.c + for i in -mabi=altivec -maltivec + do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts $i" >&5 +$as_echo_n "checking whether $CC accepts $i... " >&6; } + if test -z "`${CC} $i -c conftest.c 2>&1`" + then + lf_CFLAGS="${lf_CFLAGS} $i" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + done + rm -f conftest.c conftest.o - save_LIBS="$LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shmat" >&5 -$as_echo_n "checking for library containing shmat... " >&6; } -if test "${ac_cv_search_shmat+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shmat (); -int -main () -{ -return shmat (); - ; - return 0; -} -_ACEOF -for ac_lib in '' cygipc ipc; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_shmat=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_shmat+set}" = set; then : - break -fi -done -if test "${ac_cv_search_shmat+set}" = set; then : + echo 'void f(){}' > conftest.cc + for i in -mabi=altivec -maltivec + do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $i" >&5 +$as_echo_n "checking whether $CXX accepts $i... " >&6; } + if test -z "`${CXX} $i -c conftest.cc 2>&1`" + then + lf_CXXFLAGS="${lf_CXXFLAGS} $i" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + done + rm -f conftest.cc conftest.o -else - ac_cv_search_shmat=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shmat" >&5 -$as_echo "$ac_cv_search_shmat" >&6; } -ac_res=$ac_cv_search_shmat -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - IPC_LIBS="$LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SystemV IPC support not found. " >&5 -$as_echo "$as_me: WARNING: SystemV IPC support not found. " >&2;} + fi fi - LIBS="$save_LIBS" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for machine dependent speedups" >&5 +$as_echo_n "checking for machine dependent speedups... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MD_CPU" >&5 +$as_echo "$MD_CPU" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : - $as_echo_n "(cached) " >&6 + if test "$MD_CPU" = "x86"; then + MD_CPU_x86_TRUE= + MD_CPU_x86_FALSE='#' else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ + MD_CPU_x86_TRUE='#' + MD_CPU_x86_FALSE= +fi - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes + if test "$MD_SUBCPU" = "x86_64"; then + MD_SUBCPU_x86_64_TRUE= + MD_SUBCPU_x86_64_FALSE='#' else - ac_cv_header_stdc=no + MD_SUBCPU_x86_64_TRUE='#' + MD_SUBCPU_x86_64_FALSE= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include + if test "$MD_CPU" = "powerpc"; then + MD_CPU_powerpc_TRUE= + MD_CPU_powerpc_FALSE='#' +else + MD_CPU_powerpc_TRUE='#' + MD_CPU_powerpc_FALSE= +fi -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : + if test "$MD_CPU" = "armv5"; then + MD_CPU_armv5_TRUE= + MD_CPU_armv5_FALSE='#' +else + MD_CPU_armv5_TRUE='#' + MD_CPU_armv5_FALSE= +fi + if test "$MD_CPU" = "armv7_a"; then + MD_CPU_armv7_a_TRUE= + MD_CPU_armv7_a_FALSE='#' else - ac_cv_header_stdc=no + MD_CPU_armv7_a_TRUE='#' + MD_CPU_armv7_a_FALSE= fi -rm -f conftest* + if test "$MD_CPU" = "generic"; then + MD_CPU_generic_TRUE= + MD_CPU_generic_FALSE='#' +else + MD_CPU_generic_TRUE='#' + MD_CPU_generic_FALSE= fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : -else - ac_cv_header_stdc=no -fi -rm -f conftest* +if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cppunit") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then -fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPPUNIT" >&5 +$as_echo_n "checking for CPPUNIT... " >&6; } +if test -n "$PKG_CONFIG"; then + if test -n "$CPPUNIT_CFLAGS"; then + pkg_cv_CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.9.14" 2>/dev/null` else - ac_cv_header_stdc=no + pkg_failed=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +else + pkg_failed=untried fi +if test x$cross_compiling = xyes +then + if test -n "$PKG_CONFIG"; then + if test -n "$CPPUNIT_LIBS"; then + pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs --static "cppunit >= 1.9.14" 2>/dev/null` +else + pkg_failed=yes fi + fi +else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if test "${ac_cv_header_sys_wait_h+set}" = set; then : - $as_echo_n "(cached) " >&6 + _pkg_tmp= + for flag in $pkg_cv_CPPUNIT_LIBS; do + case $flag in + (-L/lib* | -L/usr/lib* ) ;; # ignore + (*) _pkg_tmp="$_pkg_tmp $flag" ;; + esac + done + pkg_cv_CPPUNIT_LIBS="$_pkg_tmp" else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif - -int -main () -{ - int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_sys_wait_h=yes + if test -n "$PKG_CONFIG"; then + if test -n "$CPPUNIT_LIBS"; then + pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs --static "cppunit >= 1.9.14" 2>/dev/null` else - ac_cv_header_sys_wait_h=no + pkg_failed=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -$as_echo "$ac_cv_header_sys_wait_h" >&6; } -if test $ac_cv_header_sys_wait_h = yes; then - -$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h - fi -for ac_header in fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +if test -n "$PKG_CONFIG"; then + if test -n "$CPPUNIT_INCLUDEDIR"; then + pkg_cv_CPPUNIT_INCLUDEDIR="$CPPUNIT_INCLUDEDIR" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CPPUNIT_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "cppunit >= 1.9.14" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi -done - -for ac_header in linux/ppdev.h dev/ppbus/ppi.h sys/mman.h sys/select.h sys/types.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -for ac_header in sys/resource.h stdint.h sched.h signal.h sys/syscall.h malloc.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +if test $pkg_failed = yes; then +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cppunit >= 1.9.14"` + else + CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.9.14"` + fi + # Put the nasty error message in config.log where it belongs + echo "$CPPUNIT_PKG_ERRORS" >&5 -done + as_fn_error $? "Package requirements (cppunit >= 1.9.14) were not met: -for ac_header in netinet/in.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" -if test "x$ac_cv_header_netinet_in_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NETINET_IN_H 1 -_ACEOF +$CPPUNIT_PKG_ERRORS -fi +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -done +Alternatively, you may set the environment variables CPPUNIT_CFLAGS +and CPPUNIT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -for ac_header in windows.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" -if test "x$ac_cv_header_windows_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WINDOWS_H 1 -_ACEOF +Alternatively, you may set the environment variables CPPUNIT_CFLAGS +and CPPUNIT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -fi +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5 ; } +else + CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS + CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS + CPPUNIT_INCLUDEDIR=$pkg_cv_CPPUNIT_INCLUDEDIR -done + CPPUNIT_CPPFLAGS="" + for flag in $CPPUNIT_CFLAGS; do + case $flag in + -I* | -D* | -U*) CPPUNIT_CPPFLAGS="$CPPUNIT_CPPFLAGS $flag" ;; + esac + done + pkg_cv_CPPUNIT_CPPFLAGS=$CPPUNIT_CPPFLAGS -for ac_header in vec_types.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "vec_types.h" "ac_cv_header_vec_types_h" "$ac_includes_default" -if test "x$ac_cv_header_vec_types_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VEC_TYPES_H 1 -_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : fi +else -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : - $as_echo_n "(cached) " >&6 +# Check whether --with-cppunit-prefix was given. +if test "${with_cppunit_prefix+set}" = set; then : + withval=$with_cppunit_prefix; cppunit_config_prefix="$withval" else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset cs; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; + cppunit_config_prefix="" +fi - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_const=yes +# Check whether --with-cppunit-exec-prefix was given. +if test "${with_cppunit_exec_prefix+set}" = set; then : + withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval" else - ac_cv_c_const=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cppunit_config_exec_prefix="" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then -$as_echo "#define const /**/" >>confdefs.h -fi + if test x$cppunit_config_exec_prefix != x ; then + cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix" + if test x${CPPUNIT_CONFIG+set} != xset ; then + CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config + fi + fi + if test x$cppunit_config_prefix != x ; then + cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix" + if test x${CPPUNIT_CONFIG+set} != xset ; then + CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config + fi + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : + # Extract the first word of "cppunit-config", so it can be a program name with args. +set dummy cppunit-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break + case $CPPUNIT_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_CPPUNIT_CONFIG="$CPPUNIT_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; + test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no" + ;; esac - -ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = x""yes; then : - +fi +CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG +if test -n "$CPPUNIT_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5 +$as_echo "$CPPUNIT_CONFIG" >&6; } else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if test "${ac_cv_header_time+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then + cppunit_version_min=1.9.14 -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5 +$as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; } + no_cppunit="" + if test "$CPPUNIT_CONFIG" = "no" ; then + no_cppunit=yes + else + CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags` + CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs` + cppunit_version=`$CPPUNIT_CONFIG --version` -fi + cppunit_major_version=`echo $cppunit_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + cppunit_minor_version=`echo $cppunit_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + cppunit_micro_version=`echo $cppunit_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_bigendian=unknown - # See if we're dealing with a universal compiler. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; + cppunit_major_min=`echo $cppunit_version_min | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + cppunit_minor_min=`echo $cppunit_version_min | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + cppunit_micro_min=`echo $cppunit_version_min | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : + cppunit_version_proper=`expr \ + $cppunit_major_version \> $cppunit_major_min \| \ + $cppunit_major_version \= $cppunit_major_min \& \ + $cppunit_minor_version \> $cppunit_minor_min \| \ + $cppunit_major_version \= $cppunit_major_min \& \ + $cppunit_minor_version \= $cppunit_minor_min \& \ + $cppunit_micro_version \>= $cppunit_micro_min ` - # Check for potential -arch flags. It is not universal unless - # there are at least two -arch flags with different values. - ac_arch= - ac_prev= - for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do - if test -n "$ac_prev"; then - case $ac_word in - i?86 | x86_64 | ppc | ppc64) - if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then - ac_arch=$ac_word - else - ac_cv_c_bigendian=universal - break - fi - ;; - esac - ac_prev= - elif test "x$ac_word" = "x-arch"; then - ac_prev=arch - fi - done -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include + if test "$cppunit_version_proper" = "1" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5 +$as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + no_cppunit=yes + fi + fi -int -main () -{ -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ - && LITTLE_ENDIAN) - bogus endian macros - #endif + if test "x$no_cppunit" = x ; then + : + else + CPPUNIT_CFLAGS="" + CPPUNIT_LIBS="" + as_fn_error $? "GNU Radio requires cppunit. Stop" "$LINENO" 5 + fi - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) - bogus endian macros - #endif +fi - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to _BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS -int -main () -{ -#ifndef _BIG_ENDIAN - not big endian - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes +# Extract the first word of "guile", so it can be a program name with args. +set dummy guile; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GUILE+set}" = set; then : + $as_echo_n "(cached) " >&6 else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # Compile a test program. - if test "$cross_compiling" = yes; then : - # Try to guess by grepping values from an object file. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -short int ascii_mm[] = - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; - int use_ascii (int i) { - return ascii_mm[i] + ascii_ii[i]; - } - short int ebcdic_ii[] = - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; - int use_ebcdic (int i) { - return ebcdic_mm[i] + ebcdic_ii[i]; - } - extern int foo; - -int -main () -{ -return use_ascii (foo) == use_ebcdic (foo); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then - ac_cv_c_bigendian=yes - fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi - fi + case $GUILE in + [\\/]* | ?:[\\/]*) + ac_cv_path_GUILE="$GUILE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GUILE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +GUILE=$ac_cv_path_GUILE +if test -n "$GUILE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUILE" >&5 +$as_echo "$GUILE" >&6; } else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + +case "$host_os" in + darwin*) - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_bigendian=no -else - ac_cv_c_bigendian=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +# Check whether --with-boost was given. +if test "${with_boost+set}" = set; then : + withval=$with_boost; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ac_boost_path="" + else + want_boost="yes" + ac_boost_path="$withval" fi + +else + want_boost="yes" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } - case $ac_cv_c_bigendian in #( - yes) - GR_ARCH_BIGENDIAN=1;; #( - no) - GR_ARCH_BIGENDIAN=0 ;; #( - universal) -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - ;; #( - *) - as_fn_error "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; - esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 -$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if test "${ac_cv_struct_tm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include +# Check whether --with-boost-libdir was given. +if test "${with_boost_libdir+set}" = set; then : + withval=$with_boost_libdir; + if test -d $withval + then + ac_boost_lib_path="$withval" + else + as_fn_error $? "--with-boost-libdir expected directory name" "$LINENO" 5 + fi -int -main () -{ -struct tm tm; - int *p = &tm.tm_sec; - return !p; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_tm=time.h else - ac_cv_struct_tm=sys/time.h -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_boost_lib_path="" + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 -$as_echo "$ac_cv_struct_tm" >&6; } -if test $ac_cv_struct_tm = sys/time.h; then -$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h -fi +if test "x$want_boost" = "xyes"; then + boost_lib_version_req=1.37 + boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'` + boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'` + boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'` + boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + if test "x$boost_lib_version_req_sub_minor" = "x" ; then + boost_lib_version_req_sub_minor="0" + fi + WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boost >= $boost_lib_version_req" >&5 +$as_echo_n "checking for boost >= $boost_lib_version_req... " >&6; } + succeeded=no + + if test "$ac_boost_path" != ""; then + if test -d "$ac_boost_path/lib${gr_libdir_suffix}"; then + BOOST_LDFLAGS="-L$ac_boost_path/lib${gr_libdir_suffix}" + else + BOOST_LDFLAGS="-L$ac_boost_path/lib" + fi + BOOST_CPPFLAGS="-I$ac_boost_path/include" + else + for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do + if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then + if test -d "$ac_boost_path_tmp/lib${gr_libdir_suffix}"; then + BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib${gr_libdir_suffix}" + else + BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" + fi + BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" + break; + fi + done + fi + if test "$ac_boost_lib_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_lib_path" + fi -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 -$as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -char *p = (char *) alloca (2 * sizeof (int)); - if (p) return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_working_alloca_h=yes -else - ac_cv_working_alloca_h=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 -$as_echo "$ac_cv_working_alloca_h" >&6; } -if test $ac_cv_working_alloca_h = yes; then + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS -$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS -fi + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 -$as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# ifdef HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif + + #include int main () { -char *p = (char *) alloca (1); - if (p) return 0; + + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_func_alloca_works=yes -else - ac_cv_func_alloca_works=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 -$as_echo "$ac_cv_func_alloca_works" >&6; } - -if test $ac_cv_func_alloca_works = yes; then - -$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h - -else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes -ALLOCA=\${LIBOBJDIR}alloca.$ac_objext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -$as_echo "#define C_ALLOCA 1" >>confdefs.h + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 -$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined CRAY && ! defined CRAY2 -webecray -#else -wenotbecray -#endif + if test "$succeeded" != "yes"; then + _version=0 -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then : - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -f conftest* + if test "$ac_boost_path" != ""; then + path_list="$ac_boost_path" + else + path_list="/usr /usr/local /opt /opt/local" + fi + for ac_boost_path in $path_list ; do + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's,/include/boost-,,; s,_,.,'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + best_path=$ac_boost_path + fi + done + fi + done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 -$as_echo "$ac_cv_os_cray" >&6; } -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF + if test "$ac_boost_lib_path" = ""; then + if test -d "$best_path/lib${gr_libdir_suffix}"; then + BOOST_LDFLAGS="-L$best_path/lib${gr_libdir_suffix}" + else + BOOST_LDFLAGS="-L$best_path/lib" + fi + fi - break -fi + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS - done -fi + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 -$as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_c_stack_direction=0 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -int -find_stack_direction () -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} + + #include int main () { - return find_stack_direction () < 0; + + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + + ; + return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_stack_direction=1 -else - ac_cv_c_stack_direction=-1 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 -$as_echo "$ac_cv_c_stack_direction" >&6; } -cat >>confdefs.h <<_ACEOF -#define STACK_DIRECTION $ac_cv_c_stack_direction -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi -fi + if test "$succeeded" != "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "$_version" = "0" ; then + as_fn_error $? "we could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). +If you are sure you have boost installed, then check your version number looking in ." "$LINENO" 5 + else + as_fn_error $? "your boost libraries seem to old (version $_version)." "$LINENO" 5 + fi + else +$as_echo "#define HAVE_BOOST 1" >>confdefs.h - # Check for allocing memory alignment functions - # If 'posix_memalign' is available, use it solely. - for ac_func in posix_memalign -do : - ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign" -if test "x$ac_cv_func_posix_memalign" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_POSIX_MEMALIGN 1 -_ACEOF + fi +fi -else + ;; + *) - # Otherwise, check for valloc and the - # (a-priori known) alignment of 'malloc' - for ac_func in valloc -do : - ac_fn_c_check_func "$LINENO" "valloc" "ac_cv_func_valloc" -if test "x$ac_cv_func_valloc" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VALLOC 1 -_ACEOF -fi -done - aligned_malloc=0 - # 'malloc' is 16-byte aligned on (at least) Darwin 8 and 9 - case "$host_os" in - darwin8*) aligned_malloc=16 ;; - darwin9*) aligned_malloc=16 ;; - *) ;; - esac - if test $aligned_malloc = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: malloc has unknown alignment." >&5 -$as_echo "malloc has unknown alignment." >&6; } +# Check whether --with-boost was given. +if test "${with_boost+set}" = set; then : + withval=$with_boost; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ac_boost_path="" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: malloc is $aligned_malloc-byte aligned." >&5 -$as_echo "malloc is $aligned_malloc-byte aligned." >&6; } + want_boost="yes" + ac_boost_path="$withval" fi -cat >>confdefs.h <<_ACEOF -#define ALIGNED_MALLOC $aligned_malloc -_ACEOF +else + want_boost="yes" +fi -fi -done -if test "${ac_cv_func_setvbuf_reversed+set}" = set; then : - $as_echo_n "(cached) " >&6 +# Check whether --with-boost-libdir was given. +if test "${with_boost_libdir+set}" = set; then : + withval=$with_boost_libdir; + if test -d $withval + then + ac_boost_lib_path="$withval" + else + as_fn_error $? "--with-boost-libdir expected directory name" "$LINENO" 5 + fi + else - ac_cv_func_setvbuf_reversed=no + ac_boost_lib_path="" + fi -for ac_func in vprintf -do : - ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" -if test "x$ac_cv_func_vprintf" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VPRINTF 1 -_ACEOF +if test "x$want_boost" = "xyes"; then + boost_lib_version_req=1.35 + boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'` + boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'` + boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'` + boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + if test "x$boost_lib_version_req_sub_minor" = "x" ; then + boost_lib_version_req_sub_minor="0" + fi + WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boost >= $boost_lib_version_req" >&5 +$as_echo_n "checking for boost >= $boost_lib_version_req... " >&6; } + succeeded=no + + if test "$ac_boost_path" != ""; then + if test -d "$ac_boost_path/lib${gr_libdir_suffix}"; then + BOOST_LDFLAGS="-L$ac_boost_path/lib${gr_libdir_suffix}" + else + BOOST_LDFLAGS="-L$ac_boost_path/lib" + fi + BOOST_CPPFLAGS="-I$ac_boost_path/include" + else + for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do + if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then + if test -d "$ac_boost_path_tmp/lib${gr_libdir_suffix}"; then + BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib${gr_libdir_suffix}" + else + BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" + fi + BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" + break; + fi + done + fi + + if test "$ac_boost_lib_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_lib_path" + fi + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS -ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" -if test "x$ac_cv_func__doprnt" = x""yes; then : + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS -$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -done + #include +int +main () +{ -for ac_func in mmap select socket strcspn strerror strspn getpagesize sysconf -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + + ; + return 0; +} _ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes fi -done +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -for ac_func in snprintf gettimeofday nanosleep sched_setscheduler -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" -fi -done -for ac_func in modf sqrt sigaction sigprocmask pthread_sigmask -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + if test "$succeeded" != "yes"; then + _version=0 -fi -done + if test "$ac_boost_path" != ""; then + path_list="$ac_boost_path" + else + path_list="/usr /usr/local /opt /opt/local" + fi + for ac_boost_path in $path_list ; do + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's,/include/boost-,,; s,_,.,'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + best_path=$ac_boost_path + fi + done + fi + done -for ac_func in sched_setaffinity -do : - ac_fn_c_check_func "$LINENO" "sched_setaffinity" "ac_cv_func_sched_setaffinity" -if test "x$ac_cv_func_sched_setaffinity" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SCHED_SETAFFINITY 1 -_ACEOF + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" -fi -done + if test "$ac_boost_lib_path" = ""; then + if test -d "$best_path/lib${gr_libdir_suffix}"; then + BOOST_LDFLAGS="-L$best_path/lib${gr_libdir_suffix}" + else + BOOST_LDFLAGS="-L$best_path/lib" + fi + fi + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincos in -lm" >&5 -$as_echo_n "checking for sincos in -lm... " >&6; } -if test "${ac_cv_lib_m_sincos+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sincos (); + #include + int main () { -return sincos (); + + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_sincos=yes -else - ac_cv_lib_m_sincos=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + found_system=yes + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sincos" >&5 -$as_echo "$ac_cv_lib_m_sincos" >&6; } -if test "x$ac_cv_lib_m_sincos" = x""yes; then : +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -$as_echo "#define HAVE_SINCOS 1" >>confdefs.h + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi -fi + if test "$succeeded" != "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "$_version" = "0" ; then + as_fn_error $? "we could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). +If you are sure you have boost installed, then check your version number looking in ." "$LINENO" 5 + else + as_fn_error $? "your boost libraries seem to old (version $_version)." "$LINENO" 5 + fi + else -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sincosf in -lm" >&5 -$as_echo_n "checking for sincosf in -lm... " >&6; } -if test "${ac_cv_lib_m_sincosf+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sincosf (); -int -main () -{ -return sincosf (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_sincosf=yes -else - ac_cv_lib_m_sincosf=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sincosf" >&5 -$as_echo "$ac_cv_lib_m_sincosf" >&6; } -if test "x$ac_cv_lib_m_sincosf" = x""yes; then : -$as_echo "#define HAVE_SINCOSF 1" >>confdefs.h +$as_echo "#define HAVE_BOOST 1" >>confdefs.h + fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sinf in -lm" >&5 -$as_echo_n "checking for sinf in -lm... " >&6; } -if test "${ac_cv_lib_m_sinf+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + ;; +esac -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sinf (); -int -main () -{ -return sinf (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_sinf=yes -else - ac_cv_lib_m_sinf=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sinf" >&5 -$as_echo "$ac_cv_lib_m_sinf" >&6; } -if test "x$ac_cv_lib_m_sinf" = x""yes; then : -$as_echo "#define HAVE_SINF 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cosf in -lm" >&5 -$as_echo_n "checking for cosf in -lm... " >&6; } -if test "${ac_cv_lib_m_cosf+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +acx_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -21993,1442 +20597,1262 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char cosf (); +char pthread_join (); int main () { -return cosf (); +return pthread_join (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_cosf=yes -else - ac_cv_lib_m_cosf=no + acx_pthread_ok=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } + if test x"$acx_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cosf" >&5 -$as_echo "$ac_cv_lib_m_cosf" >&6; } -if test "x$ac_cv_lib_m_cosf" = x""yes; then : -$as_echo "#define HAVE_COSF 1" >>confdefs.h +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). -fi +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for trunc in -lm" >&5 -$as_echo_n "checking for trunc in -lm... " >&6; } -if test "${ac_cv_lib_m_trunc+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char trunc (); -int -main () -{ -return trunc (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_trunc=yes -else - ac_cv_lib_m_trunc=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_trunc" >&5 -$as_echo "$ac_cv_lib_m_trunc" >&6; } -if test "x$ac_cv_lib_m_trunc" = x""yes; then : +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: -$as_echo "#define HAVE_TRUNC 1" >>confdefs.h +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) -fi +case "${host_cpu}-${host_os}" in + *solaris*) -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exp10 in -lm" >&5 -$as_echo_n "checking for exp10 in -lm... " >&6; } -if test "${ac_cv_lib_m_exp10+set}" = set; then : + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ;; +esac + +if test x"$acx_pthread_ok" = xno; then +for flag in $acx_pthread_flags; do + + case $flag in + none) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +$as_echo_n "checking whether pthreads work without any flags... " >&6; } + ;; + + -*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +$as_echo_n "checking whether pthreads work with $flag... " >&6; } + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + # Extract the first word of "pthread-config", so it can be a program name with args. +set dummy pthread-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_acx_pthread_config+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char exp10 (); -int -main () -{ -return exp10 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_exp10=yes + if test -n "$acx_pthread_config"; then + ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. else - ac_cv_lib_m_exp10=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_acx_pthread_config="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_exp10" >&5 -$as_echo "$ac_cv_lib_m_exp10" >&6; } -if test "x$ac_cv_lib_m_exp10" = x""yes; then : +acx_pthread_config=$ac_cv_prog_acx_pthread_config +if test -n "$acx_pthread_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 +$as_echo "$acx_pthread_config" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -$as_echo "#define HAVE_EXP10 1" >>confdefs.h -fi + if test x"$acx_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for log2 in -lm" >&5 -$as_echo_n "checking for log2 in -lm... " >&6; } -if test "${ac_cv_lib_m_log2+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; } + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char log2 (); +#include int main () { -return log2 (); +pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_log2=yes -else - ac_cv_lib_m_log2=no + acx_pthread_ok=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_log2" >&5 -$as_echo "$ac_cv_lib_m_log2" >&6; } -if test "x$ac_cv_lib_m_log2" = x""yes; then : - -$as_echo "#define HAVE_LOG2 1" >>confdefs.h - -fi -#AC_FUNC_MKTIME + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } + if test "x$acx_pthread_ok" = xyes; then + break; + fi + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - SHM_OPEN_LIBS="" - save_LIBS="$LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 -$as_echo_n "checking for library containing shm_open... " >&6; } -if test "${ac_cv_search_shm_open+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +$as_echo_n "checking for joinable pthread attribute... " >&6; } + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shm_open (); +#include int main () { -return shm_open (); +int attr=$attr; return attr; ; return 0; } _ACEOF -for ac_lib in '' rt; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_shm_open=$ac_res +if ac_fn_c_try_link "$LINENO"; then : + attr_name=$attr; break fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_shm_open+set}" = set; then : - break -fi -done -if test "${ac_cv_search_shm_open+set}" = set; then : - -else - ac_cv_search_shm_open=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5 -$as_echo "$ac_cv_search_shm_open" >&6; } -ac_res=$ac_cv_search_shm_open -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - SHM_OPEN_LIBS="$LIBS" -fi + conftest$ac_exeext conftest.$ac_ext + done + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 +$as_echo "$attr_name" >&6; } + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - for ac_func in shm_open -do : - ac_fn_c_check_func "$LINENO" "shm_open" "ac_cv_func_shm_open" -if test "x$ac_cv_func_shm_open" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SHM_OPEN 1 +cat >>confdefs.h <<_ACEOF +#define PTHREAD_CREATE_JOINABLE $attr_name _ACEOF -fi -done - - LIBS="$save_LIBS" - - + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; } + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +$as_echo "${flag}" >&6; } + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then : + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + for ac_prog in xlc_r cc_r +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 + break 2 + fi +done + done +IFS=$as_save_IFS + fi fi - -LD="$lt_cv_path_LD" -if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } +PTHREAD_CC=$ac_cv_prog_PTHREAD_CC +if test -n "$PTHREAD_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +$as_echo "$PTHREAD_CC" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - + test -n "$PTHREAD_CC" && break +done +test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" - - - -# on Mingw32 extra LDFLAGS are required to ease global variable linking -LIBGNURADIO_CORE_EXTRA_LDFLAGS="" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --enable-runtime-pseudo-reloc" >&5 -$as_echo_n "checking whether $LD accepts --enable-runtime-pseudo-reloc... " >&6; } -if ${LD} --enable-runtime-pseudo-reloc --version >/dev/null 2>&1 -then - # libtool requires the quotes - LIBGNURADIO_CORE_EXTRA_LDFLAGS="\"-Wl,--enable-runtime-pseudo-reloc\"" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + else + PTHREAD_CC=$CC + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + PTHREAD_CC="$CC" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CreateFileMapping function" >&5 -$as_echo_n "checking for CreateFileMapping function... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -int main (int argc, char **argv) -{ - HANDLE handle; - int size; - char seg_name[1024]; - handle = CreateFileMapping( - INVALID_HANDLE_VALUE, // use paging file - NULL, // default security - PAGE_READWRITE, // read/write access - 0, // max. object size - size, // buffer size - seg_name); // name of mapping object - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - HAVE_CREATEFILEMAPPING=yes +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_pthread_ok" = xyes; then -$as_echo "#define HAVE_CREATEFILEMAPPING 1" >>confdefs.h +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h + : else - HAVE_CREATEFILEMAPPING=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + acx_pthread_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_CREATEFILEMAPPING" >&5 -$as_echo "$HAVE_CREATEFILEMAPPING" >&6; } - if test x$HAVE_CREATEFILEMAPPING = xyes; then - HAVE_CREATEFILEMAPPING_TRUE= - HAVE_CREATEFILEMAPPING_FALSE='#' -else - HAVE_CREATEFILEMAPPING_TRUE='#' - HAVE_CREATEFILEMAPPING_FALSE= fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -for ac_header in sys/types.h fcntl.h io.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -for ac_header in windows.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" -if test "x$ac_cv_header_windows_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WINDOWS_H 1 -_ACEOF - -fi -done -for ac_header in winioctl.h winbase.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " - #if HAVE_WINDOWS_H - #include - #endif -" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +# Check whether --with-boost-thread was given. +if test "${with_boost_thread+set}" = set; then : + withval=$with_boost_thread; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_lib="" + else + want_boost="yes" + ax_boost_user_lib="$withval" + fi +else + want_boost="yes" fi -done -for ac_func in getopt usleep gettimeofday nanosleep rand srand random srandom sleep sigaction -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done + if test "$want_boost" = "yes"; then -ac_fn_c_check_type "$LINENO" "struct timezone" "ac_cv_type_struct_timezone" " - #if HAVE_SYS_TYPES_H - # include - #endif - #if TIME_WITH_SYS_TIME - # include - # include - #else - # if HAVE_SYS_TIME_H - # include - # else - # include - # endif - #endif -" -if test "x$ac_cv_type_struct_timezone" = x""yes; then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_TIMEZONE 1 -_ACEOF + CPPFLAGS_SAVED="$CPPFLAGS" + LDFLAGS_SAVED="$LDFLAGS" + CXXFLAGS_SAVED="$CXXFLAGS" -fi -ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" " - #if HAVE_SYS_TYPES_H - # include - #endif - #if TIME_WITH_SYS_TIME - # include - # include - #else - # if HAVE_SYS_TIME_H - # include - # else - # include - # endif - #endif + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $PTHREAD_LIBS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" -" -if test "x$ac_cv_type_struct_timespec" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the boost::thread includes are available" >&5 +$as_echo_n "checking whether the boost::thread includes are available... " >&6; } +if test "${ax_cv_boost_thread+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_TIMESPEC 1 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +boost::thread_group thrds; + return 0; + ; + return 0; +} _ACEOF - - +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_thread=yes +else + ax_cv_boost_thread=no fi -ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" " - #if HAVE_SYS_TYPES_H - # include - #endif - #if TIME_WITH_SYS_TIME - # include - # include - #else - # if HAVE_SYS_TIME_H - # include - # else - # include - # endif - #endif - -" -if test "x$ac_cv_type_ssize_t" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_SSIZE_T 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_thread" >&5 +$as_echo "$ax_cv_boost_thread" >&6; } + if test "$ax_cv_boost_thread" = "yes"; then + BOOST_CXXFLAGS="$PTHREAD_CFLAGS" -for ac_func in getopt usleep gettimeofday -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -else - case " $LIBOBJS " in - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" - ;; -esac -fi -done + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +$as_echo "#define HAVE_BOOST_THREAD 1" >>confdefs.h + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sleep" >&5 -$as_echo_n "checking for Sleep... " >&6; } + link_ok="no" + if test "$ax_boost_user_lib" != ""; then + for ax_lib in $ax_boost_user_lib boost_thread-${ax_boost_user_lib}; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include - #include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); int main () { - Sleep(0); +return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -$as_echo "#define HAVE_SSLEEP 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - + eval "$as_ac_Lib=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_THREAD_LIB="-l$ax_lib"; link_ok="yes"; break +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir accepts only one arg" >&5 -$as_echo_n "checking whether mkdir accepts only one arg... " >&6; } + done + else + head=$BOOSTLIBDIR/libboost_thread + for f in ${head}*.so* ${head}*.a* ${head}*.dll* ${head}*.dylib; do + case $f in + *\**) continue;; + esac + f=`echo $f | sed -e 's,.*/,,' -e 's,^lib,,'` + f=`echo $f | sed -e 's,\(boost_thread.*\)\.so.*$,\1,' -e 's,\(boost_thread.*\)\.a.*$,\1,' -e 's,\(boost_thread.*\)\.dll.*$,\1,' -e 's,\(boost_thread.*\)\.dylib.*$,\1,'` + + ax_lib=$f + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - #include - #include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); int main () { - - mkdir("") - +return exit (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define MKDIR_TAKES_ONE_ARG /**/" >>confdefs.h - +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_THREAD_LIB="-l$ax_lib"; link_ok="yes"; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + fi + if test "$link_ok" != "yes"; then + as_fn_error $? "Could not link against libboost_thread!" "$LINENO" 5 + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$link_ok" = "yes" && test -n "$PTHREAD_LIBS"; then + BOOST_THREAD_LIB="$BOOST_THREAD_LIB $PTHREAD_LIBS" + fi + fi -# Extract the first word of "dot", so it can be a program name with args. -set dummy dot; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_HAVE_DOT+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAVE_DOT"; then - ac_cv_prog_HAVE_DOT="$HAVE_DOT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_HAVE_DOT="YES" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + CXXFLAGS="$CXXFLAGS_SAVED" + fi - test -z "$ac_cv_prog_HAVE_DOT" && ac_cv_prog_HAVE_DOT="NO" -fi -fi -HAVE_DOT=$ac_cv_prog_HAVE_DOT -if test -n "$HAVE_DOT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOT" >&5 -$as_echo "$HAVE_DOT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +CXXFLAGS="$CXXFLAGS $BOOST_CXXFLAGS" CFLAGS="$CFLAGS $BOOST_CXXFLAGS" -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + +# Check whether --with-boost-date-time was given. +if test "${with_boost_date_time+set}" = set; then : + withval=$with_boost_date_time; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_lib="" + else + want_boost="yes" + ax_boost_user_lib="$withval" + fi + else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + want_boost="yes" fi -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + + if test "$want_boost" = "yes"; then + + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the boost::date_time includes are available" >&5 +$as_echo_n "checking whether the boost::date_time includes are available... " >&6; } +if test "${ax_cv_boost_date_time+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +using namespace boost::gregorian; date d(2002,Jan,10); return 0; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_date_time=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ax_cv_boost_date_time=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.18 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_date_time" >&5 +$as_echo "$ax_cv_boost_date_time" >&6; } + if test "$ax_cv_boost_date_time" = "yes"; then -fi + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFTW3F" >&5 -$as_echo_n "checking for FFTW3F... " >&6; } +$as_echo "#define HAVE_BOOST_DATE_TIME 1" >>confdefs.h -if test -n "$PKG_CONFIG"; then - if test -n "$FFTW3F_CFLAGS"; then - pkg_cv_FFTW3F_CFLAGS="$FFTW3F_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_FFTW3F_CFLAGS=`$PKG_CONFIG --cflags "fftw3f >= 3.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$FFTW3F_LIBS"; then - pkg_cv_FFTW3F_LIBS="$FFTW3F_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_FFTW3F_LIBS=`$PKG_CONFIG --libs --static "fftw3f >= 3.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_FFTW3F_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_FFTW3F_LIBS="$_pkg_tmp" + link_ok="no" + if test "$ax_boost_user_lib" != ""; then + for ax_lib in $ax_boost_user_lib boost_date_time-${ax_boost_user_lib}; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 else - if test -n "$PKG_CONFIG"; then - if test -n "$FFTW3F_LIBS"; then - pkg_cv_FFTW3F_LIBS="$FFTW3F_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_FFTW3F_LIBS=`$PKG_CONFIG --libs --static "fftw3f >= 3.0" 2>/dev/null` + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - pkg_failed=yes + eval "$as_ac_Lib=no" fi - fi -else - pkg_failed=untried +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_DATE_TIME_LIB="-l$ax_lib"; link_ok="yes"; break fi -if test -n "$PKG_CONFIG"; then - if test -n "$FFTW3F_INCLUDEDIR"; then - pkg_cv_FFTW3F_INCLUDEDIR="$FFTW3F_INCLUDEDIR" + done else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f >= 3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "fftw3f >= 3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_FFTW3F_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "fftw3f >= 3.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - + head=$BOOSTLIBDIR/libboost_date_time + for f in ${head}*.so* ${head}*.a* ${head}*.dll* ${head}*.dylib; do + case $f in + *\**) continue;; + esac + f=`echo $f | sed -e 's,.*/,,' -e 's,^lib,,'` + f=`echo $f | sed -e 's,\(boost_date_time.*\)\.so.*$,\1,' -e 's,\(boost_date_time.*\)\.a.*$,\1,' -e 's,\(boost_date_time.*\)\.dll.*$,\1,' -e 's,\(boost_date_time.*\)\.dylib.*$,\1,'` -if test $pkg_failed = yes; then + ax_lib=$f + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - _pkg_short_errors_supported=no + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_DATE_TIME_LIB="-l$ax_lib"; link_ok="yes"; break fi - if test $_pkg_short_errors_supported = yes; then - FFTW3F_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fftw3f >= 3.0"` - else - FFTW3F_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fftw3f >= 3.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$FFTW3F_PKG_ERRORS" >&5 - - as_fn_error "Package requirements (fftw3f >= 3.0) were not met: - -$FFTW3F_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + done + fi -Alternatively, you may set the environment variables FFTW3F_CFLAGS -and FFTW3F_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 -elif test $pkg_failed = untried; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + if test "$link_ok" != "yes"; then + as_fn_error $? "Could not link against libboost_date_time!" "$LINENO" 5 + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -Alternatively, you may set the environment variables FFTW3F_CFLAGS -and FFTW3F_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } -else - FFTW3F_CFLAGS=$pkg_cv_FFTW3F_CFLAGS - FFTW3F_LIBS=$pkg_cv_FFTW3F_LIBS - FFTW3F_INCLUDEDIR=$pkg_cv_FFTW3F_INCLUDEDIR - FFTW3F_CPPFLAGS="" - for flag in $FFTW3F_CFLAGS; do - case $flag in - -I* | -D* | -U*) FFTW3F_CPPFLAGS="$FFTW3F_CPPFLAGS $flag" ;; - esac - done - pkg_cv_FFTW3F_CPPFLAGS=$FFTW3F_CPPFLAGS + fi + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi - # Check whether --enable-doxygen was given. -if test "${enable_doxygen+set}" = set; then : - enableval=$enable_doxygen; -fi - # Check whether --enable-dot was given. -if test "${enable_dot+set}" = set; then : - enableval=$enable_dot; -fi - if test "x$enable_doxygen" = xno; then - enable_doc=no - else - # Extract the first word of "doxygen", so it can be a program name with args. -set dummy doxygen; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DOXYGEN+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $DOXYGEN in - [\\/]* | ?:[\\/]*) - ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -DOXYGEN=$ac_cv_path_DOXYGEN -if test -n "$DOXYGEN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 -$as_echo "$DOXYGEN" >&6; } + +# Check whether --with-boost-program-options was given. +if test "${with_boost_program_options+set}" = set; then : + withval=$with_boost_program_options; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_lib="" + else + want_boost="yes" + ax_boost_user_lib="$withval" + fi + else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + want_boost="yes" fi - if test x$DOXYGEN = x; then - if test "x$enable_doxygen" = xyes; then - as_fn_error "could not find doxygen" "$LINENO" 5 - fi - enable_doc=no - generate_docs= - else - enable_doc=yes - generate_docs=docs - # Extract the first word of "dot", so it can be a program name with args. -set dummy dot; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DOT+set}" = set; then : + + if test "$want_boost" = "yes"; then + + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the boost::program_options includes are available" >&5 +$as_echo_n "checking whether the boost::program_options includes are available... " >&6; } +if test "${ax_cv_boost_program_options+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $DOT in - [\\/]* | ?:[\\/]*) - ac_cv_path_DOT="$DOT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ;; -esac -fi -DOT=$ac_cv_path_DOT -if test -n "$DOT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5 -$as_echo "$DOT" >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +boost::program_options::options_description generic("Generic options"); + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_program_options=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ax_cv_boost_program_options=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - fi - - if test x$enable_doc = xyes; then - DOC_TRUE= - DOC_FALSE='#' -else - DOC_TRUE='#' - DOC_FALSE= fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_program_options" >&5 +$as_echo "$ax_cv_boost_program_options" >&6; } + if test "$ax_cv_boost_program_options" = "yes"; then - if test x$DOT = x; then - if test "x$enable_dot" = xyes; then - as_fn_error "could not find dot" "$LINENO" 5 - fi - enable_dot=no - else - enable_dot=yes - fi - - enable_xml_docs=YES + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - enable_html_docs=YES - enable_latex_docs=NO +$as_echo "#define HAVE_BOOST_PROGRAM_OPTIONS 1" >>confdefs.h + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` + link_ok="no" + if test "$ax_boost_user_lib" != ""; then + for ax_lib in $ax_boost_user_lib boost_program_options-${ax_boost_user_lib}; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_ok="yes"; break +fi + done + else + head=$BOOSTLIBDIR/libboost_program_options + for f in ${head}*.so* ${head}*.a* ${head}*.dll* ${head}*.dylib; do + case $f in + *\**) continue;; + esac + f=`echo $f | sed -e 's,.*/,,' -e 's,^lib,,'` + f=`echo $f | sed -e 's,\(boost_program_options.*\)\.so.*$,\1,' -e 's,\(boost_program_options.*\)\.a.*$,\1,' -e 's,\(boost_program_options.*\)\.dll.*$,\1,' -e 's,\(boost_program_options.*\)\.dylib.*$,\1,'` + ax_lib=$f + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Check whether --with-md-cpu was given. -if test "${with_md_cpu+set}" = set; then : - withval=$with_md_cpu; cf_with_md_cpu="$withval" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - cf_with_md_cpu="$host_cpu" + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_ok="yes"; break fi + done + fi - case "$cf_with_md_cpu" in - x86 | i[3-7]86) MD_CPU=x86 MD_SUBCPU=x86 ;; - x86_64) MD_CPU=x86 MD_SUBCPU=x86_64 ;; - powerpc*) MD_CPU=powerpc ;; - *) MD_CPU=generic ;; - esac + if test "$link_ok" != "yes"; then + as_fn_error $? "Could not link against libboost_program_options!" "$LINENO" 5 + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - # Check whether --enable-altivec was given. -if test "${enable_altivec+set}" = set; then : - enableval=$enable_altivec; if test $MD_CPU = powerpc; then - case "$enableval" in - (no) MD_CPU=generic ;; - (yes) - echo 'void f(){}' > conftest.c - for i in -mabi=altivec -maltivec - do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts $i" >&5 -$as_echo_n "checking whether $CC accepts $i... " >&6; } - if test -z "`${CC} $i -c conftest.c 2>&1`" - then - lf_CFLAGS="${lf_CFLAGS} $i" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + + fi + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" fi - done - rm -f conftest.c conftest.o - echo 'void f(){}' > conftest.cc - for i in -mabi=altivec -maltivec - do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $i" >&5 -$as_echo_n "checking whether $CXX accepts $i... " >&6; } - if test -z "`${CXX} $i -c conftest.cc 2>&1`" - then - lf_CXXFLAGS="${lf_CXXFLAGS} $i" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - done - rm -f conftest.cc conftest.o +BUILD_DATE=`date -u +"%a, %d %b %Y %R:%S"` - ;; - (*) as_fn_error "Invalid argument ($enableval) to --enable-altivec" "$LINENO" 5 ;; - esac - fi -else - if test $MD_CPU = powerpc; then - echo 'void f(){}' > conftest.c - for i in -mabi=altivec -maltivec - do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts $i" >&5 -$as_echo_n "checking whether $CC accepts $i... " >&6; } - if test -z "`${CC} $i -c conftest.c 2>&1`" - then - lf_CFLAGS="${lf_CFLAGS} $i" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - done - rm -f conftest.c conftest.o +if test "${sysconfdir}" == "\${prefix}/etc" ; then + if test "${prefix}" == "NONE" ; then + SYSCONFDIR="$ac_default_prefix/etc" + else + SYSCONFDIR="${prefix}/etc" + fi +else + SYSCONFDIR=${sysconfdir} +fi +GR_PREFSDIR=$SYSCONFDIR/${PACKAGE}/conf.d - echo 'void f(){}' > conftest.cc - for i in -mabi=altivec -maltivec - do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts $i" >&5 -$as_echo_n "checking whether $CXX accepts $i... " >&6; } - if test -z "`${CXX} $i -c conftest.cc 2>&1`" - then - lf_CXXFLAGS="${lf_CXXFLAGS} $i" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - done - rm -f conftest.cc conftest.o - fi +# Check whether --enable-all-components was given. +if test "${enable_all_components+set}" = set; then : + enableval=$enable_all_components; fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for machine dependent speedups" >&5 -$as_echo_n "checking for machine dependent speedups... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MD_CPU" >&5 -$as_echo "$MD_CPU" >&6; } +build_dirs="config" - if test "$MD_CPU" = "x86"; then - MD_CPU_x86_TRUE= - MD_CPU_x86_FALSE='#' + passed=yes + # Check whether --enable-gruel was given. +if test "${enable_gruel+set}" = set; then : + enableval=$enable_gruel; else - MD_CPU_x86_TRUE='#' - MD_CPU_x86_FALSE= -fi - if test "$MD_SUBCPU" = "x86_64"; then - MD_SUBCPU_x86_64_TRUE= - MD_SUBCPU_x86_64_FALSE='#' -else - MD_SUBCPU_x86_64_TRUE='#' - MD_SUBCPU_x86_64_FALSE= -fi + enable_gruel=$enable_all_components + if test x$enable_all_components = xno; then + passed=no + fi - if test "$MD_CPU" = "powerpc"; then - MD_CPU_powerpc_TRUE= - MD_CPU_powerpc_FALSE='#' -else - MD_CPU_powerpc_TRUE='#' - MD_CPU_powerpc_FALSE= fi - if test "$MD_CPU" = "generic"; then - MD_CPU_generic_TRUE= - MD_CPU_generic_FALSE='#' -else - MD_CPU_generic_TRUE='#' - MD_CPU_generic_FALSE= -fi -if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cppunit") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then + if test x = x; then + pc_comp_name="gruel" + else + pc_comp_name="" + fi +# Check whether --with-gruel was given. +if test "${with_gruel+set}" = set; then : + withval=$with_gruel; if test "x$withval" != "xyes"; then + with_gruel_val=$withval + with_gruel=yes + fi +fi -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPPUNIT" >&5 -$as_echo_n "checking for CPPUNIT... " >&6; } + if test x$with_gruel = xyes; then + if test x$enable_gruel = xyes; then + as_fn_error $? "Component gruel: Cannot use both --enable and --with" "$LINENO" 5 + else -if test -n "$PKG_CONFIG"; then - if test -n "$CPPUNIT_CFLAGS"; then - pkg_cv_CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.9.14" 2>/dev/null` -else - pkg_failed=yes -fi + s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH + + l_PKG_CONFIG_PATH=$with_gruel_val + if test "x$l_PKG_CONFIG_PATH" != "x"; then + export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH + + if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then + as_fn_error $? "Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 + fi fi -else - pkg_failed=untried -fi -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$CPPUNIT_LIBS"; then - pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS" - else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs --static "cppunit >= 1.9.14" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_CPPUNIT_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_CPPUNIT_LIBS="$_pkg_tmp" + passed=with; check1=yes else - if test -n "$PKG_CONFIG"; then - if test -n "$CPPUNIT_LIBS"; then - pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 + + check1=no + if test "x$l_PKG_CONFIG_PATH" != "x"; then + if test "x$s_PKG_CONFIG_PATH" != "x"; then + export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs --static "cppunit >= 1.9.14" 2>/dev/null` + passed=with else - pkg_failed=yes + passed=no +fi + fi + fi + if test $passed != with; then + as_fn_error $? "Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 + fi + s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH + fi + + gruel_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}` + gruel_LA=`$PKG_CONFIG --libs ${pc_comp_name}` + gruel_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}` + + if test x$check1 = xyes; then + if test "x$s_PKG_CONFIG_PATH" != "x"; then + export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} + fi + fi + + : + fi + fi + + + + if test $passed = yes; then + + if test x"$GUILE" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel requires guile, which was not found." >&5 +$as_echo "Component gruel requires guile, which was not found." >&6; } + passed=no + fi + + fi + if test $passed != with; then + gruel_INCLUDES="\ +-I\${abs_top_srcdir}/gruel/src/include \ +-I\${abs_top_builddir}/gruel/src/include" + gruel_LA="\${abs_top_builddir}/gruel/src/lib/libgruel.la" + gruel_LIBDIRPATH="\${abs_top_builddir}/gruel/src/lib:\${abs_top_builddir}/gruel/src/lib/.libs" fi + + ac_config_files="$ac_config_files gruel/Makefile gruel/gruel.pc gruel/src/Makefile gruel/src/include/Makefile gruel/src/include/gruel/Makefile gruel/src/include/gruel/inet.h gruel/src/lib/Makefile gruel/src/lib/pmt/Makefile gruel/src/lib/msg/Makefile gruel/src/scheme/Makefile gruel/src/scheme/gnuradio/Makefile" + + + ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" +if test "x$ac_cv_header_arpa_inet_h" = x""yes; then : + GR_HAVE_ARPA_INET=1 else - pkg_failed=untried -fi + GR_HAVE_ARPA_INET=0 fi -if test -n "$PKG_CONFIG"; then - if test -n "$CPPUNIT_INCLUDEDIR"; then - pkg_cv_CPPUNIT_INCLUDEDIR="$CPPUNIT_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.9.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cppunit >= 1.9.14") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_CPPUNIT_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "cppunit >= 1.9.14" 2>/dev/null` + + ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" +if test "x$ac_cv_header_netinet_in_h" = x""yes; then : + GR_HAVE_NETINET_IN=1 else - pkg_failed=yes + GR_HAVE_NETINET_IN=0 fi - fi + + + ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" +if test "x$ac_cv_header_byteswap_h" = x""yes; then : + GR_HAVE_BYTESWAP=1 else - pkg_failed=untried + GR_HAVE_BYTESWAP=0 fi -if test $pkg_failed = yes; then -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cppunit >= 1.9.14"` - else - CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.9.14"` - fi - # Put the nasty error message in config.log where it belongs - echo "$CPPUNIT_PKG_ERRORS" >&5 - as_fn_error "Package requirements (cppunit >= 1.9.14) were not met: -$CPPUNIT_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + gruel_with=no + if test $passed = no; then + if test x$enable_gruel = xyes; then + as_fn_error $? "Component gruel has errors; stopping." "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gruel." >&5 +$as_echo "Not building component gruel." >&6; } + fi + else + if test $passed = with; then + with_dirs="$with_dirs gruel" -Alternatively, you may set the environment variables CPPUNIT_CFLAGS -and CPPUNIT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 -elif test $pkg_failed = untried; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + if test "x${gruel_INCLUDES}" != "x"; then + if test "x$with_INCLUDES" = "x"; then + with_INCLUDES="${gruel_INCLUDES}" + else + with_INCLUDES="${gruel_INCLUDES}"" ""$with_INCLUDES" + fi + gruel_INCLUDES= + fi -Alternatively, you may set the environment variables CPPUNIT_CFLAGS -and CPPUNIT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } -else - CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS - CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS - CPPUNIT_INCLUDEDIR=$pkg_cv_CPPUNIT_INCLUDEDIR + if test "x${gruel_SWIG_INCLUDES}" != "x"; then + if test "x$with_SWIG_INCLUDES" = "x"; then + with_SWIG_INCLUDES="${gruel_SWIG_INCLUDES}" + else + with_SWIG_INCLUDES="${gruel_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + fi + gruel_SWIG_INCLUDES= + fi - CPPUNIT_CPPFLAGS="" - for flag in $CPPUNIT_CFLAGS; do - case $flag in - -I* | -D* | -U*) CPPUNIT_CPPFLAGS="$CPPUNIT_CPPFLAGS $flag" ;; - esac - done - pkg_cv_CPPUNIT_CPPFLAGS=$CPPUNIT_CPPFLAGS + if test "x${gruel_PYDIRPATH}" != "x"; then + if test "x$with_PYDIRPATH" = "x"; then + with_PYDIRPATH="${gruel_PYDIRPATH}" + else + with_PYDIRPATH="${gruel_PYDIRPATH}"":""$with_PYDIRPATH" + fi + gruel_PYDIRPATH= + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi -else + + if test "x${gruel_SWIGDIRPATH}" != "x"; then + if test "x$with_SWIGDIRPATH" = "x"; then + with_SWIGDIRPATH="${gruel_SWIGDIRPATH}" + else + with_SWIGDIRPATH="${gruel_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + fi + gruel_SWIGDIRPATH= + fi + if test "x${gruel_LIBDIRPATH}" != "x"; then + if test "x$with_LIBDIRPATH" = "x"; then + with_LIBDIRPATH="${gruel_LIBDIRPATH}" + else + with_LIBDIRPATH="${gruel_LIBDIRPATH}"":""$with_LIBDIRPATH" + fi + gruel_LIBDIRPATH= + fi -# Check whether --with-cppunit-prefix was given. -if test "${with_cppunit_prefix+set}" = set; then : - withval=$with_cppunit_prefix; cppunit_config_prefix="$withval" -else - cppunit_config_prefix="" -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel will be included from a pre-installed library and includes." >&5 +$as_echo "Component gruel will be included from a pre-installed library and includes." >&6; } + gruel_with=yes + else + gruel_LDFLAG= + if test x$enable_gruel != xno; then + : + build_dirs="$build_dirs gruel" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel passed configuration checks; building." >&5 +$as_echo "Component gruel passed configuration checks; building." >&6; } + else + passed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel passed configuration checks; but not building." >&5 +$as_echo "Component gruel passed configuration checks; but not building." >&6; } + fi + fi + fi + if test $passed = no; then + skipped_dirs="$skipped_dirs gruel" + gruel_skipped=yes + else + gruel_skipped=no + fi -# Check whether --with-cppunit-exec-prefix was given. -if test "${with_cppunit_exec_prefix+set}" = set; then : - withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval" + + + + + + + + + passed=yes + # Check whether --enable-gcell was given. +if test "${enable_gcell+set}" = set; then : + enableval=$enable_gcell; else - cppunit_config_exec_prefix="" + + enable_gcell=$enable_all_components + if test x$enable_all_components = xno; then + passed=no + fi + fi - if test x$cppunit_config_exec_prefix != x ; then - cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config - fi - fi - if test x$cppunit_config_prefix != x ; then - cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config - fi - fi - # Extract the first word of "cppunit-config", so it can be a program name with args. -set dummy cppunit-config; ac_word=$2 + + if test $passed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether host_cpu is powerpc*" >&5 +$as_echo_n "checking whether host_cpu is powerpc*... " >&6; } + case "$host_cpu" in + powerpc*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + ;; + *) + passed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac + + # Extract the first word of "spu-gcc", so it can be a program name with args. +set dummy spu-gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then : +if test "${ac_cv_prog_SPU_GCC_PROG+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $CPPUNIT_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_CPPUNIT_CONFIG="$CPPUNIT_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$SPU_GCC_PROG"; then + ac_cv_prog_SPU_GCC_PROG="$SPU_GCC_PROG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_SPU_GCC_PROG="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -23436,455 +21860,765 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no" - ;; -esac + test -z "$ac_cv_prog_SPU_GCC_PROG" && ac_cv_prog_SPU_GCC_PROG="no" fi -CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG -if test -n "$CPPUNIT_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5 -$as_echo "$CPPUNIT_CONFIG" >&6; } +fi +SPU_GCC_PROG=$ac_cv_prog_SPU_GCC_PROG +if test -n "$SPU_GCC_PROG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SPU_GCC_PROG" >&5 +$as_echo "$SPU_GCC_PROG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - cppunit_version_min=1.9.14 + if test $SPU_GCC_PROG = no; then + passed=no + fi + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5 -$as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; } - no_cppunit="" - if test "$CPPUNIT_CONFIG" = "no" ; then - no_cppunit=yes - else - CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags` - CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs` - cppunit_version=`$CPPUNIT_CONFIG --version` + if test $passed != with; then + gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/include" + gcell_LA="\${abs_top_builddir}/gcell/lib/libgcell.la" + gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/include" + gcell_spu_LA="\${abs_top_builddir}/gcell/lib/spu/libgcell_spu.a" - cppunit_major_version=`echo $cppunit_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - cppunit_minor_version=`echo $cppunit_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - cppunit_micro_version=`echo $cppunit_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - cppunit_major_min=`echo $cppunit_version_min | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - cppunit_minor_min=`echo $cppunit_version_min | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - cppunit_micro_min=`echo $cppunit_version_min | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - cppunit_version_proper=`expr \ - $cppunit_major_version \> $cppunit_major_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \> $cppunit_minor_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \= $cppunit_minor_min \& \ - $cppunit_micro_version \>= $cppunit_micro_min ` + fi - if test "$cppunit_version_proper" = "1" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5 -$as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; } + ac_config_files="$ac_config_files gcell/Makefile gcell/gcell.pc gcell/gcell_spu.pc gcell/include/Makefile gcell/include/gcell/Makefile gcell/include/gcell/spu/Makefile gcell/lib/Makefile gcell/lib/spu/Makefile gcell/lib/general/Makefile gcell/lib/wrapper/Makefile gcell/lib/runtime/Makefile gcell/apps/Makefile gcell/apps/spu/Makefile gcell/ibm/Makefile" + + + + + gcell_with=no + if test $passed = no; then + if test x$enable_gcell = xyes; then + as_fn_error $? "Component gcell has errors; stopping." "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gcell." >&5 +$as_echo "Not building component gcell." >&6; } + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - no_cppunit=yes + if test $passed = with; then + with_dirs="$with_dirs gcell" + + if test "x${gcell_INCLUDES}" != "x"; then + if test "x$with_INCLUDES" = "x"; then + with_INCLUDES="${gcell_INCLUDES}" + else + with_INCLUDES="${gcell_INCLUDES}"" ""$with_INCLUDES" + fi + gcell_INCLUDES= fi - fi - if test "x$no_cppunit" = x ; then - : - else - CPPUNIT_CFLAGS="" - CPPUNIT_LIBS="" - as_fn_error "GNU Radio requires cppunit. Stop" "$LINENO" 5 - fi + if test "x${gcell_SWIG_INCLUDES}" != "x"; then + if test "x$with_SWIG_INCLUDES" = "x"; then + with_SWIG_INCLUDES="${gcell_SWIG_INCLUDES}" + else + with_SWIG_INCLUDES="${gcell_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + fi + gcell_SWIG_INCLUDES= + fi + if test "x${gcell_PYDIRPATH}" != "x"; then + if test "x$with_PYDIRPATH" = "x"; then + with_PYDIRPATH="${gcell_PYDIRPATH}" + else + with_PYDIRPATH="${gcell_PYDIRPATH}"":""$with_PYDIRPATH" + fi + gcell_PYDIRPATH= + fi -fi -CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS + if test "x${gcell_SWIGDIRPATH}" != "x"; then + if test "x$with_SWIGDIRPATH" = "x"; then + with_SWIGDIRPATH="${gcell_SWIGDIRPATH}" + else + with_SWIGDIRPATH="${gcell_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + fi + gcell_SWIGDIRPATH= + fi -# Extract the first word of "guile", so it can be a program name with args. -set dummy guile; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GUILE+set}" = set; then : - $as_echo_n "(cached) " >&6 + if test "x${gcell_LIBDIRPATH}" != "x"; then + if test "x$with_LIBDIRPATH" = "x"; then + with_LIBDIRPATH="${gcell_LIBDIRPATH}" + else + with_LIBDIRPATH="${gcell_LIBDIRPATH}"":""$with_LIBDIRPATH" + fi + gcell_LIBDIRPATH= + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell will be included from a pre-installed library and includes." >&5 +$as_echo "Component gcell will be included from a pre-installed library and includes." >&6; } + gcell_with=yes + else + gcell_LDFLAG= + if test x$enable_gcell != xno; then + : + build_dirs="$build_dirs gcell" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell passed configuration checks; building." >&5 +$as_echo "Component gcell passed configuration checks; building." >&6; } + else + passed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell passed configuration checks; but not building." >&5 +$as_echo "Component gcell passed configuration checks; but not building." >&6; } + fi + fi + fi + if test $passed = no; then + skipped_dirs="$skipped_dirs gcell" + gcell_skipped=yes + else + gcell_skipped=no + fi + + + + + + + + + + + + passed=yes + # Check whether --enable-gnuradio-core was given. +if test "${enable_gnuradio_core+set}" = set; then : + enableval=$enable_gnuradio_core; else - case $GUILE in - [\\/]* | ?:[\\/]*) - ac_cv_path_GUILE="$GUILE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GUILE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac + enable_gnuradio_core=$enable_all_components + if test x$enable_all_components = xno; then + passed=no + fi + fi -GUILE=$ac_cv_path_GUILE -if test -n "$GUILE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUILE" >&5 -$as_echo "$GUILE" >&6; } + + + + + + if test x = x; then + pc_comp_name="gnuradio-core" + else + pc_comp_name="" + fi + + +# Check whether --with-gnuradio-core was given. +if test "${with_gnuradio_core+set}" = set; then : + withval=$with_gnuradio_core; if test "x$withval" != "xyes"; then + with_gnuradio_core_val=$withval + with_gnuradio_core=yes + fi +fi + + if test x$with_gnuradio_core = xyes; then + if test x$enable_gnuradio_core = xyes; then + as_fn_error $? "Component gnuradio-core: Cannot use both --enable and --with" "$LINENO" 5 + else + + s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH + + l_PKG_CONFIG_PATH=$with_gnuradio_core_val + if test "x$l_PKG_CONFIG_PATH" != "x"; then + export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH + + if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then + as_fn_error $? "Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 + fi + fi + + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + passed=with; check1=yes +else + + check1=no + if test "x$l_PKG_CONFIG_PATH" != "x"; then + if test "x$s_PKG_CONFIG_PATH" != "x"; then + export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 + ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + passed=with else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + passed=no fi + fi + fi + if test $passed != with; then + as_fn_error $? "Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 + fi + s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH +fi + gnuradio_core_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}` + gnuradio_core_LA=`$PKG_CONFIG --libs ${pc_comp_name}` + gnuradio_core_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}` + if test x$check1 = xyes; then + if test "x$s_PKG_CONFIG_PATH" != "x"; then + export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} + fi + fi + gnuradio_core_SWIGDIRPATH="$gnuradio_core_INCLUDEDIR/swig" + gnuradio_core_I="$gnuradio_core_SWIGDIRPATH/gnuradio.i" + gnuradio_core_SWIG_INCLUDES="-I$gnuradio_core_SWIGDIRPATH" + gnuradio_core_PYDIRPATH=$pythondir -# Check whether --with-boost was given. -if test "${with_boost+set}" = set; then : - withval=$with_boost; - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ac_boost_path="" - else - want_boost="yes" - ac_boost_path="$withval" + fi fi -else - want_boost="yes" -fi - -# Check whether --with-boost-libdir was given. -if test "${with_boost_libdir+set}" = set; then : - withval=$with_boost_libdir; - if test -d $withval - then - ac_boost_lib_path="$withval" + if test $passed != no; then + if test $passed = yes; then + if test x$gruel_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core requires gruel, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gnuradio-core requires gruel, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi else - as_fn_error "--with-boost-libdir expected directory name" "$LINENO" 5 + if test x$gruel_with = xno; then + as_fn_error $? "Component gnuradio-core requires gruel to be included as --with-gruel[=arg]" "$LINENO" 5 + fi fi + fi -else - ac_boost_lib_path="" + if test $passed = yes; then + + + +acx_cblas_ok=no + + +# Check whether --with-cblas was given. +if test "${with_cblas+set}" = set; then : + withval=$with_cblas; fi +case $with_cblas in + yes | "") ;; + no) acx_cblas_ok=disable ;; + -* | */* | *.a | *.so | *.so.* | *.o) CBLAS_LIBS="$with_cblas" ;; + *) CBLAS_LIBS="-l$with_cblas" ;; +esac -if test "x$want_boost" = "xyes"; then - boost_lib_version_req=1.35 - boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'` - boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'` - boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'` - boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` - if test "x$boost_lib_version_req_sub_minor" = "x" ; then - boost_lib_version_req_sub_minor="0" - fi - WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boost >= $boost_lib_version_req" >&5 -$as_echo_n "checking for boost >= $boost_lib_version_req... " >&6; } - succeeded=no - if test "$ac_boost_path" != ""; then - if test -d "$ac_boost_path/lib${gr_libdir_suffix}"; then - BOOST_LDFLAGS="-L$ac_boost_path/lib${gr_libdir_suffix}" - else - BOOST_LDFLAGS="-L$ac_boost_path/lib" - fi - BOOST_CPPFLAGS="-I$ac_boost_path/include" - else - for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do - if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then - if test -d "$ac_boost_path_tmp/lib${gr_libdir_suffix}"; then - BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib${gr_libdir_suffix}" - else - BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" - fi - BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" - break; - fi - done - fi +acx_cblas_save_LIBS="$LIBS" +LIBS="$LIBS $FLIBS" - if test "$ac_boost_lib_path" != ""; then - BOOST_LDFLAGS="-L$ac_boost_lib_path" - fi +# First, check CBLAS_LIBS environment variable +if test $acx_cblas_ok = no; then +if test "x$CBLAS_LIBS" != x; then + save_LIBS="$LIBS"; LIBS="$CBLAS_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in $CBLAS_LIBS" >&5 +$as_echo_n "checking for cblas_sgemm in $CBLAS_LIBS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - CPPFLAGS_SAVED="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_sgemm (); +int +main () +{ +return cblas_sgemm (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + acx_cblas_ok=yes +else + CBLAS_LIBS="" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cblas_ok" >&5 +$as_echo "$acx_cblas_ok" >&6; } + LIBS="$save_LIBS" +fi +fi - LDFLAGS_SAVED="$LDFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS +# CBLAS linked to by default? (happens on some supercomputers) +if test $acx_cblas_ok = no; then + save_LIBS="$LIBS"; LIBS="$LIBS" + ac_fn_c_check_func "$LINENO" "cblas_sgemm" "ac_cv_func_cblas_sgemm" +if test "x$ac_cv_func_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes +fi - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + LIBS="$save_LIBS" +fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +# CBLAS in ATLAS library? (http://math-atlas.sourceforge.net/) +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 +$as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } +if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-latlas -latlas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ATL_xerbla (); +int +main () +{ +return ATL_xerbla (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_atlas_ATL_xerbla=yes +else + ac_cv_lib_atlas_ATL_xerbla=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 +$as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; } +if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 +$as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } +if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcblas -latlas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_dgemm (); int main () { +return cblas_dgemm (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cblas_cblas_dgemm=yes +else + ac_cv_lib_cblas_cblas_dgemm=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 +$as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } +if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then : + acx_cblas_ok=yes + CBLAS_LIBS="-lcblas -latlas" +fi - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif +fi + +fi +# CBLAS in ATLAS library in /usr/lib64/atlas (if not cross-compiling) +if test $acx_cblas_ok = no && test "$cross_compiling" = no; then + unset ac_cv_lib_atlas_ATL_xerbla + unset ac_cv_lib_cblas_cblas_dgemm + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 +$as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } +if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-latlas -L/usr/lib64/atlas -latlas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ATL_xerbla (); +int +main () +{ +return ATL_xerbla (); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - succeeded=yes - found_system=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_atlas_ATL_xerbla=yes +else + ac_cv_lib_atlas_ATL_xerbla=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 +$as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; } +if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 +$as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } +if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcblas -L/usr/lib64/atlas -latlas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_dgemm (); +int +main () +{ +return cblas_dgemm (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cblas_cblas_dgemm=yes +else + ac_cv_lib_cblas_cblas_dgemm=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 +$as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } +if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then : + acx_cblas_ok=yes + CBLAS_LIBS="-L/usr/lib64/atlas -lcblas -latlas" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" +fi +fi - if test "$succeeded" != "yes"; then - _version=0 +# CBLAS in ATLAS library in /usr/lib/atlas (if not cross-compiling) +if test $acx_cblas_ok = no && test "$cross_compiling" = no; then + unset ac_cv_lib_atlas_ATL_xerbla + unset ac_cv_lib_cblas_cblas_dgemm + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 +$as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } +if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-latlas -L/usr/lib/atlas -latlas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - if test "$ac_boost_path" != ""; then - path_list="$ac_boost_path" - else - path_list="/usr /usr/local /opt /opt/local" - fi - for ac_boost_path in $path_list ; do - if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then - for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do - _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's,/include/boost-,,; s,_,.,'` - V_CHECK=`expr $_version_tmp \> $_version` - if test "$V_CHECK" = "1" ; then - _version=$_version_tmp - best_path=$ac_boost_path - fi - done - fi - done +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ATL_xerbla (); +int +main () +{ +return ATL_xerbla (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_atlas_ATL_xerbla=yes +else + ac_cv_lib_atlas_ATL_xerbla=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 +$as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; } +if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 +$as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } +if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcblas -L/usr/lib/atlas -latlas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` - BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_dgemm (); +int +main () +{ +return cblas_dgemm (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cblas_cblas_dgemm=yes +else + ac_cv_lib_cblas_cblas_dgemm=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 +$as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } +if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then : + acx_cblas_ok=yes + CBLAS_LIBS="-L/usr/lib/atlas -lcblas -latlas" +fi - if test "$ac_boost_lib_path" = ""; then - if test -d "$best_path/lib${gr_libdir_suffix}"; then - BOOST_LDFLAGS="-L$best_path/lib${gr_libdir_suffix}" - else - BOOST_LDFLAGS="-L$best_path/lib" - fi - fi +fi - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - export CPPFLAGS - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - export LDFLAGS +fi - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +# CBLAS in PhiPACK libraries? (requires generic BLAS lib, too) +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcblas" >&5 +$as_echo_n "checking for cblas_sgemm in -lcblas... " >&6; } +if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcblas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_sgemm (); +int +main () +{ +return cblas_sgemm (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cblas_cblas_sgemm=yes +else + ac_cv_lib_cblas_cblas_sgemm=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_cblas_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -ldgemm" >&5 +$as_echo_n "checking for cblas_dgemm in -ldgemm... " >&6; } +if test "${ac_cv_lib_dgemm_cblas_dgemm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldgemm -lblas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_dgemm (); int main () { - - #if BOOST_VERSION >= $WANT_BOOST_VERSION - // Everything is okay - #else - # error Boost version is too old - #endif - +return cblas_dgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - succeeded=yes - found_system=yes - +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dgemm_cblas_dgemm=yes +else + ac_cv_lib_dgemm_cblas_dgemm=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" - fi - - if test "$succeeded" != "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - if test "$_version" = "0" ; then - as_fn_error "we could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). -If you are sure you have boost installed, then check your version number looking in ." "$LINENO" 5 - else - as_fn_error "your boost libraries seem to old (version $_version)." "$LINENO" 5 - fi - else - - - -$as_echo "#define HAVE_BOOST 1" >>confdefs.h - - fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgemm_cblas_dgemm" >&5 +$as_echo "$ac_cv_lib_dgemm_cblas_dgemm" >&6; } +if test "x$ac_cv_lib_dgemm_cblas_dgemm" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lsgemm" >&5 +$as_echo_n "checking for cblas_sgemm in -lsgemm... " >&6; } +if test "${ac_cv_lib_sgemm_cblas_sgemm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsgemm -lblas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - - - - - - - -# Check whether --with-boost-thread was given. -if test "${with_boost_thread+set}" = set; then : - withval=$with_boost_thread; - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ax_boost_user_lib="" - else - want_boost="yes" - ax_boost_user_lib="$withval" - fi - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_sgemm (); +int +main () +{ +return cblas_sgemm (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sgemm_cblas_sgemm=yes else - want_boost="yes" + ac_cv_lib_sgemm_cblas_sgemm=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sgemm_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_sgemm_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_sgemm_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes; CBLAS_LIBS="-lsgemm -ldgemm -lblas" fi +fi +fi +fi - if test "$want_boost" = "yes"; then - - - - - CPPFLAGS_SAVED="$CPPFLAGS" - LDFLAGS_SAVED="$LDFLAGS" - CXXFLAGS_SAVED="$CXXFLAGS" - - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $PTHREAD_LIBS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the boost::thread includes are available" >&5 -$as_echo_n "checking whether the boost::thread includes are available... " >&6; } -if test "${ax_cv_boost_thread+set}" = set; then : +# BLAS in Intel MKL library? +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lmkl" >&5 +$as_echo_n "checking for cblas_sgemm in -lmkl... " >&6; } +if test "${ac_cv_lib_mkl_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmkl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_sgemm (); int main () { -boost::thread_group thrds; - return 0; +return cblas_sgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_boost_thread=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mkl_cblas_sgemm=yes else - ax_cv_boost_thread=no + ac_cv_lib_mkl_cblas_sgemm=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mkl_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_mkl_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_mkl_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes;CBLAS_LIBS="-lmkl" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_thread" >&5 -$as_echo "$ax_cv_boost_thread" >&6; } - - if test "$ax_cv_boost_thread" = "yes"; then - BOOST_CXXFLAGS="$PTHREAD_CFLAGS" - - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +fi -$as_echo "#define HAVE_BOOST_THREAD 1" >>confdefs.h +# CBLAS in Apple vecLib library? +if test $acx_cblas_ok = no; then + save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS" + ac_fn_c_check_func "$LINENO" "cblas_sgemm" "ac_cv_func_cblas_sgemm" +if test "x$ac_cv_func_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes;CBLAS_LIBS="-framework vecLib" +fi - BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` + LIBS="$save_LIBS" +fi - link_ok="no" - if test "$ax_boost_user_lib" != ""; then - for ax_lib in $ax_boost_user_lib boost_thread-${ax_boost_user_lib}; do - as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -$as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +# CBLAS in Alpha CXML library? +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcxml" >&5 +$as_echo_n "checking for cblas_sgemm in -lcxml... " >&6; } +if test "${ac_cv_lib_cxml_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$ax_lib $LIBS" +LIBS="-lcxml $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23894,51 +22628,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char exit (); +char cblas_sgemm (); int main () { -return exit (); +return cblas_sgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cxml_cblas_sgemm=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_cxml_cblas_sgemm=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - BOOST_THREAD_LIB="-l$ax_lib"; link_ok="yes"; break +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cxml_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_cxml_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_cxml_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes;CBLAS_LIBS="-lcxml" fi - done - else - head=$BOOSTLIBDIR/libboost_thread - for f in ${head}*.so* ${head}*.a* ${head}*.dll* ${head}*.dylib; do - case $f in - *\**) continue;; - esac - f=`echo $f | sed -e 's,.*/,,' -e 's,^lib,,'` - f=`echo $f | sed -e 's,\(boost_thread.*\)\.so.*$,\1,' -e 's,\(boost_thread.*\)\.a.*$,\1,' -e 's,\(boost_thread.*\)\.dll.*$,\1,' -e 's,\(boost_thread.*\)\.dylib.*$,\1,'` +fi - ax_lib=$f - as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -$as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +# CBLAS in Alpha DXML library? (now called CXML, see above) +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -ldxml" >&5 +$as_echo_n "checking for cblas_sgemm in -ldxml... " >&6; } +if test "${ac_cv_lib_dxml_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$ax_lib $LIBS" +LIBS="-ldxml $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23948,153 +22672,171 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char exit (); +char cblas_sgemm (); int main () { -return exit (); +return cblas_sgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dxml_cblas_sgemm=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_dxml_cblas_sgemm=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - BOOST_THREAD_LIB="-l$ax_lib"; link_ok="yes"; break +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dxml_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_dxml_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_dxml_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes;CBLAS_LIBS="-ldxml" fi - done - fi - - if test "$link_ok" != "yes"; then - as_fn_error "Could not link against libboost_thread!" "$LINENO" 5 - fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - if test "$link_ok" = "yes" && test -n "$PTHREAD_LIBS"; then - BOOST_THREAD_LIB="$BOOST_THREAD_LIB $PTHREAD_LIBS" - fi - fi - - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" - CXXFLAGS="$CXXFLAGS_SAVED" - fi - -CXXFLAGS="$CXXFLAGS $BOOST_CXXFLAGS" CFLAGS="$CFLAGS $BOOST_CXXFLAGS" - - - - - - +fi -# Check whether --with-boost-date-time was given. -if test "${with_boost_date_time+set}" = set; then : - withval=$with_boost_date_time; - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ax_boost_user_lib="" - else - want_boost="yes" - ax_boost_user_lib="$withval" - fi +# CBLAS in Sun Performance library? +if test $acx_cblas_ok = no; then + if test "x$GCC" != xyes; then # only works with Sun CC + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5 +$as_echo_n "checking for acosp in -lsunmath... " >&6; } +if test "${ac_cv_lib_sunmath_acosp+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsunmath $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char acosp (); +int +main () +{ +return acosp (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sunmath_acosp=yes else - want_boost="yes" + ac_cv_lib_sunmath_acosp=no fi - - - - if test "$want_boost" = "yes"; then - - - CPPFLAGS_SAVED="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - LDFLAGS_SAVED="$LDFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the boost::date_time includes are available" >&5 -$as_echo_n "checking whether the boost::date_time includes are available... " >&6; } -if test "${ax_cv_boost_date_time+set}" = set; then : +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sunmath_acosp" >&5 +$as_echo "$ac_cv_lib_sunmath_acosp" >&6; } +if test "x$ac_cv_lib_sunmath_acosp" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lsunperf" >&5 +$as_echo_n "checking for cblas_sgemm in -lsunperf... " >&6; } +if test "${ac_cv_lib_sunperf_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsunperf -lsunmath $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_sgemm (); int main () { -using namespace boost::gregorian; date d(2002,Jan,10); return 0; +return cblas_sgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_boost_date_time=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sunperf_cblas_sgemm=yes else - ax_cv_boost_date_time=no + ac_cv_lib_sunperf_cblas_sgemm=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sunperf_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_sunperf_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_sunperf_cblas_sgemm" = x""yes; then : + CBLAS_LIBS="-xlic_lib=sunperf -lsunmath" + acx_cblas_ok=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_date_time" >&5 -$as_echo "$ax_cv_boost_date_time" >&6; } - if test "$ax_cv_boost_date_time" = "yes"; then +fi - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + fi +fi +# CBLAS in SCSL library? (SGI/Cray Scientific Library) +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lscs" >&5 +$as_echo_n "checking for cblas_sgemm in -lscs... " >&6; } +if test "${ac_cv_lib_scs_cblas_sgemm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lscs $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -$as_echo "#define HAVE_BOOST_DATE_TIME 1" >>confdefs.h +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_sgemm (); +int +main () +{ +return cblas_sgemm (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_scs_cblas_sgemm=yes +else + ac_cv_lib_scs_cblas_sgemm=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_scs_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_scs_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_scs_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes; CBLAS_LIBS="-lscs" +fi - BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` +fi - link_ok="no" - if test "$ax_boost_user_lib" != ""; then - for ax_lib in $ax_boost_user_lib boost_date_time-${ax_boost_user_lib}; do - as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -$as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +# CBLAS in SGIMATH library? +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcomplib.sgimath" >&5 +$as_echo_n "checking for cblas_sgemm in -lcomplib.sgimath... " >&6; } +if test "${ac_cv_lib_complib_sgimath_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$ax_lib $LIBS" +LIBS="-lcomplib.sgimath $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24104,51 +22846,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char exit (); +char cblas_sgemm (); int main () { -return exit (); +return cblas_sgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_complib_sgimath_cblas_sgemm=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_complib_sgimath_cblas_sgemm=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - BOOST_DATE_TIME_LIB="-l$ax_lib"; link_ok="yes"; break -fi - - done - else - head=$BOOSTLIBDIR/libboost_date_time - for f in ${head}*.so* ${head}*.a* ${head}*.dll* ${head}*.dylib; do - case $f in - *\**) continue;; - esac - f=`echo $f | sed -e 's,.*/,,' -e 's,^lib,,'` - f=`echo $f | sed -e 's,\(boost_date_time.*\)\.so.*$,\1,' -e 's,\(boost_date_time.*\)\.a.*$,\1,' -e 's,\(boost_date_time.*\)\.dll.*$,\1,' -e 's,\(boost_date_time.*\)\.dylib.*$,\1,'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_complib_sgimath_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_complib_sgimath_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_complib_sgimath_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes; CBLAS_LIBS="-lcomplib.sgimath" +fi - ax_lib=$f - as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -$as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +fi + +# CBLAS in IBM ESSL library? (requires generic CBLAS lib, too) +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcblas" >&5 +$as_echo_n "checking for cblas_sgemm in -lcblas... " >&6; } +if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$ax_lib $LIBS" +LIBS="-lcblas $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24158,150 +22890,80 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char exit (); +char cblas_sgemm (); int main () { -return exit (); +return cblas_sgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cblas_cblas_sgemm=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_cblas_cblas_sgemm=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - BOOST_DATE_TIME_LIB="-l$ax_lib"; link_ok="yes"; break -fi - - done - fi - - if test "$link_ok" != "yes"; then - as_fn_error "Could not link against libboost_date_time!" "$LINENO" 5 - fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - fi - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" - fi - - - - - - - - - - -# Check whether --with-boost-program-options was given. -if test "${with_boost_program_options+set}" = set; then : - withval=$with_boost_program_options; - if test "$withval" = "no"; then - want_boost="no" - elif test "$withval" = "yes"; then - want_boost="yes" - ax_boost_user_lib="" - else - want_boost="yes" - ax_boost_user_lib="$withval" - fi - -else - want_boost="yes" -fi - - - - if test "$want_boost" = "yes"; then - - - CPPFLAGS_SAVED="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" - LDFLAGS_SAVED="$LDFLAGS" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the boost::program_options includes are available" >&5 -$as_echo_n "checking whether the boost::program_options includes are available... " >&6; } -if test "${ax_cv_boost_program_options+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_cblas_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lessl" >&5 +$as_echo_n "checking for cblas_sgemm in -lessl... " >&6; } +if test "${ac_cv_lib_essl_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lessl -lblas $FLIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_sgemm (); int main () { -boost::program_options::options_description generic("Generic options"); - return 0; +return cblas_sgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ax_cv_boost_program_options=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_essl_cblas_sgemm=yes else - ax_cv_boost_program_options=no + ac_cv_lib_essl_cblas_sgemm=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_essl_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_essl_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_essl_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes; CBLAS_LIBS="-lessl -lblas" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_program_options" >&5 -$as_echo "$ax_cv_boost_program_options" >&6; } - if test "$ax_cv_boost_program_options" = "yes"; then - - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -$as_echo "#define HAVE_BOOST_PROGRAM_OPTIONS 1" >>confdefs.h +fi - BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` +fi - link_ok="no" - if test "$ax_boost_user_lib" != ""; then - for ax_lib in $ax_boost_user_lib boost_program_options-${ax_boost_user_lib}; do - as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -$as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +# Generic CBLAS library? +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcblas" >&5 +$as_echo_n "checking for cblas_sgemm in -lcblas... " >&6; } +if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$ax_lib $LIBS" +LIBS="-lcblas $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24311,51 +22973,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char exit (); +char cblas_sgemm (); int main () { -return exit (); +return cblas_sgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cblas_cblas_sgemm=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_cblas_cblas_sgemm=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_ok="yes"; break +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_cblas_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes; CBLAS_LIBS="-lcblas" fi - done - else - head=$BOOSTLIBDIR/libboost_program_options - for f in ${head}*.so* ${head}*.a* ${head}*.dll* ${head}*.dylib; do - case $f in - *\**) continue;; - esac - f=`echo $f | sed -e 's,.*/,,' -e 's,^lib,,'` - f=`echo $f | sed -e 's,\(boost_program_options.*\)\.so.*$,\1,' -e 's,\(boost_program_options.*\)\.a.*$,\1,' -e 's,\(boost_program_options.*\)\.dll.*$,\1,' -e 's,\(boost_program_options.*\)\.dylib.*$,\1,'` +fi - ax_lib=$f - as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 -$as_echo_n "checking for exit in -l$ax_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +# Generic BLAS library? +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lblas" >&5 +$as_echo_n "checking for cblas_sgemm in -lblas... " >&6; } +if test "${ac_cv_lib_blas_cblas_sgemm+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$ax_lib $LIBS" +LIBS="-lblas $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -24365,536 +23017,349 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char exit (); +char cblas_sgemm (); int main () { -return exit (); +return cblas_sgemm (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_blas_cblas_sgemm=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_blas_cblas_sgemm=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : - BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_ok="yes"; break -fi - - done - fi - - if test "$link_ok" != "yes"; then - as_fn_error "Could not link against libboost_program_options!" "$LINENO" 5 - fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - fi - CPPFLAGS="$CPPFLAGS_SAVED" - LDFLAGS="$LDFLAGS_SAVED" - fi - - - - - - - # Extract the first word of "svn", so it can be a program name with args. -set dummy svn; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SVN+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $SVN in - [\\/]* | ?:[\\/]*) - ac_cv_path_SVN="$SVN" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_SVN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -SVN=$ac_cv_path_SVN -if test -n "$SVN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SVN" >&5 -$as_echo "$SVN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "$SVN" != "" -a -d .svn ; then - SVNVERSION=`$SVN info . | grep '^Revision' | cut -f 2- -d ' '` - SVNDATE=`$SVN info . | grep 'Last Changed Date' | cut -f 4-6 -d ' '` - fi - - - - - - -# Check whether --enable-all-components was given. -if test "${enable_all_components+set}" = set; then : - enableval=$enable_all_components; -fi - - -build_dirs="config" - - - - passed=yes - # Check whether --enable-gruel was given. -if test "${enable_gruel+set}" = set; then : - enableval=$enable_gruel; -else - - enable_gruel=$enable_all_components - if test x$enable_all_components = xno; then - passed=no - fi - -fi - - - - - if test x = x; then - pc_comp_name="gruel" - else - pc_comp_name="" - fi - - -# Check whether --with-gruel was given. -if test "${with_gruel+set}" = set; then : - withval=$with_gruel; if test "x$withval" != "xyes"; then - with_gruel_val=$withval - with_gruel=yes - fi -fi - - if test x$with_gruel = xyes; then - if test x$enable_gruel = xyes; then - as_fn_error "Component gruel: Cannot use both --enable and --with" "$LINENO" 5 - else - - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - - l_PKG_CONFIG_PATH=$with_gruel_val - if test "x$l_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH - - if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - as_fn_error "Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi - fi - - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - passed=with; check1=yes -else - - check1=no - if test "x$l_PKG_CONFIG_PATH" != "x"; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - passed=with -else - passed=no -fi - fi - fi - if test $passed != with; then - as_fn_error "Component gruel: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - -fi - - gruel_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}` - gruel_LA=`$PKG_CONFIG --libs ${pc_comp_name}` - gruel_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}` - - if test x$check1 = xyes; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} - fi - fi - - : - fi - fi - - - - if test $passed != with; then - gruel_INCLUDES="\ --I\${abs_top_srcdir}/gruel/src/include \ --I\${abs_top_builddir}/gruel/src/include" - gruel_LA="\${abs_top_builddir}/gruel/src/lib/libgruel.la" - gruel_LIBDIRPATH="\${abs_top_builddir}/gruel/src/lib:\${abs_top_builddir}/gruel/src/lib/.libs" - fi - - ac_config_files="$ac_config_files gruel/Makefile gruel/gruel.pc gruel/src/Makefile gruel/src/include/Makefile gruel/src/include/gruel/Makefile gruel/src/include/gruel/inet.h gruel/src/lib/Makefile" - - - ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" -if test "x$ac_cv_header_arpa_inet_h" = x""yes; then : - GR_HAVE_ARPA_INET=1 -else - GR_HAVE_ARPA_INET=0 -fi - - - ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" -if test "x$ac_cv_header_netinet_in_h" = x""yes; then : - GR_HAVE_NETINET_IN=1 -else - GR_HAVE_NETINET_IN=0 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blas_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_blas_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_blas_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes; CBLAS_LIBS="-lblas" fi - - ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default" -if test "x$ac_cv_header_byteswap_h" = x""yes; then : - GR_HAVE_BYTESWAP=1 -else - GR_HAVE_BYTESWAP=0 fi +# GSL generic CBLAS library? +if test $acx_cblas_ok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lgslcblas" >&5 +$as_echo_n "checking for cblas_sgemm in -lgslcblas... " >&6; } +if test "${ac_cv_lib_gslcblas_cblas_sgemm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgslcblas $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cblas_sgemm (); +int +main () +{ +return cblas_sgemm (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gslcblas_cblas_sgemm=yes +else + ac_cv_lib_gslcblas_cblas_sgemm=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gslcblas_cblas_sgemm" >&5 +$as_echo "$ac_cv_lib_gslcblas_cblas_sgemm" >&6; } +if test "x$ac_cv_lib_gslcblas_cblas_sgemm" = x""yes; then : + acx_cblas_ok=yes; CBLAS_LIBS="-lgslcblas" +fi +fi +LIBS="$acx_cblas_save_LIBS" +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_cblas_ok" = xyes; then - gruel_with=no - if test $passed = no; then - if test x$enable_gruel = xyes; then - as_fn_error "Component gruel has errors; stopping." "$LINENO" 5 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gruel." >&5 -$as_echo "Not building component gruel." >&6; } - fi - else - if test $passed = with; then - with_dirs="$with_dirs gruel" - - if test "x${gruel_INCLUDES}" != "x"; then - if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gruel_INCLUDES}" - else - with_INCLUDES="${gruel_INCLUDES}"" ""$with_INCLUDES" - fi - gruel_INCLUDES= - fi - - - if test "x${gruel_SWIG_INCLUDES}" != "x"; then - if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gruel_SWIG_INCLUDES}" - else - with_SWIG_INCLUDES="${gruel_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" - fi - gruel_SWIG_INCLUDES= - fi - - - if test "x${gruel_PYDIRPATH}" != "x"; then - if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gruel_PYDIRPATH}" - else - with_PYDIRPATH="${gruel_PYDIRPATH}"":""$with_PYDIRPATH" - fi - gruel_PYDIRPATH= - fi - - - if test "x${gruel_SWIGDIRPATH}" != "x"; then - if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gruel_SWIGDIRPATH}" - else - with_SWIGDIRPATH="${gruel_SWIGDIRPATH}"":""$with_SWIGDIRPATH" - fi - gruel_SWIGDIRPATH= - fi - - - if test "x${gruel_LIBDIRPATH}" != "x"; then - if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gruel_LIBDIRPATH}" - else - with_LIBDIRPATH="${gruel_LIBDIRPATH}"":""$with_LIBDIRPATH" - fi - gruel_LIBDIRPATH= - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel will be included from a pre-installed library and includes." >&5 -$as_echo "Component gruel will be included from a pre-installed library and includes." >&6; } - gruel_with=yes - else - gruel_LDFLAG= - if test x$enable_gruel != xno; then - : - build_dirs="$build_dirs gruel" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel passed configuration checks; building." >&5 -$as_echo "Component gruel passed configuration checks; building." >&6; } - else - passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gruel passed configuration checks; but not building." >&5 -$as_echo "Component gruel passed configuration checks; but not building." >&6; } - fi - fi - fi - if test $passed = no; then - skipped_dirs="$skipped_dirs gruel" - gruel_skipped=yes - else - gruel_skipped=no - fi - - - - - - - - - +$as_echo "#define HAVE_CBLAS 1" >>confdefs.h - passed=yes - # Check whether --enable-omnithread was given. -if test "${enable_omnithread+set}" = set; then : - enableval=$enable_omnithread; + : else - - enable_omnithread=$enable_all_components - if test x$enable_all_components = xno; then - passed=no - fi + acx_cblas_ok=no fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSL" >&5 +$as_echo_n "checking for GSL... " >&6; } - if test xgnuradio-omnithread = x; then - pc_comp_name="omnithread" +if test -n "$PKG_CONFIG"; then + if test -n "$GSL_CFLAGS"; then + pkg_cv_GSL_CFLAGS="$GSL_CFLAGS" else - pc_comp_name="gnuradio-omnithread" + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GSL_CFLAGS=`$PKG_CONFIG --cflags "gsl >= 1.10" 2>/dev/null` +else + pkg_failed=yes +fi fi - - -# Check whether --with-omnithread was given. -if test "${with_omnithread+set}" = set; then : - withval=$with_omnithread; if test "x$withval" != "xyes"; then - with_omnithread_val=$withval - with_omnithread=yes - fi +else + pkg_failed=untried fi - if test x$with_omnithread = xyes; then - if test x$enable_omnithread = xyes; then - as_fn_error "Component omnithread: Cannot use both --enable and --with" "$LINENO" 5 - else - - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - - l_PKG_CONFIG_PATH=$with_omnithread_val - if test "x$l_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH - - if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - as_fn_error "Component omnithread: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi +if test x$cross_compiling = xyes +then + if test -n "$PKG_CONFIG"; then + if test -n "$GSL_LIBS"; then + pkg_cv_GSL_LIBS="$GSL_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GSL_LIBS=`$PKG_CONFIG --libs --static "gsl >= 1.10" 2>/dev/null` +else + pkg_failed=yes +fi fi - +else + pkg_failed=untried +fi + _pkg_tmp= + for flag in $pkg_cv_GSL_LIBS; do + case $flag in + (-L/lib* | -L/usr/lib* ) ;; # ignore + (*) _pkg_tmp="$_pkg_tmp $flag" ;; + esac + done + pkg_cv_GSL_LIBS="$_pkg_tmp" +else + if test -n "$PKG_CONFIG"; then + if test -n "$GSL_LIBS"; then + pkg_cv_GSL_LIBS="$GSL_LIBS" + else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - passed=with; check1=yes + pkg_cv_GSL_LIBS=`$PKG_CONFIG --libs --static "gsl >= 1.10" 2>/dev/null` +else + pkg_failed=yes +fi + fi else + pkg_failed=untried +fi +fi - check1=no - if test "x$l_PKG_CONFIG_PATH" != "x"; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$GSL_INCLUDEDIR"; then + pkg_cv_GSL_INCLUDEDIR="$GSL_INCLUDEDIR" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - passed=with + pkg_cv_GSL_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "gsl >= 1.10" 2>/dev/null` else - passed=no + pkg_failed=yes fi - fi - fi - if test $passed != with; then - as_fn_error "Component omnithread: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - + fi +else + pkg_failed=untried fi - omnithread_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}` - omnithread_LA=`$PKG_CONFIG --libs ${pc_comp_name}` - omnithread_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}` - if test x$check1 = xyes; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gsl >= 1.10"` + else + GSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gsl >= 1.10"` fi + # Put the nasty error message in config.log where it belongs + echo "$GSL_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gnuradio-core requires package gsl >= 1.10, not found." >&5 +$as_echo "gnuradio-core requires package gsl >= 1.10, not found." >&6; } +elif test $pkg_failed = untried; then + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gnuradio-core requires package gsl >= 1.10, not found." >&5 +$as_echo "gnuradio-core requires package gsl >= 1.10, not found." >&6; } +else + GSL_CFLAGS=$pkg_cv_GSL_CFLAGS + GSL_LIBS=$pkg_cv_GSL_LIBS + GSL_INCLUDEDIR=$pkg_cv_GSL_INCLUDEDIR + + GSL_CPPFLAGS="" + for flag in $GSL_CFLAGS; do + case $flag in + -I* | -D* | -U*) GSL_CPPFLAGS="$GSL_CPPFLAGS $flag" ;; + esac + done + pkg_cv_GSL_CPPFLAGS=$GSL_CPPFLAGS + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi fi - : - fi + if test $passed != with; then + gnuradio_core_INCLUDES="\ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/runtime \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/general \ +-I\${abs_top_builddir}/gnuradio-core/src/lib/general \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/gengen \ +-I\${abs_top_builddir}/gnuradio-core/src/lib/gengen \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/filter \ +-I\${abs_top_builddir}/gnuradio-core/src/lib/filter \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/missing \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/reed-solomon \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/viterbi \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/io \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \ +-I\${abs_top_srcdir}/gnuradio-core/src/lib/hier \ +-I\${abs_top_builddir}/gnuradio-core/src/lib/swig \ +\$(FFTW3F_CFLAGS) \ +\$(GSL_CFLAGS)" + gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la" + gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs" + gnuradio_core_SWIGDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib/swig:\${abs_top_builddir}/gnuradio-core/src/lib/swig/.libs:\${abs_top_srcdir}/gnuradio-core/src/lib/swig" + gnuradio_core_PYDIRPATH="\${abs_top_srcdir}/gnuradio-core/src/python" fi - if test $passed != with; then - omnithread_INCLUDES="-I\${abs_top_srcdir}/omnithread" - omnithread_LA="\${abs_top_builddir}/omnithread/libgromnithread.la" - omnithread_LIBDIRPATH="\${abs_top_builddir}/omnithread:\${abs_top_builddir}/omnithread/.libs" - fi - ac_config_files="$ac_config_files omnithread/Makefile omnithread/gnuradio/Makefile omnithread/gnuradio-omnithread.pc" + + ac_config_files="$ac_config_files gnuradio-core/Makefile gnuradio-core/gnuradio-core.pc gnuradio-core/src/Makefile gnuradio-core/src/gen_interpolator_taps/Makefile gnuradio-core/src/lib/Makefile gnuradio-core/src/lib/filter/Makefile gnuradio-core/src/lib/g72x/Makefile gnuradio-core/src/lib/general/Makefile gnuradio-core/src/lib/general/gr_constants.cc gnuradio-core/src/lib/gengen/Makefile gnuradio-core/src/lib/io/Makefile gnuradio-core/src/lib/missing/Makefile gnuradio-core/src/lib/reed-solomon/Makefile gnuradio-core/src/lib/viterbi/Makefile gnuradio-core/src/lib/runtime/Makefile gnuradio-core/src/lib/hier/Makefile gnuradio-core/src/lib/swig/Makefile gnuradio-core/src/python/Makefile gnuradio-core/src/python/bin/Makefile gnuradio-core/src/python/gnuradio/Makefile gnuradio-core/src/python/gnuradio/blks2/Makefile gnuradio-core/src/python/gnuradio/blks2impl/Makefile gnuradio-core/src/python/gnuradio/gr/Makefile gnuradio-core/src/python/gnuradio/gr/run_tests gnuradio-core/src/python/gnuradio/gru/Makefile gnuradio-core/src/python/gnuradio/gruimpl/Makefile gnuradio-core/src/python/gnuradio/vocoder/Makefile gnuradio-core/src/tests/Makefile gnuradio-core/src/utils/Makefile" - omnithread_with=no + gnuradio_core_with=no if test $passed = no; then - if test x$enable_omnithread = xyes; then - as_fn_error "Component omnithread has errors; stopping." "$LINENO" 5 + if test x$enable_gnuradio_core = xyes; then + as_fn_error $? "Component gnuradio-core has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component omnithread." >&5 -$as_echo "Not building component omnithread." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gnuradio-core." >&5 +$as_echo "Not building component gnuradio-core." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs omnithread" + with_dirs="$with_dirs gnuradio-core" - if test "x${omnithread_INCLUDES}" != "x"; then + if test "x${gnuradio_core_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${omnithread_INCLUDES}" + with_INCLUDES="${gnuradio_core_INCLUDES}" else - with_INCLUDES="${omnithread_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gnuradio_core_INCLUDES}"" ""$with_INCLUDES" fi - omnithread_INCLUDES= + gnuradio_core_INCLUDES= fi - if test "x${omnithread_SWIG_INCLUDES}" != "x"; then + if test "x${gnuradio_core_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${omnithread_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gnuradio_core_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${omnithread_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gnuradio_core_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - omnithread_SWIG_INCLUDES= + gnuradio_core_SWIG_INCLUDES= fi - if test "x${omnithread_PYDIRPATH}" != "x"; then + if test "x${gnuradio_core_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${omnithread_PYDIRPATH}" + with_PYDIRPATH="${gnuradio_core_PYDIRPATH}" else - with_PYDIRPATH="${omnithread_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gnuradio_core_PYDIRPATH}"":""$with_PYDIRPATH" fi - omnithread_PYDIRPATH= + gnuradio_core_PYDIRPATH= fi - if test "x${omnithread_SWIGDIRPATH}" != "x"; then + if test "x${gnuradio_core_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${omnithread_SWIGDIRPATH}" + with_SWIGDIRPATH="${gnuradio_core_SWIGDIRPATH}" else - with_SWIGDIRPATH="${omnithread_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gnuradio_core_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - omnithread_SWIGDIRPATH= + gnuradio_core_SWIGDIRPATH= fi - if test "x${omnithread_LIBDIRPATH}" != "x"; then + if test "x${gnuradio_core_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${omnithread_LIBDIRPATH}" + with_LIBDIRPATH="${gnuradio_core_LIBDIRPATH}" else - with_LIBDIRPATH="${omnithread_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gnuradio_core_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - omnithread_LIBDIRPATH= + gnuradio_core_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component omnithread will be included from a pre-installed library and includes." >&5 -$as_echo "Component omnithread will be included from a pre-installed library and includes." >&6; } - omnithread_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core will be included from a pre-installed library and includes." >&5 +$as_echo "Component gnuradio-core will be included from a pre-installed library and includes." >&6; } + gnuradio_core_with=yes else - omnithread_LDFLAG= - if test x$enable_omnithread != xno; then + gnuradio_core_LDFLAG= + if test x$enable_gnuradio_core != xno; then + ac_config_commands="$ac_config_commands run_tests_core" + - build_dirs="$build_dirs omnithread" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component omnithread passed configuration checks; building." >&5 -$as_echo "Component omnithread passed configuration checks; building." >&6; } + build_dirs="$build_dirs gnuradio-core" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core passed configuration checks; building." >&5 +$as_echo "Component gnuradio-core passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component omnithread passed configuration checks; but not building." >&5 -$as_echo "Component omnithread passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core passed configuration checks; but not building." >&5 +$as_echo "Component gnuradio-core passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs omnithread" - omnithread_skipped=yes + skipped_dirs="$skipped_dirs gnuradio-core" + gnuradio_core_skipped=yes else - omnithread_skipped=no + gnuradio_core_skipped=no fi @@ -24904,215 +23369,113 @@ $as_echo "Component omnithread passed configuration checks; but not building." > - - - passed=yes - # Check whether --enable-gcell was given. -if test "${enable_gcell+set}" = set; then : - enableval=$enable_gcell; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 +$as_echo_n "checking whether stat file-mode macros are broken... " >&6; } +if test "${ac_cv_header_stat_broken+set}" = set; then : + $as_echo_n "(cached) " >&6 else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include - enable_gcell=$enable_all_components - if test x$enable_all_components = xno; then - passed=no - fi - -fi - - - - +#if defined S_ISBLK && defined S_IFDIR +extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1]; +#endif - if test $passed != no; then - if test $passed = yes; then - if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell requires omnithread, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gcell requires omnithread, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$omnithread_with = xno; then - as_fn_error "Component gcell requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 - fi - fi - fi +#if defined S_ISBLK && defined S_IFCHR +extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1]; +#endif +#if defined S_ISLNK && defined S_IFREG +extern char c3[S_ISLNK (S_IFREG) ? -1 : 1]; +#endif - if test $passed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether host_cpu is powerpc*" >&5 -$as_echo_n "checking whether host_cpu is powerpc*... " >&6; } - case "$host_cpu" in - powerpc*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ;; - *) - passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac +#if defined S_ISSOCK && defined S_IFREG +extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; +#endif - # Extract the first word of "spu-gcc", so it can be a program name with args. -set dummy spu-gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_SPU_GCC_PROG+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$SPU_GCC_PROG"; then - ac_cv_prog_SPU_GCC_PROG="$SPU_GCC_PROG" # Let the user override the test. +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stat_broken=no else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_SPU_GCC_PROG="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_SPU_GCC_PROG" && ac_cv_prog_SPU_GCC_PROG="no" -fi + ac_cv_header_stat_broken=yes fi -SPU_GCC_PROG=$ac_cv_prog_SPU_GCC_PROG -if test -n "$SPU_GCC_PROG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SPU_GCC_PROG" >&5 -$as_echo "$SPU_GCC_PROG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 +$as_echo "$ac_cv_header_stat_broken" >&6; } +if test $ac_cv_header_stat_broken = yes; then +$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h - if test $SPU_GCC_PROG = no; then - passed=no - fi - fi - - if test $passed != with; then - gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/include" - gcell_LA="\${abs_top_builddir}/gcell/lib/libgcell.la" - gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/include" - gcell_spu_LA="\${abs_top_builddir}/gcell/lib/spu/libgcell_spu.a" - - - - fi - - ac_config_files="$ac_config_files gcell/Makefile gcell/gcell.pc gcell/gcell_spu.pc gcell/include/Makefile gcell/include/gcell/Makefile gcell/include/gcell/spu/Makefile gcell/lib/Makefile gcell/lib/spu/Makefile gcell/lib/general/Makefile gcell/lib/wrapper/Makefile gcell/lib/runtime/Makefile gcell/apps/Makefile gcell/apps/spu/Makefile gcell/ibm/Makefile" - - +fi - gcell_with=no - if test $passed = no; then - if test x$enable_gcell = xyes; then - as_fn_error "Component gcell has errors; stopping." "$LINENO" 5 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gcell." >&5 -$as_echo "Not building component gcell." >&6; } - fi - else - if test $passed = with; then - with_dirs="$with_dirs gcell" + for ac_header in fcntl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FCNTL_H 1 +_ACEOF - if test "x${gcell_INCLUDES}" != "x"; then - if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gcell_INCLUDES}" - else - with_INCLUDES="${gcell_INCLUDES}"" ""$with_INCLUDES" - fi - gcell_INCLUDES= - fi +fi +done - if test "x${gcell_SWIG_INCLUDES}" != "x"; then - if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gcell_SWIG_INCLUDES}" - else - with_SWIG_INCLUDES="${gcell_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" - fi - gcell_SWIG_INCLUDES= - fi - if test "x${gcell_PYDIRPATH}" != "x"; then - if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gcell_PYDIRPATH}" - else - with_PYDIRPATH="${gcell_PYDIRPATH}"":""$with_PYDIRPATH" - fi - gcell_PYDIRPATH= - fi + for ac_header in sys/time.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_time_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_TIME_H 1 +_ACEOF +fi - if test "x${gcell_SWIGDIRPATH}" != "x"; then - if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gcell_SWIGDIRPATH}" - else - with_SWIGDIRPATH="${gcell_SWIGDIRPATH}"":""$with_SWIGDIRPATH" - fi - gcell_SWIGDIRPATH= - fi +done - if test "x${gcell_LIBDIRPATH}" != "x"; then - if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gcell_LIBDIRPATH}" - else - with_LIBDIRPATH="${gcell_LIBDIRPATH}"":""$with_LIBDIRPATH" - fi - gcell_LIBDIRPATH= - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell will be included from a pre-installed library and includes." >&5 -$as_echo "Component gcell will be included from a pre-installed library and includes." >&6; } - gcell_with=yes - else - gcell_LDFLAG= - if test x$enable_gcell != xno; then - : - build_dirs="$build_dirs gcell" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell passed configuration checks; building." >&5 -$as_echo "Component gcell passed configuration checks; building." >&6; } - else - passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gcell passed configuration checks; but not building." >&5 -$as_echo "Component gcell passed configuration checks; but not building." >&6; } - fi - fi - fi - if test $passed = no; then - skipped_dirs="$skipped_dirs gcell" - gcell_skipped=yes - else - gcell_skipped=no - fi + for ac_header in unistd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UNISTD_H 1 +_ACEOF +fi +done + ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default" +if test "x$ac_cv_have_decl_getenv" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETENV $ac_have_decl +_ACEOF passed=yes - # Check whether --enable-gnuradio-core was given. -if test "${enable_gnuradio_core+set}" = set; then : - enableval=$enable_gnuradio_core; + # Check whether --enable-usrp was given. +if test "${enable_usrp+set}" = set; then : + enableval=$enable_usrp; else - enable_gnuradio_core=$enable_all_components + enable_usrp=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -25124,33 +23487,33 @@ fi if test x = x; then - pc_comp_name="gnuradio-core" + pc_comp_name="usrp" else pc_comp_name="" fi -# Check whether --with-gnuradio-core was given. -if test "${with_gnuradio_core+set}" = set; then : - withval=$with_gnuradio_core; if test "x$withval" != "xyes"; then - with_gnuradio_core_val=$withval - with_gnuradio_core=yes +# Check whether --with-usrp was given. +if test "${with_usrp+set}" = set; then : + withval=$with_usrp; if test "x$withval" != "xyes"; then + with_usrp_val=$withval + with_usrp=yes fi fi - - if test x$with_gnuradio_core = xyes; then - if test x$enable_gnuradio_core = xyes; then - as_fn_error "Component gnuradio-core: Cannot use both --enable and --with" "$LINENO" 5 + + if test x$with_usrp = xyes; then + if test x$enable_usrp = xyes; then + as_fn_error $? "Component usrp: Cannot use both --enable and --with" "$LINENO" 5 else s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - l_PKG_CONFIG_PATH=$with_gnuradio_core_val + l_PKG_CONFIG_PATH=$with_usrp_val if test "x$l_PKG_CONFIG_PATH" != "x"; then export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - as_fn_error "Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 + as_fn_error $? "Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 fi fi @@ -25180,15 +23543,15 @@ fi fi fi if test $passed != with; then - as_fn_error "Component gnuradio-core: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 + as_fn_error $? "Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 fi s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH fi - gnuradio_core_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}` - gnuradio_core_LA=`$PKG_CONFIG --libs ${pc_comp_name}` - gnuradio_core_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}` + usrp_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}` + usrp_LA=`$PKG_CONFIG --libs ${pc_comp_name}` + usrp_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}` if test x$check1 = xyes; then if test "x$s_PKG_CONFIG_PATH" != "x"; then @@ -25196,12 +23559,7 @@ fi fi fi - - gnuradio_core_SWIGDIRPATH="$gnuradio_core_INCLUDEDIR/swig" - gnuradio_core_I="$gnuradio_core_SWIGDIRPATH/gnuradio.i" - gnuradio_core_SWIG_INCLUDES="-I$gnuradio_core_SWIGDIRPATH" - gnuradio_core_PYDIRPATH=$pythondir - + : fi fi @@ -25211,1048 +23569,896 @@ fi if test $passed != no; then if test $passed = yes; then if test x$gruel_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core requires gruel, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gnuradio-core requires gruel, which is not being built or specified via pre-installed files." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp requires gruel, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component usrp requires gruel, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gruel_with = xno; then - as_fn_error "Component gnuradio-core requires gruel to be included as --with-gruel[=arg]" "$LINENO" 5 - fi - fi - fi - - - if test $passed != no; then - if test $passed = yes; then - if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core requires omnithread, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gnuradio-core requires omnithread, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$omnithread_with = xno; then - as_fn_error "Component gnuradio-core requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 + as_fn_error $? "Component usrp requires gruel to be included as --with-gruel[=arg]" "$LINENO" 5 fi fi fi - if test $passed = yes; then - - - -acx_cblas_ok=no - - -# Check whether --with-cblas was given. -if test "${with_cblas+set}" = set; then : - withval=$with_cblas; -fi - -case $with_cblas in - yes | "") ;; - no) acx_cblas_ok=disable ;; - -* | */* | *.a | *.so | *.so.* | *.o) CBLAS_LIBS="$with_cblas" ;; - *) CBLAS_LIBS="-l$with_cblas" ;; -esac - - -acx_cblas_save_LIBS="$LIBS" -LIBS="$LIBS $FLIBS" - -# First, check CBLAS_LIBS environment variable -if test $acx_cblas_ok = no; then -if test "x$CBLAS_LIBS" != x; then - save_LIBS="$LIBS"; LIBS="$CBLAS_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in $CBLAS_LIBS" >&5 -$as_echo_n "checking for cblas_sgemm in $CBLAS_LIBS... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); -int -main () -{ -return cblas_sgemm (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - acx_cblas_ok=yes -else - CBLAS_LIBS="" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cblas_ok" >&5 -$as_echo "$acx_cblas_ok" >&6; } - LIBS="$save_LIBS" -fi -fi - -# CBLAS linked to by default? (happens on some supercomputers) -if test $acx_cblas_ok = no; then - save_LIBS="$LIBS"; LIBS="$LIBS" - ac_fn_c_check_func "$LINENO" "cblas_sgemm" "ac_cv_func_cblas_sgemm" -if test "x$ac_cv_func_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes -fi - - LIBS="$save_LIBS" -fi - -# CBLAS in ATLAS library? (http://math-atlas.sourceforge.net/) -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 -$as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } -if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-latlas -latlas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ATL_xerbla (); -int -main () -{ -return ATL_xerbla (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_atlas_ATL_xerbla=yes -else - ac_cv_lib_atlas_ATL_xerbla=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 -$as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; } -if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 -$as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcblas -latlas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_dgemm (); -int -main () -{ -return cblas_dgemm (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cblas_cblas_dgemm=yes -else - ac_cv_lib_cblas_cblas_dgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 -$as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then : - acx_cblas_ok=yes - CBLAS_LIBS="-lcblas -latlas" -fi - -fi - -fi - -# CBLAS in ATLAS library in /usr/lib64/atlas (if not cross-compiling) -if test $acx_cblas_ok = no && test "$cross_compiling" = no; then - unset ac_cv_lib_atlas_ATL_xerbla - unset ac_cv_lib_cblas_cblas_dgemm - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 -$as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } -if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-latlas -L/usr/lib64/atlas -latlas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ATL_xerbla (); -int -main () -{ -return ATL_xerbla (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_atlas_ATL_xerbla=yes -else - ac_cv_lib_atlas_ATL_xerbla=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 -$as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; } -if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 -$as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcblas -L/usr/lib64/atlas -latlas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_dgemm (); -int -main () -{ -return cblas_dgemm (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cblas_cblas_dgemm=yes -else - ac_cv_lib_cblas_cblas_dgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 -$as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then : - acx_cblas_ok=yes - CBLAS_LIBS="-L/usr/lib64/atlas -lcblas -latlas" -fi - -fi - -fi - -# CBLAS in ATLAS library in /usr/lib/atlas (if not cross-compiling) -if test $acx_cblas_ok = no && test "$cross_compiling" = no; then - unset ac_cv_lib_atlas_ATL_xerbla - unset ac_cv_lib_cblas_cblas_dgemm - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5 -$as_echo_n "checking for ATL_xerbla in -latlas... " >&6; } -if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-latlas -L/usr/lib/atlas -latlas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ATL_xerbla (); -int -main () -{ -return ATL_xerbla (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_atlas_ATL_xerbla=yes -else - ac_cv_lib_atlas_ATL_xerbla=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5 -$as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; } -if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 -$as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcblas -L/usr/lib/atlas -latlas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_dgemm (); -int -main () -{ -return cblas_dgemm (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cblas_cblas_dgemm=yes -else - ac_cv_lib_cblas_cblas_dgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5 -$as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then : - acx_cblas_ok=yes - CBLAS_LIBS="-L/usr/lib/atlas -lcblas -latlas" -fi - -fi - -fi - - -# CBLAS in PhiPACK libraries? (requires generic BLAS lib, too) -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcblas" >&5 -$as_echo_n "checking for cblas_sgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcblas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); -int -main () -{ -return cblas_sgemm (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cblas_cblas_sgemm=yes -else - ac_cv_lib_cblas_cblas_sgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_cblas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -ldgemm" >&5 -$as_echo_n "checking for cblas_dgemm in -ldgemm... " >&6; } -if test "${ac_cv_lib_dgemm_cblas_dgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldgemm -lblas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + req_libusb1=no + USE_LIBUSB1=0 -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_dgemm (); -int -main () -{ -return cblas_dgemm (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dgemm_cblas_dgemm=yes +# Check whether --with-fusb-tech was given. +if test "${with_fusb_tech+set}" = set; then : + withval=$with_fusb_tech; cf_with_fusb_tech="$withval" else - ac_cv_lib_dgemm_cblas_dgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + cf_with_fusb_tech="$host_os" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgemm_cblas_dgemm" >&5 -$as_echo "$ac_cv_lib_dgemm_cblas_dgemm" >&6; } -if test "x$ac_cv_lib_dgemm_cblas_dgemm" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lsgemm" >&5 -$as_echo_n "checking for cblas_sgemm in -lsgemm... " >&6; } -if test "${ac_cv_lib_sgemm_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsgemm -lblas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); -int -main () -{ -return cblas_sgemm (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_sgemm_cblas_sgemm=yes + if test x${enable_usrp} != xno; then + case "$cf_with_fusb_tech" in + libusb1*) + FUSB_TECH=libusb1 + req_libusb1=yes + USE_LIBUSB1=1 + ;; + linux*) + ac_fn_c_check_header_mongrel "$LINENO" "linux/usbdevice_fs.h" "ac_cv_header_linux_usbdevice_fs_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_usbdevice_fs_h" = x""yes; then : + x_have_usbdevice_fs_h=yes else - ac_cv_lib_sgemm_cblas_sgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sgemm_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_sgemm_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_sgemm_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes; CBLAS_LIBS="-lsgemm -ldgemm -lblas" -fi - -fi - -fi - + x_have_usbdevice_fs_h=no fi -# BLAS in Intel MKL library? -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lmkl" >&5 -$as_echo_n "checking for cblas_sgemm in -lmkl... " >&6; } -if test "${ac_cv_lib_mkl_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmkl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); + if test x${x_have_usbdevice_fs_h} = xyes; then + FUSB_TECH=linux + else + FUSB_TECH=generic + fi + ;; + darwin*) + FUSB_TECH=darwin + ;; + cygwin*|win*|mingw*) + FUSB_TECH=win32 + ;; + *bsd*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RA/WB" >&5 +$as_echo_n "checking for RA/WB... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include int main () { -return cblas_sgemm (); +struct usb_bulk_ra_wb_opt o; + ioctl(0, USB_SET_BULK_RA, &o); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mkl_cblas_sgemm=yes +if ac_fn_c_try_compile "$LINENO"; then : + FUSB_TECH=ra_wb else - ac_cv_lib_mkl_cblas_sgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mkl_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_mkl_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_mkl_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes;CBLAS_LIBS="-lmkl" + FUSB_TECH=generic fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + *) + FUSB_TECH=generic + ;; + esac -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fast usb technique to use" >&5 +$as_echo_n "checking for fast usb technique to use... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FUSB_TECH" >&5 +$as_echo "$FUSB_TECH" >&6; } -# CBLAS in Apple vecLib library? -if test $acx_cblas_ok = no; then - save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS" - ac_fn_c_check_func "$LINENO" "cblas_sgemm" "ac_cv_func_cblas_sgemm" -if test "x$ac_cv_func_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes;CBLAS_LIBS="-framework vecLib" + fi + + if test x$FUSB_TECH = xdarwin; then + FUSB_TECH_darwin_TRUE= + FUSB_TECH_darwin_FALSE='#' +else + FUSB_TECH_darwin_TRUE='#' + FUSB_TECH_darwin_FALSE= fi - LIBS="$save_LIBS" + if test x$FUSB_TECH = xwin32; then + FUSB_TECH_win32_TRUE= + FUSB_TECH_win32_FALSE='#' +else + FUSB_TECH_win32_TRUE='#' + FUSB_TECH_win32_FALSE= fi -# CBLAS in Alpha CXML library? -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcxml" >&5 -$as_echo_n "checking for cblas_sgemm in -lcxml... " >&6; } -if test "${ac_cv_lib_cxml_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 + if test x$FUSB_TECH = xgeneric; then + FUSB_TECH_generic_TRUE= + FUSB_TECH_generic_FALSE='#' else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcxml $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + FUSB_TECH_generic_TRUE='#' + FUSB_TECH_generic_FALSE= +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); -int -main () -{ -return cblas_sgemm (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cxml_cblas_sgemm=yes + if test x$FUSB_TECH = xlinux; then + FUSB_TECH_linux_TRUE= + FUSB_TECH_linux_FALSE='#' else - ac_cv_lib_cxml_cblas_sgemm=no + FUSB_TECH_linux_TRUE='#' + FUSB_TECH_linux_FALSE= fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + + if test x$FUSB_TECH = xlibusb1; then + FUSB_TECH_libusb1_TRUE= + FUSB_TECH_libusb1_FALSE='#' +else + FUSB_TECH_libusb1_TRUE='#' + FUSB_TECH_libusb1_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cxml_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_cxml_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_cxml_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes;CBLAS_LIBS="-lcxml" + + if test x$FUSB_TECH = xra_wb; then + FUSB_TECH_ra_wb_TRUE= + FUSB_TECH_ra_wb_FALSE='#' +else + FUSB_TECH_ra_wb_TRUE='#' + FUSB_TECH_ra_wb_FALSE= fi + + + ac_config_files="$ac_config_files usrp/host/include/usrp/libusb_types.h" + + + + if test $passed = yes; then + ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp" +if test "x$ac_cv_func_mkstemp" = x""yes; then : + $as_echo "#define HAVE_MKSTEMP 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" mkstemp.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" + ;; +esac + fi -# CBLAS in Alpha DXML library? (now called CXML, see above) -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -ldxml" >&5 -$as_echo_n "checking for cblas_sgemm in -ldxml... " >&6; } -if test "${ac_cv_lib_dxml_cblas_sgemm+set}" = set; then : + + if test $ac_cv_func_mkstemp = no; then + utils_cv_func_mkstemp_limitations=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mkstemp limitations" >&5 +$as_echo_n "checking for mkstemp limitations... " >&6; } +if test "${utils_cv_func_mkstemp_limitations+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldxml $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + if test "$cross_compiling" = yes; then : + utils_cv_func_mkstemp_limitations=yes + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); -int -main () -{ -return cblas_sgemm (); - ; - return 0; -} +# include + int main () + { + int i; + for (i = 0; i < 70; i++) + { + char template[] = "conftestXXXXXX"; + int fd = mkstemp (template); + if (fd == -1) + exit (1); + close (fd); + } + exit (0); + } + _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dxml_cblas_sgemm=yes +if ac_fn_c_try_run "$LINENO"; then : + utils_cv_func_mkstemp_limitations=no else - ac_cv_lib_dxml_cblas_sgemm=no + utils_cv_func_mkstemp_limitations=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dxml_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_dxml_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_dxml_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes;CBLAS_LIBS="-ldxml" + + + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $utils_cv_func_mkstemp_limitations" >&5 +$as_echo "$utils_cv_func_mkstemp_limitations" >&6; } + fi + + if test $utils_cv_func_mkstemp_limitations = yes; then + case " $LIBOBJS " in + *" mkstemp.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" + ;; +esac + + case " $LIBOBJS " in + *" tempname.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS tempname.$ac_objext" + ;; +esac + + +$as_echo "#define mkstemp rpl_mkstemp" >>confdefs.h + + + + + + + + : + + + + + + + + + + + + for ac_header in stdint.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H 1 +_ACEOF fi -# CBLAS in Sun Performance library? -if test $acx_cblas_ok = no; then - if test "x$GCC" != xyes; then # only works with Sun CC - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5 -$as_echo_n "checking for acosp in -lsunmath... " >&6; } -if test "${ac_cv_lib_sunmath_acosp+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsunmath $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +done -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char acosp (); + for ac_func in __secure_getenv gettimeofday lstat +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + : + + + + + + # AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir accepts only one arg" >&5 +$as_echo_n "checking whether mkdir accepts only one arg... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include int main () { -return acosp (); + + mkdir("") + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_sunmath_acosp=yes +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define MKDIR_TAKES_ONE_ARG /**/" >>confdefs.h + else - ac_cv_lib_sunmath_acosp=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sunmath_acosp" >&5 -$as_echo "$ac_cv_lib_sunmath_acosp" >&6; } -if test "x$ac_cv_lib_sunmath_acosp" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lsunperf" >&5 -$as_echo_n "checking for cblas_sgemm in -lsunperf... " >&6; } -if test "${ac_cv_lib_sunperf_cblas_sgemm+set}" = set; then : +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsunperf -lsunmath $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); int main () { -return cblas_sgemm (); +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_sunperf_cblas_sgemm=yes -else - ac_cv_lib_sunperf_cblas_sgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sunperf_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_sunperf_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_sunperf_cblas_sgemm" = x""yes; then : - CBLAS_LIBS="-xlic_lib=sunperf -lsunmath" - acx_cblas_ok=yes -fi - -fi - - fi -fi - -# CBLAS in SCSL library? (SGI/Cray Scientific Library) -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lscs" >&5 -$as_echo_n "checking for cblas_sgemm in -lscs... " >&6; } -if test "${ac_cv_lib_scs_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lscs $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include + #include -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); int main () { -return cblas_sgemm (); +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_scs_cblas_sgemm=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes else - ac_cv_lib_scs_cblas_sgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_scs_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_scs_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_scs_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes; CBLAS_LIBS="-lscs" + ac_cv_c_bigendian=no fi - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -# CBLAS in SGIMATH library? -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcomplib.sgimath" >&5 -$as_echo_n "checking for cblas_sgemm in -lcomplib.sgimath... " >&6; } -if test "${ac_cv_lib_complib_sgimath_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcomplib.sgimath $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); int main () { -return cblas_sgemm (); +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_complib_sgimath_cblas_sgemm=yes -else - ac_cv_lib_complib_sgimath_cblas_sgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_complib_sgimath_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_complib_sgimath_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_complib_sgimath_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes; CBLAS_LIBS="-lcomplib.sgimath" -fi - -fi - -# CBLAS in IBM ESSL library? (requires generic CBLAS lib, too) -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcblas" >&5 -$as_echo_n "checking for cblas_sgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcblas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + int main () { -return cblas_sgemm (); +#ifndef _BIG_ENDIAN + not big endian + #endif + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cblas_cblas_sgemm=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes else - ac_cv_lib_cblas_cblas_sgemm=no + ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_cblas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lessl" >&5 -$as_echo_n "checking for cblas_sgemm in -lessl... " >&6; } -if test "${ac_cv_lib_essl_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lessl -lblas $FLIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); int main () { -return cblas_sgemm (); +return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_essl_cblas_sgemm=yes -else - ac_cv_lib_essl_cblas_sgemm=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_essl_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_essl_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_essl_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes; CBLAS_LIBS="-lessl -lblas" -fi - -fi - +if ac_fn_c_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi fi - -# Generic CBLAS library? -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lcblas" >&5 -$as_echo_n "checking for cblas_sgemm in -lcblas... " >&6; } -if test "${ac_cv_lib_cblas_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcblas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); +$ac_includes_default int main () { -return cblas_sgemm (); + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_cblas_cblas_sgemm=yes +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_bigendian=no else - ac_cv_lib_cblas_cblas_sgemm=no + ac_cv_c_bigendian=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_cblas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_cblas_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes; CBLAS_LIBS="-lcblas" + + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h +;; #( + no) + ;; #( + universal) + +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + + for ac_header in byteswap.h linux/compiler.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -# Generic BLAS library? -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lblas" >&5 -$as_echo_n "checking for cblas_sgemm in -lblas... " >&6; } -if test "${ac_cv_lib_blas_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lblas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +done -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); -int -main () -{ -return cblas_sgemm (); - ; - return 0; -} + for ac_func in getrusage sched_setscheduler pthread_setschedparam +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_blas_cblas_sgemm=yes + +fi +done + + for ac_func in sigaction snprintf +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + libusbok=no + have_libusb1=no + LIBUSB_PKG_CONFIG_NAME='' + if test x$req_libusb1 = xyes; then + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5 +$as_echo_n "checking for USB... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$USB_CFLAGS"; then + pkg_cv_USB_CFLAGS="$USB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null` else - ac_cv_lib_blas_cblas_sgemm=no + pkg_failed=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + fi +else + pkg_failed=untried +fi + +if test x$cross_compiling = xyes +then + if test -n "$PKG_CONFIG"; then + if test -n "$USB_LIBS"; then + pkg_cv_USB_LIBS="$USB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-1.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + _pkg_tmp= + for flag in $pkg_cv_USB_LIBS; do + case $flag in + (-L/lib* | -L/usr/lib* ) ;; # ignore + (*) _pkg_tmp="$_pkg_tmp $flag" ;; + esac + done + pkg_cv_USB_LIBS="$_pkg_tmp" +else + if test -n "$PKG_CONFIG"; then + if test -n "$USB_LIBS"; then + pkg_cv_USB_LIBS="$USB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-1.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blas_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_blas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_blas_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes; CBLAS_LIBS="-lblas" fi +if test -n "$PKG_CONFIG"; then + if test -n "$USB_INCLUDEDIR"; then + pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb-1.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi -# GSL generic CBLAS library? -if test $acx_cblas_ok = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_sgemm in -lgslcblas" >&5 -$as_echo_n "checking for cblas_sgemm in -lgslcblas... " >&6; } -if test "${ac_cv_lib_gslcblas_cblas_sgemm+set}" = set; then : - $as_echo_n "(cached) " >&6 + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgslcblas $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb-1.0"` + else + USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb-1.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$USB_PKG_ERRORS" >&5 -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char cblas_sgemm (); -int -main () -{ -return cblas_sgemm (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gslcblas_cblas_sgemm=yes + as_fn_error $? "Package requirements (libusb-1.0) were not met: + +$USB_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables USB_CFLAGS +and USB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables USB_CFLAGS +and USB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5 ; } else - ac_cv_lib_gslcblas_cblas_sgemm=no + USB_CFLAGS=$pkg_cv_USB_CFLAGS + USB_LIBS=$pkg_cv_USB_LIBS + USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR + + USB_CPPFLAGS="" + for flag in $USB_CFLAGS; do + case $flag in + -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;; + esac + done + pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + libusbok=yes + have_libusb1=yes + usb_header='libusb-1.0/libusb.h' + usb_lib_func='libusb_bulk_transfer' + usb_lib_name='usb-1.0' + LIBUSB_PKG_CONFIG_NAME='libusb-1.0' + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + else + + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5 +$as_echo_n "checking for USB... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$USB_CFLAGS"; then + pkg_cv_USB_CFLAGS="$USB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + +if test x$cross_compiling = xyes +then + if test -n "$PKG_CONFIG"; then + if test -n "$USB_LIBS"; then + pkg_cv_USB_LIBS="$USB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + _pkg_tmp= + for flag in $pkg_cv_USB_LIBS; do + case $flag in + (-L/lib* | -L/usr/lib* ) ;; # ignore + (*) _pkg_tmp="$_pkg_tmp $flag" ;; + esac + done + pkg_cv_USB_LIBS="$_pkg_tmp" +else + if test -n "$PKG_CONFIG"; then + if test -n "$USB_LIBS"; then + pkg_cv_USB_LIBS="$USB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gslcblas_cblas_sgemm" >&5 -$as_echo "$ac_cv_lib_gslcblas_cblas_sgemm" >&6; } -if test "x$ac_cv_lib_gslcblas_cblas_sgemm" = x""yes; then : - acx_cblas_ok=yes; CBLAS_LIBS="-lgslcblas" fi +if test -n "$PKG_CONFIG"; then + if test -n "$USB_INCLUDEDIR"; then + pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi -LIBS="$acx_cblas_save_LIBS" -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_cblas_ok" = xyes; then +if test $pkg_failed = yes; then -$as_echo "#define HAVE_CBLAS 1" >>confdefs.h +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb"` + else + USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb"` + fi + # Put the nasty error message in config.log where it belongs + echo "$USB_PKG_ERRORS" >&5 - : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + libusbok=no +elif test $pkg_failed = untried; then + libusbok=no else - acx_cblas_ok=no + USB_CFLAGS=$pkg_cv_USB_CFLAGS + USB_LIBS=$pkg_cv_USB_LIBS + USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR -fi + USB_CPPFLAGS="" + for flag in $USB_CFLAGS; do + case $flag in + -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;; + esac + done + pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + libusbok=yes + LIBUSB_PKG_CONFIG_NAME='libusb' + +fi + if test $libusbok = no; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSL" >&5 -$as_echo_n "checking for GSL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5 +$as_echo_n "checking for USB... " >&6; } if test -n "$PKG_CONFIG"; then - if test -n "$GSL_CFLAGS"; then - pkg_cv_GSL_CFLAGS="$GSL_CFLAGS" + if test -n "$USB_CFLAGS"; then + pkg_cv_USB_CFLAGS="$USB_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GSL_CFLAGS=`$PKG_CONFIG --cflags "gsl >= 1.10" 2>/dev/null` + pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-legacy" 2>/dev/null` else pkg_failed=yes fi @@ -26264,16 +24470,16 @@ fi if test x$cross_compiling = xyes then if test -n "$PKG_CONFIG"; then - if test -n "$GSL_LIBS"; then - pkg_cv_GSL_LIBS="$GSL_LIBS" + if test -n "$USB_LIBS"; then + pkg_cv_USB_LIBS="$USB_LIBS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GSL_LIBS=`$PKG_CONFIG --libs --static "gsl >= 1.10" 2>/dev/null` + pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null` else pkg_failed=yes fi @@ -26282,25 +24488,25 @@ else pkg_failed=untried fi _pkg_tmp= - for flag in $pkg_cv_GSL_LIBS; do + for flag in $pkg_cv_USB_LIBS; do case $flag in (-L/lib* | -L/usr/lib* ) ;; # ignore (*) _pkg_tmp="$_pkg_tmp $flag" ;; esac done - pkg_cv_GSL_LIBS="$_pkg_tmp" + pkg_cv_USB_LIBS="$_pkg_tmp" else if test -n "$PKG_CONFIG"; then - if test -n "$GSL_LIBS"; then - pkg_cv_GSL_LIBS="$GSL_LIBS" + if test -n "$USB_LIBS"; then + pkg_cv_USB_LIBS="$USB_LIBS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GSL_LIBS=`$PKG_CONFIG --libs --static "gsl >= 1.10" 2>/dev/null` + pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null` else pkg_failed=yes fi @@ -26311,16 +24517,16 @@ fi fi if test -n "$PKG_CONFIG"; then - if test -n "$GSL_INCLUDEDIR"; then - pkg_cv_GSL_INCLUDEDIR="$GSL_INCLUDEDIR" + if test -n "$USB_INCLUDEDIR"; then + pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gsl >= 1.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gsl >= 1.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GSL_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "gsl >= 1.10" 2>/dev/null` + pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb-legacy" 2>/dev/null` else pkg_failed=yes fi @@ -26340,625 +24546,416 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gsl >= 1.10"` + USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb-legacy"` else - GSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gsl >= 1.10"` + USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb-legacy"` fi # Put the nasty error message in config.log where it belongs - echo "$GSL_PKG_ERRORS" >&5 + echo "$USB_PKG_ERRORS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gnuradio-core requires package gsl >= 1.10, not found." >&5 -$as_echo "gnuradio-core requires package gsl >= 1.10, not found." >&6; } + libusbok=no elif test $pkg_failed = untried; then - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gnuradio-core requires package gsl >= 1.10, not found." >&5 -$as_echo "gnuradio-core requires package gsl >= 1.10, not found." >&6; } + libusbok=no else - GSL_CFLAGS=$pkg_cv_GSL_CFLAGS - GSL_LIBS=$pkg_cv_GSL_LIBS - GSL_INCLUDEDIR=$pkg_cv_GSL_INCLUDEDIR + USB_CFLAGS=$pkg_cv_USB_CFLAGS + USB_LIBS=$pkg_cv_USB_LIBS + USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR - GSL_CPPFLAGS="" - for flag in $GSL_CFLAGS; do + USB_CPPFLAGS="" + for flag in $USB_CFLAGS; do case $flag in - -I* | -D* | -U*) GSL_CPPFLAGS="$GSL_CPPFLAGS $flag" ;; + -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;; esac done - pkg_cv_GSL_CPPFLAGS=$GSL_CPPFLAGS + pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : -fi - fi - - if test $passed != with; then - gnuradio_core_INCLUDES="\ --I\${abs_top_srcdir}/gnuradio-core/src/lib/runtime \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/general \ --I\${abs_top_builddir}/gnuradio-core/src/lib/general \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/gengen \ --I\${abs_top_builddir}/gnuradio-core/src/lib/gengen \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/filter \ --I\${abs_top_builddir}/gnuradio-core/src/lib/filter \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/missing \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/reed-solomon \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/viterbi \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/io \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \ --I\${abs_top_srcdir}/gnuradio-core/src/lib/hier \ --I\${abs_top_builddir}/gnuradio-core/src/lib/swig \ -\$(FFTW3F_CFLAGS) \ -\$(GSL_CFLAGS)" - gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la" - gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs" - gnuradio_core_SWIGDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib/swig:\${abs_top_builddir}/gnuradio-core/src/lib/swig/.libs:\${abs_top_srcdir}/gnuradio-core/src/lib/swig" - gnuradio_core_PYDIRPATH="\${abs_top_srcdir}/gnuradio-core/src/python" - fi - - - - - - ac_config_files="$ac_config_files gnuradio-core/Makefile gnuradio-core/gnuradio-core.pc gnuradio-core/src/Makefile gnuradio-core/src/gen_interpolator_taps/Makefile gnuradio-core/src/lib/Makefile gnuradio-core/src/lib/filter/Makefile gnuradio-core/src/lib/g72x/Makefile gnuradio-core/src/lib/general/Makefile gnuradio-core/src/lib/general/gr_prefix.cc gnuradio-core/src/lib/gengen/Makefile gnuradio-core/src/lib/io/Makefile gnuradio-core/src/lib/missing/Makefile gnuradio-core/src/lib/reed-solomon/Makefile gnuradio-core/src/lib/viterbi/Makefile gnuradio-core/src/lib/runtime/Makefile gnuradio-core/src/lib/hier/Makefile gnuradio-core/src/lib/swig/Makefile gnuradio-core/src/python/Makefile gnuradio-core/src/python/bin/Makefile gnuradio-core/src/python/gnuradio/Makefile gnuradio-core/src/python/gnuradio/blks2/Makefile gnuradio-core/src/python/gnuradio/blks2impl/Makefile gnuradio-core/src/python/gnuradio/gr/Makefile gnuradio-core/src/python/gnuradio/gr/run_tests gnuradio-core/src/python/gnuradio/gru/Makefile gnuradio-core/src/python/gnuradio/gruimpl/Makefile gnuradio-core/src/python/gnuradio/vocoder/Makefile gnuradio-core/src/tests/Makefile gnuradio-core/src/utils/Makefile" - - - - - gnuradio_core_with=no - if test $passed = no; then - if test x$enable_gnuradio_core = xyes; then - as_fn_error "Component gnuradio-core has errors; stopping." "$LINENO" 5 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gnuradio-core." >&5 -$as_echo "Not building component gnuradio-core." >&6; } - fi - else - if test $passed = with; then - with_dirs="$with_dirs gnuradio-core" - - if test "x${gnuradio_core_INCLUDES}" != "x"; then - if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gnuradio_core_INCLUDES}" - else - with_INCLUDES="${gnuradio_core_INCLUDES}"" ""$with_INCLUDES" - fi - gnuradio_core_INCLUDES= - fi - - - if test "x${gnuradio_core_SWIG_INCLUDES}" != "x"; then - if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gnuradio_core_SWIG_INCLUDES}" - else - with_SWIG_INCLUDES="${gnuradio_core_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" - fi - gnuradio_core_SWIG_INCLUDES= - fi + libusbok=yes + LIBUSB_PKG_CONFIG_NAME='libusb-legacy' - if test "x${gnuradio_core_PYDIRPATH}" != "x"; then - if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gnuradio_core_PYDIRPATH}" - else - with_PYDIRPATH="${gnuradio_core_PYDIRPATH}"":""$with_PYDIRPATH" - fi - gnuradio_core_PYDIRPATH= +fi fi + usb_header='usb.h' + usb_lib_func='usb_bulk_write' + usb_lib_name='usb' + fi - - if test "x${gnuradio_core_SWIGDIRPATH}" != "x"; then - if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gnuradio_core_SWIGDIRPATH}" - else - with_SWIGDIRPATH="${gnuradio_core_SWIGDIRPATH}"":""$with_SWIGDIRPATH" - fi - gnuradio_core_SWIGDIRPATH= - fi + if test x$req_libusb1 != xyes || test $have_libusb1 = yes; then + libusbok=yes - if test "x${gnuradio_core_LIBDIRPATH}" != "x"; then - if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gnuradio_core_LIBDIRPATH}" - else - with_LIBDIRPATH="${gnuradio_core_LIBDIRPATH}"":""$with_LIBDIRPATH" - fi - gnuradio_core_LIBDIRPATH= - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core will be included from a pre-installed library and includes." >&5 -$as_echo "Component gnuradio-core will be included from a pre-installed library and includes." >&6; } - gnuradio_core_with=yes - else - gnuradio_core_LDFLAG= - if test x$enable_gnuradio_core != xno; then - ac_config_commands="$ac_config_commands run_tests_core" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + save_CPPFLAGS="$CPPFLAGS" + if test x$USB_INCLUDEDIR != x; then + USB_INCLUDES="-I$USB_INCLUDEDIR" + CPPFLAGS="$CPPFLAGS $USB_INCLUDES" - build_dirs="$build_dirs gnuradio-core" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core passed configuration checks; building." >&5 -$as_echo "Component gnuradio-core passed configuration checks; building." >&6; } - else - passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gnuradio-core passed configuration checks; but not building." >&5 -$as_echo "Component gnuradio-core passed configuration checks; but not building." >&6; } - fi - fi fi - if test $passed = no; then - skipped_dirs="$skipped_dirs gnuradio-core" - gnuradio_core_skipped=yes - else - gnuradio_core_skipped=no - fi - - - - - - - - - - + for ac_header in $usb_header +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - passed=yes - # Check whether --enable-pmt was given. -if test "${enable_pmt+set}" = set; then : - enableval=$enable_pmt; else - - enable_pmt=$enable_all_components - if test x$enable_all_components = xno; then - passed=no - fi - + libusbok=no fi +done + CPPFLAGS="$save_CPPFLAGS" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test x = x; then - pc_comp_name="pmt" + if test $libusbok = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires libusb header '$usb_header' which was not found or was not usable. See http://www.libusb.org" >&5 +$as_echo "USRP requires libusb header '$usb_header' which was not found or was not usable. See http://www.libusb.org" >&6; } else - pc_comp_name="" - fi - - -# Check whether --with-pmt was given. -if test "${with_pmt+set}" = set; then : - withval=$with_pmt; if test "x$withval" != "xyes"; then - with_pmt_val=$withval - with_pmt=yes - fi -fi - - if test x$with_pmt = xyes; then - if test x$enable_pmt = xyes; then - as_fn_error "Component pmt: Cannot use both --enable and --with" "$LINENO" 5 - else - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - - l_PKG_CONFIG_PATH=$with_pmt_val - if test "x$l_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH - if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - as_fn_error "Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi - fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - passed=with; check1=yes + save_LIBS="$LIBS" + LIBS="" + case "$host_os" in + darwin*) + USB_LIBS="$USB_LIBS -lIOKit" + LIBS="$USB_LIBS" + ;; + *) ;; + esac + as_ac_Lib=`$as_echo "ac_cv_lib_$usb_lib_name''_$usb_lib_func" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $usb_lib_func in -l$usb_lib_name" >&5 +$as_echo_n "checking for $usb_lib_func in -l$usb_lib_name... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$usb_lib_name $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - check1=no - if test "x$l_PKG_CONFIG_PATH" != "x"; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - passed=with +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $usb_lib_func (); +int +main () +{ +return $usb_lib_func (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" else - passed=no + eval "$as_ac_Lib=no" fi - fi - fi - if test $passed != with; then - as_fn_error "Component pmt: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_LIB$usb_lib_name" | $as_tr_cpp` 1 +_ACEOF - pmt_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}` - pmt_LA=`$PKG_CONFIG --libs ${pc_comp_name}` - pmt_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}` - - if test x$check1 = xyes; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} - fi - fi - - : - fi - fi - - - - - if test $passed != no; then - if test $passed = yes; then - if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component pmt requires omnithread, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$omnithread_with = xno; then - as_fn_error "Component pmt requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 - fi - fi - fi - - - if test $passed = yes; then - - if test x"$GUILE" = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt requires guile, which was not found." >&5 -$as_echo "Component pmt requires guile, which was not found." >&6; } - passed=no - fi - - fi - if test $passed != with; then - pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib" - pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la" - fi - - ac_config_files="$ac_config_files pmt/Makefile pmt/pmt.pc pmt/doc/Makefile pmt/src/Makefile pmt/src/lib/Makefile pmt/src/scheme/Makefile pmt/src/scheme/gnuradio/Makefile" - - - - - pmt_with=no - if test $passed = no; then - if test x$enable_pmt = xyes; then - as_fn_error "Component pmt has errors; stopping." "$LINENO" 5 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component pmt." >&5 -$as_echo "Not building component pmt." >&6; } - fi - else - if test $passed = with; then - with_dirs="$with_dirs pmt" - - if test "x${pmt_INCLUDES}" != "x"; then - if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${pmt_INCLUDES}" - else - with_INCLUDES="${pmt_INCLUDES}"" ""$with_INCLUDES" - fi - pmt_INCLUDES= - fi - - - if test "x${pmt_SWIG_INCLUDES}" != "x"; then - if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}" - else - with_SWIG_INCLUDES="${pmt_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" - fi - pmt_SWIG_INCLUDES= - fi - - - if test "x${pmt_PYDIRPATH}" != "x"; then - if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${pmt_PYDIRPATH}" - else - with_PYDIRPATH="${pmt_PYDIRPATH}"":""$with_PYDIRPATH" - fi - pmt_PYDIRPATH= - fi - + LIBS="-l$usb_lib_name $LIBS" - if test "x${pmt_SWIGDIRPATH}" != "x"; then - if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${pmt_SWIGDIRPATH}" - else - with_SWIGDIRPATH="${pmt_SWIGDIRPATH}"":""$with_SWIGDIRPATH" - fi - pmt_SWIGDIRPATH= - fi +else + libusbok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires library '$usb_lib_name' with function '$usb_lib_func', which was either not found or was not usable. See http://www.libusb.org" >&5 +$as_echo "USRP requires library '$usb_lib_name' with function '$usb_lib_func', which was either not found or was not usable. See http://www.libusb.org" >&6; } - if test "x${pmt_LIBDIRPATH}" != "x"; then - if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${pmt_LIBDIRPATH}" - else - with_LIBDIRPATH="${pmt_LIBDIRPATH}"":""$with_LIBDIRPATH" - fi - pmt_LIBDIRPATH= - fi +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt will be included from a pre-installed library and includes." >&5 -$as_echo "Component pmt will be included from a pre-installed library and includes." >&6; } - pmt_with=yes - else - pmt_LDFLAG= - if test x$enable_pmt != xno; then + case "$host_os" in + cygwin* | mingw*) + USB_LIBS="$LIBS" + ;; + *) ;; + esac + LIBS="$save_LIBS" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - build_dirs="$build_dirs pmt" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt passed configuration checks; building." >&5 -$as_echo "Component pmt passed configuration checks; building." >&6; } - else - passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component pmt passed configuration checks; but not building." >&5 -$as_echo "Component pmt passed configuration checks; but not building." >&6; } - fi - fi - fi - if test $passed = no; then - skipped_dirs="$skipped_dirs pmt" - pmt_skipped=yes - else - pmt_skipped=no fi + fi + if test $libusbok = yes; then + : + else + USB_INCLUDES= + USB_LIBS= + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Unable to find dependency libusb." >&5 +$as_echo "Unable to find dependency libusb." >&6; } + fi - - - - - - - - passed=yes - # Check whether --enable-mblock was given. -if test "${enable_mblock+set}" = set; then : - enableval=$enable_mblock; + sdccok=yes + # Extract the first word of "sdcc", so it can be a program name with args. +set dummy sdcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_XCC+set}" = set; then : + $as_echo_n "(cached) " >&6 else + if test -n "$XCC"; then + ac_cv_prog_XCC="$XCC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_XCC="sdcc -mmcs51 --no-xinit-opt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - enable_mblock=$enable_all_components - if test x$enable_all_components = xno; then - passed=no - fi - + test -z "$ac_cv_prog_XCC" && ac_cv_prog_XCC="no" fi - - - - - - if test x = x; then - pc_comp_name="mblock" - else - pc_comp_name="" - fi - - -# Check whether --with-mblock was given. -if test "${with_mblock+set}" = set; then : - withval=$with_mblock; if test "x$withval" != "xyes"; then - with_mblock_val=$withval - with_mblock=yes - fi +fi +XCC=$ac_cv_prog_XCC +if test -n "$XCC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCC" >&5 +$as_echo "$XCC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test x$with_mblock = xyes; then - if test x$enable_mblock = xyes; then - as_fn_error "Component mblock: Cannot use both --enable and --with" "$LINENO" 5 - else - - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - - l_PKG_CONFIG_PATH=$with_mblock_val - if test "x$l_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH - - if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - as_fn_error "Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi - fi - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - passed=with; check1=yes + # Extract the first word of "asx8051", so it can be a program name with args. +set dummy asx8051; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_XAS+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$XAS"; then + ac_cv_prog_XAS="$XAS" # Let the user override the test. else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_XAS="asx8051 -plosgff" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - check1=no - if test "x$l_PKG_CONFIG_PATH" != "x"; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - passed=with + test -z "$ac_cv_prog_XAS" && ac_cv_prog_XAS="no" +fi +fi +XAS=$ac_cv_prog_XAS +if test -n "$XAS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAS" >&5 +$as_echo "$XAS" >&6; } else - passed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - fi - fi - if test $passed != with; then - as_fn_error "Component mblock: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH -fi - mblock_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}` - mblock_LA=`$PKG_CONFIG --libs ${pc_comp_name}` - mblock_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}` - if test x$check1 = xyes; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} - fi - fi + if test "$XCC" = "no" -o "$XAS" = "no" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires sdcc. sdcc not found. See http://sdcc.sf.net" >&5 +$as_echo "USRP requires sdcc. sdcc not found. See http://sdcc.sf.net" >&6; } + sdccok=no + else + sdcc_version_min=2.4.0 - : - fi - fi + sdcc_version=`sdcc --version 2>&1 | \ + sed 's/\(SDCC.* \)\([0-9]*\.[0-9]*\.[0-9]*\)\( .*$\)/\2/'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking sdcc_version \"$sdcc_version\"" >&5 +$as_echo_n "checking sdcc_version \"$sdcc_version\"... " >&6; } + sdcc_major_version=`echo $sdcc_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + sdcc_minor_version=`echo $sdcc_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + sdcc_micro_version=`echo $sdcc_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + sdcc_major_min=`echo $sdcc_version_min | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + sdcc_minor_min=`echo $sdcc_version_min | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + sdcc_micro_min=`echo $sdcc_version_min | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test $passed != no; then - if test $passed = yes; then - if test x$pmt_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock requires pmt, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component mblock requires pmt, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$pmt_with = xno; then - as_fn_error "Component mblock requires pmt to be included as --with-pmt[=arg]" "$LINENO" 5 - fi - fi - fi + sdcc_version_proper=`expr \ + "$sdcc_major_version" \> "$sdcc_major_min" \| \ + "$sdcc_major_version" \= "$sdcc_major_min" \& \ + "$sdcc_minor_version" \> "$sdcc_minor_min" \| \ + "$sdcc_major_version" \= "$sdcc_major_min" \& \ + "$sdcc_minor_version" \= "$sdcc_minor_min" \& \ + "$sdcc_micro_version" \>= "$sdcc_micro_min" ` + if test "$sdcc_version_proper" = "1" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sdcc_major_version.$sdcc_minor_version.$sdcc_micro_version" >&5 +$as_echo "$sdcc_major_version.$sdcc_minor_version.$sdcc_micro_version" >&6; } + else + sdccok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires sdcc >= $sdcc_version_min. sdcc not found. See http://sdcc.sf.net" >&5 +$as_echo "USRP requires sdcc >= $sdcc_version_min. sdcc not found. See http://sdcc.sf.net" >&6; } + fi - if test $passed != no; then - if test $passed = yes; then - if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component mblock requires omnithread, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$omnithread_with = xno; then - as_fn_error "Component mblock requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 - fi - fi - fi - if test $passed = yes; then + fi - if test x"$GUILE" = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock requires guile, which was not found." >&5 -$as_echo "Component mblock requires guile, which was not found." >&6; } - passed=no - fi + if test $sdccok = yes; then + : + else + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Unable to find firmware compiler SDCC." >&5 +$as_echo "Unable to find firmware compiler SDCC." >&6; } + fi fi if test $passed != with; then - mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/include" - mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la" + usrp_INCLUDES=" \ + -I\${abs_top_srcdir}/usrp/host/include \ + -I\${abs_top_builddir}/usrp/host/include \ + -I\${abs_top_srcdir}/usrp/firmware/include" + usrp_LA="\${abs_top_builddir}/usrp/host/lib/libusrp.la" fi - ac_config_files="$ac_config_files mblock/Makefile mblock/mblock.pc mblock/doc/Makefile mblock/src/Makefile mblock/src/include/Makefile mblock/src/include/mblock/Makefile mblock/src/lib/Makefile mblock/src/scheme/Makefile mblock/src/scheme/gnuradio/Makefile" + ac_config_files="$ac_config_files usrp/Makefile usrp/usrp.pc usrp/usrp.iss usrp/doc/Doxyfile usrp/doc/Makefile usrp/doc/other/Makefile usrp/host/Makefile usrp/host/include/Makefile usrp/host/include/usrp/Makefile usrp/host/misc/Makefile usrp/host/lib/Makefile usrp/host/lib/std_paths.h usrp/host/swig/Makefile usrp/host/apps/Makefile usrp/firmware/Makefile usrp/firmware/include/Makefile usrp/firmware/lib/Makefile usrp/firmware/src/Makefile usrp/firmware/src/common/Makefile usrp/firmware/src/usrp2/Makefile usrp/fpga/Makefile usrp/fpga/rbf/Makefile usrp/fpga/rbf/rev2/Makefile usrp/fpga/rbf/rev4/Makefile" - mblock_with=no + usrp_with=no if test $passed = no; then - if test x$enable_mblock = xyes; then - as_fn_error "Component mblock has errors; stopping." "$LINENO" 5 + if test x$enable_usrp = xyes; then + as_fn_error $? "Component usrp has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component mblock." >&5 -$as_echo "Not building component mblock." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp." >&5 +$as_echo "Not building component usrp." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs mblock" + with_dirs="$with_dirs usrp" - if test "x${mblock_INCLUDES}" != "x"; then + if test "x${usrp_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${mblock_INCLUDES}" + with_INCLUDES="${usrp_INCLUDES}" else - with_INCLUDES="${mblock_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${usrp_INCLUDES}"" ""$with_INCLUDES" fi - mblock_INCLUDES= + usrp_INCLUDES= fi - if test "x${mblock_SWIG_INCLUDES}" != "x"; then + if test "x${usrp_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${usrp_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${mblock_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${usrp_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - mblock_SWIG_INCLUDES= + usrp_SWIG_INCLUDES= fi - if test "x${mblock_PYDIRPATH}" != "x"; then + if test "x${usrp_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${mblock_PYDIRPATH}" + with_PYDIRPATH="${usrp_PYDIRPATH}" else - with_PYDIRPATH="${mblock_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${usrp_PYDIRPATH}"":""$with_PYDIRPATH" fi - mblock_PYDIRPATH= + usrp_PYDIRPATH= fi - if test "x${mblock_SWIGDIRPATH}" != "x"; then + if test "x${usrp_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${mblock_SWIGDIRPATH}" + with_SWIGDIRPATH="${usrp_SWIGDIRPATH}" else - with_SWIGDIRPATH="${mblock_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${usrp_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - mblock_SWIGDIRPATH= + usrp_SWIGDIRPATH= fi - if test "x${mblock_LIBDIRPATH}" != "x"; then + if test "x${usrp_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${mblock_LIBDIRPATH}" + with_LIBDIRPATH="${usrp_LIBDIRPATH}" else - with_LIBDIRPATH="${mblock_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${usrp_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - mblock_LIBDIRPATH= + usrp_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock will be included from a pre-installed library and includes." >&5 -$as_echo "Component mblock will be included from a pre-installed library and includes." >&6; } - mblock_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp will be included from a pre-installed library and includes." >&5 +$as_echo "Component usrp will be included from a pre-installed library and includes." >&6; } + usrp_with=yes else - mblock_LDFLAG= - if test x$enable_mblock != xno; then - - build_dirs="$build_dirs mblock" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock passed configuration checks; building." >&5 -$as_echo "Component mblock passed configuration checks; building." >&6; } + usrp_LDFLAG= + if test x$enable_usrp != xno; then + : + build_dirs="$build_dirs usrp" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp passed configuration checks; building." >&5 +$as_echo "Component usrp passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component mblock passed configuration checks; but not building." >&5 -$as_echo "Component mblock passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp passed configuration checks; but not building." >&5 +$as_echo "Component usrp passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs mblock" - mblock_skipped=yes + skipped_dirs="$skipped_dirs usrp" + usrp_skipped=yes else - mblock_skipped=no + usrp_skipped=no fi @@ -26967,113 +24964,19 @@ $as_echo "Component mblock passed configuration checks; but not building." >&6; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 -$as_echo_n "checking whether stat file-mode macros are broken... " >&6; } -if test "${ac_cv_header_stat_broken+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include - -#if defined S_ISBLK && defined S_IFDIR -extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1]; -#endif - -#if defined S_ISBLK && defined S_IFCHR -extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1]; -#endif - -#if defined S_ISLNK && defined S_IFREG -extern char c3[S_ISLNK (S_IFREG) ? -1 : 1]; -#endif - -#if defined S_ISSOCK && defined S_IFREG -extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stat_broken=no -else - ac_cv_header_stat_broken=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 -$as_echo "$ac_cv_header_stat_broken" >&6; } -if test $ac_cv_header_stat_broken = yes; then - -$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h - -fi - - - for ac_header in fcntl.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" -if test "x$ac_cv_header_fcntl_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FCNTL_H 1 -_ACEOF - -fi - -done - - - - for ac_header in sys/time.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_time_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TIME_H 1 -_ACEOF - -fi - -done - - - - for ac_header in unistd.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" -if test "x$ac_cv_header_unistd_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_UNISTD_H 1 -_ACEOF - -fi - -done - - - - ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default" -if test "x$ac_cv_have_decl_getenv" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETENV $ac_have_decl -_ACEOF passed=yes - # Check whether --enable-usrp was given. -if test "${enable_usrp+set}" = set; then : - enableval=$enable_usrp; + # Check whether --enable-usrp2 was given. +if test "${enable_usrp2+set}" = set; then : + enableval=$enable_usrp2; else - enable_usrp=$enable_all_components + enable_usrp2=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -27083,1230 +24986,652 @@ fi - - if test x = x; then - pc_comp_name="usrp" - else - pc_comp_name="" - fi - - -# Check whether --with-usrp was given. -if test "${with_usrp+set}" = set; then : - withval=$with_usrp; if test "x$withval" != "xyes"; then - with_usrp_val=$withval - with_usrp=yes - fi -fi - - if test x$with_usrp = xyes; then - if test x$enable_usrp = xyes; then - as_fn_error "Component usrp: Cannot use both --enable and --with" "$LINENO" 5 - else - - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - - l_PKG_CONFIG_PATH=$with_usrp_val - if test "x$l_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH - - if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - as_fn_error "Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi - fi - - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - passed=with; check1=yes -else - - check1=no - if test "x$l_PKG_CONFIG_PATH" != "x"; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\${pc_comp_name}\""; } >&5 - ($PKG_CONFIG --exists --print-errors "${pc_comp_name}") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - passed=with -else - passed=no -fi - fi - fi - if test $passed != with; then - as_fn_error "Component usrp: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 - fi - s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH - -fi - - usrp_INCLUDES=`$PKG_CONFIG --cflags-only-I ${pc_comp_name}` - usrp_LA=`$PKG_CONFIG --libs ${pc_comp_name}` - usrp_INCLUDEDIR=`$PKG_CONFIG --variable=includedir ${pc_comp_name}` - - if test x$check1 = xyes; then - if test "x$s_PKG_CONFIG_PATH" != "x"; then - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH} - fi - fi - - : - fi - fi - + subdirs="$subdirs usrp2/firmware" if test $passed != no; then if test $passed = yes; then - if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp requires omnithread, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component usrp requires omnithread, which is not being built or specified via pre-installed files." >&6; } + if test x$gruel_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 requires gruel, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component usrp2 requires gruel, which is not being built or specified via pre-installed files." >&6; } passed=no fi else - if test x$omnithread_with = xno; then - as_fn_error "Component usrp requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 + if test x$gruel_with = xno; then + as_fn_error $? "Component usrp2 requires gruel to be included as --with-gruel[=arg]" "$LINENO" 5 fi fi fi - - -# Check whether --with-fusb-tech was given. -if test "${with_fusb_tech+set}" = set; then : - withval=$with_fusb_tech; cf_with_fusb_tech="$withval" -else - cf_with_fusb_tech="$host_os" -fi - - if test x${enable_usrp} != xno; then - case "$cf_with_fusb_tech" in - linux*) - ac_fn_c_check_header_mongrel "$LINENO" "linux/usbdevice_fs.h" "ac_cv_header_linux_usbdevice_fs_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_usbdevice_fs_h" = x""yes; then : - x_have_usbdevice_fs_h=yes -else - x_have_usbdevice_fs_h=no -fi - - - if test x${x_have_usbdevice_fs_h} = xyes; then - FUSB_TECH=linux - else - FUSB_TECH=generic - fi - ;; - darwin*) - FUSB_TECH=darwin - ;; - cygwin*|win*|mingw*) - FUSB_TECH=win32 - ;; - *bsd*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RA/WB" >&5 -$as_echo_n "checking for RA/WB... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -struct usb_bulk_ra_wb_opt o; - ioctl(0, USB_SET_BULK_RA, &o); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - FUSB_TECH=ra_wb -else - FUSB_TECH=generic -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; - *) - FUSB_TECH=generic - ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fast usb technique to use" >&5 -$as_echo_n "checking for fast usb technique to use... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FUSB_TECH" >&5 -$as_echo "$FUSB_TECH" >&6; } - - fi - - if test x$FUSB_TECH = xdarwin; then - FUSB_TECH_darwin_TRUE= - FUSB_TECH_darwin_FALSE='#' -else - FUSB_TECH_darwin_TRUE='#' - FUSB_TECH_darwin_FALSE= -fi - - if test x$FUSB_TECH = xwin32; then - FUSB_TECH_win32_TRUE= - FUSB_TECH_win32_FALSE='#' -else - FUSB_TECH_win32_TRUE='#' - FUSB_TECH_win32_FALSE= -fi - - if test x$FUSB_TECH = xgeneric; then - FUSB_TECH_generic_TRUE= - FUSB_TECH_generic_FALSE='#' -else - FUSB_TECH_generic_TRUE='#' - FUSB_TECH_generic_FALSE= -fi - - if test x$FUSB_TECH = xlinux; then - FUSB_TECH_linux_TRUE= - FUSB_TECH_linux_FALSE='#' -else - FUSB_TECH_linux_TRUE='#' - FUSB_TECH_linux_FALSE= -fi - - if test x$FUSB_TECH = xra_wb; then - FUSB_TECH_ra_wb_TRUE= - FUSB_TECH_ra_wb_FALSE='#' -else - FUSB_TECH_ra_wb_TRUE='#' - FUSB_TECH_ra_wb_FALSE= -fi - - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether host_os is linux*" >&5 +$as_echo_n "checking whether host_os is linux*... " >&6; } + case "$host_os" in + linux*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: USRP2 currently requires Linux host OS, not found" >&5 +$as_echo "$as_me: USRP2 currently requires Linux host OS, not found" >&6;} + passed="no" + ;; + esac if test $passed = yes; then - for ac_func in mkstemp + for ac_header in arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h do : - ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp" -if test "x$ac_cv_func_mkstemp" = x""yes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_MKSTEMP 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -else - case " $LIBOBJS " in - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" - ;; -esac - fi -done - - - if test $ac_cv_func_mkstemp = no; then - utils_cv_func_mkstemp_limitations=yes - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mkstemp limitations" >&5 -$as_echo_n "checking for mkstemp limitations... " >&6; } -if test "${utils_cv_func_mkstemp_limitations+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - - if test "$cross_compiling" = yes; then : - utils_cv_func_mkstemp_limitations=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +done -# include - int main () - { - int i; - for (i = 0; i < 70; i++) - { - char template[] = "conftestXXXXXX"; - int fd = mkstemp (template); - if (fd == -1) - exit (1); - close (fd); - } - exit (0); - } + ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" "#define __USE_GNU 1 + #include + #include + #include +" +if test "x$ac_cv_member_struct_msghdr_msg_control" = x""yes; then : +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1 _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - utils_cv_func_mkstemp_limitations=no -else - utils_cv_func_mkstemp_limitations=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $utils_cv_func_mkstemp_limitations" >&5 -$as_echo "$utils_cv_func_mkstemp_limitations" >&6; } - fi - - if test $utils_cv_func_mkstemp_limitations = yes; then - case " $LIBOBJS " in - *" mkstemp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" - ;; -esac - - case " $LIBOBJS " in - *" tempname.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS tempname.$ac_objext" - ;; -esac - - -$as_echo "#define mkstemp rpl_mkstemp" >>confdefs.h - - - - - - - - : - - - - - - - - +ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_accrights" "ac_cv_member_struct_msghdr_msg_accrights" "#define __USE_GNU 1 + #include + #include + #include +" +if test "x$ac_cv_member_struct_msghdr_msg_accrights" = x""yes; then : +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS 1 +_ACEOF - for ac_header in stdint.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" -if test "x$ac_cv_header_stdint_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDINT_H 1 +fi +ac_fn_c_check_member "$LINENO" "struct cmsgcred" "cmcred_uid" "ac_cv_member_struct_cmsgcred_cmcred_uid" "#define __USE_GNU 1 + #include + #include + #include +" +if test "x$ac_cv_member_struct_cmsgcred_cmcred_uid" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_CMSGCRED_CMCRED_UID 1 _ACEOF -fi -done +fi +ac_fn_c_check_member "$LINENO" "struct ucred" "uid" "ac_cv_member_struct_ucred_uid" "#define __USE_GNU 1 + #include + #include + #include +" +if test "x$ac_cv_member_struct_ucred_uid" = x""yes; then : - for ac_func in __secure_getenv gettimeofday lstat -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_UCRED_UID 1 _ACEOF + fi -done + fi + if test $passed != with; then + USRP2_INCLUDES="-I\${abs_top_srcdir}/usrp2/host/include \ + -I\${abs_top_srcdir}/usrp2/firmware/include" + USRP2_LA="\${abs_top_builddir}/usrp2/host/lib/libusrp2.la" + fi - : + ac_config_files="$ac_config_files usrp2/Makefile usrp2/host/Makefile usrp2/host/usrp2.pc usrp2/host/include/Makefile usrp2/host/include/usrp2/Makefile usrp2/host/lib/Makefile usrp2/host/apps/Makefile" - # AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir accepts only one arg" >&5 -$as_echo_n "checking whether mkdir accepts only one arg... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include - #include -int -main () -{ - mkdir("") + usrp2_with=no + if test $passed = no; then + if test x$enable_usrp2 = xyes; then + as_fn_error $? "Component usrp2 has errors; stopping." "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp2." >&5 +$as_echo "Not building component usrp2." >&6; } + fi + else + if test $passed = with; then + with_dirs="$with_dirs usrp2" - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if test "x${usrp2_INCLUDES}" != "x"; then + if test "x$with_INCLUDES" = "x"; then + with_INCLUDES="${usrp2_INCLUDES}" + else + with_INCLUDES="${usrp2_INCLUDES}"" ""$with_INCLUDES" + fi + usrp2_INCLUDES= + fi -$as_echo "#define MKDIR_TAKES_ONE_ARG /**/" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + if test "x${usrp2_SWIG_INCLUDES}" != "x"; then + if test "x$with_SWIG_INCLUDES" = "x"; then + with_SWIG_INCLUDES="${usrp2_SWIG_INCLUDES}" + else + with_SWIG_INCLUDES="${usrp2_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + fi + usrp2_SWIG_INCLUDES= + fi -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi + if test "x${usrp2_PYDIRPATH}" != "x"; then + if test "x$with_PYDIRPATH" = "x"; then + with_PYDIRPATH="${usrp2_PYDIRPATH}" + else + with_PYDIRPATH="${usrp2_PYDIRPATH}"":""$with_PYDIRPATH" + fi + usrp2_PYDIRPATH= + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_bigendian=unknown - # See if we're dealing with a universal compiler. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; + if test "x${usrp2_SWIGDIRPATH}" != "x"; then + if test "x$with_SWIGDIRPATH" = "x"; then + with_SWIGDIRPATH="${usrp2_SWIGDIRPATH}" + else + with_SWIGDIRPATH="${usrp2_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + fi + usrp2_SWIGDIRPATH= + fi -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # Check for potential -arch flags. It is not universal unless - # there are at least two -arch flags with different values. - ac_arch= - ac_prev= - for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do - if test -n "$ac_prev"; then - case $ac_word in - i?86 | x86_64 | ppc | ppc64) - if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then - ac_arch=$ac_word - else - ac_cv_c_bigendian=universal - break - fi - ;; - esac - ac_prev= - elif test "x$ac_word" = "x-arch"; then - ac_prev=arch - fi - done -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include + if test "x${usrp2_LIBDIRPATH}" != "x"; then + if test "x$with_LIBDIRPATH" = "x"; then + with_LIBDIRPATH="${usrp2_LIBDIRPATH}" + else + with_LIBDIRPATH="${usrp2_LIBDIRPATH}"":""$with_LIBDIRPATH" + fi + usrp2_LIBDIRPATH= + fi -int -main () -{ -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ - && LITTLE_ENDIAN) - bogus endian macros - #endif + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 will be included from a pre-installed library and includes." >&5 +$as_echo "Component usrp2 will be included from a pre-installed library and includes." >&6; } + usrp2_with=yes + else + usrp2_LDFLAG= + if test x$enable_usrp2 != xno; then + : + build_dirs="$build_dirs usrp2" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 passed configuration checks; building." >&5 +$as_echo "Component usrp2 passed configuration checks; building." >&6; } + else + passed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 passed configuration checks; but not building." >&5 +$as_echo "Component usrp2 passed configuration checks; but not building." >&6; } + fi + fi + fi + if test $passed = no; then + skipped_dirs="$skipped_dirs usrp2" + usrp2_skipped=yes + else + usrp2_skipped=no + fi - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) - bogus endian macros - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to _BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -#ifndef _BIG_ENDIAN - not big endian - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # Compile a test program. - if test "$cross_compiling" = yes; then : - # Try to guess by grepping values from an object file. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -short int ascii_mm[] = - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; - int use_ascii (int i) { - return ascii_mm[i] + ascii_ii[i]; - } - short int ebcdic_ii[] = - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; - int use_ebcdic (int i) { - return ebcdic_mm[i] + ebcdic_ii[i]; - } - extern int foo; -int -main () -{ -return use_ascii (foo) == use_ebcdic (foo); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then - ac_cv_c_bigendian=yes - fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi - fi -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_bigendian=no + + passed=yes + # Check whether --enable-gr-usrp was given. +if test "${enable_gr_usrp+set}" = set; then : + enableval=$enable_gr_usrp; else - ac_cv_c_bigendian=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - fi + enable_gr_usrp=$enable_all_components + if test x$enable_all_components = xno; then + passed=no + fi + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } - case $ac_cv_c_bigendian in #( - yes) - $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h -;; #( - no) - ;; #( - universal) -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - ;; #( - *) - as_fn_error "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; - esac - for ac_header in byteswap.h linux/compiler.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done + if test $passed != no; then + if test $passed = yes; then + if test x$usrp_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp requires usrp, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-usrp requires usrp, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$usrp_with = xno; then + as_fn_error $? "Component gr-usrp requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 + fi + fi + fi - for ac_func in getrusage sched_setscheduler pthread_setschedparam -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done + if test $passed != no; then + if test $passed = yes; then + if test x$gnuradio_core_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-usrp requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$gnuradio_core_with = xno; then + as_fn_error $? "Component gr-usrp requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + fi + fi + fi - for ac_func in sigaction snprintf -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done + ac_config_files="$ac_config_files gr-usrp/Makefile gr-usrp/gnuradio-usrp.pc gr-usrp/src/Makefile gr-usrp/src/run_tests gr-usrp/apps/Makefile" - libusbok=yes + gr_usrp_with=no + if test $passed = no; then + if test x$enable_gr_usrp = xyes; then + as_fn_error $? "Component gr-usrp has errors; stopping." "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-usrp." >&5 +$as_echo "Not building component gr-usrp." >&6; } + fi + else + if test $passed = with; then + with_dirs="$with_dirs gr-usrp" + if test "x${gr_usrp_INCLUDES}" != "x"; then + if test "x$with_INCLUDES" = "x"; then + with_INCLUDES="${gr_usrp_INCLUDES}" + else + with_INCLUDES="${gr_usrp_INCLUDES}"" ""$with_INCLUDES" + fi + gr_usrp_INCLUDES= + fi -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5 -$as_echo_n "checking for USB... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$USB_CFLAGS"; then - pkg_cv_USB_CFLAGS="$USB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null` -else - pkg_failed=yes -fi + if test "x${gr_usrp_SWIG_INCLUDES}" != "x"; then + if test "x$with_SWIG_INCLUDES" = "x"; then + with_SWIG_INCLUDES="${gr_usrp_SWIG_INCLUDES}" + else + with_SWIG_INCLUDES="${gr_usrp_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + fi + gr_usrp_SWIG_INCLUDES= fi -else - pkg_failed=untried -fi -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$USB_LIBS"; then - pkg_cv_USB_LIBS="$USB_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_USB_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; - esac - done - pkg_cv_USB_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$USB_LIBS"; then - pkg_cv_USB_LIBS="$USB_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null` -else - pkg_failed=yes -fi + + if test "x${gr_usrp_PYDIRPATH}" != "x"; then + if test "x$with_PYDIRPATH" = "x"; then + with_PYDIRPATH="${gr_usrp_PYDIRPATH}" + else + with_PYDIRPATH="${gr_usrp_PYDIRPATH}"":""$with_PYDIRPATH" + fi + gr_usrp_PYDIRPATH= fi -else - pkg_failed=untried -fi -fi -if test -n "$PKG_CONFIG"; then - if test -n "$USB_INCLUDEDIR"; then - pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb" 2>/dev/null` -else - pkg_failed=yes -fi + + if test "x${gr_usrp_SWIGDIRPATH}" != "x"; then + if test "x$with_SWIGDIRPATH" = "x"; then + with_SWIGDIRPATH="${gr_usrp_SWIGDIRPATH}" + else + with_SWIGDIRPATH="${gr_usrp_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + fi + gr_usrp_SWIGDIRPATH= fi -else - pkg_failed=untried -fi + if test "x${gr_usrp_LIBDIRPATH}" != "x"; then + if test "x$with_LIBDIRPATH" = "x"; then + with_LIBDIRPATH="${gr_usrp_LIBDIRPATH}" + else + with_LIBDIRPATH="${gr_usrp_LIBDIRPATH}"":""$with_LIBDIRPATH" + fi + gr_usrp_LIBDIRPATH= + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-usrp will be included from a pre-installed library and includes." >&6; } + gr_usrp_with=yes + else + gr_usrp_LDFLAG= + if test x$enable_gr_usrp != xno; then + ac_config_commands="$ac_config_commands run_tests_usrp" -if test $pkg_failed = yes; then -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb"` - else - USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb"` - fi - # Put the nasty error message in config.log where it belongs - echo "$USB_PKG_ERRORS" >&5 + build_dirs="$build_dirs gr-usrp" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp passed configuration checks; building." >&5 +$as_echo "Component gr-usrp passed configuration checks; building." >&6; } + else + passed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp passed configuration checks; but not building." >&5 +$as_echo "Component gr-usrp passed configuration checks; but not building." >&6; } + fi + fi + fi + if test $passed = no; then + skipped_dirs="$skipped_dirs gr-usrp" + gr_usrp_skipped=yes + else + gr_usrp_skipped=no + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - for ac_header in usb.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default" -if test "x$ac_cv_header_usb_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_USB_H 1 -_ACEOF -else - libusbok=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5 -$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; } -fi -done - save_LIBS="$LIBS" - case "$host_os" in - darwin*) - LIBS="$LIBS -lIOKit" - ;; - *) ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing usb_bulk_write" >&5 -$as_echo_n "checking for library containing usb_bulk_write... " >&6; } -if test "${ac_cv_search_usb_bulk_write+set}" = set; then : - $as_echo_n "(cached) " >&6 + + passed=yes + # Check whether --enable-gr-usrp2 was given. +if test "${enable_gr_usrp2+set}" = set; then : + enableval=$enable_gr_usrp2; else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char usb_bulk_write (); -int -main () -{ -return usb_bulk_write (); - ; - return 0; -} -_ACEOF -for ac_lib in '' usb; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_usb_bulk_write=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_usb_bulk_write+set}" = set; then : - break -fi -done -if test "${ac_cv_search_usb_bulk_write+set}" = set; then : + enable_gr_usrp2=$enable_all_components + if test x$enable_all_components = xno; then + passed=no + fi -else - ac_cv_search_usb_bulk_write=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_usb_bulk_write" >&5 -$as_echo "$ac_cv_search_usb_bulk_write" >&6; } -ac_res=$ac_cv_search_usb_bulk_write -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - USB_LIBS="$LIBS" -else - libusbok=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5 -$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; } fi - LIBS="$save_LIBS" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -elif test $pkg_failed = untried; then + if test $passed != no; then + if test $passed = yes; then + if test x$usrp2_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 requires usrp2, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-usrp2 requires usrp2, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$usrp2_with = xno; then + as_fn_error $? "Component gr-usrp2 requires usrp2 to be included as --with-usrp2[=arg]" "$LINENO" 5 + fi + fi + fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $passed != no; then + if test $passed = yes; then + if test x$gnuradio_core_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-usrp2 requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$gnuradio_core_with = xno; then + as_fn_error $? "Component gr-usrp2 requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + fi + fi + fi - for ac_header in usb.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default" -if test "x$ac_cv_header_usb_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_USB_H 1 -_ACEOF -else - libusbok=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5 -$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; } -fi + ac_config_files="$ac_config_files gr-usrp2/Makefile gr-usrp2/gnuradio-usrp2.pc gr-usrp2/src/Makefile gr-usrp2/src/run_tests" -done - save_LIBS="$LIBS" - case "$host_os" in - darwin*) - LIBS="$LIBS -lIOKit" - ;; - *) ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing usb_bulk_write" >&5 -$as_echo_n "checking for library containing usb_bulk_write... " >&6; } -if test "${ac_cv_search_usb_bulk_write+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + gr_usrp2_with=no + if test $passed = no; then + if test x$enable_gr_usrp2 = xyes; then + as_fn_error $? "Component gr-usrp2 has errors; stopping." "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-usrp2." >&5 +$as_echo "Not building component gr-usrp2." >&6; } + fi + else + if test $passed = with; then + with_dirs="$with_dirs gr-usrp2" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char usb_bulk_write (); -int -main () -{ -return usb_bulk_write (); - ; - return 0; -} -_ACEOF -for ac_lib in '' usb; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_usb_bulk_write=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_usb_bulk_write+set}" = set; then : - break -fi -done -if test "${ac_cv_search_usb_bulk_write+set}" = set; then : + if test "x${gr_usrp2_INCLUDES}" != "x"; then + if test "x$with_INCLUDES" = "x"; then + with_INCLUDES="${gr_usrp2_INCLUDES}" + else + with_INCLUDES="${gr_usrp2_INCLUDES}"" ""$with_INCLUDES" + fi + gr_usrp2_INCLUDES= + fi -else - ac_cv_search_usb_bulk_write=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_usb_bulk_write" >&5 -$as_echo "$ac_cv_search_usb_bulk_write" >&6; } -ac_res=$ac_cv_search_usb_bulk_write -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - USB_LIBS="$LIBS" -else - libusbok=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5 -$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; } -fi + if test "x${gr_usrp2_SWIG_INCLUDES}" != "x"; then + if test "x$with_SWIG_INCLUDES" = "x"; then + with_SWIG_INCLUDES="${gr_usrp2_SWIG_INCLUDES}" + else + with_SWIG_INCLUDES="${gr_usrp2_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + fi + gr_usrp2_SWIG_INCLUDES= + fi - LIBS="$save_LIBS" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "x${gr_usrp2_PYDIRPATH}" != "x"; then + if test "x$with_PYDIRPATH" = "x"; then + with_PYDIRPATH="${gr_usrp2_PYDIRPATH}" + else + with_PYDIRPATH="${gr_usrp2_PYDIRPATH}"":""$with_PYDIRPATH" + fi + gr_usrp2_PYDIRPATH= + fi -else - USB_CFLAGS=$pkg_cv_USB_CFLAGS - USB_LIBS=$pkg_cv_USB_LIBS - USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR + if test "x${gr_usrp2_SWIGDIRPATH}" != "x"; then + if test "x$with_SWIGDIRPATH" = "x"; then + with_SWIGDIRPATH="${gr_usrp2_SWIGDIRPATH}" + else + with_SWIGDIRPATH="${gr_usrp2_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + fi + gr_usrp2_SWIGDIRPATH= + fi - USB_CPPFLAGS="" - for flag in $USB_CFLAGS; do - case $flag in - -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;; - esac - done - pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS + if test "x${gr_usrp2_LIBDIRPATH}" != "x"; then + if test "x$with_LIBDIRPATH" = "x"; then + with_LIBDIRPATH="${gr_usrp2_LIBDIRPATH}" + else + with_LIBDIRPATH="${gr_usrp2_LIBDIRPATH}"":""$with_LIBDIRPATH" + fi + gr_usrp2_LIBDIRPATH= + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-usrp2 will be included from a pre-installed library and includes." >&6; } + gr_usrp2_with=yes + else + gr_usrp2_LDFLAG= + if test x$enable_gr_usrp2 != xno; then + ac_config_commands="$ac_config_commands run_tests_usrp2" - if test x$libusbok = xyes; then - : + build_dirs="$build_dirs gr-usrp2" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 passed configuration checks; building." >&5 +$as_echo "Component gr-usrp2 passed configuration checks; building." >&6; } + else + passed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 passed configuration checks; but not building." >&5 +$as_echo "Component gr-usrp2 passed configuration checks; but not building." >&6; } + fi + fi + fi + if test $passed = no; then + skipped_dirs="$skipped_dirs gr-usrp2" + gr_usrp2_skipped=yes else - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Unable to find dependency libusb." >&5 -$as_echo "Unable to find dependency libusb." >&6; } + gr_usrp2_skipped=no fi - sdccok=yes - # Extract the first word of "sdcc", so it can be a program name with args. -set dummy sdcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_XCC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$XCC"; then - ac_cv_prog_XCC="$XCC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_XCC="sdcc -mmcs51 --no-xinit-opt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_XCC" && ac_cv_prog_XCC="no" -fi -fi -XCC=$ac_cv_prog_XCC -if test -n "$XCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCC" >&5 -$as_echo "$XCC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - # Extract the first word of "asx8051", so it can be a program name with args. -set dummy asx8051; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_XAS+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$XAS"; then - ac_cv_prog_XAS="$XAS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_XAS="asx8051 -plosgff" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - test -z "$ac_cv_prog_XAS" && ac_cv_prog_XAS="no" -fi -fi -XAS=$ac_cv_prog_XAS -if test -n "$XAS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAS" >&5 -$as_echo "$XAS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "$XCC" = "no" -o "$XAS" = "no" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires sdcc. sdcc not found. See http://sdcc.sf.net" >&5 -$as_echo "USRP requires sdcc. sdcc not found. See http://sdcc.sf.net" >&6; } - sdccok=no - else - sdcc_version_min=2.4.0 - sdcc_version=`sdcc --version 2>&1 | \ - sed 's/\(SDCC.* \)\([0-9]*\.[0-9]*\.[0-9]*\)\( .*$\)/\2/'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking sdcc_version \"$sdcc_version\"" >&5 -$as_echo_n "checking sdcc_version \"$sdcc_version\"... " >&6; } + passed=yes + # Check whether --enable-gr-gcell was given. +if test "${enable_gr_gcell+set}" = set; then : + enableval=$enable_gr_gcell; +else - sdcc_major_version=`echo $sdcc_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - sdcc_minor_version=`echo $sdcc_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - sdcc_micro_version=`echo $sdcc_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + enable_gr_gcell=$enable_all_components + if test x$enable_all_components = xno; then + passed=no + fi - sdcc_major_min=`echo $sdcc_version_min | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - sdcc_minor_min=`echo $sdcc_version_min | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - sdcc_micro_min=`echo $sdcc_version_min | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` +fi - sdcc_version_proper=`expr \ - "$sdcc_major_version" \> "$sdcc_major_min" \| \ - "$sdcc_major_version" \= "$sdcc_major_min" \& \ - "$sdcc_minor_version" \> "$sdcc_minor_min" \| \ - "$sdcc_major_version" \= "$sdcc_major_min" \& \ - "$sdcc_minor_version" \= "$sdcc_minor_min" \& \ - "$sdcc_micro_version" \>= "$sdcc_micro_min" ` - if test "$sdcc_version_proper" = "1" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sdcc_major_version.$sdcc_minor_version.$sdcc_micro_version" >&5 -$as_echo "$sdcc_major_version.$sdcc_minor_version.$sdcc_micro_version" >&6; } - else - sdccok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: USRP requires sdcc >= $sdcc_version_min. sdcc not found. See http://sdcc.sf.net" >&5 -$as_echo "USRP requires sdcc >= $sdcc_version_min. sdcc not found. See http://sdcc.sf.net" >&6; } - fi - fi + if test $passed != no; then + if test $passed = yes; then + if test x$gcell_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell requires gcell, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-gcell requires gcell, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$gcell_with = xno; then + as_fn_error $? "Component gr-gcell requires gcell to be included as --with-gcell[=arg]" "$LINENO" 5 + fi + fi + fi - if test $sdccok = yes; then - : - else - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Unable to find firmware compiler SDCC." >&5 -$as_echo "Unable to find firmware compiler SDCC." >&6; } - fi + if test $passed != no; then + if test $passed = yes; then + if test x$gnuradio_core_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-gcell requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$gnuradio_core_with = xno; then + as_fn_error $? "Component gr-gcell requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + fi + fi fi - if test $passed != with; then - usrp_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/legacy \ - -I\${abs_top_srcdir}/usrp/firmware/include \ - -I\${abs_top_builddir}/usrp/host/lib/legacy" - usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la" - fi - - case "$host_os" in - darwin*) - usrp_darwin_omnithread_pc_requires="gnuradio-omnithread" - ;; - *) usrp_darwin_omnithread_pc_requires="" - ;; - esac - ac_config_files="$ac_config_files usrp/Makefile usrp/usrp.pc usrp/usrp.iss usrp/doc/Doxyfile usrp/doc/Makefile usrp/doc/other/Makefile usrp/host/Makefile usrp/host/misc/Makefile usrp/host/lib/Makefile usrp/host/lib/legacy/Makefile usrp/host/lib/legacy/std_paths.h usrp/host/swig/Makefile usrp/host/apps/Makefile usrp/firmware/Makefile usrp/firmware/include/Makefile usrp/firmware/lib/Makefile usrp/firmware/src/Makefile usrp/firmware/src/common/Makefile usrp/firmware/src/usrp2/Makefile usrp/fpga/Makefile usrp/fpga/rbf/Makefile usrp/fpga/rbf/rev2/Makefile usrp/fpga/rbf/rev4/Makefile" + ac_config_files="$ac_config_files gr-gcell/Makefile gr-gcell/src/Makefile gr-gcell/src/examples/Makefile gr-gcell/src/run_tests" - usrp_with=no + gr_gcell_with=no if test $passed = no; then - if test x$enable_usrp = xyes; then - as_fn_error "Component usrp has errors; stopping." "$LINENO" 5 + if test x$enable_gr_gcell = xyes; then + as_fn_error $? "Component gr-gcell has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp." >&5 -$as_echo "Not building component usrp." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-gcell." >&5 +$as_echo "Not building component gr-gcell." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs usrp" + with_dirs="$with_dirs gr-gcell" - if test "x${usrp_INCLUDES}" != "x"; then + if test "x${gr_gcell_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${usrp_INCLUDES}" + with_INCLUDES="${gr_gcell_INCLUDES}" else - with_INCLUDES="${usrp_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_gcell_INCLUDES}"" ""$with_INCLUDES" fi - usrp_INCLUDES= + gr_gcell_INCLUDES= fi - if test "x${usrp_SWIG_INCLUDES}" != "x"; then + if test "x${gr_gcell_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${usrp_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_gcell_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${usrp_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_gcell_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - usrp_SWIG_INCLUDES= + gr_gcell_SWIG_INCLUDES= fi - if test "x${usrp_PYDIRPATH}" != "x"; then + if test "x${gr_gcell_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${usrp_PYDIRPATH}" + with_PYDIRPATH="${gr_gcell_PYDIRPATH}" else - with_PYDIRPATH="${usrp_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_gcell_PYDIRPATH}"":""$with_PYDIRPATH" fi - usrp_PYDIRPATH= + gr_gcell_PYDIRPATH= fi - if test "x${usrp_SWIGDIRPATH}" != "x"; then + if test "x${gr_gcell_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${usrp_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_gcell_SWIGDIRPATH}" else - with_SWIGDIRPATH="${usrp_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_gcell_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - usrp_SWIGDIRPATH= + gr_gcell_SWIGDIRPATH= fi - if test "x${usrp_LIBDIRPATH}" != "x"; then + if test "x${gr_gcell_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${usrp_LIBDIRPATH}" + with_LIBDIRPATH="${gr_gcell_LIBDIRPATH}" else - with_LIBDIRPATH="${usrp_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_gcell_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - usrp_LIBDIRPATH= + gr_gcell_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp will be included from a pre-installed library and includes." >&5 -$as_echo "Component usrp will be included from a pre-installed library and includes." >&6; } - usrp_with=yes - else - usrp_LDFLAG= - if test x$enable_usrp != xno; then - : - build_dirs="$build_dirs usrp" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp passed configuration checks; building." >&5 -$as_echo "Component usrp passed configuration checks; building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-gcell will be included from a pre-installed library and includes." >&6; } + gr_gcell_with=yes + else + gr_gcell_LDFLAG= + if test x$enable_gr_gcell != xno; then + ac_config_commands="$ac_config_commands run_tests_gcell" + + + build_dirs="$build_dirs gr-gcell" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell passed configuration checks; building." >&5 +$as_echo "Component gr-gcell passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp passed configuration checks; but not building." >&5 -$as_echo "Component usrp passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell passed configuration checks; but not building." >&5 +$as_echo "Component gr-gcell passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs usrp" - usrp_skipped=yes + skipped_dirs="$skipped_dirs gr-gcell" + gr_gcell_skipped=yes else - usrp_skipped=no + gr_gcell_skipped=no fi @@ -28318,16 +25643,13 @@ $as_echo "Component usrp passed configuration checks; but not building." >&6; } - - - passed=yes - # Check whether --enable-usrp2 was given. -if test "${enable_usrp2+set}" = set; then : - enableval=$enable_usrp2; + # Check whether --enable-gr-msdd6000 was given. +if test "${enable_gr_msdd6000+set}" = set; then : + enableval=$enable_gr_msdd6000; else - enable_usrp2=$enable_all_components + enable_gr_msdd6000=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -28337,222 +25659,126 @@ fi - subdirs="$subdirs usrp2/firmware" - - + ac_config_files="$ac_config_files gr-msdd6000/Makefile gr-msdd6000/gnuradio-msdd6000.pc gr-msdd6000/src/Makefile" - if test $passed != no; then - if test $passed = yes; then - if test x$gruel_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 requires gruel, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component usrp2 requires gruel, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$gruel_with = xno; then - as_fn_error "Component usrp2 requires gruel to be included as --with-gruel[=arg]" "$LINENO" 5 - fi - fi - fi if test $passed != no; then if test $passed = yes; then - if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 requires omnithread, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component usrp2 requires omnithread, which is not being built or specified via pre-installed files." >&6; } + if test x$gnuradio_core_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-msdd6000 requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-msdd6000 requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else - if test x$omnithread_with = xno; then - as_fn_error "Component usrp2 requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 + if test x$gnuradio_core_with = xno; then + as_fn_error $? "Component gr-msdd6000 requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether host_os is linux*" >&5 -$as_echo_n "checking whether host_os is linux*... " >&6; } - case "$host_os" in - linux*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: USRP2 currently requires Linux host OS, not found" >&5 -$as_echo "$as_me: USRP2 currently requires Linux host OS, not found" >&6;} - passed="no" - ;; - esac - - if test $passed = yes; then - for ac_header in arpa/inet.h byteswap.h linux/if_packet.h sys/socket.h sys/un.h + for ac_header in netinet/in.h arpa/inet.h sys/socket.h netdb.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF +else + passed=no fi done - ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" "#define __USE_GNU 1 - #include - #include - #include -" -if test "x$ac_cv_member_struct_msghdr_msg_control" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1 -_ACEOF - - -fi -ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_accrights" "ac_cv_member_struct_msghdr_msg_accrights" "#define __USE_GNU 1 - #include - #include - #include -" -if test "x$ac_cv_member_struct_msghdr_msg_accrights" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS 1 -_ACEOF - - -fi -ac_fn_c_check_member "$LINENO" "struct cmsgcred" "cmcred_uid" "ac_cv_member_struct_cmsgcred_cmcred_uid" "#define __USE_GNU 1 - #include - #include - #include -" -if test "x$ac_cv_member_struct_cmsgcred_cmcred_uid" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_CMSGCRED_CMCRED_UID 1 -_ACEOF - - -fi -ac_fn_c_check_member "$LINENO" "struct ucred" "uid" "ac_cv_member_struct_ucred_uid" "#define __USE_GNU 1 - #include - #include - #include -" -if test "x$ac_cv_member_struct_ucred_uid" = x""yes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_UCRED_UID 1 -_ACEOF - - -fi - - fi - if test $passed != with; then - USRP2_INCLUDES="-I\${abs_top_srcdir}/usrp2/host/include \ - -I\${abs_top_srcdir}/usrp2/firmware/include" - USRP2_LA="\${abs_top_builddir}/usrp2/host/lib/libusrp2.la" - fi - - - - - ac_config_files="$ac_config_files usrp2/Makefile usrp2/host/Makefile usrp2/host/usrp2.pc usrp2/host/include/Makefile usrp2/host/include/usrp2/Makefile usrp2/host/lib/Makefile usrp2/host/apps/Makefile" - - usrp2_with=no + gr_msdd6000_with=no if test $passed = no; then - if test x$enable_usrp2 = xyes; then - as_fn_error "Component usrp2 has errors; stopping." "$LINENO" 5 + if test x$enable_gr_msdd6000 = xyes; then + as_fn_error $? "Component gr-msdd6000 has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp2." >&5 -$as_echo "Not building component usrp2." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-msdd6000." >&5 +$as_echo "Not building component gr-msdd6000." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs usrp2" + with_dirs="$with_dirs gr-msdd6000" - if test "x${usrp2_INCLUDES}" != "x"; then + if test "x${gr_msdd6000_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${usrp2_INCLUDES}" + with_INCLUDES="${gr_msdd6000_INCLUDES}" else - with_INCLUDES="${usrp2_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_msdd6000_INCLUDES}"" ""$with_INCLUDES" fi - usrp2_INCLUDES= + gr_msdd6000_INCLUDES= fi - if test "x${usrp2_SWIG_INCLUDES}" != "x"; then + if test "x${gr_msdd6000_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${usrp2_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_msdd6000_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${usrp2_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_msdd6000_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - usrp2_SWIG_INCLUDES= + gr_msdd6000_SWIG_INCLUDES= fi - if test "x${usrp2_PYDIRPATH}" != "x"; then + if test "x${gr_msdd6000_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${usrp2_PYDIRPATH}" + with_PYDIRPATH="${gr_msdd6000_PYDIRPATH}" else - with_PYDIRPATH="${usrp2_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_msdd6000_PYDIRPATH}"":""$with_PYDIRPATH" fi - usrp2_PYDIRPATH= + gr_msdd6000_PYDIRPATH= fi - if test "x${usrp2_SWIGDIRPATH}" != "x"; then + if test "x${gr_msdd6000_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${usrp2_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_msdd6000_SWIGDIRPATH}" else - with_SWIGDIRPATH="${usrp2_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_msdd6000_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - usrp2_SWIGDIRPATH= + gr_msdd6000_SWIGDIRPATH= fi - if test "x${usrp2_LIBDIRPATH}" != "x"; then + if test "x${gr_msdd6000_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${usrp2_LIBDIRPATH}" + with_LIBDIRPATH="${gr_msdd6000_LIBDIRPATH}" else - with_LIBDIRPATH="${usrp2_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_msdd6000_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - usrp2_LIBDIRPATH= + gr_msdd6000_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 will be included from a pre-installed library and includes." >&5 -$as_echo "Component usrp2 will be included from a pre-installed library and includes." >&6; } - usrp2_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-msdd6000 will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-msdd6000 will be included from a pre-installed library and includes." >&6; } + gr_msdd6000_with=yes else - usrp2_LDFLAG= - if test x$enable_usrp2 != xno; then - : - build_dirs="$build_dirs usrp2" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 passed configuration checks; building." >&5 -$as_echo "Component usrp2 passed configuration checks; building." >&6; } + gr_msdd6000_LDFLAG= + if test x$enable_gr_msdd6000 != xno; then + + build_dirs="$build_dirs gr-msdd6000" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-msdd6000 passed configuration checks; building." >&5 +$as_echo "Component gr-msdd6000 passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component usrp2 passed configuration checks; but not building." >&5 -$as_echo "Component usrp2 passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-msdd6000 passed configuration checks; but not building." >&5 +$as_echo "Component gr-msdd6000 passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs usrp2" - usrp2_skipped=yes + skipped_dirs="$skipped_dirs gr-msdd6000" + gr_msdd6000_skipped=yes else - usrp2_skipped=no + gr_msdd6000_skipped=no fi @@ -28566,12 +25792,12 @@ $as_echo "Component usrp2 passed configuration checks; but not building." >&6; } passed=yes - # Check whether --enable-gr-usrp was given. -if test "${enable_gr_usrp+set}" = set; then : - enableval=$enable_gr_usrp; + # Check whether --enable-gr-audio-alsa was given. +if test "${enable_gr_audio_alsa+set}" = set; then : + enableval=$enable_gr_audio_alsa; else - enable_gr_usrp=$enable_all_components + enable_gr_audio_alsa=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -28584,124 +25810,249 @@ fi if test $passed != no; then if test $passed = yes; then - if test x$usrp_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp requires usrp, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-usrp requires usrp, which is not being built or specified via pre-installed files." >&6; } + if test x$gnuradio_core_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-audio-alsa requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else - if test x$usrp_with = xno; then - as_fn_error "Component gr-usrp requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 + if test x$gnuradio_core_with = xno; then + as_fn_error $? "Component gr-audio-alsa requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi - if test $passed != no; then - if test $passed = yes; then - if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-usrp requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi + if test $passed = yes; then + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5 +$as_echo_n "checking for ALSA... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$ALSA_CFLAGS"; then + pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 0.9" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + +if test x$cross_compiling = xyes +then + if test -n "$PKG_CONFIG"; then + if test -n "$ALSA_LIBS"; then + pkg_cv_ALSA_LIBS="$ALSA_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs --static "alsa >= 0.9" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + _pkg_tmp= + for flag in $pkg_cv_ALSA_LIBS; do + case $flag in + (-L/lib* | -L/usr/lib* ) ;; # ignore + (*) _pkg_tmp="$_pkg_tmp $flag" ;; + esac + done + pkg_cv_ALSA_LIBS="$_pkg_tmp" +else + if test -n "$PKG_CONFIG"; then + if test -n "$ALSA_LIBS"; then + pkg_cv_ALSA_LIBS="$ALSA_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs --static "alsa >= 0.9" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +fi + +if test -n "$PKG_CONFIG"; then + if test -n "$ALSA_INCLUDEDIR"; then + pkg_cv_ALSA_INCLUDEDIR="$ALSA_INCLUDEDIR" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ALSA_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "alsa >= 0.9" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa >= 0.9"` else - if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-usrp requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 - fi + ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 0.9"` fi - fi + # Put the nasty error message in config.log where it belongs + echo "$ALSA_PKG_ERRORS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-alsa requires package alsa, not found." >&5 +$as_echo "gr-audio-alsa requires package alsa, not found." >&6; } +elif test $pkg_failed = untried; then + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-alsa requires package alsa, not found." >&5 +$as_echo "gr-audio-alsa requires package alsa, not found." >&6; } +else + ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS + ALSA_LIBS=$pkg_cv_ALSA_LIBS + ALSA_INCLUDEDIR=$pkg_cv_ALSA_INCLUDEDIR - ac_config_files="$ac_config_files gr-usrp/Makefile gr-usrp/gnuradio-usrp.pc gr-usrp/src/Makefile gr-usrp/src/run_tests gr-usrp/apps/Makefile" + ALSA_CPPFLAGS="" + for flag in $ALSA_CFLAGS; do + case $flag in + -I* | -D* | -U*) ALSA_CPPFLAGS="$ALSA_CPPFLAGS $flag" ;; + esac + done + pkg_cv_ALSA_CPPFLAGS=$ALSA_CPPFLAGS + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + fi + ac_config_files="$ac_config_files gr-audio-alsa/Makefile gr-audio-alsa/gnuradio-audio-alsa.pc gr-audio-alsa/src/Makefile gr-audio-alsa/src/run_tests" - gr_usrp_with=no + + gr_audio_alsa_with=no if test $passed = no; then - if test x$enable_gr_usrp = xyes; then - as_fn_error "Component gr-usrp has errors; stopping." "$LINENO" 5 + if test x$enable_gr_audio_alsa = xyes; then + as_fn_error $? "Component gr-audio-alsa has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-usrp." >&5 -$as_echo "Not building component gr-usrp." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-alsa." >&5 +$as_echo "Not building component gr-audio-alsa." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs gr-usrp" + with_dirs="$with_dirs gr-audio-alsa" - if test "x${gr_usrp_INCLUDES}" != "x"; then + if test "x${gr_audio_alsa_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gr_usrp_INCLUDES}" + with_INCLUDES="${gr_audio_alsa_INCLUDES}" else - with_INCLUDES="${gr_usrp_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_audio_alsa_INCLUDES}"" ""$with_INCLUDES" fi - gr_usrp_INCLUDES= + gr_audio_alsa_INCLUDES= fi - if test "x${gr_usrp_SWIG_INCLUDES}" != "x"; then + if test "x${gr_audio_alsa_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gr_usrp_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_audio_alsa_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${gr_usrp_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_audio_alsa_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - gr_usrp_SWIG_INCLUDES= + gr_audio_alsa_SWIG_INCLUDES= fi - if test "x${gr_usrp_PYDIRPATH}" != "x"; then + if test "x${gr_audio_alsa_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gr_usrp_PYDIRPATH}" + with_PYDIRPATH="${gr_audio_alsa_PYDIRPATH}" else - with_PYDIRPATH="${gr_usrp_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_audio_alsa_PYDIRPATH}"":""$with_PYDIRPATH" fi - gr_usrp_PYDIRPATH= + gr_audio_alsa_PYDIRPATH= fi - if test "x${gr_usrp_SWIGDIRPATH}" != "x"; then + if test "x${gr_audio_alsa_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gr_usrp_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_audio_alsa_SWIGDIRPATH}" else - with_SWIGDIRPATH="${gr_usrp_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_audio_alsa_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - gr_usrp_SWIGDIRPATH= + gr_audio_alsa_SWIGDIRPATH= fi - if test "x${gr_usrp_LIBDIRPATH}" != "x"; then + if test "x${gr_audio_alsa_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gr_usrp_LIBDIRPATH}" + with_LIBDIRPATH="${gr_audio_alsa_LIBDIRPATH}" else - with_LIBDIRPATH="${gr_usrp_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_audio_alsa_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - gr_usrp_LIBDIRPATH= + gr_audio_alsa_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp will be included from a pre-installed library and includes." >&5 -$as_echo "Component gr-usrp will be included from a pre-installed library and includes." >&6; } - gr_usrp_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-audio-alsa will be included from a pre-installed library and includes." >&6; } + gr_audio_alsa_with=yes else - gr_usrp_LDFLAG= - if test x$enable_gr_usrp != xno; then - ac_config_commands="$ac_config_commands run_tests_usrp" + gr_audio_alsa_LDFLAG= + if test x$enable_gr_audio_alsa != xno; then + ac_config_commands="$ac_config_commands run_tests_alsa" - build_dirs="$build_dirs gr-usrp" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp passed configuration checks; building." >&5 -$as_echo "Component gr-usrp passed configuration checks; building." >&6; } + build_dirs="$build_dirs gr-audio-alsa" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa passed configuration checks; building." >&5 +$as_echo "Component gr-audio-alsa passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp passed configuration checks; but not building." >&5 -$as_echo "Component gr-usrp passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa passed configuration checks; but not building." >&5 +$as_echo "Component gr-audio-alsa passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs gr-usrp" - gr_usrp_skipped=yes + skipped_dirs="$skipped_dirs gr-audio-alsa" + gr_audio_alsa_skipped=yes else - gr_usrp_skipped=no + gr_audio_alsa_skipped=no fi @@ -28713,13 +26064,14 @@ $as_echo "Component gr-usrp passed configuration checks; but not building." >&6; + passed=yes - # Check whether --enable-gr-usrp2 was given. -if test "${enable_gr_usrp2+set}" = set; then : - enableval=$enable_gr_usrp2; + # Check whether --enable-gr-audio-jack was given. +if test "${enable_gr_audio_jack+set}" = set; then : + enableval=$enable_gr_audio_jack; else - enable_gr_usrp2=$enable_all_components + enable_gr_audio_jack=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -28730,126 +26082,251 @@ fi - if test $passed != no; then - if test $passed = yes; then - if test x$usrp2_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 requires usrp2, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-usrp2 requires usrp2, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi + if test $passed != no; then + if test $passed = yes; then + if test x$gnuradio_core_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-audio-jack requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$gnuradio_core_with = xno; then + as_fn_error $? "Component gr-audio-jack requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + fi + fi + fi + + + if test $passed = yes; then + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5 +$as_echo_n "checking for JACK... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$JACK_CFLAGS"; then + pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.8" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + +if test x$cross_compiling = xyes +then + if test -n "$PKG_CONFIG"; then + if test -n "$JACK_LIBS"; then + pkg_cv_JACK_LIBS="$JACK_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs --static "jack >= 0.8" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + _pkg_tmp= + for flag in $pkg_cv_JACK_LIBS; do + case $flag in + (-L/lib* | -L/usr/lib* ) ;; # ignore + (*) _pkg_tmp="$_pkg_tmp $flag" ;; + esac + done + pkg_cv_JACK_LIBS="$_pkg_tmp" +else + if test -n "$PKG_CONFIG"; then + if test -n "$JACK_LIBS"; then + pkg_cv_JACK_LIBS="$JACK_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs --static "jack >= 0.8" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +fi + +if test -n "$PKG_CONFIG"; then + if test -n "$JACK_INCLUDEDIR"; then + pkg_cv_JACK_INCLUDEDIR="$JACK_INCLUDEDIR" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_JACK_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "jack >= 0.8" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "jack >= 0.8"` else - if test x$usrp2_with = xno; then - as_fn_error "Component gr-usrp2 requires usrp2 to be included as --with-usrp2[=arg]" "$LINENO" 5 - fi + JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "jack >= 0.8"` fi - fi + # Put the nasty error message in config.log where it belongs + echo "$JACK_PKG_ERRORS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-jack requires package jack, not found." >&5 +$as_echo "gr-audio-jack requires package jack, not found." >&6; } +elif test $pkg_failed = untried; then + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-jack requires package jack, not found." >&5 +$as_echo "gr-audio-jack requires package jack, not found." >&6; } +else + JACK_CFLAGS=$pkg_cv_JACK_CFLAGS + JACK_LIBS=$pkg_cv_JACK_LIBS + JACK_INCLUDEDIR=$pkg_cv_JACK_INCLUDEDIR - if test $passed != no; then - if test $passed = yes; then - if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-usrp2 requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-usrp2 requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 - fi - fi - fi + JACK_CPPFLAGS="" + for flag in $JACK_CFLAGS; do + case $flag in + -I* | -D* | -U*) JACK_CPPFLAGS="$JACK_CPPFLAGS $flag" ;; + esac + done + pkg_cv_JACK_CPPFLAGS=$JACK_CPPFLAGS - ac_config_files="$ac_config_files gr-usrp2/Makefile gr-usrp2/gnuradio-usrp2.pc gr-usrp2/src/Makefile gr-usrp2/src/run_tests" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + fi + ac_config_files="$ac_config_files gr-audio-jack/Makefile gr-audio-jack/gnuradio-audio-jack.pc gr-audio-jack/src/Makefile gr-audio-jack/src/run_tests" - gr_usrp2_with=no + + gr_audio_jack_with=no if test $passed = no; then - if test x$enable_gr_usrp2 = xyes; then - as_fn_error "Component gr-usrp2 has errors; stopping." "$LINENO" 5 + if test x$enable_gr_audio_jack = xyes; then + as_fn_error $? "Component gr-audio-jack has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-usrp2." >&5 -$as_echo "Not building component gr-usrp2." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-jack." >&5 +$as_echo "Not building component gr-audio-jack." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs gr-usrp2" + with_dirs="$with_dirs gr-audio-jack" - if test "x${gr_usrp2_INCLUDES}" != "x"; then + if test "x${gr_audio_jack_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gr_usrp2_INCLUDES}" + with_INCLUDES="${gr_audio_jack_INCLUDES}" else - with_INCLUDES="${gr_usrp2_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_audio_jack_INCLUDES}"" ""$with_INCLUDES" fi - gr_usrp2_INCLUDES= + gr_audio_jack_INCLUDES= fi - if test "x${gr_usrp2_SWIG_INCLUDES}" != "x"; then + if test "x${gr_audio_jack_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gr_usrp2_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_audio_jack_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${gr_usrp2_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_audio_jack_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - gr_usrp2_SWIG_INCLUDES= + gr_audio_jack_SWIG_INCLUDES= fi - if test "x${gr_usrp2_PYDIRPATH}" != "x"; then + if test "x${gr_audio_jack_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gr_usrp2_PYDIRPATH}" + with_PYDIRPATH="${gr_audio_jack_PYDIRPATH}" else - with_PYDIRPATH="${gr_usrp2_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_audio_jack_PYDIRPATH}"":""$with_PYDIRPATH" fi - gr_usrp2_PYDIRPATH= + gr_audio_jack_PYDIRPATH= fi - if test "x${gr_usrp2_SWIGDIRPATH}" != "x"; then + if test "x${gr_audio_jack_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gr_usrp2_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_audio_jack_SWIGDIRPATH}" else - with_SWIGDIRPATH="${gr_usrp2_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_audio_jack_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - gr_usrp2_SWIGDIRPATH= + gr_audio_jack_SWIGDIRPATH= fi - if test "x${gr_usrp2_LIBDIRPATH}" != "x"; then + if test "x${gr_audio_jack_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gr_usrp2_LIBDIRPATH}" + with_LIBDIRPATH="${gr_audio_jack_LIBDIRPATH}" else - with_LIBDIRPATH="${gr_usrp2_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_audio_jack_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - gr_usrp2_LIBDIRPATH= + gr_audio_jack_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 will be included from a pre-installed library and includes." >&5 -$as_echo "Component gr-usrp2 will be included from a pre-installed library and includes." >&6; } - gr_usrp2_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-audio-jack will be included from a pre-installed library and includes." >&6; } + gr_audio_jack_with=yes else - gr_usrp2_LDFLAG= - if test x$enable_gr_usrp2 != xno; then - ac_config_commands="$ac_config_commands run_tests_usrp2" + gr_audio_jack_LDFLAG= + if test x$enable_gr_audio_jack != xno; then + ac_config_commands="$ac_config_commands run_tests_jack" - build_dirs="$build_dirs gr-usrp2" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 passed configuration checks; building." >&5 -$as_echo "Component gr-usrp2 passed configuration checks; building." >&6; } + build_dirs="$build_dirs gr-audio-jack" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack passed configuration checks; building." >&5 +$as_echo "Component gr-audio-jack passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-usrp2 passed configuration checks; but not building." >&5 -$as_echo "Component gr-usrp2 passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack passed configuration checks; but not building." >&5 +$as_echo "Component gr-audio-jack passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs gr-usrp2" - gr_usrp2_skipped=yes + skipped_dirs="$skipped_dirs gr-audio-jack" + gr_audio_jack_skipped=yes else - gr_usrp2_skipped=no + gr_audio_jack_skipped=no fi @@ -28863,12 +26340,12 @@ $as_echo "Component gr-usrp2 passed configuration checks; but not building." >&6 passed=yes - # Check whether --enable-gr-gcell was given. -if test "${enable_gr_gcell+set}" = set; then : - enableval=$enable_gr_gcell; + # Check whether --enable-gr-audio-oss was given. +if test "${enable_gr_audio_oss+set}" = set; then : + enableval=$enable_gr_audio_oss; else - enable_gr_gcell=$enable_all_components + enable_gr_audio_oss=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -28879,126 +26356,180 @@ fi - if test $passed != no; then - if test $passed = yes; then - if test x$gcell_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell requires gcell, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-gcell requires gcell, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$gcell_with = xno; then - as_fn_error "Component gr-gcell requires gcell to be included as --with-gcell[=arg]" "$LINENO" 5 - fi - fi - fi - - if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-gcell requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-audio-oss requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-gcell requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-audio-oss requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi - ac_config_files="$ac_config_files gr-gcell/Makefile gr-gcell/src/Makefile gr-gcell/src/examples/Makefile gr-gcell/src/run_tests" + if test $passed = yes; then + case $host_os in + netbsd*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lossaudio" >&5 +$as_echo_n "checking for main in -lossaudio... " >&6; } +if test "${ac_cv_lib_ossaudio_main+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lossaudio $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ossaudio_main=yes +else + ac_cv_lib_ossaudio_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_main" >&5 +$as_echo "$ac_cv_lib_ossaudio_main" >&6; } +if test "x$ac_cv_lib_ossaudio_main" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBOSSAUDIO 1 +_ACEOF + LIBS="-lossaudio $LIBS" - gr_gcell_with=no +else + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-oss requires library ossaudio, not found." >&5 +$as_echo "gr-audio-oss requires library ossaudio, not found." >&6; } +fi +ac_cv_lib_ossaudio=ac_cv_lib_ossaudio_main + + if test $passed != no; then + OSS_LIBS=-lossaudio + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OSS library $OSS_LIBS" >&5 +$as_echo "Using OSS library $OSS_LIBS" >&6; } + fi + ;; + darwin*) + passed=no + ;; + *) + ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then : + +else + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-oss requires sys/soundcard.h, not found." >&5 +$as_echo "gr-audio-oss requires sys/soundcard.h, not found." >&6; } +fi + + + esac + fi + + ac_config_files="$ac_config_files gr-audio-oss/Makefile gr-audio-oss/gnuradio-audio-oss.pc gr-audio-oss/src/Makefile gr-audio-oss/src/run_tests" + + + + + gr_audio_oss_with=no if test $passed = no; then - if test x$enable_gr_gcell = xyes; then - as_fn_error "Component gr-gcell has errors; stopping." "$LINENO" 5 + if test x$enable_gr_audio_oss = xyes; then + as_fn_error $? "Component gr-audio-oss has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-gcell." >&5 -$as_echo "Not building component gr-gcell." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-oss." >&5 +$as_echo "Not building component gr-audio-oss." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs gr-gcell" + with_dirs="$with_dirs gr-audio-oss" - if test "x${gr_gcell_INCLUDES}" != "x"; then + if test "x${gr_audio_oss_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gr_gcell_INCLUDES}" + with_INCLUDES="${gr_audio_oss_INCLUDES}" else - with_INCLUDES="${gr_gcell_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_audio_oss_INCLUDES}"" ""$with_INCLUDES" fi - gr_gcell_INCLUDES= + gr_audio_oss_INCLUDES= fi - if test "x${gr_gcell_SWIG_INCLUDES}" != "x"; then + if test "x${gr_audio_oss_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gr_gcell_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_audio_oss_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${gr_gcell_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_audio_oss_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - gr_gcell_SWIG_INCLUDES= + gr_audio_oss_SWIG_INCLUDES= fi - if test "x${gr_gcell_PYDIRPATH}" != "x"; then + if test "x${gr_audio_oss_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gr_gcell_PYDIRPATH}" + with_PYDIRPATH="${gr_audio_oss_PYDIRPATH}" else - with_PYDIRPATH="${gr_gcell_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_audio_oss_PYDIRPATH}"":""$with_PYDIRPATH" fi - gr_gcell_PYDIRPATH= + gr_audio_oss_PYDIRPATH= fi - if test "x${gr_gcell_SWIGDIRPATH}" != "x"; then + if test "x${gr_audio_oss_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gr_gcell_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_audio_oss_SWIGDIRPATH}" else - with_SWIGDIRPATH="${gr_gcell_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_audio_oss_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - gr_gcell_SWIGDIRPATH= + gr_audio_oss_SWIGDIRPATH= fi - if test "x${gr_gcell_LIBDIRPATH}" != "x"; then + if test "x${gr_audio_oss_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gr_gcell_LIBDIRPATH}" + with_LIBDIRPATH="${gr_audio_oss_LIBDIRPATH}" else - with_LIBDIRPATH="${gr_gcell_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_audio_oss_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - gr_gcell_LIBDIRPATH= + gr_audio_oss_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell will be included from a pre-installed library and includes." >&5 -$as_echo "Component gr-gcell will be included from a pre-installed library and includes." >&6; } - gr_gcell_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-audio-oss will be included from a pre-installed library and includes." >&6; } + gr_audio_oss_with=yes else - gr_gcell_LDFLAG= - if test x$enable_gr_gcell != xno; then - ac_config_commands="$ac_config_commands run_tests_gcell" + gr_audio_oss_LDFLAG= + if test x$enable_gr_audio_oss != xno; then + ac_config_commands="$ac_config_commands run_tests_oss" - build_dirs="$build_dirs gr-gcell" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell passed configuration checks; building." >&5 -$as_echo "Component gr-gcell passed configuration checks; building." >&6; } + build_dirs="$build_dirs gr-audio-oss" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss passed configuration checks; building." >&5 +$as_echo "Component gr-audio-oss passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-gcell passed configuration checks; but not building." >&5 -$as_echo "Component gr-gcell passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss passed configuration checks; but not building." >&5 +$as_echo "Component gr-audio-oss passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs gr-gcell" - gr_gcell_skipped=yes + skipped_dirs="$skipped_dirs gr-audio-oss" + gr_audio_oss_skipped=yes else - gr_gcell_skipped=no + gr_audio_oss_skipped=no fi @@ -29010,13 +26541,14 @@ $as_echo "Component gr-gcell passed configuration checks; but not building." >&6 + passed=yes - # Check whether --enable-gr-audio-alsa was given. -if test "${enable_gr_audio_alsa+set}" = set; then : - enableval=$enable_gr_audio_alsa; + # Check whether --enable-gr-audio-osx was given. +if test "${enable_gr_audio_osx+set}" = set; then : + enableval=$enable_gr_audio_osx; else - enable_gr_audio_alsa=$enable_all_components + enable_gr_audio_osx=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -29030,248 +26562,169 @@ fi if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-audio-alsa requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-audio-alsa requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-audio-osx requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi if test $passed = yes; then + case "$host_os" in + darwin*) - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5 -$as_echo_n "checking for ALSA... " >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$ALSA_CFLAGS"; then - pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 0.9" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - -if test x$cross_compiling = xyes -then - if test -n "$PKG_CONFIG"; then - if test -n "$ALSA_LIBS"; then - pkg_cv_ALSA_LIBS="$ALSA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs --static "alsa >= 0.9" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - _pkg_tmp= - for flag in $pkg_cv_ALSA_LIBS; do - case $flag in - (-L/lib* | -L/usr/lib* ) ;; # ignore - (*) _pkg_tmp="$_pkg_tmp $flag" ;; + audiounitok=yes + case "$host_os" in + darwin*);; + *) + audiounitok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires darwin or MacOS X." >&5 +$as_echo "gr-audio-osx requires darwin or MacOS X." >&6; } esac - done - pkg_cv_ALSA_LIBS="$_pkg_tmp" -else - if test -n "$PKG_CONFIG"; then - if test -n "$ALSA_LIBS"; then - pkg_cv_ALSA_LIBS="$ALSA_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs --static "alsa >= 0.9" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -fi -if test -n "$PKG_CONFIG"; then - if test -n "$ALSA_INCLUDEDIR"; then - pkg_cv_ALSA_INCLUDEDIR="$ALSA_INCLUDEDIR" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "alsa >= 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ALSA_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "alsa >= 0.9" 2>/dev/null` -else - pkg_failed=yes -fi - fi + for ac_header in AudioUnit/AudioUnit.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "AudioUnit/AudioUnit.h" "ac_cv_header_AudioUnit_AudioUnit_h" "$ac_includes_default" +if test "x$ac_cv_header_AudioUnit_AudioUnit_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_AUDIOUNIT_AUDIOUNIT_H 1 +_ACEOF + else - pkg_failed=untried + audiounitok=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires AudioUnit/AudioUnit.h, which is available on MacOS X." >&5 +$as_echo "gr-audio-osx requires AudioUnit/AudioUnit.h, which is available on MacOS X." >&6; } fi +done + for ac_header in AudioToolbox/AudioToolbox.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "AudioToolbox/AudioToolbox.h" "ac_cv_header_AudioToolbox_AudioToolbox_h" "$ac_includes_default" +if test "x$ac_cv_header_AudioToolbox_AudioToolbox_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_AUDIOTOOLBOX_AUDIOTOOLBOX_H 1 +_ACEOF -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes else - _pkg_short_errors_supported=no + audiounitok=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires AudioToolbox/AudioToolbox.h, which is available on MacOS X." >&5 +$as_echo "gr-audio-osx requires AudioToolbox/AudioToolbox.h, which is available on MacOS X." >&6; } fi - if test $_pkg_short_errors_supported = yes; then - ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa >= 0.9"` - else - ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 0.9"` - fi - # Put the nasty error message in config.log where it belongs - echo "$ALSA_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-alsa requires package alsa, not found." >&5 -$as_echo "gr-audio-alsa requires package alsa, not found." >&6; } -elif test $pkg_failed = untried; then - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-alsa requires package alsa, not found." >&5 -$as_echo "gr-audio-alsa requires package alsa, not found." >&6; } -else - ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS - ALSA_LIBS=$pkg_cv_ALSA_LIBS - ALSA_INCLUDEDIR=$pkg_cv_ALSA_INCLUDEDIR +done - ALSA_CPPFLAGS="" - for flag in $ALSA_CFLAGS; do - case $flag in - -I* | -D* | -U*) ALSA_CPPFLAGS="$ALSA_CPPFLAGS $flag" ;; - esac - done - pkg_cv_ALSA_CPPFLAGS=$ALSA_CPPFLAGS + if test $audiounitok = yes; then + : + else + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires AudioUnit, not found." >&5 +$as_echo "gr-audio-osx requires AudioUnit, not found." >&6; } + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx will build on Mac OS X and Darwin only." >&5 +$as_echo "gr-audio-osx will build on Mac OS X and Darwin only." >&6; } + passed=no + ;; + esac fi - ac_config_files="$ac_config_files gr-audio-alsa/Makefile gr-audio-alsa/gr-audio-alsa.pc gr-audio-alsa/src/Makefile gr-audio-alsa/src/run_tests" + ac_config_files="$ac_config_files gr-audio-osx/Makefile gr-audio-osx/src/Makefile gr-audio-osx/src/run_tests" - gr_audio_alsa_with=no + gr_audio_osx_with=no if test $passed = no; then - if test x$enable_gr_audio_alsa = xyes; then - as_fn_error "Component gr-audio-alsa has errors; stopping." "$LINENO" 5 + if test x$enable_gr_audio_osx = xyes; then + as_fn_error $? "Component gr-audio-osx has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-alsa." >&5 -$as_echo "Not building component gr-audio-alsa." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-osx." >&5 +$as_echo "Not building component gr-audio-osx." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs gr-audio-alsa" + with_dirs="$with_dirs gr-audio-osx" - if test "x${gr_audio_alsa_INCLUDES}" != "x"; then + if test "x${gr_audio_osx_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gr_audio_alsa_INCLUDES}" + with_INCLUDES="${gr_audio_osx_INCLUDES}" else - with_INCLUDES="${gr_audio_alsa_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_audio_osx_INCLUDES}"" ""$with_INCLUDES" fi - gr_audio_alsa_INCLUDES= + gr_audio_osx_INCLUDES= fi - if test "x${gr_audio_alsa_SWIG_INCLUDES}" != "x"; then + if test "x${gr_audio_osx_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gr_audio_alsa_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_audio_osx_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${gr_audio_alsa_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_audio_osx_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - gr_audio_alsa_SWIG_INCLUDES= + gr_audio_osx_SWIG_INCLUDES= fi - if test "x${gr_audio_alsa_PYDIRPATH}" != "x"; then + if test "x${gr_audio_osx_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gr_audio_alsa_PYDIRPATH}" + with_PYDIRPATH="${gr_audio_osx_PYDIRPATH}" else - with_PYDIRPATH="${gr_audio_alsa_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_audio_osx_PYDIRPATH}"":""$with_PYDIRPATH" fi - gr_audio_alsa_PYDIRPATH= + gr_audio_osx_PYDIRPATH= fi - if test "x${gr_audio_alsa_SWIGDIRPATH}" != "x"; then + if test "x${gr_audio_osx_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gr_audio_alsa_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_audio_osx_SWIGDIRPATH}" else - with_SWIGDIRPATH="${gr_audio_alsa_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_audio_osx_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - gr_audio_alsa_SWIGDIRPATH= + gr_audio_osx_SWIGDIRPATH= fi - if test "x${gr_audio_alsa_LIBDIRPATH}" != "x"; then + if test "x${gr_audio_osx_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gr_audio_alsa_LIBDIRPATH}" + with_LIBDIRPATH="${gr_audio_osx_LIBDIRPATH}" else - with_LIBDIRPATH="${gr_audio_alsa_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_audio_osx_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - gr_audio_alsa_LIBDIRPATH= + gr_audio_osx_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa will be included from a pre-installed library and includes." >&5 -$as_echo "Component gr-audio-alsa will be included from a pre-installed library and includes." >&6; } - gr_audio_alsa_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-audio-osx will be included from a pre-installed library and includes." >&6; } + gr_audio_osx_with=yes else - gr_audio_alsa_LDFLAG= - if test x$enable_gr_audio_alsa != xno; then - ac_config_commands="$ac_config_commands run_tests_alsa" + gr_audio_osx_LDFLAG= + if test x$enable_gr_audio_osx != xno; then + ac_config_commands="$ac_config_commands run_tests_osx" - build_dirs="$build_dirs gr-audio-alsa" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa passed configuration checks; building." >&5 -$as_echo "Component gr-audio-alsa passed configuration checks; building." >&6; } + build_dirs="$build_dirs gr-audio-osx" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx passed configuration checks; building." >&5 +$as_echo "Component gr-audio-osx passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-alsa passed configuration checks; but not building." >&5 -$as_echo "Component gr-audio-alsa passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx passed configuration checks; but not building." >&5 +$as_echo "Component gr-audio-osx passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs gr-audio-alsa" - gr_audio_alsa_skipped=yes + skipped_dirs="$skipped_dirs gr-audio-osx" + gr_audio_osx_skipped=yes else - gr_audio_alsa_skipped=no + gr_audio_osx_skipped=no fi @@ -29285,12 +26738,12 @@ $as_echo "Component gr-audio-alsa passed configuration checks; but not building. passed=yes - # Check whether --enable-gr-audio-jack was given. -if test "${enable_gr_audio_jack+set}" = set; then : - enableval=$enable_gr_audio_jack; + # Check whether --enable-gr-audio-portaudio was given. +if test "${enable_gr_audio_portaudio+set}" = set; then : + enableval=$enable_gr_audio_portaudio; else - enable_gr_audio_jack=$enable_all_components + enable_gr_audio_portaudio=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -29304,13 +26757,13 @@ fi if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-audio-jack requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-audio-portaudio requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-audio-jack requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-audio-portaudio requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -29321,20 +26774,20 @@ $as_echo "Component gr-audio-jack requires gnuradio-core, which is not being bui pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5 -$as_echo_n "checking for JACK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5 +$as_echo_n "checking for PORTAUDIO... " >&6; } if test -n "$PKG_CONFIG"; then - if test -n "$JACK_CFLAGS"; then - pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" + if test -n "$PORTAUDIO_CFLAGS"; then + pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 + ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.8" 2>/dev/null` + pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 19" 2>/dev/null` else pkg_failed=yes fi @@ -29346,16 +26799,16 @@ fi if test x$cross_compiling = xyes then if test -n "$PKG_CONFIG"; then - if test -n "$JACK_LIBS"; then - pkg_cv_JACK_LIBS="$JACK_LIBS" + if test -n "$PORTAUDIO_LIBS"; then + pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 + ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs --static "jack >= 0.8" 2>/dev/null` + pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs --static "portaudio-2.0 >= 19" 2>/dev/null` else pkg_failed=yes fi @@ -29364,25 +26817,25 @@ else pkg_failed=untried fi _pkg_tmp= - for flag in $pkg_cv_JACK_LIBS; do + for flag in $pkg_cv_PORTAUDIO_LIBS; do case $flag in (-L/lib* | -L/usr/lib* ) ;; # ignore (*) _pkg_tmp="$_pkg_tmp $flag" ;; esac done - pkg_cv_JACK_LIBS="$_pkg_tmp" + pkg_cv_PORTAUDIO_LIBS="$_pkg_tmp" else if test -n "$PKG_CONFIG"; then - if test -n "$JACK_LIBS"; then - pkg_cv_JACK_LIBS="$JACK_LIBS" + if test -n "$PORTAUDIO_LIBS"; then + pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 + ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs --static "jack >= 0.8" 2>/dev/null` + pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs --static "portaudio-2.0 >= 19" 2>/dev/null` else pkg_failed=yes fi @@ -29393,16 +26846,16 @@ fi fi if test -n "$PKG_CONFIG"; then - if test -n "$JACK_INCLUDEDIR"; then - pkg_cv_JACK_INCLUDEDIR="$JACK_INCLUDEDIR" + if test -n "$PORTAUDIO_INCLUDEDIR"; then + pkg_cv_PORTAUDIO_INCLUDEDIR="$PORTAUDIO_INCLUDEDIR" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "jack >= 0.8") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 + ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_JACK_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "jack >= 0.8" 2>/dev/null` + pkg_cv_PORTAUDIO_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "portaudio-2.0 >= 19" 2>/dev/null` else pkg_failed=yes fi @@ -29422,32 +26875,32 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "jack >= 0.8"` + PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "portaudio-2.0 >= 19"` else - JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "jack >= 0.8"` + PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "portaudio-2.0 >= 19"` fi # Put the nasty error message in config.log where it belongs - echo "$JACK_PKG_ERRORS" >&5 + echo "$PORTAUDIO_PKG_ERRORS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-jack requires package jack, not found." >&5 -$as_echo "gr-audio-jack requires package jack, not found." >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-portaudio requires package portaudio, not found." >&5 +$as_echo "gr-audio-portaudio requires package portaudio, not found." >&6; } elif test $pkg_failed = untried; then - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-jack requires package jack, not found." >&5 -$as_echo "gr-audio-jack requires package jack, not found." >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-portaudio requires package portaudio, not found." >&5 +$as_echo "gr-audio-portaudio requires package portaudio, not found." >&6; } else - JACK_CFLAGS=$pkg_cv_JACK_CFLAGS - JACK_LIBS=$pkg_cv_JACK_LIBS - JACK_INCLUDEDIR=$pkg_cv_JACK_INCLUDEDIR + PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS + PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS + PORTAUDIO_INCLUDEDIR=$pkg_cv_PORTAUDIO_INCLUDEDIR - JACK_CPPFLAGS="" - for flag in $JACK_CFLAGS; do + PORTAUDIO_CPPFLAGS="" + for flag in $PORTAUDIO_CFLAGS; do case $flag in - -I* | -D* | -U*) JACK_CPPFLAGS="$JACK_CPPFLAGS $flag" ;; + -I* | -D* | -U*) PORTAUDIO_CPPFLAGS="$PORTAUDIO_CPPFLAGS $flag" ;; esac done - pkg_cv_JACK_CPPFLAGS=$JACK_CPPFLAGS + pkg_cv_PORTAUDIO_CPPFLAGS=$PORTAUDIO_CPPFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -29456,96 +26909,96 @@ $as_echo "yes" >&6; } fi fi - ac_config_files="$ac_config_files gr-audio-jack/Makefile gr-audio-jack/src/Makefile gr-audio-jack/src/run_tests" + ac_config_files="$ac_config_files gr-audio-portaudio/Makefile gr-audio-portaudio/gnuradio-audio-portaudio.pc gr-audio-portaudio/src/Makefile gr-audio-portaudio/src/run_tests" - gr_audio_jack_with=no + gr_audio_portaudio_with=no if test $passed = no; then - if test x$enable_gr_audio_jack = xyes; then - as_fn_error "Component gr-audio-jack has errors; stopping." "$LINENO" 5 + if test x$enable_gr_audio_portaudio = xyes; then + as_fn_error $? "Component gr-audio-portaudio has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-jack." >&5 -$as_echo "Not building component gr-audio-jack." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-portaudio." >&5 +$as_echo "Not building component gr-audio-portaudio." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs gr-audio-jack" + with_dirs="$with_dirs gr-audio-portaudio" - if test "x${gr_audio_jack_INCLUDES}" != "x"; then + if test "x${gr_audio_portaudio_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gr_audio_jack_INCLUDES}" + with_INCLUDES="${gr_audio_portaudio_INCLUDES}" else - with_INCLUDES="${gr_audio_jack_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_audio_portaudio_INCLUDES}"" ""$with_INCLUDES" fi - gr_audio_jack_INCLUDES= + gr_audio_portaudio_INCLUDES= fi - if test "x${gr_audio_jack_SWIG_INCLUDES}" != "x"; then + if test "x${gr_audio_portaudio_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gr_audio_jack_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_audio_portaudio_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${gr_audio_jack_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_audio_portaudio_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - gr_audio_jack_SWIG_INCLUDES= + gr_audio_portaudio_SWIG_INCLUDES= fi - if test "x${gr_audio_jack_PYDIRPATH}" != "x"; then + if test "x${gr_audio_portaudio_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gr_audio_jack_PYDIRPATH}" + with_PYDIRPATH="${gr_audio_portaudio_PYDIRPATH}" else - with_PYDIRPATH="${gr_audio_jack_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_audio_portaudio_PYDIRPATH}"":""$with_PYDIRPATH" fi - gr_audio_jack_PYDIRPATH= + gr_audio_portaudio_PYDIRPATH= fi - if test "x${gr_audio_jack_SWIGDIRPATH}" != "x"; then + if test "x${gr_audio_portaudio_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gr_audio_jack_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_audio_portaudio_SWIGDIRPATH}" else - with_SWIGDIRPATH="${gr_audio_jack_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_audio_portaudio_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - gr_audio_jack_SWIGDIRPATH= + gr_audio_portaudio_SWIGDIRPATH= fi - if test "x${gr_audio_jack_LIBDIRPATH}" != "x"; then + if test "x${gr_audio_portaudio_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gr_audio_jack_LIBDIRPATH}" + with_LIBDIRPATH="${gr_audio_portaudio_LIBDIRPATH}" else - with_LIBDIRPATH="${gr_audio_jack_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_audio_portaudio_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - gr_audio_jack_LIBDIRPATH= + gr_audio_portaudio_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack will be included from a pre-installed library and includes." >&5 -$as_echo "Component gr-audio-jack will be included from a pre-installed library and includes." >&6; } - gr_audio_jack_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-audio-portaudio will be included from a pre-installed library and includes." >&6; } + gr_audio_portaudio_with=yes else - gr_audio_jack_LDFLAG= - if test x$enable_gr_audio_jack != xno; then - ac_config_commands="$ac_config_commands run_tests_jack" + gr_audio_portaudio_LDFLAG= + if test x$enable_gr_audio_portaudio != xno; then + ac_config_commands="$ac_config_commands run_tests_portaudio" - build_dirs="$build_dirs gr-audio-jack" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack passed configuration checks; building." >&5 -$as_echo "Component gr-audio-jack passed configuration checks; building." >&6; } + build_dirs="$build_dirs gr-audio-portaudio" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio passed configuration checks; building." >&5 +$as_echo "Component gr-audio-portaudio passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-jack passed configuration checks; but not building." >&5 -$as_echo "Component gr-audio-jack passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio passed configuration checks; but not building." >&5 +$as_echo "Component gr-audio-portaudio passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs gr-audio-jack" - gr_audio_jack_skipped=yes + skipped_dirs="$skipped_dirs gr-audio-portaudio" + gr_audio_portaudio_skipped=yes else - gr_audio_jack_skipped=no + gr_audio_portaudio_skipped=no fi @@ -29559,12 +27012,12 @@ $as_echo "Component gr-audio-jack passed configuration checks; but not building. passed=yes - # Check whether --enable-gr-audio-oss was given. -if test "${enable_gr_audio_oss+set}" = set; then : - enableval=$enable_gr_audio_oss; + # Check whether --enable-gr-audio-windows was given. +if test "${enable_gr_audio_windows+set}" = set; then : + enableval=$enable_gr_audio_windows; else - enable_gr_audio_oss=$enable_all_components + enable_gr_audio_windows=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -29578,28 +27031,28 @@ fi if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-audio-oss requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-audio-windows requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-audio-oss requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-audio-windows requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi if test $passed = yes; then - case $host_os in - netbsd*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lossaudio" >&5 -$as_echo_n "checking for main in -lossaudio... " >&6; } -if test "${ac_cv_lib_ossaudio_main+set}" = set; then : + case "$host_os" in + cygwin*|win*|mingw*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwinmm" >&5 +$as_echo_n "checking for main in -lwinmm... " >&6; } +if test "${ac_cv_lib_winmm_main+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lossaudio $LIBS" +LIBS="-lwinmm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -29613,142 +27066,130 @@ return main (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ossaudio_main=yes + ac_cv_lib_winmm_main=yes else - ac_cv_lib_ossaudio_main=no + ac_cv_lib_winmm_main=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_main" >&5 -$as_echo "$ac_cv_lib_ossaudio_main" >&6; } -if test "x$ac_cv_lib_ossaudio_main" = x""yes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_winmm_main" >&5 +$as_echo "$ac_cv_lib_winmm_main" >&6; } +if test "x$ac_cv_lib_winmm_main" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_LIBOSSAUDIO 1 +#define HAVE_LIBWINMM 1 _ACEOF - LIBS="-lossaudio $LIBS" + LIBS="-lwinmm $LIBS" else - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-oss requires library ossaudio, not found." >&5 -$as_echo "gr-audio-oss requires library ossaudio, not found." >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-windows requires library winmm, not found." >&5 +$as_echo "gr-audio-windows requires library winmm, not found." >&6; } fi -ac_cv_lib_ossaudio=ac_cv_lib_ossaudio_main - - if test $passed != no; then - OSS_LIBS=-lossaudio +ac_cv_lib_winmm=ac_cv_lib_winmm_main - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OSS library $OSS_LIBS" >&5 -$as_echo "Using OSS library $OSS_LIBS" >&6; } - fi - ;; - darwin*) - passed=no ;; - *) - ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then : - -else - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-oss requires sys/soundcard.h, not found." >&5 -$as_echo "gr-audio-oss requires sys/soundcard.h, not found." >&6; } -fi - - + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-windows will build on a Windows Unix environment only." >&5 +$as_echo "gr-audio-windows will build on a Windows Unix environment only." >&6; } + passed=no + ;; esac fi - ac_config_files="$ac_config_files gr-audio-oss/Makefile gr-audio-oss/src/Makefile gr-audio-oss/src/run_tests" + ac_config_files="$ac_config_files gr-audio-windows/Makefile gr-audio-windows/src/Makefile gr-audio-windows/src/run_tests" - gr_audio_oss_with=no + gr_audio_windows_with=no if test $passed = no; then - if test x$enable_gr_audio_oss = xyes; then - as_fn_error "Component gr-audio-oss has errors; stopping." "$LINENO" 5 + if test x$enable_gr_audio_windows = xyes; then + as_fn_error $? "Component gr-audio-windows has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-oss." >&5 -$as_echo "Not building component gr-audio-oss." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-windows." >&5 +$as_echo "Not building component gr-audio-windows." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs gr-audio-oss" + with_dirs="$with_dirs gr-audio-windows" - if test "x${gr_audio_oss_INCLUDES}" != "x"; then + if test "x${gr_audio_windows_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gr_audio_oss_INCLUDES}" + with_INCLUDES="${gr_audio_windows_INCLUDES}" else - with_INCLUDES="${gr_audio_oss_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_audio_windows_INCLUDES}"" ""$with_INCLUDES" fi - gr_audio_oss_INCLUDES= + gr_audio_windows_INCLUDES= fi - if test "x${gr_audio_oss_SWIG_INCLUDES}" != "x"; then + if test "x${gr_audio_windows_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gr_audio_oss_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_audio_windows_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${gr_audio_oss_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_audio_windows_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - gr_audio_oss_SWIG_INCLUDES= + gr_audio_windows_SWIG_INCLUDES= fi - if test "x${gr_audio_oss_PYDIRPATH}" != "x"; then + if test "x${gr_audio_windows_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gr_audio_oss_PYDIRPATH}" + with_PYDIRPATH="${gr_audio_windows_PYDIRPATH}" else - with_PYDIRPATH="${gr_audio_oss_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_audio_windows_PYDIRPATH}"":""$with_PYDIRPATH" fi - gr_audio_oss_PYDIRPATH= + gr_audio_windows_PYDIRPATH= fi - if test "x${gr_audio_oss_SWIGDIRPATH}" != "x"; then + if test "x${gr_audio_windows_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gr_audio_oss_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_audio_windows_SWIGDIRPATH}" else - with_SWIGDIRPATH="${gr_audio_oss_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_audio_windows_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - gr_audio_oss_SWIGDIRPATH= + gr_audio_windows_SWIGDIRPATH= fi - if test "x${gr_audio_oss_LIBDIRPATH}" != "x"; then + if test "x${gr_audio_windows_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gr_audio_oss_LIBDIRPATH}" + with_LIBDIRPATH="${gr_audio_windows_LIBDIRPATH}" else - with_LIBDIRPATH="${gr_audio_oss_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_audio_windows_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - gr_audio_oss_LIBDIRPATH= + gr_audio_windows_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss will be included from a pre-installed library and includes." >&5 -$as_echo "Component gr-audio-oss will be included from a pre-installed library and includes." >&6; } - gr_audio_oss_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-audio-windows will be included from a pre-installed library and includes." >&6; } + gr_audio_windows_with=yes else - gr_audio_oss_LDFLAG= - if test x$enable_gr_audio_oss != xno; then - ac_config_commands="$ac_config_commands run_tests_oss" + gr_audio_windows_LDFLAG= + if test x$enable_gr_audio_windows != xno; then + WINAUDIO_LIBS=-lwinmm + ac_config_commands="$ac_config_commands run_tests_audio_windows" - build_dirs="$build_dirs gr-audio-oss" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss passed configuration checks; building." >&5 -$as_echo "Component gr-audio-oss passed configuration checks; building." >&6; } + + build_dirs="$build_dirs gr-audio-windows" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows passed configuration checks; building." >&5 +$as_echo "Component gr-audio-windows passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-oss passed configuration checks; but not building." >&5 -$as_echo "Component gr-audio-oss passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows passed configuration checks; but not building." >&5 +$as_echo "Component gr-audio-windows passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs gr-audio-oss" - gr_audio_oss_skipped=yes + skipped_dirs="$skipped_dirs gr-audio-windows" + gr_audio_windows_skipped=yes else - gr_audio_oss_skipped=no + gr_audio_windows_skipped=no fi @@ -29762,12 +27203,12 @@ $as_echo "Component gr-audio-oss passed configuration checks; but not building." passed=yes - # Check whether --enable-gr-audio-osx was given. -if test "${enable_gr_audio_osx+set}" = set; then : - enableval=$enable_gr_audio_osx; + # Check whether --enable-gr-atsc was given. +if test "${enable_gr_atsc+set}" = set; then : + enableval=$enable_gr_atsc; else - enable_gr_audio_osx=$enable_all_components + enable_gr_atsc=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -29778,187 +27219,111 @@ fi - if test $passed != no; then - if test $passed = yes; then - if test x$omnithread_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx requires omnithread, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-audio-osx requires omnithread, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$omnithread_with = xno; then - as_fn_error "Component gr-audio-osx requires omnithread to be included as --with-omnithread[=arg]" "$LINENO" 5 - fi - fi - fi - - if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-atsc requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-atsc requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-audio-osx requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-atsc requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi - if test $passed = yes; then - case "$host_os" in - darwin*) - - audiounitok=yes - case "$host_os" in - darwin*);; - *) - audiounitok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires darwin or MacOS X." >&5 -$as_echo "gr-audio-osx requires darwin or MacOS X." >&6; } - esac - - for ac_header in AudioUnit/AudioUnit.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "AudioUnit/AudioUnit.h" "ac_cv_header_AudioUnit_AudioUnit_h" "$ac_includes_default" -if test "x$ac_cv_header_AudioUnit_AudioUnit_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_AUDIOUNIT_AUDIOUNIT_H 1 -_ACEOF - -else - audiounitok=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires AudioUnit/AudioUnit.h, which is available on MacOS X." >&5 -$as_echo "gr-audio-osx requires AudioUnit/AudioUnit.h, which is available on MacOS X." >&6; } -fi - -done - - - for ac_header in AudioToolbox/AudioToolbox.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "AudioToolbox/AudioToolbox.h" "ac_cv_header_AudioToolbox_AudioToolbox_h" "$ac_includes_default" -if test "x$ac_cv_header_AudioToolbox_AudioToolbox_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_AUDIOTOOLBOX_AUDIOTOOLBOX_H 1 -_ACEOF - -else - audiounitok=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires AudioToolbox/AudioToolbox.h, which is available on MacOS X." >&5 -$as_echo "gr-audio-osx requires AudioToolbox/AudioToolbox.h, which is available on MacOS X." >&6; } -fi - -done - - - if test $audiounitok = yes; then - : - else - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx requires AudioUnit, not found." >&5 -$as_echo "gr-audio-osx requires AudioUnit, not found." >&6; } - fi - - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-osx will build on Mac OS X and Darwin only." >&5 -$as_echo "gr-audio-osx will build on Mac OS X and Darwin only." >&6; } - passed=no - ;; - esac - fi - - ac_config_files="$ac_config_files gr-audio-osx/Makefile gr-audio-osx/src/Makefile gr-audio-osx/src/run_tests" + ac_config_files="$ac_config_files gr-atsc/Makefile gr-atsc/gnuradio-atsc.pc gr-atsc/doc/Makefile gr-atsc/src/Makefile gr-atsc/src/lib/Makefile gr-atsc/src/python/Makefile gr-atsc/src/python/run_tests" - gr_audio_osx_with=no + gr_atsc_with=no if test $passed = no; then - if test x$enable_gr_audio_osx = xyes; then - as_fn_error "Component gr-audio-osx has errors; stopping." "$LINENO" 5 + if test x$enable_gr_atsc = xyes; then + as_fn_error $? "Component gr-atsc has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-osx." >&5 -$as_echo "Not building component gr-audio-osx." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-atsc." >&5 +$as_echo "Not building component gr-atsc." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs gr-audio-osx" + with_dirs="$with_dirs gr-atsc" - if test "x${gr_audio_osx_INCLUDES}" != "x"; then + if test "x${gr_atsc_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gr_audio_osx_INCLUDES}" + with_INCLUDES="${gr_atsc_INCLUDES}" else - with_INCLUDES="${gr_audio_osx_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_atsc_INCLUDES}"" ""$with_INCLUDES" fi - gr_audio_osx_INCLUDES= + gr_atsc_INCLUDES= fi - if test "x${gr_audio_osx_SWIG_INCLUDES}" != "x"; then + if test "x${gr_atsc_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gr_audio_osx_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_atsc_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${gr_audio_osx_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_atsc_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - gr_audio_osx_SWIG_INCLUDES= + gr_atsc_SWIG_INCLUDES= fi - if test "x${gr_audio_osx_PYDIRPATH}" != "x"; then + if test "x${gr_atsc_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gr_audio_osx_PYDIRPATH}" + with_PYDIRPATH="${gr_atsc_PYDIRPATH}" else - with_PYDIRPATH="${gr_audio_osx_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_atsc_PYDIRPATH}"":""$with_PYDIRPATH" fi - gr_audio_osx_PYDIRPATH= + gr_atsc_PYDIRPATH= fi - if test "x${gr_audio_osx_SWIGDIRPATH}" != "x"; then + if test "x${gr_atsc_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gr_audio_osx_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_atsc_SWIGDIRPATH}" else - with_SWIGDIRPATH="${gr_audio_osx_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_atsc_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - gr_audio_osx_SWIGDIRPATH= + gr_atsc_SWIGDIRPATH= fi - if test "x${gr_audio_osx_LIBDIRPATH}" != "x"; then + if test "x${gr_atsc_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gr_audio_osx_LIBDIRPATH}" + with_LIBDIRPATH="${gr_atsc_LIBDIRPATH}" else - with_LIBDIRPATH="${gr_audio_osx_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_atsc_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - gr_audio_osx_LIBDIRPATH= + gr_atsc_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx will be included from a pre-installed library and includes." >&5 -$as_echo "Component gr-audio-osx will be included from a pre-installed library and includes." >&6; } - gr_audio_osx_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-atsc will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-atsc will be included from a pre-installed library and includes." >&6; } + gr_atsc_with=yes else - gr_audio_osx_LDFLAG= - if test x$enable_gr_audio_osx != xno; then - ac_config_commands="$ac_config_commands run_tests_osx" + gr_atsc_LDFLAG= + if test x$enable_gr_atsc != xno; then + ac_config_commands="$ac_config_commands run_tests_atsc" - build_dirs="$build_dirs gr-audio-osx" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx passed configuration checks; building." >&5 -$as_echo "Component gr-audio-osx passed configuration checks; building." >&6; } + build_dirs="$build_dirs gr-atsc" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-atsc passed configuration checks; building." >&5 +$as_echo "Component gr-atsc passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-osx passed configuration checks; but not building." >&5 -$as_echo "Component gr-audio-osx passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-atsc passed configuration checks; but not building." >&5 +$as_echo "Component gr-atsc passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs gr-audio-osx" - gr_audio_osx_skipped=yes + skipped_dirs="$skipped_dirs gr-atsc" + gr_atsc_skipped=yes else - gr_audio_osx_skipped=no + gr_atsc_skipped=no fi @@ -29970,14 +27335,14 @@ $as_echo "Component gr-audio-osx passed configuration checks; but not building." - - passed=yes - # Check whether --enable-gr-audio-portaudio was given. -if test "${enable_gr_audio_portaudio+set}" = set; then : - enableval=$enable_gr_audio_portaudio; + + passed=yes + # Check whether --enable-gr-comedi was given. +if test "${enable_gr_comedi+set}" = set; then : + enableval=$enable_gr_comedi; else - enable_gr_audio_portaudio=$enable_all_components + enable_gr_comedi=$enable_all_components if test x$enable_all_components = xno; then passed=no fi @@ -29991,13 +27356,13 @@ fi if test $passed != no; then if test $passed = yes; then if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-audio-portaudio requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-comedi requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-comedi requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } passed=no fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-audio-portaudio requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-comedi requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -30008,20 +27373,20 @@ $as_echo "Component gr-audio-portaudio requires gnuradio-core, which is not bein pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5 -$as_echo_n "checking for PORTAUDIO... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMEDI" >&5 +$as_echo_n "checking for COMEDI... " >&6; } if test -n "$PKG_CONFIG"; then - if test -n "$PORTAUDIO_CFLAGS"; then - pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS" + if test -n "$COMEDI_CFLAGS"; then + pkg_cv_COMEDI_CFLAGS="$COMEDI_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 - ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"comedilib < 0.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "comedilib < 0.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 19" 2>/dev/null` + pkg_cv_COMEDI_CFLAGS=`$PKG_CONFIG --cflags "comedilib < 0.8" 2>/dev/null` else pkg_failed=yes fi @@ -30033,16 +27398,16 @@ fi if test x$cross_compiling = xyes then if test -n "$PKG_CONFIG"; then - if test -n "$PORTAUDIO_LIBS"; then - pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS" + if test -n "$COMEDI_LIBS"; then + pkg_cv_COMEDI_LIBS="$COMEDI_LIBS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 - ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"comedilib < 0.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "comedilib < 0.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs --static "portaudio-2.0 >= 19" 2>/dev/null` + pkg_cv_COMEDI_LIBS=`$PKG_CONFIG --libs --static "comedilib < 0.8" 2>/dev/null` else pkg_failed=yes fi @@ -30051,25 +27416,25 @@ else pkg_failed=untried fi _pkg_tmp= - for flag in $pkg_cv_PORTAUDIO_LIBS; do + for flag in $pkg_cv_COMEDI_LIBS; do case $flag in (-L/lib* | -L/usr/lib* ) ;; # ignore (*) _pkg_tmp="$_pkg_tmp $flag" ;; esac done - pkg_cv_PORTAUDIO_LIBS="$_pkg_tmp" + pkg_cv_COMEDI_LIBS="$_pkg_tmp" else if test -n "$PKG_CONFIG"; then - if test -n "$PORTAUDIO_LIBS"; then - pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS" + if test -n "$COMEDI_LIBS"; then + pkg_cv_COMEDI_LIBS="$COMEDI_LIBS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 - ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"comedilib < 0.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "comedilib < 0.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs --static "portaudio-2.0 >= 19" 2>/dev/null` + pkg_cv_COMEDI_LIBS=`$PKG_CONFIG --libs --static "comedilib < 0.8" 2>/dev/null` else pkg_failed=yes fi @@ -30080,16 +27445,16 @@ fi fi if test -n "$PKG_CONFIG"; then - if test -n "$PORTAUDIO_INCLUDEDIR"; then - pkg_cv_PORTAUDIO_INCLUDEDIR="$PORTAUDIO_INCLUDEDIR" + if test -n "$COMEDI_INCLUDEDIR"; then + pkg_cv_COMEDI_INCLUDEDIR="$COMEDI_INCLUDEDIR" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5 - ($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"comedilib < 0.8\""; } >&5 + ($PKG_CONFIG --exists --print-errors "comedilib < 0.8") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PORTAUDIO_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "portaudio-2.0 >= 19" 2>/dev/null` + pkg_cv_COMEDI_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "comedilib < 0.8" 2>/dev/null` else pkg_failed=yes fi @@ -30109,32 +27474,32 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "portaudio-2.0 >= 19"` + COMEDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "comedilib < 0.8"` else - PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "portaudio-2.0 >= 19"` + COMEDI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "comedilib < 0.8"` fi # Put the nasty error message in config.log where it belongs - echo "$PORTAUDIO_PKG_ERRORS" >&5 + echo "$COMEDI_PKG_ERRORS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-portaudio requires package portaudio, not found." >&5 -$as_echo "gr-audio-portaudio requires package portaudio, not found." >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-comedi requires comedilib, not found." >&5 +$as_echo "gr-comedi requires comedilib, not found." >&6; } elif test $pkg_failed = untried; then - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-portaudio requires package portaudio, not found." >&5 -$as_echo "gr-audio-portaudio requires package portaudio, not found." >&6; } + passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-comedi requires comedilib, not found." >&5 +$as_echo "gr-comedi requires comedilib, not found." >&6; } else - PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS - PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS - PORTAUDIO_INCLUDEDIR=$pkg_cv_PORTAUDIO_INCLUDEDIR + COMEDI_CFLAGS=$pkg_cv_COMEDI_CFLAGS + COMEDI_LIBS=$pkg_cv_COMEDI_LIBS + COMEDI_INCLUDEDIR=$pkg_cv_COMEDI_INCLUDEDIR - PORTAUDIO_CPPFLAGS="" - for flag in $PORTAUDIO_CFLAGS; do + COMEDI_CPPFLAGS="" + for flag in $COMEDI_CFLAGS; do case $flag in - -I* | -D* | -U*) PORTAUDIO_CPPFLAGS="$PORTAUDIO_CPPFLAGS $flag" ;; + -I* | -D* | -U*) COMEDI_CPPFLAGS="$COMEDI_CPPFLAGS $flag" ;; esac done - pkg_cv_PORTAUDIO_CPPFLAGS=$PORTAUDIO_CPPFLAGS + pkg_cv_COMEDI_CPPFLAGS=$COMEDI_CPPFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -30143,287 +27508,96 @@ $as_echo "yes" >&6; } fi fi - ac_config_files="$ac_config_files gr-audio-portaudio/Makefile gr-audio-portaudio/src/Makefile gr-audio-portaudio/src/run_tests" - - - - - gr_audio_portaudio_with=no - if test $passed = no; then - if test x$enable_gr_audio_portaudio = xyes; then - as_fn_error "Component gr-audio-portaudio has errors; stopping." "$LINENO" 5 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-portaudio." >&5 -$as_echo "Not building component gr-audio-portaudio." >&6; } - fi - else - if test $passed = with; then - with_dirs="$with_dirs gr-audio-portaudio" - - if test "x${gr_audio_portaudio_INCLUDES}" != "x"; then - if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gr_audio_portaudio_INCLUDES}" - else - with_INCLUDES="${gr_audio_portaudio_INCLUDES}"" ""$with_INCLUDES" - fi - gr_audio_portaudio_INCLUDES= - fi - - - if test "x${gr_audio_portaudio_SWIG_INCLUDES}" != "x"; then - if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gr_audio_portaudio_SWIG_INCLUDES}" - else - with_SWIG_INCLUDES="${gr_audio_portaudio_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" - fi - gr_audio_portaudio_SWIG_INCLUDES= - fi - - - if test "x${gr_audio_portaudio_PYDIRPATH}" != "x"; then - if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gr_audio_portaudio_PYDIRPATH}" - else - with_PYDIRPATH="${gr_audio_portaudio_PYDIRPATH}"":""$with_PYDIRPATH" - fi - gr_audio_portaudio_PYDIRPATH= - fi - - - if test "x${gr_audio_portaudio_SWIGDIRPATH}" != "x"; then - if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gr_audio_portaudio_SWIGDIRPATH}" - else - with_SWIGDIRPATH="${gr_audio_portaudio_SWIGDIRPATH}"":""$with_SWIGDIRPATH" - fi - gr_audio_portaudio_SWIGDIRPATH= - fi - - - if test "x${gr_audio_portaudio_LIBDIRPATH}" != "x"; then - if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gr_audio_portaudio_LIBDIRPATH}" - else - with_LIBDIRPATH="${gr_audio_portaudio_LIBDIRPATH}"":""$with_LIBDIRPATH" - fi - gr_audio_portaudio_LIBDIRPATH= - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio will be included from a pre-installed library and includes." >&5 -$as_echo "Component gr-audio-portaudio will be included from a pre-installed library and includes." >&6; } - gr_audio_portaudio_with=yes - else - gr_audio_portaudio_LDFLAG= - if test x$enable_gr_audio_portaudio != xno; then - ac_config_commands="$ac_config_commands run_tests_portaudio" - - - build_dirs="$build_dirs gr-audio-portaudio" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio passed configuration checks; building." >&5 -$as_echo "Component gr-audio-portaudio passed configuration checks; building." >&6; } - else - passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-portaudio passed configuration checks; but not building." >&5 -$as_echo "Component gr-audio-portaudio passed configuration checks; but not building." >&6; } - fi - fi - fi - if test $passed = no; then - skipped_dirs="$skipped_dirs gr-audio-portaudio" - gr_audio_portaudio_skipped=yes - else - gr_audio_portaudio_skipped=no - fi - - - - - - - - - - - - passed=yes - # Check whether --enable-gr-audio-windows was given. -if test "${enable_gr_audio_windows+set}" = set; then : - enableval=$enable_gr_audio_windows; -else - - enable_gr_audio_windows=$enable_all_components - if test x$enable_all_components = xno; then - passed=no - fi - -fi - - - - - - if test $passed != no; then - if test $passed = yes; then - if test x$gnuradio_core_skipped = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 -$as_echo "Component gr-audio-windows requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } - passed=no - fi - else - if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-audio-windows requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 - fi - fi - fi - - - if test $passed = yes; then - case "$host_os" in - cygwin*|win*|mingw*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwinmm" >&5 -$as_echo_n "checking for main in -lwinmm... " >&6; } -if test "${ac_cv_lib_winmm_main+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lwinmm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_winmm_main=yes -else - ac_cv_lib_winmm_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_winmm_main" >&5 -$as_echo "$ac_cv_lib_winmm_main" >&6; } -if test "x$ac_cv_lib_winmm_main" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBWINMM 1 -_ACEOF - - LIBS="-lwinmm $LIBS" - -else - passed=no;{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-windows requires library winmm, not found." >&5 -$as_echo "gr-audio-windows requires library winmm, not found." >&6; } -fi -ac_cv_lib_winmm=ac_cv_lib_winmm_main - - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gr-audio-windows will build on a Windows Unix environment only." >&5 -$as_echo "gr-audio-windows will build on a Windows Unix environment only." >&6; } - passed=no - ;; - esac - fi - - ac_config_files="$ac_config_files gr-audio-windows/Makefile gr-audio-windows/src/Makefile gr-audio-windows/src/run_tests" + ac_config_files="$ac_config_files gr-comedi/Makefile gr-comedi/gnuradio-comedi.pc gr-comedi/src/Makefile gr-comedi/src/run_tests" - gr_audio_windows_with=no + gr_comedi_with=no if test $passed = no; then - if test x$enable_gr_audio_windows = xyes; then - as_fn_error "Component gr-audio-windows has errors; stopping." "$LINENO" 5 + if test x$enable_gr_comedi = xyes; then + as_fn_error $? "Component gr-comedi has errors; stopping." "$LINENO" 5 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-audio-windows." >&5 -$as_echo "Not building component gr-audio-windows." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-comedi." >&5 +$as_echo "Not building component gr-comedi." >&6; } fi else if test $passed = with; then - with_dirs="$with_dirs gr-audio-windows" + with_dirs="$with_dirs gr-comedi" - if test "x${gr_audio_windows_INCLUDES}" != "x"; then + if test "x${gr_comedi_INCLUDES}" != "x"; then if test "x$with_INCLUDES" = "x"; then - with_INCLUDES="${gr_audio_windows_INCLUDES}" + with_INCLUDES="${gr_comedi_INCLUDES}" else - with_INCLUDES="${gr_audio_windows_INCLUDES}"" ""$with_INCLUDES" + with_INCLUDES="${gr_comedi_INCLUDES}"" ""$with_INCLUDES" fi - gr_audio_windows_INCLUDES= + gr_comedi_INCLUDES= fi - if test "x${gr_audio_windows_SWIG_INCLUDES}" != "x"; then + if test "x${gr_comedi_SWIG_INCLUDES}" != "x"; then if test "x$with_SWIG_INCLUDES" = "x"; then - with_SWIG_INCLUDES="${gr_audio_windows_SWIG_INCLUDES}" + with_SWIG_INCLUDES="${gr_comedi_SWIG_INCLUDES}" else - with_SWIG_INCLUDES="${gr_audio_windows_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + with_SWIG_INCLUDES="${gr_comedi_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" fi - gr_audio_windows_SWIG_INCLUDES= + gr_comedi_SWIG_INCLUDES= fi - if test "x${gr_audio_windows_PYDIRPATH}" != "x"; then + if test "x${gr_comedi_PYDIRPATH}" != "x"; then if test "x$with_PYDIRPATH" = "x"; then - with_PYDIRPATH="${gr_audio_windows_PYDIRPATH}" + with_PYDIRPATH="${gr_comedi_PYDIRPATH}" else - with_PYDIRPATH="${gr_audio_windows_PYDIRPATH}"":""$with_PYDIRPATH" + with_PYDIRPATH="${gr_comedi_PYDIRPATH}"":""$with_PYDIRPATH" fi - gr_audio_windows_PYDIRPATH= + gr_comedi_PYDIRPATH= fi - if test "x${gr_audio_windows_SWIGDIRPATH}" != "x"; then + if test "x${gr_comedi_SWIGDIRPATH}" != "x"; then if test "x$with_SWIGDIRPATH" = "x"; then - with_SWIGDIRPATH="${gr_audio_windows_SWIGDIRPATH}" + with_SWIGDIRPATH="${gr_comedi_SWIGDIRPATH}" else - with_SWIGDIRPATH="${gr_audio_windows_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + with_SWIGDIRPATH="${gr_comedi_SWIGDIRPATH}"":""$with_SWIGDIRPATH" fi - gr_audio_windows_SWIGDIRPATH= + gr_comedi_SWIGDIRPATH= fi - if test "x${gr_audio_windows_LIBDIRPATH}" != "x"; then + if test "x${gr_comedi_LIBDIRPATH}" != "x"; then if test "x$with_LIBDIRPATH" = "x"; then - with_LIBDIRPATH="${gr_audio_windows_LIBDIRPATH}" + with_LIBDIRPATH="${gr_comedi_LIBDIRPATH}" else - with_LIBDIRPATH="${gr_audio_windows_LIBDIRPATH}"":""$with_LIBDIRPATH" + with_LIBDIRPATH="${gr_comedi_LIBDIRPATH}"":""$with_LIBDIRPATH" fi - gr_audio_windows_LIBDIRPATH= + gr_comedi_LIBDIRPATH= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows will be included from a pre-installed library and includes." >&5 -$as_echo "Component gr-audio-windows will be included from a pre-installed library and includes." >&6; } - gr_audio_windows_with=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-comedi will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-comedi will be included from a pre-installed library and includes." >&6; } + gr_comedi_with=yes else - gr_audio_windows_LDFLAG= - if test x$enable_gr_audio_windows != xno; then - WINAUDIO_LIBS=-lwinmm - - ac_config_commands="$ac_config_commands run_tests_audio_windows" + gr_comedi_LDFLAG= + if test x$enable_gr_comedi != xno; then + ac_config_commands="$ac_config_commands run_tests_comedi" - build_dirs="$build_dirs gr-audio-windows" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows passed configuration checks; building." >&5 -$as_echo "Component gr-audio-windows passed configuration checks; building." >&6; } + build_dirs="$build_dirs gr-comedi" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-comedi passed configuration checks; building." >&5 +$as_echo "Component gr-comedi passed configuration checks; building." >&6; } else passed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-audio-windows passed configuration checks; but not building." >&5 -$as_echo "Component gr-audio-windows passed configuration checks; but not building." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-comedi passed configuration checks; but not building." >&5 +$as_echo "Component gr-comedi passed configuration checks; but not building." >&6; } fi fi fi if test $passed = no; then - skipped_dirs="$skipped_dirs gr-audio-windows" - gr_audio_windows_skipped=yes + skipped_dirs="$skipped_dirs gr-comedi" + gr_comedi_skipped=yes else - gr_audio_windows_skipped=no + gr_comedi_skipped=no fi @@ -30462,13 +27636,13 @@ $as_echo "Component gr-cvsd-vocoder requires gnuradio-core, which is not being b fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-cvsd-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-cvsd-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi - ac_config_files="$ac_config_files gr-cvsd-vocoder/Makefile gr-cvsd-vocoder/src/Makefile gr-cvsd-vocoder/src/lib/Makefile gr-cvsd-vocoder/src/python/Makefile gr-cvsd-vocoder/src/python/run_tests" + ac_config_files="$ac_config_files gr-cvsd-vocoder/Makefile gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc gr-cvsd-vocoder/src/Makefile gr-cvsd-vocoder/src/lib/Makefile gr-cvsd-vocoder/src/python/Makefile gr-cvsd-vocoder/src/python/run_tests" @@ -30476,7 +27650,7 @@ $as_echo "Component gr-cvsd-vocoder requires gnuradio-core, which is not being b gr_cvsd_vocoder_with=no if test $passed = no; then if test x$enable_gr_cvsd_vocoder = xyes; then - as_fn_error "Component gr-cvsd-vocoder has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-cvsd-vocoder has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-cvsd-vocoder." >&5 $as_echo "Not building component gr-cvsd-vocoder." >&6; } @@ -30596,7 +27770,7 @@ $as_echo "Component gr-gpio requires usrp, which is not being built or specified fi else if test x$usrp_with = xno; then - as_fn_error "Component gr-gpio requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-gpio requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 fi fi fi @@ -30610,7 +27784,7 @@ $as_echo "Component gr-gpio requires usrp, which is not being built or specified gr_gpio_with=no if test $passed = no; then if test x$enable_gr_gpio = xyes; then - as_fn_error "Component gr-gpio has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-gpio has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-gpio." >&5 $as_echo "Not building component gr-gpio." >&6; } @@ -30728,13 +27902,13 @@ $as_echo "Component gr-gsm-fr-vocoder requires gnuradio-core, which is not being fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-gsm-fr-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-gsm-fr-vocoder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi - ac_config_files="$ac_config_files gr-gsm-fr-vocoder/Makefile gr-gsm-fr-vocoder/src/Makefile gr-gsm-fr-vocoder/src/lib/Makefile gr-gsm-fr-vocoder/src/lib/gsm/Makefile gr-gsm-fr-vocoder/src/python/Makefile gr-gsm-fr-vocoder/src/python/run_tests" + ac_config_files="$ac_config_files gr-gsm-fr-vocoder/Makefile gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc gr-gsm-fr-vocoder/src/Makefile gr-gsm-fr-vocoder/src/lib/Makefile gr-gsm-fr-vocoder/src/lib/gsm/Makefile gr-gsm-fr-vocoder/src/python/Makefile gr-gsm-fr-vocoder/src/python/run_tests" @@ -30742,7 +27916,7 @@ $as_echo "Component gr-gsm-fr-vocoder requires gnuradio-core, which is not being gr_gsm_fr_vocoder_with=no if test $passed = no; then if test x$enable_gr_gsm_fr_vocoder = xyes; then - as_fn_error "Component gr-gsm-fr-vocoder has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-gsm-fr-vocoder has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-gsm-fr-vocoder." >&5 $as_echo "Not building component gr-gsm-fr-vocoder." >&6; } @@ -30836,6 +28010,169 @@ $as_echo "Component gr-gsm-fr-vocoder passed configuration checks; but not build + passed=yes + # Check whether --enable-gr-noaa was given. +if test "${enable_gr_noaa+set}" = set; then : + enableval=$enable_gr_noaa; +else + + enable_gr_noaa=$enable_all_components + if test x$enable_all_components = xno; then + passed=no + fi + +fi + + + + + + if test $passed != no; then + if test $passed = yes; then + if test x$gnuradio_core_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-noaa requires gnuradio-core, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-noaa requires gnuradio-core, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$gnuradio_core_with = xno; then + as_fn_error $? "Component gr-noaa requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + fi + fi + fi + + + if test $passed != no; then + if test $passed = yes; then + if test x$gr_wxgui_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-noaa requires gr-wxgui, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-noaa requires gr-wxgui, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$gr_wxgui_with = xno; then + as_fn_error $? "Component gr-noaa requires gr-wxgui to be included as --with-gr-wxgui[=arg]" "$LINENO" 5 + fi + fi + fi + + + if test $passed != no; then + if test $passed = yes; then + if test x$grc_skipped = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-noaa requires grc, which is not being built or specified via pre-installed files." >&5 +$as_echo "Component gr-noaa requires grc, which is not being built or specified via pre-installed files." >&6; } + passed=no + fi + else + if test x$grc_with = xno; then + as_fn_error $? "Component gr-noaa requires grc to be included as --with-grc[=arg]" "$LINENO" 5 + fi + fi + fi + + + ac_config_files="$ac_config_files gr-noaa/Makefile gr-noaa/apps/Makefile gr-noaa/grc/Makefile gr-noaa/lib/Makefile gr-noaa/oct/Makefile gr-noaa/python/Makefile gr-noaa/swig/Makefile" + + + + + gr_noaa_with=no + if test $passed = no; then + if test x$enable_gr_noaa = xyes; then + as_fn_error $? "Component gr-noaa has errors; stopping." "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-noaa." >&5 +$as_echo "Not building component gr-noaa." >&6; } + fi + else + if test $passed = with; then + with_dirs="$with_dirs gr-noaa" + + if test "x${gr_noaa_INCLUDES}" != "x"; then + if test "x$with_INCLUDES" = "x"; then + with_INCLUDES="${gr_noaa_INCLUDES}" + else + with_INCLUDES="${gr_noaa_INCLUDES}"" ""$with_INCLUDES" + fi + gr_noaa_INCLUDES= + fi + + + if test "x${gr_noaa_SWIG_INCLUDES}" != "x"; then + if test "x$with_SWIG_INCLUDES" = "x"; then + with_SWIG_INCLUDES="${gr_noaa_SWIG_INCLUDES}" + else + with_SWIG_INCLUDES="${gr_noaa_SWIG_INCLUDES}"" ""$with_SWIG_INCLUDES" + fi + gr_noaa_SWIG_INCLUDES= + fi + + + if test "x${gr_noaa_PYDIRPATH}" != "x"; then + if test "x$with_PYDIRPATH" = "x"; then + with_PYDIRPATH="${gr_noaa_PYDIRPATH}" + else + with_PYDIRPATH="${gr_noaa_PYDIRPATH}"":""$with_PYDIRPATH" + fi + gr_noaa_PYDIRPATH= + fi + + + if test "x${gr_noaa_SWIGDIRPATH}" != "x"; then + if test "x$with_SWIGDIRPATH" = "x"; then + with_SWIGDIRPATH="${gr_noaa_SWIGDIRPATH}" + else + with_SWIGDIRPATH="${gr_noaa_SWIGDIRPATH}"":""$with_SWIGDIRPATH" + fi + gr_noaa_SWIGDIRPATH= + fi + + + if test "x${gr_noaa_LIBDIRPATH}" != "x"; then + if test "x$with_LIBDIRPATH" = "x"; then + with_LIBDIRPATH="${gr_noaa_LIBDIRPATH}" + else + with_LIBDIRPATH="${gr_noaa_LIBDIRPATH}"":""$with_LIBDIRPATH" + fi + gr_noaa_LIBDIRPATH= + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-noaa will be included from a pre-installed library and includes." >&5 +$as_echo "Component gr-noaa will be included from a pre-installed library and includes." >&6; } + gr_noaa_with=yes + else + gr_noaa_LDFLAG= + if test x$enable_gr_noaa != xno; then + #AC_CONFIG_COMMANDS([run_tests_noaa], [chmod +x gr-pager/lib/run_tests]) + + build_dirs="$build_dirs gr-noaa" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-noaa passed configuration checks; building." >&5 +$as_echo "Component gr-noaa passed configuration checks; building." >&6; } + else + passed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Component gr-noaa passed configuration checks; but not building." >&5 +$as_echo "Component gr-noaa passed configuration checks; but not building." >&6; } + fi + fi + fi + if test $passed = no; then + skipped_dirs="$skipped_dirs gr-noaa" + gr_noaa_skipped=yes + else + gr_noaa_skipped=no + fi + + + + + + + + + + + passed=yes # Check whether --enable-gr-pager was given. if test "${enable_gr_pager+set}" = set; then : @@ -30862,13 +28199,13 @@ $as_echo "Component gr-pager requires gnuradio-core, which is not being built or fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-pager requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-pager requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi - ac_config_files="$ac_config_files gr-pager/Makefile gr-pager/src/Makefile gr-pager/src/run_tests" + ac_config_files="$ac_config_files gr-pager/Makefile gr-pager/gnuradio-pager.pc gr-pager/apps/Makefile gr-pager/grc/Makefile gr-pager/lib/Makefile gr-pager/python/Makefile gr-pager/python/run_tests gr-pager/swig/Makefile" @@ -30876,7 +28213,7 @@ $as_echo "Component gr-pager requires gnuradio-core, which is not being built or gr_pager_with=no if test $passed = no; then if test x$enable_gr_pager = xyes; then - as_fn_error "Component gr-pager has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-pager has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-pager." >&5 $as_echo "Not building component gr-pager." >&6; } @@ -30996,7 +28333,7 @@ $as_echo "Component gr-radar-mono requires usrp, which is not being built or spe fi else if test x$usrp_with = xno; then - as_fn_error "Component gr-radar-mono requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-radar-mono requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 fi fi fi @@ -31011,7 +28348,7 @@ $as_echo "Component gr-radar-mono requires gnuradio-core, which is not being bui fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-radar-mono requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-radar-mono requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -31025,7 +28362,7 @@ $as_echo "Component gr-radar-mono requires gnuradio-core, which is not being bui gr_radar_mono_with=no if test $passed = no; then if test x$enable_gr_radar_mono = xyes; then - as_fn_error "Component gr-radar-mono has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-radar-mono has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-radar-mono." >&5 $as_echo "Not building component gr-radar-mono." >&6; } @@ -31145,7 +28482,7 @@ $as_echo "Component gr-radio-astronomy requires gnuradio-core, which is not bein fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-radio-astronomy requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-radio-astronomy requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -31159,7 +28496,7 @@ $as_echo "Component gr-radio-astronomy requires gnuradio-core, which is not bein gr_radio_astronomy_with=no if test $passed = no; then if test x$enable_gr_radio_astronomy = xyes; then - as_fn_error "Component gr-radio-astronomy has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-radio-astronomy has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-radio-astronomy." >&5 $as_echo "Not building component gr-radio-astronomy." >&6; } @@ -31279,13 +28616,13 @@ $as_echo "Component gr-trellis requires gnuradio-core, which is not being built fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-trellis requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-trellis requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi - ac_config_files="$ac_config_files gr-trellis/Makefile gr-trellis/doc/Makefile gr-trellis/src/Makefile gr-trellis/src/lib/Makefile gr-trellis/src/python/Makefile gr-trellis/src/python/run_tests gr-trellis/src/examples/Makefile gr-trellis/src/examples/fsm_files/Makefile" + ac_config_files="$ac_config_files gr-trellis/Makefile gr-trellis/gnuradio-trellis.pc gr-trellis/doc/Makefile gr-trellis/src/Makefile gr-trellis/src/lib/Makefile gr-trellis/src/python/Makefile gr-trellis/src/python/run_tests gr-trellis/src/examples/Makefile gr-trellis/src/examples/fsm_files/Makefile" @@ -31293,7 +28630,7 @@ $as_echo "Component gr-trellis requires gnuradio-core, which is not being built gr_trellis_with=no if test $passed = no; then if test x$enable_gr_trellis = xyes; then - as_fn_error "Component gr-trellis has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-trellis has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-trellis." >&5 $as_echo "Not building component gr-trellis." >&6; } @@ -31413,7 +28750,7 @@ $as_echo "Component gr-video-sdl requires gnuradio-core, which is not being buil fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-video-sdl requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-video-sdl requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -32055,7 +29392,7 @@ $as_echo "yes" >&6; } fi fi - ac_config_files="$ac_config_files gr-video-sdl/Makefile gr-video-sdl/src/Makefile gr-video-sdl/src/run_tests" + ac_config_files="$ac_config_files gr-video-sdl/Makefile gr-video-sdl/gnuradio-video-sdl.pc gr-video-sdl/src/Makefile gr-video-sdl/src/run_tests" @@ -32063,7 +29400,7 @@ fi gr_video_sdl_with=no if test $passed = no; then if test x$enable_gr_video_sdl = xyes; then - as_fn_error "Component gr-video-sdl has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-video-sdl has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-video-sdl." >&5 $as_echo "Not building component gr-video-sdl." >&6; } @@ -32190,7 +29527,7 @@ fi if test x$with_gr_wxgui = xyes; then if test x$enable_gr_wxgui = xyes; then - as_fn_error "Component gr-wxgui: Cannot use both --enable and --with" "$LINENO" 5 + as_fn_error $? "Component gr-wxgui: Cannot use both --enable and --with" "$LINENO" 5 else s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -32200,7 +29537,7 @@ fi export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH if ! test -r ${l_PKG_CONFIG_PATH}/${pc_comp_name}.pc; then - as_fn_error "Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 + as_fn_error $? "Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with provided PKG_CONFIG_PATH = [ $l_PKG_CONFIG_PATH ] ." "$LINENO" 5 fi fi @@ -32230,7 +29567,7 @@ fi fi fi if test $passed != with; then - as_fn_error "Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 + as_fn_error $? "Component gr-wxgui: PKGCONFIG cannot find info for ${pc_comp_name}, with PKG_CONFIG_PATH = [ $PKG_CONFIG_PATH ] ." "$LINENO" 5 fi s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH @@ -32262,7 +29599,7 @@ $as_echo "Component gr-wxgui requires gnuradio-core, which is not being built or fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-wxgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-wxgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -32327,7 +29664,7 @@ $as_echo "yes" >&6; } gr_wxgui_with=no if test $passed = no; then if test x$enable_gr_wxgui = xyes; then - as_fn_error "Component gr-wxgui has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-wxgui has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-wxgui." >&5 $as_echo "Not building component gr-wxgui." >&6; } @@ -32446,7 +29783,7 @@ $as_echo "Component gr-qtgui requires gnuradio-core, which is not being built or fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-qtgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-qtgui requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -32983,8 +30320,7 @@ fi QWT_CFLAGS="$QWT_CFLAGS -I$qwt_incdir" as_ac_Header=`$as_echo "ac_cv_header_$qwt_incdir/qwt.h" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$qwt_incdir/qwt.h" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : else libqwt_ok=no @@ -33007,7 +30343,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$qwt_lib''_main" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$qwt_lib" >&5 $as_echo_n "checking for main in -l$qwt_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33036,8 +30372,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : libqwt_ok=yes else libqwt_ok=no @@ -33231,8 +30566,7 @@ fi QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I$qwtplot3d_incdir" as_ac_Header=`$as_echo "ac_cv_header_$qwtplot3d_incdir/qwt3d_plot.h" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$qwtplot3d_incdir/qwt3d_plot.h" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : else libqwtplot3d_ok=no @@ -33255,7 +30589,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$qwtplot3d_lib''_main" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$qwtplot3d_lib" >&5 $as_echo_n "checking for main in -l$qwtplot3d_lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33284,8 +30618,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : libqwtplot3d_ok=yes else libqwtplot3d_ok=no @@ -33420,26 +30753,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - - if test "$passed" = "no"; then - if false; then - BUILD_QT_TRUE= - BUILD_QT_FALSE='#' -else - BUILD_QT_TRUE='#' - BUILD_QT_FALSE= -fi - - else - if true; then - BUILD_QT_TRUE= - BUILD_QT_FALSE='#' -else - BUILD_QT_TRUE='#' - BUILD_QT_FALSE= -fi - fi ac_config_files="$ac_config_files gr-qtgui/Makefile gr-qtgui/src/Makefile gr-qtgui/src/lib/Makefile gr-qtgui/src/python/Makefile" @@ -33450,7 +30763,7 @@ fi gr_qtgui_with=no if test $passed = no; then if test x$enable_gr_qtgui = xyes; then - as_fn_error "Component gr-qtgui has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-qtgui has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-qtgui." >&5 $as_echo "Not building component gr-qtgui." >&6; } @@ -33568,7 +30881,7 @@ $as_echo "Component gr-sounder requires usrp, which is not being built or specif fi else if test x$usrp_with = xno; then - as_fn_error "Component gr-sounder requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-sounder requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 fi fi fi @@ -33583,7 +30896,7 @@ $as_echo "Component gr-sounder requires gnuradio-core, which is not being built fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-sounder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-sounder requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -33597,7 +30910,7 @@ $as_echo "Component gr-sounder requires gnuradio-core, which is not being built gr_sounder_with=no if test $passed = no; then if test x$enable_gr_sounder = xyes; then - as_fn_error "Component gr-sounder has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-sounder has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-sounder." >&5 $as_echo "Not building component gr-sounder." >&6; } @@ -33716,7 +31029,7 @@ $as_echo "Component gr-utils requires gnuradio-core, which is not being built or fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gr-utils requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-utils requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi @@ -33731,7 +31044,7 @@ $as_echo "Component gr-utils requires usrp, which is not being built or specifie fi else if test x$usrp_with = xno; then - as_fn_error "Component gr-utils requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-utils requires usrp to be included as --with-usrp[=arg]" "$LINENO" 5 fi fi fi @@ -33746,7 +31059,7 @@ $as_echo "Component gr-utils requires gr-wxgui, which is not being built or spec fi else if test x$gr_wxgui_with = xno; then - as_fn_error "Component gr-utils requires gr-wxgui to be included as --with-gr-wxgui[=arg]" "$LINENO" 5 + as_fn_error $? "Component gr-utils requires gr-wxgui to be included as --with-gr-wxgui[=arg]" "$LINENO" 5 fi fi fi @@ -33760,7 +31073,7 @@ $as_echo "Component gr-utils requires gr-wxgui, which is not being built or spec gr_utils_with=no if test $passed = no; then if test x$enable_gr_utils = xyes; then - as_fn_error "Component gr-utils has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gr-utils has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gr-utils." >&5 $as_echo "Not building component gr-utils." >&6; } @@ -33877,13 +31190,13 @@ $as_echo "Component gnuradio-examples requires gnuradio-core, which is not being fi else if test x$gnuradio_core_with = xno; then - as_fn_error "Component gnuradio-examples requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 + as_fn_error $? "Component gnuradio-examples requires gnuradio-core to be included as --with-gnuradio-core[=arg]" "$LINENO" 5 fi fi fi - ac_config_files="$ac_config_files gnuradio-examples/Makefile gnuradio-examples/c++/Makefile gnuradio-examples/python/Makefile gnuradio-examples/python/apps/hf_explorer/Makefile gnuradio-examples/python/apps/hf_radio/Makefile gnuradio-examples/python/apps/Makefile gnuradio-examples/python/audio/Makefile gnuradio-examples/python/digital/Makefile gnuradio-examples/python/digital_voice/Makefile gnuradio-examples/python/digital-bert/Makefile gnuradio-examples/python/mp-sched/Makefile gnuradio-examples/python/multi-antenna/Makefile gnuradio-examples/python/multi_usrp/Makefile gnuradio-examples/python/network/Makefile gnuradio-examples/python/ofdm/Makefile gnuradio-examples/python/usrp/Makefile gnuradio-examples/python/usrp2/Makefile" + ac_config_files="$ac_config_files gnuradio-examples/Makefile gnuradio-examples/c++/Makefile gnuradio-examples/python/Makefile gnuradio-examples/grc/Makefile gnuradio-examples/python/apps/hf_explorer/Makefile gnuradio-examples/python/apps/hf_radio/Makefile gnuradio-examples/python/apps/Makefile gnuradio-examples/python/audio/Makefile gnuradio-examples/python/digital/Makefile gnuradio-examples/python/digital_voice/Makefile gnuradio-examples/python/digital-bert/Makefile gnuradio-examples/python/mp-sched/Makefile gnuradio-examples/python/multi-antenna/Makefile gnuradio-examples/python/multi_usrp/Makefile gnuradio-examples/python/network/Makefile gnuradio-examples/python/ofdm/Makefile gnuradio-examples/python/pfb/Makefile gnuradio-examples/python/usrp/Makefile gnuradio-examples/python/usrp2/Makefile" @@ -33891,7 +31204,7 @@ $as_echo "Component gnuradio-examples requires gnuradio-core, which is not being gnuradio_examples_with=no if test $passed = no; then if test x$enable_gnuradio_examples = xyes; then - as_fn_error "Component gnuradio-examples has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component gnuradio-examples has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component gnuradio-examples." >&5 $as_echo "Not building component gnuradio-examples." >&6; } @@ -34008,7 +31321,7 @@ $as_echo "Component grc requires gr-wxgui, which is not being built or specified fi else if test x$gr_wxgui_with = xno; then - as_fn_error "Component grc requires gr-wxgui to be included as --with-gr-wxgui[=arg]" "$LINENO" 5 + as_fn_error $? "Component grc requires gr-wxgui to be included as --with-gr-wxgui[=arg]" "$LINENO" 5 fi fi fi @@ -34111,13 +31424,13 @@ $as_echo "yes" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python lxml wrappers >= 2.0.0" >&5 -$as_echo_n "checking for Python lxml wrappers >= 2.0.0... " >&6; } - if test "lxml.etree.LXML_VERSION >= (2, 0, 0, 0)"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python lxml wrappers >= 1.3.6" >&5 +$as_echo_n "checking for Python lxml wrappers >= 1.3.6... " >&6; } + if test "lxml.etree.LXML_VERSION >= (1, 3, 6, 0)"; then python_cmd=' try: import lxml.etree - assert lxml.etree.LXML_VERSION >= (2, 0, 0, 0) + assert lxml.etree.LXML_VERSION >= (1, 3, 6, 0) except: exit(1)' else python_cmd=' @@ -34167,7 +31480,7 @@ $as_echo "yes" >&6; } fi - ac_config_files="$ac_config_files grc/Makefile grc/base/Makefile grc/blocks/Makefile grc/examples/Makefile grc/freedesktop/Makefile grc/grc_gnuradio/Makefile grc/gui/Makefile grc/python/Makefile grc/scripts/Makefile" + ac_config_files="$ac_config_files grc/Makefile grc/base/Makefile grc/blocks/Makefile grc/freedesktop/Makefile grc/grc_gnuradio/Makefile grc/gui/Makefile grc/python/Makefile grc/scripts/Makefile" @@ -34175,7 +31488,7 @@ $as_echo "yes" >&6; } grc_with=no if test $passed = no; then if test x$enable_grc = xyes; then - as_fn_error "Component grc has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component grc has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component grc." >&5 $as_echo "Not building component grc." >&6; } @@ -34291,7 +31604,7 @@ fi docs_with=no if test $passed = no; then if test x$enable_docs = xyes; then - as_fn_error "Component docs has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component docs has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component docs." >&5 $as_echo "Not building component docs." >&6; } @@ -34495,6 +31808,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -34518,97 +31832,93 @@ else fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then - as_fn_error "conditional \"am__fastdepCCAS\" was never defined. + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_FORTRAN_TRUE}" && test -z "${ENABLE_FORTRAN_FALSE}"; then - as_fn_error "conditional \"ENABLE_FORTRAN\" was never defined. +if test -z "${PYTHON_TRUE}" && test -z "${PYTHON_FALSE}"; then + as_fn_error $? "conditional \"PYTHON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAS_XMLTO_TRUE}" && test -z "${HAS_XMLTO_FALSE}"; then - as_fn_error "conditional \"HAS_XMLTO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${OMNITHREAD_POSIX_TRUE}" && test -z "${OMNITHREAD_POSIX_FALSE}"; then - as_fn_error "conditional \"OMNITHREAD_POSIX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${OMNITHREAD_NT_TRUE}" && test -z "${OMNITHREAD_NT_FALSE}"; then - as_fn_error "conditional \"OMNITHREAD_NT\" was never defined. + as_fn_error $? "conditional \"HAS_XMLTO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_CREATEFILEMAPPING_TRUE}" && test -z "${HAVE_CREATEFILEMAPPING_FALSE}"; then - as_fn_error "conditional \"HAVE_CREATEFILEMAPPING\" was never defined. + as_fn_error $? "conditional \"HAVE_CREATEFILEMAPPING\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${DOC_TRUE}" && test -z "${DOC_FALSE}"; then - as_fn_error "conditional \"DOC\" was never defined. + as_fn_error $? "conditional \"DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MD_CPU_x86_TRUE}" && test -z "${MD_CPU_x86_FALSE}"; then - as_fn_error "conditional \"MD_CPU_x86\" was never defined. + as_fn_error $? "conditional \"MD_CPU_x86\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MD_SUBCPU_x86_64_TRUE}" && test -z "${MD_SUBCPU_x86_64_FALSE}"; then - as_fn_error "conditional \"MD_SUBCPU_x86_64\" was never defined. + as_fn_error $? "conditional \"MD_SUBCPU_x86_64\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MD_CPU_powerpc_TRUE}" && test -z "${MD_CPU_powerpc_FALSE}"; then - as_fn_error "conditional \"MD_CPU_powerpc\" was never defined. + as_fn_error $? "conditional \"MD_CPU_powerpc\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${MD_CPU_armv5_TRUE}" && test -z "${MD_CPU_armv5_FALSE}"; then + as_fn_error $? "conditional \"MD_CPU_armv5\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${MD_CPU_armv7_a_TRUE}" && test -z "${MD_CPU_armv7_a_FALSE}"; then + as_fn_error $? "conditional \"MD_CPU_armv7_a\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${MD_CPU_generic_TRUE}" && test -z "${MD_CPU_generic_FALSE}"; then - as_fn_error "conditional \"MD_CPU_generic\" was never defined. + as_fn_error $? "conditional \"MD_CPU_generic\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FUSB_TECH_darwin_TRUE}" && test -z "${FUSB_TECH_darwin_FALSE}"; then - as_fn_error "conditional \"FUSB_TECH_darwin\" was never defined. + as_fn_error $? "conditional \"FUSB_TECH_darwin\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FUSB_TECH_win32_TRUE}" && test -z "${FUSB_TECH_win32_FALSE}"; then - as_fn_error "conditional \"FUSB_TECH_win32\" was never defined. + as_fn_error $? "conditional \"FUSB_TECH_win32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FUSB_TECH_generic_TRUE}" && test -z "${FUSB_TECH_generic_FALSE}"; then - as_fn_error "conditional \"FUSB_TECH_generic\" was never defined. + as_fn_error $? "conditional \"FUSB_TECH_generic\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${FUSB_TECH_linux_TRUE}" && test -z "${FUSB_TECH_linux_FALSE}"; then - as_fn_error "conditional \"FUSB_TECH_linux\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${FUSB_TECH_ra_wb_TRUE}" && test -z "${FUSB_TECH_ra_wb_FALSE}"; then - as_fn_error "conditional \"FUSB_TECH_ra_wb\" was never defined. + as_fn_error $? "conditional \"FUSB_TECH_linux\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi - -if test -z "${BUILD_QT_TRUE}" && test -z "${BUILD_QT_FALSE}"; then - as_fn_error "conditional \"BUILD_QT\" was never defined. +if test -z "${FUSB_TECH_libusb1_TRUE}" && test -z "${FUSB_TECH_libusb1_FALSE}"; then + as_fn_error $? "conditional \"FUSB_TECH_libusb1\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_QT_TRUE}" && test -z "${BUILD_QT_FALSE}"; then - as_fn_error "conditional \"BUILD_QT\" was never defined. +if test -z "${FUSB_TECH_ra_wb_TRUE}" && test -z "${FUSB_TECH_ra_wb_FALSE}"; then + as_fn_error $? "conditional \"FUSB_TECH_ra_wb\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi + if test -z "${XDG_UTILS_TRUE}" && test -z "${XDG_UTILS_FALSE}"; then - as_fn_error "conditional \"XDG_UTILS\" was never defined. + as_fn_error $? "conditional \"XDG_UTILS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -34758,19 +32068,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -34966,7 +32276,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -35020,7 +32330,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -35086,10 +32396,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -35107,11 +32417,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -35133,6 +32448,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -35145,7 +32461,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -35154,7 +32470,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -35335,99 +32651,52 @@ predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -LD_F77='`$ECHO "X$LD_F77" | $Xsed -e "$delay_single_quote_subst"`' old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_F77='`$ECHO "X$old_archive_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`' compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_F77='`$ECHO "X$compiler_F77" | $Xsed -e "$delay_single_quote_subst"`' GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_F77='`$ECHO "X$GCC_F77" | $Xsed -e "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_F77='`$ECHO "X$lt_prog_compiler_no_builtin_flag_F77" | $Xsed -e "$delay_single_quote_subst"`' lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_F77='`$ECHO "X$lt_prog_compiler_wl_F77" | $Xsed -e "$delay_single_quote_subst"`' lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_F77='`$ECHO "X$lt_prog_compiler_pic_F77" | $Xsed -e "$delay_single_quote_subst"`' lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_F77='`$ECHO "X$lt_prog_compiler_static_F77" | $Xsed -e "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_F77='`$ECHO "X$lt_cv_prog_compiler_c_o_F77" | $Xsed -e "$delay_single_quote_subst"`' archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_F77='`$ECHO "X$archive_cmds_need_lc_F77" | $Xsed -e "$delay_single_quote_subst"`' enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_F77='`$ECHO "X$enable_shared_with_static_runtimes_F77" | $Xsed -e "$delay_single_quote_subst"`' export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_F77='`$ECHO "X$export_dynamic_flag_spec_F77" | $Xsed -e "$delay_single_quote_subst"`' whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_F77='`$ECHO "X$whole_archive_flag_spec_F77" | $Xsed -e "$delay_single_quote_subst"`' compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_F77='`$ECHO "X$compiler_needs_object_F77" | $Xsed -e "$delay_single_quote_subst"`' old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_F77='`$ECHO "X$old_archive_from_new_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`' old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_F77='`$ECHO "X$old_archive_from_expsyms_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`' archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_F77='`$ECHO "X$archive_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`' archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_F77='`$ECHO "X$archive_expsym_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`' module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_F77='`$ECHO "X$module_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`' module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_F77='`$ECHO "X$module_expsym_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`' with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_F77='`$ECHO "X$with_gnu_ld_F77" | $Xsed -e "$delay_single_quote_subst"`' allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_F77='`$ECHO "X$allow_undefined_flag_F77" | $Xsed -e "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_F77='`$ECHO "X$no_undefined_flag_F77" | $Xsed -e "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_F77='`$ECHO "X$hardcode_libdir_flag_spec_F77" | $Xsed -e "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_F77='`$ECHO "X$hardcode_libdir_flag_spec_ld_F77" | $Xsed -e "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_F77='`$ECHO "X$hardcode_libdir_separator_F77" | $Xsed -e "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_F77='`$ECHO "X$hardcode_direct_F77" | $Xsed -e "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_F77='`$ECHO "X$hardcode_direct_absolute_F77" | $Xsed -e "$delay_single_quote_subst"`' hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_F77='`$ECHO "X$hardcode_minus_L_F77" | $Xsed -e "$delay_single_quote_subst"`' hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_F77='`$ECHO "X$hardcode_shlibpath_var_F77" | $Xsed -e "$delay_single_quote_subst"`' hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_F77='`$ECHO "X$hardcode_automatic_F77" | $Xsed -e "$delay_single_quote_subst"`' inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_F77='`$ECHO "X$inherit_rpath_F77" | $Xsed -e "$delay_single_quote_subst"`' link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_F77='`$ECHO "X$link_all_deplibs_F77" | $Xsed -e "$delay_single_quote_subst"`' fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_F77='`$ECHO "X$fix_srcfile_path_F77" | $Xsed -e "$delay_single_quote_subst"`' always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_F77='`$ECHO "X$always_export_symbols_F77" | $Xsed -e "$delay_single_quote_subst"`' export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_F77='`$ECHO "X$export_symbols_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`' exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_F77='`$ECHO "X$exclude_expsyms_F77" | $Xsed -e "$delay_single_quote_subst"`' include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_F77='`$ECHO "X$include_expsyms_F77" | $Xsed -e "$delay_single_quote_subst"`' prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_F77='`$ECHO "X$prelink_cmds_F77" | $Xsed -e "$delay_single_quote_subst"`' file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_F77='`$ECHO "X$file_list_spec_F77" | $Xsed -e "$delay_single_quote_subst"`' hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_F77='`$ECHO "X$hardcode_action_F77" | $Xsed -e "$delay_single_quote_subst"`' compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_F77='`$ECHO "X$compiler_lib_search_dirs_F77" | $Xsed -e "$delay_single_quote_subst"`' predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_F77='`$ECHO "X$predep_objects_F77" | $Xsed -e "$delay_single_quote_subst"`' postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_F77='`$ECHO "X$postdep_objects_F77" | $Xsed -e "$delay_single_quote_subst"`' predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_F77='`$ECHO "X$predeps_F77" | $Xsed -e "$delay_single_quote_subst"`' postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_F77='`$ECHO "X$postdeps_F77" | $Xsed -e "$delay_single_quote_subst"`' compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_F77='`$ECHO "X$compiler_lib_search_path_F77" | $Xsed -e "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' @@ -35498,57 +32767,31 @@ predeps \ postdeps \ compiler_lib_search_path \ LD_CXX \ -LD_F77 \ compiler_CXX \ -compiler_F77 \ lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_no_builtin_flag_F77 \ lt_prog_compiler_wl_CXX \ -lt_prog_compiler_wl_F77 \ lt_prog_compiler_pic_CXX \ -lt_prog_compiler_pic_F77 \ lt_prog_compiler_static_CXX \ -lt_prog_compiler_static_F77 \ lt_cv_prog_compiler_c_o_CXX \ -lt_cv_prog_compiler_c_o_F77 \ export_dynamic_flag_spec_CXX \ -export_dynamic_flag_spec_F77 \ whole_archive_flag_spec_CXX \ -whole_archive_flag_spec_F77 \ compiler_needs_object_CXX \ -compiler_needs_object_F77 \ with_gnu_ld_CXX \ -with_gnu_ld_F77 \ allow_undefined_flag_CXX \ -allow_undefined_flag_F77 \ no_undefined_flag_CXX \ -no_undefined_flag_F77 \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_F77 \ hardcode_libdir_flag_spec_ld_CXX \ -hardcode_libdir_flag_spec_ld_F77 \ hardcode_libdir_separator_CXX \ -hardcode_libdir_separator_F77 \ fix_srcfile_path_CXX \ -fix_srcfile_path_F77 \ exclude_expsyms_CXX \ -exclude_expsyms_F77 \ include_expsyms_CXX \ -include_expsyms_F77 \ file_list_spec_CXX \ -file_list_spec_F77 \ compiler_lib_search_dirs_CXX \ -compiler_lib_search_dirs_F77 \ predep_objects_CXX \ -predep_objects_F77 \ postdep_objects_CXX \ -postdep_objects_F77 \ predeps_CXX \ -predeps_F77 \ postdeps_CXX \ -postdeps_F77 \ -compiler_lib_search_path_CXX \ -compiler_lib_search_path_F77; do +compiler_lib_search_path_CXX; do case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" @@ -35579,23 +32822,14 @@ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec \ old_archive_cmds_CXX \ -old_archive_cmds_F77 \ old_archive_from_new_cmds_CXX \ -old_archive_from_new_cmds_F77 \ old_archive_from_expsyms_cmds_CXX \ -old_archive_from_expsyms_cmds_F77 \ archive_cmds_CXX \ -archive_cmds_F77 \ archive_expsym_cmds_CXX \ -archive_expsym_cmds_F77 \ module_cmds_CXX \ -module_cmds_F77 \ module_expsym_cmds_CXX \ -module_expsym_cmds_F77 \ export_symbols_cmds_CXX \ -export_symbols_cmds_F77 \ -prelink_cmds_CXX \ -prelink_cmds_F77; do +prelink_cmds_CXX; do case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" @@ -35634,8 +32868,6 @@ fi - - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -35654,9 +32886,10 @@ do "gruel/src/include/gruel/Makefile") CONFIG_FILES="$CONFIG_FILES gruel/src/include/gruel/Makefile" ;; "gruel/src/include/gruel/inet.h") CONFIG_FILES="$CONFIG_FILES gruel/src/include/gruel/inet.h" ;; "gruel/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES gruel/src/lib/Makefile" ;; - "omnithread/Makefile") CONFIG_FILES="$CONFIG_FILES omnithread/Makefile" ;; - "omnithread/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES omnithread/gnuradio/Makefile" ;; - "omnithread/gnuradio-omnithread.pc") CONFIG_FILES="$CONFIG_FILES omnithread/gnuradio-omnithread.pc" ;; + "gruel/src/lib/pmt/Makefile") CONFIG_FILES="$CONFIG_FILES gruel/src/lib/pmt/Makefile" ;; + "gruel/src/lib/msg/Makefile") CONFIG_FILES="$CONFIG_FILES gruel/src/lib/msg/Makefile" ;; + "gruel/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES gruel/src/scheme/Makefile" ;; + "gruel/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES gruel/src/scheme/gnuradio/Makefile" ;; "gcell/Makefile") CONFIG_FILES="$CONFIG_FILES gcell/Makefile" ;; "gcell/gcell.pc") CONFIG_FILES="$CONFIG_FILES gcell/gcell.pc" ;; "gcell/gcell_spu.pc") CONFIG_FILES="$CONFIG_FILES gcell/gcell_spu.pc" ;; @@ -35679,7 +32912,7 @@ do "gnuradio-core/src/lib/filter/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/lib/filter/Makefile" ;; "gnuradio-core/src/lib/g72x/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/lib/g72x/Makefile" ;; "gnuradio-core/src/lib/general/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/lib/general/Makefile" ;; - "gnuradio-core/src/lib/general/gr_prefix.cc") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/lib/general/gr_prefix.cc" ;; + "gnuradio-core/src/lib/general/gr_constants.cc") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/lib/general/gr_constants.cc" ;; "gnuradio-core/src/lib/gengen/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/lib/gengen/Makefile" ;; "gnuradio-core/src/lib/io/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/lib/io/Makefile" ;; "gnuradio-core/src/lib/missing/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/lib/missing/Makefile" ;; @@ -35701,22 +32934,7 @@ do "gnuradio-core/src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/tests/Makefile" ;; "gnuradio-core/src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-core/src/utils/Makefile" ;; "run_tests_core") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_core" ;; - "pmt/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/Makefile" ;; - "pmt/pmt.pc") CONFIG_FILES="$CONFIG_FILES pmt/pmt.pc" ;; - "pmt/doc/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/doc/Makefile" ;; - "pmt/src/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/Makefile" ;; - "pmt/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/lib/Makefile" ;; - "pmt/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/Makefile" ;; - "pmt/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES pmt/src/scheme/gnuradio/Makefile" ;; - "mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/Makefile" ;; - "mblock/mblock.pc") CONFIG_FILES="$CONFIG_FILES mblock/mblock.pc" ;; - "mblock/doc/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/doc/Makefile" ;; - "mblock/src/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/Makefile" ;; - "mblock/src/include/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/Makefile" ;; - "mblock/src/include/mblock/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/include/mblock/Makefile" ;; - "mblock/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/lib/Makefile" ;; - "mblock/src/scheme/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/Makefile" ;; - "mblock/src/scheme/gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES mblock/src/scheme/gnuradio/Makefile" ;; + "usrp/host/include/usrp/libusb_types.h") CONFIG_FILES="$CONFIG_FILES usrp/host/include/usrp/libusb_types.h" ;; "usrp/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/Makefile" ;; "usrp/usrp.pc") CONFIG_FILES="$CONFIG_FILES usrp/usrp.pc" ;; "usrp/usrp.iss") CONFIG_FILES="$CONFIG_FILES usrp/usrp.iss" ;; @@ -35724,10 +32942,11 @@ do "usrp/doc/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/doc/Makefile" ;; "usrp/doc/other/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/doc/other/Makefile" ;; "usrp/host/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/host/Makefile" ;; + "usrp/host/include/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/host/include/Makefile" ;; + "usrp/host/include/usrp/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/host/include/usrp/Makefile" ;; "usrp/host/misc/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/host/misc/Makefile" ;; "usrp/host/lib/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/host/lib/Makefile" ;; - "usrp/host/lib/legacy/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/host/lib/legacy/Makefile" ;; - "usrp/host/lib/legacy/std_paths.h") CONFIG_FILES="$CONFIG_FILES usrp/host/lib/legacy/std_paths.h" ;; + "usrp/host/lib/std_paths.h") CONFIG_FILES="$CONFIG_FILES usrp/host/lib/std_paths.h" ;; "usrp/host/swig/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/host/swig/Makefile" ;; "usrp/host/apps/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/host/apps/Makefile" ;; "usrp/firmware/Makefile") CONFIG_FILES="$CONFIG_FILES usrp/firmware/Makefile" ;; @@ -35763,16 +32982,21 @@ do "gr-gcell/src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES gr-gcell/src/examples/Makefile" ;; "gr-gcell/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-gcell/src/run_tests" ;; "run_tests_gcell") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_gcell" ;; + "gr-msdd6000/Makefile") CONFIG_FILES="$CONFIG_FILES gr-msdd6000/Makefile" ;; + "gr-msdd6000/gnuradio-msdd6000.pc") CONFIG_FILES="$CONFIG_FILES gr-msdd6000/gnuradio-msdd6000.pc" ;; + "gr-msdd6000/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-msdd6000/src/Makefile" ;; "gr-audio-alsa/Makefile") CONFIG_FILES="$CONFIG_FILES gr-audio-alsa/Makefile" ;; - "gr-audio-alsa/gr-audio-alsa.pc") CONFIG_FILES="$CONFIG_FILES gr-audio-alsa/gr-audio-alsa.pc" ;; + "gr-audio-alsa/gnuradio-audio-alsa.pc") CONFIG_FILES="$CONFIG_FILES gr-audio-alsa/gnuradio-audio-alsa.pc" ;; "gr-audio-alsa/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-audio-alsa/src/Makefile" ;; "gr-audio-alsa/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-audio-alsa/src/run_tests" ;; "run_tests_alsa") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_alsa" ;; "gr-audio-jack/Makefile") CONFIG_FILES="$CONFIG_FILES gr-audio-jack/Makefile" ;; + "gr-audio-jack/gnuradio-audio-jack.pc") CONFIG_FILES="$CONFIG_FILES gr-audio-jack/gnuradio-audio-jack.pc" ;; "gr-audio-jack/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-audio-jack/src/Makefile" ;; "gr-audio-jack/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-audio-jack/src/run_tests" ;; "run_tests_jack") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_jack" ;; "gr-audio-oss/Makefile") CONFIG_FILES="$CONFIG_FILES gr-audio-oss/Makefile" ;; + "gr-audio-oss/gnuradio-audio-oss.pc") CONFIG_FILES="$CONFIG_FILES gr-audio-oss/gnuradio-audio-oss.pc" ;; "gr-audio-oss/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-audio-oss/src/Makefile" ;; "gr-audio-oss/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-audio-oss/src/run_tests" ;; "run_tests_oss") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_oss" ;; @@ -35781,6 +33005,7 @@ do "gr-audio-osx/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-audio-osx/src/run_tests" ;; "run_tests_osx") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_osx" ;; "gr-audio-portaudio/Makefile") CONFIG_FILES="$CONFIG_FILES gr-audio-portaudio/Makefile" ;; + "gr-audio-portaudio/gnuradio-audio-portaudio.pc") CONFIG_FILES="$CONFIG_FILES gr-audio-portaudio/gnuradio-audio-portaudio.pc" ;; "gr-audio-portaudio/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-audio-portaudio/src/Makefile" ;; "gr-audio-portaudio/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-audio-portaudio/src/run_tests" ;; "run_tests_portaudio") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_portaudio" ;; @@ -35788,7 +33013,21 @@ do "gr-audio-windows/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-audio-windows/src/Makefile" ;; "gr-audio-windows/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-audio-windows/src/run_tests" ;; "run_tests_audio_windows") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_audio_windows" ;; + "gr-atsc/Makefile") CONFIG_FILES="$CONFIG_FILES gr-atsc/Makefile" ;; + "gr-atsc/gnuradio-atsc.pc") CONFIG_FILES="$CONFIG_FILES gr-atsc/gnuradio-atsc.pc" ;; + "gr-atsc/doc/Makefile") CONFIG_FILES="$CONFIG_FILES gr-atsc/doc/Makefile" ;; + "gr-atsc/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-atsc/src/Makefile" ;; + "gr-atsc/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES gr-atsc/src/lib/Makefile" ;; + "gr-atsc/src/python/Makefile") CONFIG_FILES="$CONFIG_FILES gr-atsc/src/python/Makefile" ;; + "gr-atsc/src/python/run_tests") CONFIG_FILES="$CONFIG_FILES gr-atsc/src/python/run_tests" ;; + "run_tests_atsc") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_atsc" ;; + "gr-comedi/Makefile") CONFIG_FILES="$CONFIG_FILES gr-comedi/Makefile" ;; + "gr-comedi/gnuradio-comedi.pc") CONFIG_FILES="$CONFIG_FILES gr-comedi/gnuradio-comedi.pc" ;; + "gr-comedi/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-comedi/src/Makefile" ;; + "gr-comedi/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-comedi/src/run_tests" ;; + "run_tests_comedi") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_comedi" ;; "gr-cvsd-vocoder/Makefile") CONFIG_FILES="$CONFIG_FILES gr-cvsd-vocoder/Makefile" ;; + "gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc") CONFIG_FILES="$CONFIG_FILES gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc" ;; "gr-cvsd-vocoder/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-cvsd-vocoder/src/Makefile" ;; "gr-cvsd-vocoder/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES gr-cvsd-vocoder/src/lib/Makefile" ;; "gr-cvsd-vocoder/src/python/Makefile") CONFIG_FILES="$CONFIG_FILES gr-cvsd-vocoder/src/python/Makefile" ;; @@ -35803,15 +33042,28 @@ do "gr-gpio/src/fpga/rbf/Makefile") CONFIG_FILES="$CONFIG_FILES gr-gpio/src/fpga/rbf/Makefile" ;; "gr-gpio/src/python/Makefile") CONFIG_FILES="$CONFIG_FILES gr-gpio/src/python/Makefile" ;; "gr-gsm-fr-vocoder/Makefile") CONFIG_FILES="$CONFIG_FILES gr-gsm-fr-vocoder/Makefile" ;; + "gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc") CONFIG_FILES="$CONFIG_FILES gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc" ;; "gr-gsm-fr-vocoder/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-gsm-fr-vocoder/src/Makefile" ;; "gr-gsm-fr-vocoder/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES gr-gsm-fr-vocoder/src/lib/Makefile" ;; "gr-gsm-fr-vocoder/src/lib/gsm/Makefile") CONFIG_FILES="$CONFIG_FILES gr-gsm-fr-vocoder/src/lib/gsm/Makefile" ;; "gr-gsm-fr-vocoder/src/python/Makefile") CONFIG_FILES="$CONFIG_FILES gr-gsm-fr-vocoder/src/python/Makefile" ;; "gr-gsm-fr-vocoder/src/python/run_tests") CONFIG_FILES="$CONFIG_FILES gr-gsm-fr-vocoder/src/python/run_tests" ;; "run_tests_gsm") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_gsm" ;; + "gr-noaa/Makefile") CONFIG_FILES="$CONFIG_FILES gr-noaa/Makefile" ;; + "gr-noaa/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gr-noaa/apps/Makefile" ;; + "gr-noaa/grc/Makefile") CONFIG_FILES="$CONFIG_FILES gr-noaa/grc/Makefile" ;; + "gr-noaa/lib/Makefile") CONFIG_FILES="$CONFIG_FILES gr-noaa/lib/Makefile" ;; + "gr-noaa/oct/Makefile") CONFIG_FILES="$CONFIG_FILES gr-noaa/oct/Makefile" ;; + "gr-noaa/python/Makefile") CONFIG_FILES="$CONFIG_FILES gr-noaa/python/Makefile" ;; + "gr-noaa/swig/Makefile") CONFIG_FILES="$CONFIG_FILES gr-noaa/swig/Makefile" ;; "gr-pager/Makefile") CONFIG_FILES="$CONFIG_FILES gr-pager/Makefile" ;; - "gr-pager/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-pager/src/Makefile" ;; - "gr-pager/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-pager/src/run_tests" ;; + "gr-pager/gnuradio-pager.pc") CONFIG_FILES="$CONFIG_FILES gr-pager/gnuradio-pager.pc" ;; + "gr-pager/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gr-pager/apps/Makefile" ;; + "gr-pager/grc/Makefile") CONFIG_FILES="$CONFIG_FILES gr-pager/grc/Makefile" ;; + "gr-pager/lib/Makefile") CONFIG_FILES="$CONFIG_FILES gr-pager/lib/Makefile" ;; + "gr-pager/python/Makefile") CONFIG_FILES="$CONFIG_FILES gr-pager/python/Makefile" ;; + "gr-pager/python/run_tests") CONFIG_FILES="$CONFIG_FILES gr-pager/python/run_tests" ;; + "gr-pager/swig/Makefile") CONFIG_FILES="$CONFIG_FILES gr-pager/swig/Makefile" ;; "run_tests_pager") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_pager" ;; "gr-radar-mono/Makefile") CONFIG_FILES="$CONFIG_FILES gr-radar-mono/Makefile" ;; "gr-radar-mono/doc/Makefile") CONFIG_FILES="$CONFIG_FILES gr-radar-mono/doc/Makefile" ;; @@ -35832,6 +33084,7 @@ do "gr-radio-astronomy/src/python/run_tests") CONFIG_FILES="$CONFIG_FILES gr-radio-astronomy/src/python/run_tests" ;; "run_tests_astronomy") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_astronomy" ;; "gr-trellis/Makefile") CONFIG_FILES="$CONFIG_FILES gr-trellis/Makefile" ;; + "gr-trellis/gnuradio-trellis.pc") CONFIG_FILES="$CONFIG_FILES gr-trellis/gnuradio-trellis.pc" ;; "gr-trellis/doc/Makefile") CONFIG_FILES="$CONFIG_FILES gr-trellis/doc/Makefile" ;; "gr-trellis/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-trellis/src/Makefile" ;; "gr-trellis/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES gr-trellis/src/lib/Makefile" ;; @@ -35841,6 +33094,7 @@ do "gr-trellis/src/examples/fsm_files/Makefile") CONFIG_FILES="$CONFIG_FILES gr-trellis/src/examples/fsm_files/Makefile" ;; "run_tests_gr_trellis") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_gr_trellis" ;; "gr-video-sdl/Makefile") CONFIG_FILES="$CONFIG_FILES gr-video-sdl/Makefile" ;; + "gr-video-sdl/gnuradio-video-sdl.pc") CONFIG_FILES="$CONFIG_FILES gr-video-sdl/gnuradio-video-sdl.pc" ;; "gr-video-sdl/src/Makefile") CONFIG_FILES="$CONFIG_FILES gr-video-sdl/src/Makefile" ;; "gr-video-sdl/src/run_tests") CONFIG_FILES="$CONFIG_FILES gr-video-sdl/src/run_tests" ;; "run_tests_sdl") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_sdl" ;; @@ -35871,6 +33125,7 @@ do "gnuradio-examples/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/Makefile" ;; "gnuradio-examples/c++/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/c++/Makefile" ;; "gnuradio-examples/python/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/Makefile" ;; + "gnuradio-examples/grc/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/grc/Makefile" ;; "gnuradio-examples/python/apps/hf_explorer/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/apps/hf_explorer/Makefile" ;; "gnuradio-examples/python/apps/hf_radio/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/apps/hf_radio/Makefile" ;; "gnuradio-examples/python/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/apps/Makefile" ;; @@ -35883,12 +33138,12 @@ do "gnuradio-examples/python/multi_usrp/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/multi_usrp/Makefile" ;; "gnuradio-examples/python/network/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/network/Makefile" ;; "gnuradio-examples/python/ofdm/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/ofdm/Makefile" ;; + "gnuradio-examples/python/pfb/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/pfb/Makefile" ;; "gnuradio-examples/python/usrp/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/usrp/Makefile" ;; "gnuradio-examples/python/usrp2/Makefile") CONFIG_FILES="$CONFIG_FILES gnuradio-examples/python/usrp2/Makefile" ;; "grc/Makefile") CONFIG_FILES="$CONFIG_FILES grc/Makefile" ;; "grc/base/Makefile") CONFIG_FILES="$CONFIG_FILES grc/base/Makefile" ;; "grc/blocks/Makefile") CONFIG_FILES="$CONFIG_FILES grc/blocks/Makefile" ;; - "grc/examples/Makefile") CONFIG_FILES="$CONFIG_FILES grc/examples/Makefile" ;; "grc/freedesktop/Makefile") CONFIG_FILES="$CONFIG_FILES grc/freedesktop/Makefile" ;; "grc/grc_gnuradio/Makefile") CONFIG_FILES="$CONFIG_FILES grc/grc_gnuradio/Makefile" ;; "grc/gui/Makefile") CONFIG_FILES="$CONFIG_FILES grc/gui/Makefile" ;; @@ -35904,7 +33159,7 @@ do "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;; "run_tests_build") CONFIG_COMMANDS="$CONFIG_COMMANDS run_tests_build" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -35942,7 +33197,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -35959,7 +33214,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -35973,18 +33228,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -36073,20 +33328,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -36114,7 +33377,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -36199,7 +33462,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -36212,7 +33475,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -36240,7 +33503,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -36267,7 +33530,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -36404,22 +33667,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -36430,19 +33693,19 @@ which seems to be undefined. Please make sure it is defined." >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -36631,7 +33894,7 @@ $as_echo X"$file" | # The names of the tagged configurations supported by this script. -available_tags="CXX F77 " +available_tags="CXX " # ### BEGIN LIBTOOL CONFIG @@ -37389,159 +34652,6 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX # ### END LIBTOOL TAG CONFIG: CXX _LT_EOF - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: F77 - -# The linker used to build libraries. -LD=$lt_LD_F77 - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_F77 - -# A language specific compiler. -CC=$lt_compiler_F77 - -# Is the compiler the GNU compiler? -with_gcc=$GCC_F77 - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_F77 - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_F77 - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_F77 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_F77 - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_F77 - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_F77 -archive_expsym_cmds=$lt_archive_expsym_cmds_F77 - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_F77 -module_expsym_cmds=$lt_module_expsym_cmds_F77 - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_F77 - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_F77 - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_F77 - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 - -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_F77 - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_F77 - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_F77 - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_F77 - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_F77 - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_F77 - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_F77 - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_F77 - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_F77 - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_F77 - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_F77 - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_F77 - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_F77 - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_F77 - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_F77 -postdep_objects=$lt_postdep_objects_F77 -predeps=$lt_predeps_F77 -postdeps=$lt_postdeps_F77 - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 - -# ### END LIBTOOL TAG CONFIG: F77 -_LT_EOF - ;; "run_tests_core":C) chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests ;; "run_tests_usrp":C) chmod +x gr-usrp/src/run_tests ;; @@ -37553,9 +34663,11 @@ _LT_EOF "run_tests_osx":C) chmod +x gr-audio-osx/src/run_tests ;; "run_tests_portaudio":C) chmod +x gr-audio-portaudio/src/run_tests ;; "run_tests_audio_windows":C) chmod +x gr-audio-windows/src/run_tests ;; + "run_tests_atsc":C) chmod +x gr-atsc/src/python/run_tests ;; + "run_tests_comedi":C) chmod +x gr-comedi/src/run_tests ;; "run_tests_cvsd":C) chmod +x gr-cvsd-vocoder/src/python/run_tests ;; "run_tests_gsm":C) chmod +x gr-gsm-fr-vocoder/src/python/run_tests ;; - "run_tests_pager":C) chmod +x gr-pager/src/run_tests ;; + "run_tests_pager":C) chmod +x gr-pager/python/run_tests ;; "run_tests_radar_mono":C) chmod +x gr-radar-mono/src/python/run_tests ;; "run_tests_astronomy":C) chmod +x gr-radio-astronomy/src/python/run_tests ;; "run_tests_gr_trellis":C) chmod +x gr-trellis/src/python/run_tests ;; @@ -37572,7 +34684,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -37593,7 +34705,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi # @@ -37734,7 +34846,7 @@ $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cach # The eval makes quoting arguments work. eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 + as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 fi cd "$ac_popdir" @@ -37783,3 +34895,5 @@ if test "$with_dirs" != ""; then echo These components will not be built. echo fi + +echo Configured GNU Radio release $RELEASE for build. diff --git a/debian/changelog b/debian/changelog index 857d4532..58f20fd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ gnuradio (3.3.0.dfsg-1) UNRELEASED; urgency=low * new upstream version * add Vcs entries to the control file + * use maintainer-clean target, always run bootstrap before configure - -- Bdale Garbee Fri, 12 Nov 2010 01:05:51 -0700 + -- Bdale Garbee Mon, 13 Dec 2010 09:07:43 -0700 gnuradio (3.2.2.dfsg-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index b9c92f08..d6772c64 100755 --- a/debian/rules +++ b/debian/rules @@ -22,12 +22,7 @@ clean: if [ -f Makefile ]; \ then\ - if [ -d .svn ]; \ - then \ - $(MAKE) maintainer-clean; \ - else \ - $(MAKE) distclean; \ - fi; \ + $(MAKE) maintainer-clean; \ fi dh_clean @@ -42,7 +37,7 @@ update: configure: configure-stamp configure-stamp: dh_testdir - [ -f ./configure ] || ./bootstrap + ./bootstrap ./configure \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ diff --git a/docs/Makefile.in b/docs/Makefile.in index bfd67dfe..3ae2b3c3 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -37,7 +37,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 # @@ -91,36 +91,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 \ @@ -134,9 +137,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 \ @@ -221,6 +221,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@ @@ -228,6 +229,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@ @@ -246,6 +251,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +261,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@ @@ -291,6 +300,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@ @@ -352,6 +363,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@ @@ -364,17 +376,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@ @@ -390,7 +402,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@ @@ -442,6 +453,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@ @@ -472,6 +488,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@ @@ -493,6 +514,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@ @@ -575,26 +606,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@ @@ -625,7 +641,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@ @@ -635,23 +650,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 @@ -663,7 +681,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, @@ -671,10 +689,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@ @@ -690,18 +704,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@ @@ -716,15 +718,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 = diff --git a/docs/doxygen/Makefile.in b/docs/doxygen/Makefile.in index 98e20145..fcc6cad4 100644 --- a/docs/doxygen/Makefile.in +++ b/docs/doxygen/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -247,6 +247,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@ @@ -254,6 +255,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@ @@ -272,6 +277,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -281,20 +287,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@ @@ -317,6 +326,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@ @@ -378,6 +389,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@ @@ -390,17 +402,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@ @@ -416,7 +428,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@ @@ -468,6 +479,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@ @@ -498,6 +514,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@ @@ -519,6 +540,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@ @@ -601,26 +632,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@ @@ -651,7 +667,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@ @@ -661,23 +676,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 @@ -689,7 +707,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, @@ -697,10 +715,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@ @@ -716,18 +730,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@ @@ -742,15 +744,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 = diff --git a/docs/doxygen/other/Makefile.in b/docs/doxygen/other/Makefile.in index 42dda00a..a0ad4313 100644 --- a/docs/doxygen/other/Makefile.in +++ b/docs/doxygen/other/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2001,2004 Free Software Foundation, Inc. +# Copyright 2001,2004,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = @@ -693,9 +697,6 @@ MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT EXTRA_DIST = \ doxypy.py \ group_defs.dox \ - omnithread.html \ - omnithread.pdf \ - omnithread.ps \ shared_ptr_docstub.h \ tv-channel-frequencies \ vector_docstub.h diff --git a/docs/doxygen/xml-swig/Makefile.in b/docs/doxygen/xml-swig/Makefile.in index 28255343..5693fe73 100644 --- a/docs/doxygen/xml-swig/Makefile.in +++ b/docs/doxygen/xml-swig/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -159,6 +159,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@ @@ -166,6 +167,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@ @@ -184,6 +189,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -193,20 +199,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@ @@ -229,6 +238,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@ @@ -290,6 +301,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@ @@ -302,17 +314,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@ @@ -328,7 +340,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@ @@ -380,6 +391,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@ @@ -410,6 +426,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@ @@ -431,6 +452,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@ @@ -513,26 +544,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@ @@ -563,7 +579,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@ diff --git a/gcell/Makefile.in b/gcell/Makefile.in index 80b49d2e..e06df315 100644 --- a/gcell/Makefile.in +++ b/gcell/Makefile.in @@ -37,7 +37,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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -246,6 +246,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@ @@ -253,6 +254,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@ @@ -271,6 +276,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -280,20 +286,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@ @@ -316,6 +325,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@ @@ -377,6 +388,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@ @@ -389,17 +401,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@ @@ -415,7 +427,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@ @@ -467,6 +478,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@ @@ -497,6 +513,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@ @@ -518,6 +539,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@ @@ -600,26 +631,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@ @@ -650,7 +666,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@ @@ -660,23 +675,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 @@ -688,7 +706,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, @@ -696,10 +714,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@ @@ -715,18 +729,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@ @@ -741,15 +743,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 = diff --git a/gcell/apps/Makefile.in b/gcell/apps/Makefile.in index 230e5acc..05d7b110 100644 --- a/gcell/apps/Makefile.in +++ b/gcell/apps/Makefile.in @@ -37,7 +37,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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -258,6 +258,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@ @@ -265,6 +266,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@ @@ -283,6 +288,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -292,20 +298,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@ @@ -328,6 +337,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@ @@ -389,6 +400,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@ @@ -401,17 +413,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@ @@ -427,7 +439,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@ @@ -479,6 +490,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@ @@ -509,6 +525,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@ @@ -530,6 +551,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@ @@ -612,26 +643,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@ @@ -662,7 +678,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@ @@ -672,23 +687,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 @@ -700,7 +718,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, @@ -708,10 +726,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@ @@ -727,18 +741,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@ @@ -753,23 +755,23 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT SUBDIRS = spu . -AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) \ - $(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) - +AM_CPPFLAGS = $(DEFINES) $(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) GCELL_QA_LA = $(top_builddir)/gcell/lib/libgcell-qa.la test_all_SOURCES = test_all.cc test_all_LDADD = $(GCELL_QA_LA) $(GCELL_LA) diff --git a/gcell/apps/spu/Makefile.in b/gcell/apps/spu/Makefile.in index 35e53af3..99753e9a 100644 --- a/gcell/apps/spu/Makefile.in +++ b/gcell/apps/spu/Makefile.in @@ -58,7 +58,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 # @@ -115,36 +115,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 \ @@ -158,9 +161,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 \ @@ -228,6 +228,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 = spu-gcc CCAS = spu-gcc @@ -235,6 +236,10 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = +COMEDI_CFLAGS = @COMEDI_CFLAGS@ +COMEDI_CPPFLAGS = @COMEDI_CPPFLAGS@ +COMEDI_INCLUDEDIR = @COMEDI_INCLUDEDIR@ +COMEDI_LIBS = @COMEDI_LIBS@ CPP = @CPP@ # Need to override user stuff even though it gives a warning. @@ -256,6 +261,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -265,20 +271,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@ @@ -301,6 +310,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@ @@ -362,6 +373,7 @@ QWTPLOT3D_LIBS = @QWTPLOT3D_LIBS@ QWT_CFLAGS = @QWT_CFLAGS@ QWT_LIBS = @QWT_LIBS@ RANLIB = spu-ranlib +RELEASE = @RELEASE@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ @@ -374,17 +386,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@ @@ -400,7 +412,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@ @@ -452,6 +463,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@ @@ -482,6 +498,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@ @@ -503,6 +524,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@ @@ -585,26 +616,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@ @@ -635,7 +651,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@ @@ -645,23 +660,26 @@ with_dirs = @with_dirs@ AM_CFLAGS = -O3 -g --std=gnu99 -fstrict-aliasing $(C_WARNINGS) 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 @@ -673,7 +691,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, @@ -681,10 +699,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@ @@ -700,18 +714,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@ @@ -726,15 +728,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 = diff --git a/gcell/ibm/Makefile.in b/gcell/ibm/Makefile.in index ed645f81..c57b10a2 100644 --- a/gcell/ibm/Makefile.in +++ b/gcell/ibm/Makefile.in @@ -37,7 +37,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 # @@ -91,36 +91,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 \ @@ -134,9 +137,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 \ @@ -181,6 +181,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@ @@ -188,6 +189,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@ @@ -206,6 +211,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -215,20 +221,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@ @@ -251,6 +260,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@ @@ -312,6 +323,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@ @@ -324,17 +336,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@ @@ -350,7 +362,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@ @@ -402,6 +413,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@ @@ -432,6 +448,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@ @@ -453,6 +474,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@ @@ -535,26 +566,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@ @@ -585,7 +601,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@ @@ -595,23 +610,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 @@ -623,7 +641,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, @@ -631,10 +649,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@ @@ -650,18 +664,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@ @@ -676,15 +678,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 = diff --git a/gcell/include/Makefile.in b/gcell/include/Makefile.in index 50425ca3..78745a42 100644 --- a/gcell/include/Makefile.in +++ b/gcell/include/Makefile.in @@ -37,7 +37,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 # @@ -91,36 +91,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 \ @@ -134,9 +137,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 \ @@ -221,6 +221,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@ @@ -228,6 +229,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@ @@ -246,6 +251,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +261,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@ @@ -291,6 +300,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@ @@ -352,6 +363,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@ @@ -364,17 +376,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@ @@ -390,7 +402,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@ @@ -442,6 +453,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@ @@ -472,6 +488,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@ @@ -493,6 +514,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@ @@ -575,26 +606,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@ @@ -625,7 +641,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@ @@ -635,23 +650,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 @@ -663,7 +681,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, @@ -671,10 +689,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@ @@ -690,18 +704,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@ @@ -716,15 +718,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 = diff --git a/gcell/include/gcell/Makefile.in b/gcell/include/gcell/Makefile.in index 4f0d1f20..a604dd1c 100644 --- a/gcell/include/gcell/Makefile.in +++ b/gcell/include/gcell/Makefile.in @@ -37,7 +37,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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -245,6 +245,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@ @@ -252,6 +253,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@ @@ -270,6 +275,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -279,20 +285,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@ @@ -315,6 +324,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@ @@ -376,6 +387,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@ @@ -388,17 +400,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@ @@ -414,7 +426,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@ @@ -466,6 +477,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@ @@ -496,6 +512,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@ @@ -517,6 +538,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@ @@ -599,26 +630,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@ @@ -649,7 +665,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@ @@ -659,23 +674,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 @@ -687,7 +705,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, @@ -695,10 +713,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@ @@ -714,18 +728,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@ @@ -740,15 +742,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 = diff --git a/gcell/include/gcell/spu/Makefile.in b/gcell/include/gcell/spu/Makefile.in index 2ba81f44..c5250b17 100644 --- a/gcell/include/gcell/spu/Makefile.in +++ b/gcell/include/gcell/spu/Makefile.in @@ -37,7 +37,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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -207,6 +207,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@ @@ -214,6 +215,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@ @@ -232,6 +237,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -241,20 +247,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@ @@ -277,6 +286,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@ @@ -338,6 +349,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@ @@ -350,17 +362,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@ @@ -376,7 +388,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@ @@ -428,6 +439,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@ @@ -458,6 +474,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@ @@ -479,6 +500,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@ @@ -561,26 +592,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@ @@ -611,7 +627,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@ @@ -621,23 +636,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 @@ -649,7 +667,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, @@ -657,10 +675,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@ @@ -676,18 +690,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@ @@ -702,15 +704,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 = diff --git a/gcell/lib/Makefile.in b/gcell/lib/Makefile.in index 7099dfdf..d4e7e331 100644 --- a/gcell/lib/Makefile.in +++ b/gcell/lib/Makefile.in @@ -37,7 +37,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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -192,7 +192,7 @@ libgcell_qa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libgcell_qa_la_LDFLAGS) $(LDFLAGS) -o $@ libgcell_la_DEPENDENCIES = runtime/libruntime.la wrapper/libwrapper.la \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libgcell_la_OBJECTS = libgcell_la_OBJECTS = $(am_libgcell_la_OBJECTS) libgcell_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -270,6 +270,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@ @@ -277,6 +278,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@ @@ -295,6 +300,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -304,20 +310,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@ @@ -340,6 +349,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@ @@ -401,6 +412,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@ @@ -413,17 +425,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@ @@ -439,7 +451,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@ @@ -491,6 +502,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@ @@ -521,6 +537,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@ @@ -542,6 +563,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@ @@ -624,26 +655,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@ @@ -674,7 +690,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@ @@ -684,23 +699,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 @@ -712,7 +730,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, @@ -720,10 +738,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@ @@ -739,18 +753,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@ @@ -765,15 +767,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 = @@ -783,14 +787,14 @@ SUBDIRS = spu runtime general wrapper . # generate libgcell.la from the convenience libraries in subdirs lib_LTLIBRARIES = libgcell.la libgcell-qa.la libgcell_la_SOURCES = -libgcell_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgcell_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) libgcell_qa_la_SOURCES = -libgcell_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgcell_qa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) libgcell_la_LIBADD = \ runtime/libruntime.la \ wrapper/libwrapper.la \ -lspe2 \ - $(OMNITHREAD_LA) + $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) libgcell_qa_la_LIBADD = \ runtime/libruntime-qa.la \ diff --git a/gcell/lib/general/Makefile.in b/gcell/lib/general/Makefile.in index 3736f0b8..82585656 100644 --- a/gcell/lib/general/Makefile.in +++ b/gcell/lib/general/Makefile.in @@ -37,7 +37,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 # @@ -91,36 +91,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 \ @@ -134,9 +137,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 \ @@ -181,6 +181,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@ @@ -188,6 +189,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@ @@ -206,6 +211,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -215,20 +221,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@ @@ -251,6 +260,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@ @@ -312,6 +323,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@ @@ -324,17 +336,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@ @@ -350,7 +362,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@ @@ -402,6 +413,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@ @@ -432,6 +448,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@ @@ -453,6 +474,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@ @@ -535,26 +566,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@ @@ -585,7 +601,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@ @@ -595,23 +610,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 @@ -623,7 +641,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, @@ -631,10 +649,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@ @@ -650,18 +664,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@ @@ -676,15 +678,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 = diff --git a/gcell/lib/runtime/Makefile.in b/gcell/lib/runtime/Makefile.in index 66abf5ba..5d99233e 100644 --- a/gcell/lib/runtime/Makefile.in +++ b/gcell/lib/runtime/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2007,2008 Free Software Foundation, Inc. +# Copyright 2007,2008,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -37,7 +37,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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -243,6 +243,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@ @@ -250,6 +251,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@ @@ -268,6 +273,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -277,20 +283,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@ @@ -313,6 +322,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@ @@ -374,6 +385,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@ @@ -386,17 +398,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@ @@ -412,7 +424,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@ @@ -464,6 +475,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@ @@ -494,6 +510,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@ @@ -515,6 +536,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@ @@ -597,26 +628,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@ @@ -647,7 +663,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@ @@ -657,23 +672,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 @@ -685,7 +703,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, @@ -693,10 +711,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@ @@ -712,18 +726,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@ @@ -738,21 +740,23 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/ppu_source -AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(MBLOCK_INCLUDES) $(CPPUNIT_INCLUDES) \ +AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \ $(GCELL_INCLUDES) $(IBM_PPU_SYNC_INCLUDES) $(WITH_INCLUDES) dist_bin_SCRIPTS = gcell-embedspu-libtool diff --git a/gcell/lib/spu/Makefile.in b/gcell/lib/spu/Makefile.in index 431f4a6c..72bc7908 100644 --- a/gcell/lib/spu/Makefile.in +++ b/gcell/lib/spu/Makefile.in @@ -67,7 +67,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 # @@ -128,36 +128,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 \ @@ -171,9 +174,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 \ @@ -291,6 +291,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 = spu-gcc CCAS = spu-gcc @@ -298,6 +299,10 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = +COMEDI_CFLAGS = @COMEDI_CFLAGS@ +COMEDI_CPPFLAGS = @COMEDI_CPPFLAGS@ +COMEDI_INCLUDEDIR = @COMEDI_INCLUDEDIR@ +COMEDI_LIBS = @COMEDI_LIBS@ CPP = @CPP@ # Need to override user stuff even though it gives a warning. @@ -319,6 +324,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -328,20 +334,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@ @@ -364,6 +373,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@ @@ -425,6 +436,7 @@ QWTPLOT3D_LIBS = @QWTPLOT3D_LIBS@ QWT_CFLAGS = @QWT_CFLAGS@ QWT_LIBS = @QWT_LIBS@ RANLIB = spu-ranlib +RELEASE = @RELEASE@ RM_PROG = @RM_PROG@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ @@ -437,17 +449,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@ @@ -463,7 +475,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@ @@ -515,6 +526,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@ @@ -545,6 +561,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@ @@ -566,6 +587,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@ @@ -648,26 +679,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@ @@ -698,7 +714,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@ @@ -708,23 +723,26 @@ with_dirs = @with_dirs@ AM_CFLAGS = -O3 -g --std=gnu99 -fstrict-aliasing $(C_WARNINGS) 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 @@ -736,7 +754,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, @@ -744,10 +762,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@ @@ -763,18 +777,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@ @@ -789,15 +791,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 = diff --git a/gcell/lib/wrapper/Makefile.in b/gcell/lib/wrapper/Makefile.in index 9943f3b5..33b717e3 100644 --- a/gcell/lib/wrapper/Makefile.in +++ b/gcell/lib/wrapper/Makefile.in @@ -37,7 +37,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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/gnuradio-core/Makefile.in b/gnuradio-core/Makefile.in index 6c4a01ad..81e26473 100644 --- a/gnuradio-core/Makefile.in +++ b/gnuradio-core/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -247,6 +247,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@ @@ -254,6 +255,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@ @@ -272,6 +277,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -281,20 +287,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@ @@ -317,6 +326,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@ @@ -378,6 +389,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@ @@ -390,17 +402,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@ @@ -416,7 +428,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@ @@ -468,6 +479,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@ @@ -498,6 +514,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@ @@ -519,6 +540,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@ @@ -601,26 +632,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@ @@ -651,7 +667,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@ @@ -661,23 +676,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 @@ -689,7 +707,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, @@ -697,10 +715,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@ @@ -716,18 +730,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@ @@ -742,15 +744,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 = @@ -761,7 +765,7 @@ EXTRA_DIST = \ SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnuradio-core.pc -etcdir = $(gr_sysconfdir) +etcdir = $(gr_prefsdir) dist_etc_DATA = gnuradio-core.conf all: all-recursive diff --git a/gnuradio-core/src/Makefile.in b/gnuradio-core/src/Makefile.in index fb85a965..80363ee7 100644 --- a/gnuradio-core/src/Makefile.in +++ b/gnuradio-core/src/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2001,2004 Free Software Foundation, Inc. +# Copyright 2001,2004,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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,6 +79,7 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.common +@PYTHON_TRUE@am__append_1 = python subdir = gnuradio-core/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -92,36 +93,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 \ @@ -135,9 +139,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 \ @@ -221,6 +222,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@ @@ -228,6 +230,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@ @@ -246,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +262,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@ @@ -291,6 +301,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@ @@ -352,6 +364,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@ @@ -364,17 +377,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@ @@ -390,7 +403,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@ @@ -442,6 +454,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@ @@ -472,6 +489,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@ @@ -493,6 +515,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@ @@ -575,26 +607,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@ @@ -625,7 +642,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@ @@ -635,23 +651,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 @@ -663,7 +682,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, @@ -671,10 +690,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@ @@ -690,18 +705,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@ @@ -716,20 +719,22 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -SUBDIRS = gen_interpolator_taps lib tests python +SUBDIRS = gen_interpolator_taps lib tests $(am__append_1) DIST_SUBDIRS = gen_interpolator_taps lib tests python utils all: all-recursive diff --git a/gnuradio-core/src/gen_interpolator_taps/Makefile.in b/gnuradio-core/src/gen_interpolator_taps/Makefile.in index 6dc9e009..72cb75b9 100644 --- a/gnuradio-core/src/gen_interpolator_taps/Makefile.in +++ b/gnuradio-core/src/gen_interpolator_taps/Makefile.in @@ -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 # @@ -57,8 +57,6 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. # - - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -79,9 +77,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = README $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common -@ENABLE_FORTRAN_TRUE@noinst_PROGRAMS = gen_interpolator_taps$(EXEEXT) +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.common subdir = gnuradio-core/src/gen_interpolator_taps ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -95,36 +92,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 \ @@ -138,9 +138,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 \ @@ -163,43 +160,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am__gen_interpolator_taps_SOURCES_DIST = gen_interpolator_taps.c \ - objective_fct.c simpson.c praxis.f -@ENABLE_FORTRAN_TRUE@am_gen_interpolator_taps_OBJECTS = \ -@ENABLE_FORTRAN_TRUE@ gen_interpolator_taps.$(OBJEXT) \ -@ENABLE_FORTRAN_TRUE@ objective_fct.$(OBJEXT) simpson.$(OBJEXT) \ -@ENABLE_FORTRAN_TRUE@ praxis.$(OBJEXT) -gen_interpolator_taps_OBJECTS = $(am_gen_interpolator_taps_OBJECTS) -am__DEPENDENCIES_1 = -@ENABLE_FORTRAN_TRUE@gen_interpolator_taps_DEPENDENCIES = \ -@ENABLE_FORTRAN_TRUE@ $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) -LTF77COMPILE = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -F77LD = $(F77) -F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(gen_interpolator_taps_SOURCES) -DIST_SOURCES = $(am__gen_interpolator_taps_SOURCES_DIST) -am__noinst_HEADERS_DIST = simpson.h -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags +SOURCES = +DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -220,6 +182,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@ @@ -227,6 +190,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@ @@ -245,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -254,20 +222,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@ @@ -290,6 +261,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@ @@ -351,6 +324,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@ @@ -363,17 +337,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@ @@ -389,7 +363,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@ @@ -441,6 +414,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@ @@ -471,6 +449,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@ @@ -492,6 +475,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@ @@ -574,26 +567,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@ @@ -624,7 +602,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@ @@ -634,23 +611,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 @@ -662,7 +642,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, @@ -670,10 +650,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@ @@ -689,18 +665,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@ @@ -715,27 +679,25 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -EXTRA_DIST = praxis.txt simpson.h -@ENABLE_FORTRAN_TRUE@noinst_HEADERS = simpson.h -@ENABLE_FORTRAN_TRUE@gen_interpolator_taps_SOURCES = gen_interpolator_taps.c objective_fct.c simpson.c praxis.f -@ENABLE_FORTRAN_TRUE@gen_interpolator_taps_LDADD = $(FLIBS) -lm +EXTRA_DIST = praxis.txt simpson.h objective_fct.c gen_interpolator_taps.c simpson.c praxis.f all: all-am .SUFFIXES: -.SUFFIXES: .c .f .lo .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -767,115 +729,17 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -gen_interpolator_taps$(EXEEXT): $(gen_interpolator_taps_OBJECTS) $(gen_interpolator_taps_DEPENDENCIES) - @rm -f gen_interpolator_taps$(EXEEXT) - $(F77LINK) $(gen_interpolator_taps_OBJECTS) $(gen_interpolator_taps_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_interpolator_taps.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objective_fct.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simpson.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -.f.o: - $(F77COMPILE) -c -o $@ $< - -.f.obj: - $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.f.lo: - $(LTF77COMPILE) -c -o $@ $< - mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique tags: TAGS +TAGS: -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +CTAGS: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -912,7 +776,7 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(HEADERS) +all-am: Makefile installdirs: install: install-am install-exec: install-exec-am @@ -942,14 +806,11 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ - mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -992,14 +853,12 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool +mostlyclean-am: mostlyclean-generic mostlyclean-libtool pdf: pdf-am @@ -1013,18 +872,17 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags dist-hook distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + dist-hook distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1037,6 +895,15 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; +# if ENABLE_FORTRAN +# noinst_PROGRAMS = gen_interpolator_taps +# noinst_HEADERS = simpson.h +# +# gen_interpolator_taps_SOURCES = gen_interpolator_taps.c objective_fct.c simpson.c praxis.f +# gen_interpolator_taps_LDADD = $(FLIBS) -lm +# +# endif + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/gnuradio-core/src/lib/Makefile.in b/gnuradio-core/src/lib/Makefile.in index e1432fa8..40d90f94 100644 --- a/gnuradio-core/src/lib/Makefile.in +++ b/gnuradio-core/src/lib/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2001,2004 Free Software Foundation, Inc. +# Copyright 2001,2004,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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 # @@ -58,6 +58,7 @@ # Boston, MA 02110-1301, USA. # + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -80,6 +81,8 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.common +@PYTHON_TRUE@am__append_1 = swig +bin_PROGRAMS = gnuradio-config-info$(EXEEXT) subdir = gnuradio-core/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -93,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 \ @@ -136,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 \ @@ -182,8 +185,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" +LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = libgnuradio_core_qa_la_DEPENDENCIES = filter/libfilter-qa.la \ general/libgeneral-qa.la runtime/libruntime-qa.la \ @@ -198,13 +201,17 @@ libgnuradio_core_la_DEPENDENCIES = filter/libfilter.la \ gengen/libgengen.la io/libio.la missing/libmissing.la \ reed-solomon/librs.la runtime/libruntime.la hier/libhier.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libgnuradio_core_la_OBJECTS = bug_work_around_6.lo libgnuradio_core_la_OBJECTS = $(am_libgnuradio_core_la_OBJECTS) libgnuradio_core_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(libgnuradio_core_la_LDFLAGS) $(LDFLAGS) -o $@ +PROGRAMS = $(bin_PROGRAMS) +am_gnuradio_config_info_OBJECTS = gnuradio-config-info.$(OBJEXT) +gnuradio_config_info_OBJECTS = $(am_gnuradio_config_info_OBJECTS) +gnuradio_config_info_DEPENDENCIES = libgnuradio-core.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -219,9 +226,9 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libgnuradio_core_qa_la_SOURCES) \ - $(libgnuradio_core_la_SOURCES) + $(libgnuradio_core_la_SOURCES) $(gnuradio_config_info_SOURCES) DIST_SOURCES = $(libgnuradio_core_qa_la_SOURCES) \ - $(libgnuradio_core_la_SOURCES) + $(libgnuradio_core_la_SOURCES) $(gnuradio_config_info_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -236,7 +243,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = missing runtime filter viterbi general gengen g72x \ + reed-solomon io hier . swig DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -282,6 +290,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@ @@ -289,6 +298,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@ @@ -307,6 +320,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -316,20 +330,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@ @@ -352,6 +369,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@ @@ -413,6 +432,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@ @@ -425,17 +445,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@ @@ -451,7 +471,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@ @@ -503,6 +522,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@ @@ -533,6 +557,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@ @@ -554,6 +583,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@ @@ -636,26 +675,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@ @@ -686,7 +710,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@ @@ -696,23 +719,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 @@ -724,7 +750,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, @@ -732,10 +758,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@ @@ -751,18 +773,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@ @@ -777,27 +787,32 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT # We've got to build . before swig -SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io hier . swig +SUBDIRS = missing runtime filter viterbi general gengen g72x \ + reed-solomon io hier . $(am__append_1) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) # generate libgnuradio-core.la from the convenience libraries in subdirs -lib_LTLIBRARIES = libgnuradio-core.la libgnuradio-core-qa.la +lib_LTLIBRARIES = libgnuradio-core.la +noinst_LTLIBRARIES = libgnuradio-core-qa.la libgnuradio_core_la_SOURCES = bug_work_around_6.cc -libgnuradio_core_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgnuradio_core_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \ $(LIBGNURADIO_CORE_EXTRA_LDFLAGS) @@ -813,7 +828,6 @@ libgnuradio_core_la_LIBADD = \ reed-solomon/librs.la \ runtime/libruntime.la \ hier/libhier.la \ - $(OMNITHREAD_LA) \ $(GRUEL_LA) \ $(FFTW3F_LIBS) \ $(GSL_LIBS) \ @@ -826,6 +840,8 @@ libgnuradio_core_qa_la_LIBADD = \ libgnuradio-core.la \ $(CPPUNIT_LIBS) +gnuradio_config_info_SOURCES = gnuradio-config-info.cc +gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) all: all-recursive .SUFFIXES: @@ -891,10 +907,65 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done libgnuradio-core-qa.la: $(libgnuradio_core_qa_la_OBJECTS) $(libgnuradio_core_qa_la_DEPENDENCIES) - $(libgnuradio_core_qa_la_LINK) -rpath $(libdir) $(libgnuradio_core_qa_la_OBJECTS) $(libgnuradio_core_qa_la_LIBADD) $(LIBS) + $(libgnuradio_core_qa_la_LINK) $(libgnuradio_core_qa_la_OBJECTS) $(libgnuradio_core_qa_la_LIBADD) $(LIBS) libgnuradio-core.la: $(libgnuradio_core_la_OBJECTS) $(libgnuradio_core_la_DEPENDENCIES) $(libgnuradio_core_la_LINK) -rpath $(libdir) $(libgnuradio_core_la_OBJECTS) $(libgnuradio_core_la_LIBADD) $(LIBS) +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +gnuradio-config-info$(EXEEXT): $(gnuradio_config_info_OBJECTS) $(gnuradio_config_info_DEPENDENCIES) + @rm -f gnuradio-config-info$(EXEEXT) + $(CXXLINK) $(gnuradio_config_info_OBJECTS) $(gnuradio_config_info_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -903,6 +974,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bug_work_around_6.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnuradio-config-info.Po@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1129,10 +1201,12 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-recursive -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) +install-binPROGRAMS: install-libLTLIBRARIES + installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1163,8 +1237,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-recursive -rm -rf ./$(DEPDIR) @@ -1190,7 +1264,7 @@ install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-html: install-html-recursive @@ -1230,26 +1304,28 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ - dist-hook distclean distclean-compile distclean-generic \ + all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-noinstLTLIBRARIES ctags ctags-recursive dist-hook \ + distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-libLTLIBRARIES + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-libLTLIBRARIES # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gnuradio-core/src/lib/filter/Makefile.in b/gnuradio-core/src/lib/filter/Makefile.in index 00583a9a..91935fec 100644 --- a/gnuradio-core/src/lib/filter/Makefile.in +++ b/gnuradio-core/src/lib/filter/Makefile.in @@ -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 # @@ -123,9 +123,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = README $(grinclude_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.gen \ - $(srcdir)/Makefile.in $(swiginclude_HEADERS) \ +DIST_COMMON = README $(am__swiginclude_HEADERS_DIST) \ + $(grinclude_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.gen $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.gen.gen \ $(top_srcdir)/Makefile.par.gen subdir = gnuradio-core/src/lib/filter @@ -141,36 +141,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 \ @@ -184,9 +187,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 \ @@ -215,25 +215,28 @@ am__libfilter_qa_la_SOURCES_DIST = qa_filter.cc qa_gr_fir_ccf.cc \ qa_gr_fir_fcc.cc qa_gr_fir_fff.cc qa_gr_fir_ccc.cc \ qa_gr_fir_scc.cc qa_gr_rotator.cc \ qa_gri_mmse_fir_interpolator.cc \ - qa_gri_mmse_fir_interpolator_cc.cc qa_dotprod_generic.cc \ - qa_dotprod_powerpc.cc qa_dotprod_x86.cc \ + qa_gri_mmse_fir_interpolator_cc.cc qa_dotprod_armv7_a.cc \ + qa_dotprod_generic.cc qa_dotprod_powerpc.cc qa_dotprod_x86.cc \ qa_float_dotprod_x86.cc qa_complex_dotprod_x86.cc \ qa_ccomplex_dotprod_x86.cc am__objects_1 = qa_filter.lo qa_gr_fir_ccf.lo qa_gr_fir_fcc.lo \ qa_gr_fir_fff.lo qa_gr_fir_ccc.lo qa_gr_fir_scc.lo \ qa_gr_rotator.lo qa_gri_mmse_fir_interpolator.lo \ qa_gri_mmse_fir_interpolator_cc.lo -am__objects_2 = qa_dotprod_generic.lo -am__objects_3 = qa_dotprod_powerpc.lo -am__objects_4 = qa_dotprod_x86.lo qa_float_dotprod_x86.lo \ +am__objects_2 = qa_dotprod_armv7_a.lo +am__objects_3 = qa_dotprod_generic.lo +am__objects_4 = qa_dotprod_powerpc.lo +am__objects_5 = qa_dotprod_x86.lo qa_float_dotprod_x86.lo \ qa_complex_dotprod_x86.lo qa_ccomplex_dotprod_x86.lo -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@am_libfilter_qa_la_OBJECTS = $(am__objects_1) \ -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@ $(am__objects_4) -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@am_libfilter_qa_la_OBJECTS = \ -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@ $(am__objects_1) \ -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@ $(am__objects_3) -@MD_CPU_generic_TRUE@am_libfilter_qa_la_OBJECTS = $(am__objects_1) \ -@MD_CPU_generic_TRUE@ $(am__objects_2) +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@am_libfilter_qa_la_OBJECTS = $(am__objects_1) \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@ $(am__objects_5) +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@am_libfilter_qa_la_OBJECTS = $(am__objects_1) \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@ $(am__objects_4) +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_TRUE@am_libfilter_qa_la_OBJECTS = \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_TRUE@ $(am__objects_1) \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_TRUE@ $(am__objects_3) +@MD_CPU_armv7_a_TRUE@am_libfilter_qa_la_OBJECTS = $(am__objects_1) \ +@MD_CPU_armv7_a_TRUE@ $(am__objects_2) libfilter_qa_la_OBJECTS = $(am_libfilter_qa_la_OBJECTS) libfilter_la_LIBADD = am__libfilter_la_SOURCES_DIST = gr_fir_ccc.cc gr_fir_ccc_generic.cc \ @@ -258,7 +261,8 @@ am__libfilter_la_SOURCES_DIST = gr_fir_ccc.cc gr_fir_ccc_generic.cc \ gr_rational_resampler_base_fff.cc \ gr_rational_resampler_base_fsf.cc \ gr_rational_resampler_base_scc.cc gr_adaptive_fir_ccf.cc \ - gr_cma_equalizer_cc.cc gr_fft_filter_ccc.cc \ + gr_cma_equalizer_cc.cc gri_fft_filter_fff_generic.cc \ + gri_fft_filter_ccc_generic.cc gr_fft_filter_ccc.cc \ gr_fft_filter_fff.cc gr_goertzel_fc.cc gr_filter_delay_fc.cc \ gr_fractional_interpolator_ff.cc \ gr_fractional_interpolator_cc.cc gr_hilbert_fc.cc \ @@ -268,6 +272,11 @@ am__libfilter_la_SOURCES_DIST = gr_fir_ccc.cc gr_fir_ccc_generic.cc \ gri_mmse_fir_interpolator.cc gri_mmse_fir_interpolator_cc.cc \ complex_dotprod_generic.cc ccomplex_dotprod_generic.cc \ float_dotprod_generic.c short_dotprod_generic.c \ + gr_pfb_channelizer_ccf.cc gr_pfb_decimator_ccf.cc \ + gr_pfb_interpolator_ccf.cc gr_pfb_arb_resampler_ccf.cc \ + gr_pfb_clock_sync_ccf.cc gr_pfb_clock_sync_fff.cc \ + sysconfig_armv7_a.cc gr_fir_sysconfig_armv7_a.cc \ + gr_cpu_armv7_a.cc gr_fir_fff_armv7_a.cc dotprod_fff_armv7_a.c \ sysconfig_generic.cc sysconfig_powerpc.cc \ gr_fir_sysconfig_powerpc.cc gr_cpu_powerpc.cc \ gr_fir_fff_altivec.cc gr_altivec.c dotprod_fff_altivec.c \ @@ -288,7 +297,7 @@ am__libfilter_la_SOURCES_DIST = gr_fir_ccc.cc gr_fir_ccc_generic.cc \ ccomplex_dotprod_3dnow64.S ccomplex_dotprod_sse64.S \ fcomplex_dotprod_3dnow64.S fcomplex_dotprod_sse64.S \ short_dotprod_mmx64.S cpuid_x86_64.S -am__objects_5 = gr_fir_ccc.lo gr_fir_ccc_generic.lo gr_fir_ccf.lo \ +am__objects_6 = gr_fir_ccc.lo gr_fir_ccc_generic.lo gr_fir_ccf.lo \ gr_fir_ccf_generic.lo gr_fir_fcc.lo gr_fir_fcc_generic.lo \ gr_fir_fff.lo gr_fir_fff_generic.lo gr_fir_filter_ccc.lo \ gr_fir_filter_ccf.lo gr_fir_filter_fcc.lo gr_fir_filter_fff.lo \ @@ -309,8 +318,9 @@ am__objects_5 = gr_fir_ccc.lo gr_fir_ccc_generic.lo gr_fir_ccf.lo \ gr_rational_resampler_base_fff.lo \ gr_rational_resampler_base_fsf.lo \ gr_rational_resampler_base_scc.lo -am__objects_6 = $(am__objects_5) gr_adaptive_fir_ccf.lo \ - gr_cma_equalizer_cc.lo gr_fft_filter_ccc.lo \ +am__objects_7 = $(am__objects_6) gr_adaptive_fir_ccf.lo \ + gr_cma_equalizer_cc.lo gri_fft_filter_fff_generic.lo \ + gri_fft_filter_ccc_generic.lo gr_fft_filter_ccc.lo \ gr_fft_filter_fff.lo gr_goertzel_fc.lo gr_filter_delay_fc.lo \ gr_fractional_interpolator_ff.lo \ gr_fractional_interpolator_cc.lo gr_hilbert_fc.lo \ @@ -319,40 +329,47 @@ am__objects_6 = $(am__objects_5) gr_adaptive_fir_ccf.lo \ gr_single_pole_iir_filter_cc.lo gri_goertzel.lo \ gri_mmse_fir_interpolator.lo gri_mmse_fir_interpolator_cc.lo \ complex_dotprod_generic.lo ccomplex_dotprod_generic.lo \ - float_dotprod_generic.lo short_dotprod_generic.lo -am__objects_7 = sysconfig_generic.lo -am__objects_8 = sysconfig_powerpc.lo gr_fir_sysconfig_powerpc.lo \ + float_dotprod_generic.lo short_dotprod_generic.lo \ + gr_pfb_channelizer_ccf.lo gr_pfb_decimator_ccf.lo \ + gr_pfb_interpolator_ccf.lo gr_pfb_arb_resampler_ccf.lo \ + gr_pfb_clock_sync_ccf.lo gr_pfb_clock_sync_fff.lo +am__objects_8 = sysconfig_armv7_a.lo gr_fir_sysconfig_armv7_a.lo \ + gr_cpu_armv7_a.lo gr_fir_fff_armv7_a.lo dotprod_fff_armv7_a.lo +am__objects_9 = sysconfig_generic.lo +am__objects_10 = sysconfig_powerpc.lo gr_fir_sysconfig_powerpc.lo \ gr_cpu_powerpc.lo gr_fir_fff_altivec.lo gr_altivec.lo \ dotprod_fff_altivec.lo -am__objects_9 = float_dotprod_sse.lo float_dotprod_3dnow.lo \ +am__objects_11 = float_dotprod_sse.lo float_dotprod_3dnow.lo \ complex_dotprod_3dnowext.lo complex_dotprod_3dnow.lo \ complex_dotprod_sse.lo ccomplex_dotprod_3dnowext.lo \ ccomplex_dotprod_3dnow.lo ccomplex_dotprod_sse.lo \ fcomplex_dotprod_3dnow.lo fcomplex_dotprod_sse.lo \ short_dotprod_mmx.lo cpuid_x86.lo -am__objects_10 = sysconfig_x86.lo gr_fir_sysconfig_x86.lo \ +am__objects_12 = sysconfig_x86.lo gr_fir_sysconfig_x86.lo \ gr_cpu_x86.lo gr_fir_ccc_simd.lo gr_fir_ccc_x86.lo \ gr_fir_fff_simd.lo gr_fir_fff_x86.lo gr_fir_fsf_simd.lo \ gr_fir_fsf_x86.lo gr_fir_scc_simd.lo gr_fir_scc_x86.lo \ gr_fir_fcc_simd.lo gr_fir_fcc_x86.lo gr_fir_ccf_simd.lo \ gr_fir_ccf_x86.lo sse_debug.lo -am__objects_11 = float_dotprod_sse64.lo float_dotprod_3dnow64.lo \ +am__objects_13 = float_dotprod_sse64.lo float_dotprod_3dnow64.lo \ complex_dotprod_3dnowext64.lo complex_dotprod_3dnow64.lo \ complex_dotprod_sse64.lo ccomplex_dotprod_3dnowext64.lo \ ccomplex_dotprod_3dnow64.lo ccomplex_dotprod_sse64.lo \ fcomplex_dotprod_3dnow64.lo fcomplex_dotprod_sse64.lo \ short_dotprod_mmx64.lo cpuid_x86_64.lo -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_FALSE@am_libfilter_la_OBJECTS = $(am__objects_6) \ -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_FALSE@ $(am__objects_9) \ -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_FALSE@ $(am__objects_10) -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_TRUE@am_libfilter_la_OBJECTS = $(am__objects_6) \ -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_TRUE@ $(am__objects_11) \ -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_TRUE@ $(am__objects_10) -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@am_libfilter_la_OBJECTS = \ -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@ $(am__objects_6) \ -@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@ $(am__objects_8) -@MD_CPU_generic_TRUE@am_libfilter_la_OBJECTS = $(am__objects_6) \ -@MD_CPU_generic_TRUE@ $(am__objects_7) +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_FALSE@am_libfilter_la_OBJECTS = $(am__objects_7) \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_FALSE@ $(am__objects_11) \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_FALSE@ $(am__objects_12) +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_TRUE@am_libfilter_la_OBJECTS = $(am__objects_7) \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_TRUE@ $(am__objects_13) \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_FALSE@@MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_TRUE@ $(am__objects_12) +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@am_libfilter_la_OBJECTS = $(am__objects_7) \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_FALSE@@MD_CPU_powerpc_TRUE@ $(am__objects_10) +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_TRUE@am_libfilter_la_OBJECTS = \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_TRUE@ $(am__objects_7) \ +@MD_CPU_armv7_a_FALSE@@MD_CPU_generic_TRUE@ $(am__objects_9) +@MD_CPU_armv7_a_TRUE@am_libfilter_la_OBJECTS = $(am__objects_7) \ +@MD_CPU_armv7_a_TRUE@ $(am__objects_8) libfilter_la_OBJECTS = $(am_libfilter_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -408,6 +425,32 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(grincludedir)" \ "$(DESTDIR)$(swigincludedir)" +am__swiginclude_HEADERS_DIST = filter.i filter_generated.i \ + gr_adaptive_fir_ccf.i gr_cma_equalizer_cc.i \ + gr_fft_filter_ccc.i gr_fft_filter_fff.i gr_filter_delay_fc.i \ + gr_fractional_interpolator_ff.i \ + gr_fractional_interpolator_cc.i gr_goertzel_fc.i \ + gr_hilbert_fc.i gr_iir_filter_ffd.i \ + 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 \ + gr_pfb_clock_sync_ccf.i gr_pfb_clock_sync_fff.i \ + gr_fir_filter_ccc.i gr_fir_filter_ccf.i gr_fir_filter_fcc.i \ + gr_fir_filter_fff.i gr_fir_filter_fsf.i gr_fir_filter_scc.i \ + gr_freq_xlating_fir_filter_ccc.i \ + gr_freq_xlating_fir_filter_ccf.i \ + gr_freq_xlating_fir_filter_fcc.i \ + gr_freq_xlating_fir_filter_fcf.i \ + gr_freq_xlating_fir_filter_scc.i \ + gr_freq_xlating_fir_filter_scf.i gr_interp_fir_filter_ccc.i \ + gr_interp_fir_filter_ccf.i gr_interp_fir_filter_fcc.i \ + gr_interp_fir_filter_fff.i gr_interp_fir_filter_fsf.i \ + gr_interp_fir_filter_scc.i gr_rational_resampler_base_ccc.i \ + gr_rational_resampler_base_ccf.i \ + gr_rational_resampler_base_fcc.i \ + gr_rational_resampler_base_fff.i \ + gr_rational_resampler_base_fsf.i \ + gr_rational_resampler_base_scc.i HEADERS = $(grinclude_HEADERS) $(noinst_HEADERS) \ $(swiginclude_HEADERS) ETAGS = etags @@ -432,6 +475,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@ @@ -439,6 +483,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@ @@ -457,6 +505,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -466,20 +515,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@ @@ -502,6 +554,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@ @@ -563,6 +617,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@ @@ -575,17 +630,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@ @@ -601,7 +656,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@ @@ -653,6 +707,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@ @@ -683,6 +742,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@ @@ -704,6 +768,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@ @@ -786,26 +860,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@ @@ -836,7 +895,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@ @@ -846,23 +904,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 @@ -874,7 +935,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, @@ -882,10 +943,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@ @@ -901,18 +958,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@ @@ -927,15 +972,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 = $(DEPDIR)/Makefile.gen-generate-generate-* \ @@ -1068,6 +1115,16 @@ powerpc_CODE = \ powerpc_qa_CODE = \ qa_dotprod_powerpc.cc +armv7_a_CODE = \ + sysconfig_armv7_a.cc \ + gr_fir_sysconfig_armv7_a.cc \ + gr_cpu_armv7_a.cc \ + gr_fir_fff_armv7_a.cc \ + dotprod_fff_armv7_a.c + +armv7_a_qa_CODE = \ + qa_dotprod_armv7_a.cc + # # include each _CODE entry here... @@ -1080,7 +1137,9 @@ EXTRA_libfilter_la_SOURCES = \ $(x86_64_SUBCODE) \ $(x86_qa_CODE) \ $(powerpc_CODE) \ - $(powerpc_qa_CODE) + $(powerpc_qa_CODE) \ + $(armv7_a_CODE) \ + $(armv7_a_qa_CODE) EXTRA_DIST = 3dnow_float_dotprod_really_simple.S \ 3dnow_float_dotprod_simple.S $(code_generator) \ @@ -1091,6 +1150,8 @@ libfilter_la_common_SOURCES = \ $(GENERATED_CC) \ gr_adaptive_fir_ccf.cc \ gr_cma_equalizer_cc.cc \ + gri_fft_filter_fff_generic.cc \ + gri_fft_filter_ccc_generic.cc \ gr_fft_filter_ccc.cc \ gr_fft_filter_fff.cc \ gr_goertzel_fc.cc \ @@ -1108,7 +1169,13 @@ libfilter_la_common_SOURCES = \ complex_dotprod_generic.cc \ ccomplex_dotprod_generic.cc \ float_dotprod_generic.c \ - short_dotprod_generic.c + short_dotprod_generic.c \ + gr_pfb_channelizer_ccf.cc \ + gr_pfb_decimator_ccf.cc \ + gr_pfb_interpolator_ccf.cc \ + gr_pfb_arb_resampler_ccf.cc \ + gr_pfb_clock_sync_ccf.cc \ + gr_pfb_clock_sync_fff.cc libfilter_qa_la_common_SOURCES = \ qa_filter.cc \ @@ -1121,10 +1188,12 @@ libfilter_qa_la_common_SOURCES = \ qa_gri_mmse_fir_interpolator.cc \ qa_gri_mmse_fir_interpolator_cc.cc +@MD_CPU_armv7_a_TRUE@libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(armv7_a_CODE) @MD_CPU_generic_TRUE@libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(generic_CODE) @MD_CPU_powerpc_TRUE@libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(powerpc_CODE) @MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_FALSE@libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(x86_SUBCODE) $(x86_CODE) @MD_CPU_x86_TRUE@@MD_SUBCPU_x86_64_TRUE@libfilter_la_SOURCES = $(libfilter_la_common_SOURCES) $(x86_64_SUBCODE) $(x86_CODE) +@MD_CPU_armv7_a_TRUE@libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(armv7_a_qa_CODE) @MD_CPU_generic_TRUE@libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(generic_qa_CODE) @MD_CPU_powerpc_TRUE@libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(powerpc_qa_CODE) @MD_CPU_x86_TRUE@libfilter_qa_la_SOURCES = $(libfilter_qa_la_common_SOURCES) $(x86_qa_CODE) @@ -1141,6 +1210,8 @@ grinclude_HEADERS = \ gr_altivec.h \ gr_cma_equalizer_cc.h \ gr_cpu.h \ + gri_fft_filter_fff_generic.h \ + gri_fft_filter_ccc_generic.h \ gr_fft_filter_ccc.h \ gr_fft_filter_fff.h \ gr_filter_delay_fc.h \ @@ -1164,11 +1235,18 @@ grinclude_HEADERS = \ qa_filter.h \ short_dotprod_generic.h \ short_dotprod_x86.h \ - sse_debug.h + sse_debug.h \ + gr_pfb_channelizer_ccf.h \ + gr_pfb_decimator_ccf.h \ + gr_pfb_interpolator_ccf.h \ + gr_pfb_arb_resampler_ccf.h \ + gr_pfb_clock_sync_ccf.h \ + gr_pfb_clock_sync_fff.h noinst_HEADERS = \ assembly.h \ dotprod_fff_altivec.h \ + dotprod_fff_armv7_a.h \ gr_fir_scc_simd.h \ gr_fir_scc_x86.h \ gr_fir_fcc_simd.h \ @@ -1178,6 +1256,7 @@ noinst_HEADERS = \ gr_fir_ccc_simd.h \ gr_fir_ccc_x86.h \ gr_fir_fff_altivec.h \ + gr_fir_fff_armv7_a.h \ gr_fir_fff_simd.h \ gr_fir_fff_x86.h \ gr_fir_fsf_simd.h \ @@ -1196,22 +1275,28 @@ noinst_HEADERS = \ qa_gri_mmse_fir_interpolator.h \ qa_gri_mmse_fir_interpolator_cc.h -swiginclude_HEADERS = \ - filter.i \ - filter_generated.i \ - gr_adaptive_fir_ccf.i \ - gr_cma_equalizer_cc.i \ - gr_fft_filter_ccc.i \ - gr_fft_filter_fff.i \ - gr_filter_delay_fc.i \ - gr_fractional_interpolator_ff.i \ - gr_fractional_interpolator_cc.i \ - gr_goertzel_fc.i \ - gr_hilbert_fc.i \ - gr_iir_filter_ffd.i \ - gr_single_pole_iir_filter_ff.i \ - gr_single_pole_iir_filter_cc.i \ - $(GENERATED_I) +@PYTHON_TRUE@swiginclude_HEADERS = \ +@PYTHON_TRUE@ filter.i \ +@PYTHON_TRUE@ filter_generated.i \ +@PYTHON_TRUE@ gr_adaptive_fir_ccf.i \ +@PYTHON_TRUE@ gr_cma_equalizer_cc.i \ +@PYTHON_TRUE@ gr_fft_filter_ccc.i \ +@PYTHON_TRUE@ gr_fft_filter_fff.i \ +@PYTHON_TRUE@ gr_filter_delay_fc.i \ +@PYTHON_TRUE@ gr_fractional_interpolator_ff.i \ +@PYTHON_TRUE@ gr_fractional_interpolator_cc.i \ +@PYTHON_TRUE@ gr_goertzel_fc.i \ +@PYTHON_TRUE@ gr_hilbert_fc.i \ +@PYTHON_TRUE@ gr_iir_filter_ffd.i \ +@PYTHON_TRUE@ gr_single_pole_iir_filter_ff.i \ +@PYTHON_TRUE@ gr_single_pole_iir_filter_cc.i \ +@PYTHON_TRUE@ gr_pfb_channelizer_ccf.i \ +@PYTHON_TRUE@ gr_pfb_decimator_ccf.i \ +@PYTHON_TRUE@ gr_pfb_interpolator_ccf.i \ +@PYTHON_TRUE@ gr_pfb_arb_resampler_ccf.i \ +@PYTHON_TRUE@ gr_pfb_clock_sync_ccf.i \ +@PYTHON_TRUE@ gr_pfb_clock_sync_fff.i \ +@PYTHON_TRUE@ $(GENERATED_I) # @@ -1411,6 +1496,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpuid_x86.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpuid_x86_64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dotprod_fff_altivec.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dotprod_fff_armv7_a.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcomplex_dotprod_3dnow.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcomplex_dotprod_3dnow64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcomplex_dotprod_sse.Plo@am__quote@ @@ -1423,6 +1509,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_adaptive_fir_ccf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_altivec.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_cma_equalizer_cc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_cpu_armv7_a.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_cpu_powerpc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_cpu_x86.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fft_filter_ccc.Plo@am__quote@ @@ -1442,6 +1529,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_fcc_x86.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_fff.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_fff_altivec.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_fff_armv7_a.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_fff_generic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_fff_simd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_fff_x86.Plo@am__quote@ @@ -1460,6 +1548,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_scc_simd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_scc_x86.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_sysconfig.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_sysconfig_armv7_a.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_sysconfig_generic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_sysconfig_powerpc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_fir_sysconfig_x86.Plo@am__quote@ @@ -1481,6 +1570,12 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_interp_fir_filter_fff.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_interp_fir_filter_fsf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_interp_fir_filter_scc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pfb_arb_resampler_ccf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pfb_channelizer_ccf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pfb_clock_sync_ccf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pfb_clock_sync_fff.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pfb_decimator_ccf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pfb_interpolator_ccf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_rational_resampler_base_ccc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_rational_resampler_base_ccf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_rational_resampler_base_fcc.Plo@am__quote@ @@ -1490,11 +1585,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_sincos.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_single_pole_iir_filter_cc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_single_pole_iir_filter_ff.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gri_fft_filter_ccc_generic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gri_fft_filter_fff_generic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gri_goertzel.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gri_mmse_fir_interpolator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gri_mmse_fir_interpolator_cc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qa_ccomplex_dotprod_x86.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qa_complex_dotprod_x86.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qa_dotprod_armv7_a.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qa_dotprod_generic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qa_dotprod_powerpc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qa_dotprod_x86.Plo@am__quote@ @@ -1512,6 +1610,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/short_dotprod_mmx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/short_dotprod_mmx64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sse_debug.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysconfig_armv7_a.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysconfig_generic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysconfig_powerpc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysconfig_x86.Plo@am__quote@ diff --git a/gnuradio-core/src/lib/filter/filter_generated.i b/gnuradio-core/src/lib/filter/filter_generated.i deleted file mode 100644 index 0be0d895..00000000 --- a/gnuradio-core/src/lib/filter/filter_generated.i +++ /dev/null @@ -1,54 +0,0 @@ -// -// This file is machine generated. All edits will be overwritten -// -%{ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -%} - -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccc.cc b/gnuradio-core/src/lib/filter/gr_fir_ccc.cc deleted file mode 100644 index 912aaa70..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_ccc.cc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -gr_fir_ccc::~gr_fir_ccc () -{ -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccc.h b/gnuradio-core/src/lib/filter/gr_fir_ccc.h deleted file mode 100644 index 77e3f6af..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_ccc.h +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2003 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_XXX.py - * Any changes made to this file will be overwritten. - */ - - -#ifndef INCLUDED_GR_FIR_CCC_H -#define INCLUDED_GR_FIR_CCC_H - -#include -#include -#include - -/*! - * \brief Abstract class for FIR with gr_complex input, gr_complex output and gr_complex taps - * \ingroup filter_primitive - * - * This is the abstract class for a Finite Impulse Response filter. - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_ccc { - -protected: - std::vector d_taps; // reversed taps - -public: - - // CONSTRUCTORS - - /*! - * \brief construct new FIR with given taps. - * - * Note that taps must be in forward order, e.g., coefficient 0 is - * stored in new_taps[0], coefficient 1 is stored in - * new_taps[1], etc. - */ - gr_fir_ccc () {} - gr_fir_ccc (const std::vector &taps) : d_taps (gr_reverse(taps)) {} - - virtual ~gr_fir_ccc (); - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual gr_complex filter (const gr_complex input[]) = 0; - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (gr_complex output[], const gr_complex input[], - unsigned long n) = 0; - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (gr_complex output[], const gr_complex input[], - unsigned long n, unsigned decimate) = 0; - - /*! - * \brief install \p new_taps as the current taps. - */ - virtual void set_taps (const std::vector &taps) - { - d_taps = gr_reverse(taps); - } - - // ACCESSORS - - /*! - * \return number of taps in filter. - */ - unsigned ntaps () const { return d_taps.size (); } - - /*! - * \return current taps - */ - virtual const std::vector get_taps () const - { - return gr_reverse(d_taps); - } -}; - -#endif /* INCLUDED_GR_FIR_CCC_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccc_generic.cc b/gnuradio-core/src/lib/filter/gr_fir_ccc_generic.cc deleted file mode 100644 index 25d92f7a..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_ccc_generic.cc +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -#if (2 == 4) - -gr_complex -gr_fir_ccc_generic::filter (const gr_complex input[]) -{ - static const int N_UNROLL = 4; - - gr_complex acc0 = 0; - gr_complex acc1 = 0; - gr_complex acc2 = 0; - gr_complex acc3 = 0; - - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - acc2 += d_taps[i + 2] * input[i + 2]; - acc3 += d_taps[i + 3] * input[i + 3]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (gr_complex) (acc0 + acc1 + acc2 + acc3); -} - -#else - -gr_complex -gr_fir_ccc_generic::filter (const gr_complex input[]) -{ - static const int N_UNROLL = 2; - - gr_complex acc0 = 0; - gr_complex acc1 = 0; - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (gr_complex) (acc0 + acc1); -} - -#endif // N_UNROLL - -void -gr_fir_ccc_generic::filterN (gr_complex output[], - const gr_complex input[], - unsigned long n) -{ - for (unsigned i = 0; i < n; i++) - output[i] = filter (&input[i]); -} - -void -gr_fir_ccc_generic::filterNdec (gr_complex output[], - const gr_complex input[], - unsigned long n, - unsigned decimate) -{ - unsigned j = 0; - for (unsigned i = 0; i < n; i++){ - output[i] = filter (&input[j]); - j += decimate; - } -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccc_generic.h b/gnuradio-core/src/lib/filter/gr_fir_ccc_generic.h deleted file mode 100644 index e71de8af..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_ccc_generic.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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_FIR_CCC_GENERIC_H -#define INCLUDED_GR_FIR_CCC_GENERIC_H - -#include - -/*! - * \brief Concrete class for generic implementation of FIR with gr_complex input, gr_complex output and gr_complex taps - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_ccc_generic : public gr_fir_ccc { - -public: - - // CREATORS - - gr_fir_ccc_generic () {} - gr_fir_ccc_generic (const std::vector &taps) : gr_fir_ccc (taps) {} - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual gr_complex filter (const gr_complex input[]); - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (gr_complex output[], const gr_complex input[], - unsigned long n); - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (gr_complex output[], const gr_complex input[], - unsigned long n, unsigned decimate); - -}; - -#endif /* INCLUDED_GR_FIR_CCC_GENERIC_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccf.cc b/gnuradio-core/src/lib/filter/gr_fir_ccf.cc deleted file mode 100644 index 1a61038f..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_ccf.cc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -gr_fir_ccf::~gr_fir_ccf () -{ -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccf.h b/gnuradio-core/src/lib/filter/gr_fir_ccf.h deleted file mode 100644 index 3e0f4379..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_ccf.h +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2003 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_XXX.py - * Any changes made to this file will be overwritten. - */ - - -#ifndef INCLUDED_GR_FIR_CCF_H -#define INCLUDED_GR_FIR_CCF_H - -#include -#include -#include - -/*! - * \brief Abstract class for FIR with gr_complex input, gr_complex output and float taps - * \ingroup filter_primitive - * - * This is the abstract class for a Finite Impulse Response filter. - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_ccf { - -protected: - std::vector d_taps; // reversed taps - -public: - - // CONSTRUCTORS - - /*! - * \brief construct new FIR with given taps. - * - * Note that taps must be in forward order, e.g., coefficient 0 is - * stored in new_taps[0], coefficient 1 is stored in - * new_taps[1], etc. - */ - gr_fir_ccf () {} - gr_fir_ccf (const std::vector &taps) : d_taps (gr_reverse(taps)) {} - - virtual ~gr_fir_ccf (); - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual gr_complex filter (const gr_complex input[]) = 0; - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (gr_complex output[], const gr_complex input[], - unsigned long n) = 0; - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (gr_complex output[], const gr_complex input[], - unsigned long n, unsigned decimate) = 0; - - /*! - * \brief install \p new_taps as the current taps. - */ - virtual void set_taps (const std::vector &taps) - { - d_taps = gr_reverse(taps); - } - - // ACCESSORS - - /*! - * \return number of taps in filter. - */ - unsigned ntaps () const { return d_taps.size (); } - - /*! - * \return current taps - */ - virtual const std::vector get_taps () const - { - return gr_reverse(d_taps); - } -}; - -#endif /* INCLUDED_GR_FIR_CCF_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccf_generic.cc b/gnuradio-core/src/lib/filter/gr_fir_ccf_generic.cc deleted file mode 100644 index 6b0e1541..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_ccf_generic.cc +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -#if (2 == 4) - -gr_complex -gr_fir_ccf_generic::filter (const gr_complex input[]) -{ - static const int N_UNROLL = 4; - - gr_complex acc0 = 0; - gr_complex acc1 = 0; - gr_complex acc2 = 0; - gr_complex acc3 = 0; - - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - acc2 += d_taps[i + 2] * input[i + 2]; - acc3 += d_taps[i + 3] * input[i + 3]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (gr_complex) (acc0 + acc1 + acc2 + acc3); -} - -#else - -gr_complex -gr_fir_ccf_generic::filter (const gr_complex input[]) -{ - static const int N_UNROLL = 2; - - gr_complex acc0 = 0; - gr_complex acc1 = 0; - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (gr_complex) (acc0 + acc1); -} - -#endif // N_UNROLL - -void -gr_fir_ccf_generic::filterN (gr_complex output[], - const gr_complex input[], - unsigned long n) -{ - for (unsigned i = 0; i < n; i++) - output[i] = filter (&input[i]); -} - -void -gr_fir_ccf_generic::filterNdec (gr_complex output[], - const gr_complex input[], - unsigned long n, - unsigned decimate) -{ - unsigned j = 0; - for (unsigned i = 0; i < n; i++){ - output[i] = filter (&input[j]); - j += decimate; - } -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccf_generic.h b/gnuradio-core/src/lib/filter/gr_fir_ccf_generic.h deleted file mode 100644 index 63a2651a..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_ccf_generic.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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_FIR_CCF_GENERIC_H -#define INCLUDED_GR_FIR_CCF_GENERIC_H - -#include - -/*! - * \brief Concrete class for generic implementation of FIR with gr_complex input, gr_complex output and float taps - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_ccf_generic : public gr_fir_ccf { - -public: - - // CREATORS - - gr_fir_ccf_generic () {} - gr_fir_ccf_generic (const std::vector &taps) : gr_fir_ccf (taps) {} - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual gr_complex filter (const gr_complex input[]); - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (gr_complex output[], const gr_complex input[], - unsigned long n); - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (gr_complex output[], const gr_complex input[], - unsigned long n, unsigned decimate); - -}; - -#endif /* INCLUDED_GR_FIR_CCF_GENERIC_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_fcc.cc b/gnuradio-core/src/lib/filter/gr_fir_fcc.cc deleted file mode 100644 index c3f27fd1..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fcc.cc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -gr_fir_fcc::~gr_fir_fcc () -{ -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_fcc.h b/gnuradio-core/src/lib/filter/gr_fir_fcc.h deleted file mode 100644 index eb6ea393..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fcc.h +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2003 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_XXX.py - * Any changes made to this file will be overwritten. - */ - - -#ifndef INCLUDED_GR_FIR_FCC_H -#define INCLUDED_GR_FIR_FCC_H - -#include -#include -#include - -/*! - * \brief Abstract class for FIR with float input, gr_complex output and gr_complex taps - * \ingroup filter_primitive - * - * This is the abstract class for a Finite Impulse Response filter. - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_fcc { - -protected: - std::vector d_taps; // reversed taps - -public: - - // CONSTRUCTORS - - /*! - * \brief construct new FIR with given taps. - * - * Note that taps must be in forward order, e.g., coefficient 0 is - * stored in new_taps[0], coefficient 1 is stored in - * new_taps[1], etc. - */ - gr_fir_fcc () {} - gr_fir_fcc (const std::vector &taps) : d_taps (gr_reverse(taps)) {} - - virtual ~gr_fir_fcc (); - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual gr_complex filter (const float input[]) = 0; - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (gr_complex output[], const float input[], - unsigned long n) = 0; - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (gr_complex output[], const float input[], - unsigned long n, unsigned decimate) = 0; - - /*! - * \brief install \p new_taps as the current taps. - */ - virtual void set_taps (const std::vector &taps) - { - d_taps = gr_reverse(taps); - } - - // ACCESSORS - - /*! - * \return number of taps in filter. - */ - unsigned ntaps () const { return d_taps.size (); } - - /*! - * \return current taps - */ - virtual const std::vector get_taps () const - { - return gr_reverse(d_taps); - } -}; - -#endif /* INCLUDED_GR_FIR_FCC_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_fcc_generic.cc b/gnuradio-core/src/lib/filter/gr_fir_fcc_generic.cc deleted file mode 100644 index aa99a92f..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fcc_generic.cc +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -#if (2 == 4) - -gr_complex -gr_fir_fcc_generic::filter (const float input[]) -{ - static const int N_UNROLL = 4; - - gr_complex acc0 = 0; - gr_complex acc1 = 0; - gr_complex acc2 = 0; - gr_complex acc3 = 0; - - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - acc2 += d_taps[i + 2] * input[i + 2]; - acc3 += d_taps[i + 3] * input[i + 3]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (gr_complex) (acc0 + acc1 + acc2 + acc3); -} - -#else - -gr_complex -gr_fir_fcc_generic::filter (const float input[]) -{ - static const int N_UNROLL = 2; - - gr_complex acc0 = 0; - gr_complex acc1 = 0; - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (gr_complex) (acc0 + acc1); -} - -#endif // N_UNROLL - -void -gr_fir_fcc_generic::filterN (gr_complex output[], - const float input[], - unsigned long n) -{ - for (unsigned i = 0; i < n; i++) - output[i] = filter (&input[i]); -} - -void -gr_fir_fcc_generic::filterNdec (gr_complex output[], - const float input[], - unsigned long n, - unsigned decimate) -{ - unsigned j = 0; - for (unsigned i = 0; i < n; i++){ - output[i] = filter (&input[j]); - j += decimate; - } -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_fcc_generic.h b/gnuradio-core/src/lib/filter/gr_fir_fcc_generic.h deleted file mode 100644 index e63de12f..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fcc_generic.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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_FIR_FCC_GENERIC_H -#define INCLUDED_GR_FIR_FCC_GENERIC_H - -#include - -/*! - * \brief Concrete class for generic implementation of FIR with float input, gr_complex output and gr_complex taps - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_fcc_generic : public gr_fir_fcc { - -public: - - // CREATORS - - gr_fir_fcc_generic () {} - gr_fir_fcc_generic (const std::vector &taps) : gr_fir_fcc (taps) {} - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual gr_complex filter (const float input[]); - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (gr_complex output[], const float input[], - unsigned long n); - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (gr_complex output[], const float input[], - unsigned long n, unsigned decimate); - -}; - -#endif /* INCLUDED_GR_FIR_FCC_GENERIC_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_fff.cc b/gnuradio-core/src/lib/filter/gr_fir_fff.cc deleted file mode 100644 index e8300b52..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fff.cc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -gr_fir_fff::~gr_fir_fff () -{ -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_fff.h b/gnuradio-core/src/lib/filter/gr_fir_fff.h deleted file mode 100644 index be0be492..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fff.h +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2003 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_XXX.py - * Any changes made to this file will be overwritten. - */ - - -#ifndef INCLUDED_GR_FIR_FFF_H -#define INCLUDED_GR_FIR_FFF_H - -#include - -#include - -/*! - * \brief Abstract class for FIR with float input, float output and float taps - * \ingroup filter_primitive - * - * This is the abstract class for a Finite Impulse Response filter. - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_fff { - -protected: - std::vector d_taps; // reversed taps - -public: - - // CONSTRUCTORS - - /*! - * \brief construct new FIR with given taps. - * - * Note that taps must be in forward order, e.g., coefficient 0 is - * stored in new_taps[0], coefficient 1 is stored in - * new_taps[1], etc. - */ - gr_fir_fff () {} - gr_fir_fff (const std::vector &taps) : d_taps (gr_reverse(taps)) {} - - virtual ~gr_fir_fff (); - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual float filter (const float input[]) = 0; - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (float output[], const float input[], - unsigned long n) = 0; - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (float output[], const float input[], - unsigned long n, unsigned decimate) = 0; - - /*! - * \brief install \p new_taps as the current taps. - */ - virtual void set_taps (const std::vector &taps) - { - d_taps = gr_reverse(taps); - } - - // ACCESSORS - - /*! - * \return number of taps in filter. - */ - unsigned ntaps () const { return d_taps.size (); } - - /*! - * \return current taps - */ - virtual const std::vector get_taps () const - { - return gr_reverse(d_taps); - } -}; - -#endif /* INCLUDED_GR_FIR_FFF_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_fff_generic.cc b/gnuradio-core/src/lib/filter/gr_fir_fff_generic.cc deleted file mode 100644 index cc2dcaa2..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fff_generic.cc +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -#if (4 == 4) - -float -gr_fir_fff_generic::filter (const float input[]) -{ - static const int N_UNROLL = 4; - - float acc0 = 0; - float acc1 = 0; - float acc2 = 0; - float acc3 = 0; - - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - acc2 += d_taps[i + 2] * input[i + 2]; - acc3 += d_taps[i + 3] * input[i + 3]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (float) (acc0 + acc1 + acc2 + acc3); -} - -#else - -float -gr_fir_fff_generic::filter (const float input[]) -{ - static const int N_UNROLL = 2; - - float acc0 = 0; - float acc1 = 0; - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (float) (acc0 + acc1); -} - -#endif // N_UNROLL - -void -gr_fir_fff_generic::filterN (float output[], - const float input[], - unsigned long n) -{ - for (unsigned i = 0; i < n; i++) - output[i] = filter (&input[i]); -} - -void -gr_fir_fff_generic::filterNdec (float output[], - const float input[], - unsigned long n, - unsigned decimate) -{ - unsigned j = 0; - for (unsigned i = 0; i < n; i++){ - output[i] = filter (&input[j]); - j += decimate; - } -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_fff_generic.h b/gnuradio-core/src/lib/filter/gr_fir_fff_generic.h deleted file mode 100644 index 86bc71be..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fff_generic.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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_FIR_FFF_GENERIC_H -#define INCLUDED_GR_FIR_FFF_GENERIC_H - -#include - -/*! - * \brief Concrete class for generic implementation of FIR with float input, float output and float taps - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_fff_generic : public gr_fir_fff { - -public: - - // CREATORS - - gr_fir_fff_generic () {} - gr_fir_fff_generic (const std::vector &taps) : gr_fir_fff (taps) {} - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual float filter (const float input[]); - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (float output[], const float input[], - unsigned long n); - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (float output[], const float input[], - unsigned long n, unsigned decimate); - -}; - -#endif /* INCLUDED_GR_FIR_FFF_GENERIC_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_ccc.cc b/gnuradio-core/src/lib/filter/gr_fir_filter_ccc.cc deleted file mode 100644 index 5f5909f5..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_ccc.cc +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_fir_filter_ccc_sptr gr_make_fir_filter_ccc (int decimation, const std::vector &taps) -{ - return gr_fir_filter_ccc_sptr (new gr_fir_filter_ccc (decimation, taps)); -} - - -gr_fir_filter_ccc::gr_fir_filter_ccc (int decimation, const std::vector &taps) - : gr_sync_decimator ("fir_filter_ccc", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_updated (false) -{ - d_fir = gr_fir_util::create_gr_fir_ccc (taps); - set_history (d_fir->ntaps ()); -} - -gr_fir_filter_ccc::~gr_fir_filter_ccc () -{ - delete d_fir; -} - -void -gr_fir_filter_ccc::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; -} - -int -gr_fir_filter_ccc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *in = (gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - d_fir->set_taps (d_new_taps); - set_history (d_fir->ntaps ()); - d_updated = false; - return 0; // history requirements may have changed. - } - - if (decimation() == 1) - d_fir->filterN (out, in, noutput_items); - - else - d_fir->filterNdec (out, in, noutput_items, decimation()); - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_ccc.h b/gnuradio-core/src/lib/filter/gr_fir_filter_ccc.h deleted file mode 100644 index f33b2dcb..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_ccc.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_FIR_FILTER_CCC_H -#define INCLUDED_GR_FIR_FILTER_CCC_H - -#include - -class gr_fir_filter_ccc; -typedef boost::shared_ptr gr_fir_filter_ccc_sptr; -gr_fir_filter_ccc_sptr gr_make_fir_filter_ccc (int decimation, const std::vector &taps); - -class gr_fir_ccc; - -/*! - * \brief FIR filter with gr_complex input, gr_complex output and gr_complex taps - * \ingroup filter_blk - */ -class gr_fir_filter_ccc : public gr_sync_decimator -{ - private: - friend gr_fir_filter_ccc_sptr gr_make_fir_filter_ccc (int decimation, const std::vector &taps); - - gr_fir_ccc *d_fir; - std::vector d_new_taps; - bool d_updated; - - /*! - * Construct a FIR filter with the given taps - */ - gr_fir_filter_ccc (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_ccc (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_fir_filter_ccc.i b/gnuradio-core/src/lib/filter/gr_fir_filter_ccc.i deleted file mode 100644 index 8207b4b2..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_ccc.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,fir_filter_ccc) - -gr_fir_filter_ccc_sptr gr_make_fir_filter_ccc (int decimation, const std::vector &taps); - -class gr_fir_filter_ccc : public gr_sync_decimator -{ - private: - gr_fir_filter_ccc (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_ccc (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_ccf.cc b/gnuradio-core/src/lib/filter/gr_fir_filter_ccf.cc deleted file mode 100644 index c36c8f3b..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_ccf.cc +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_fir_filter_ccf_sptr gr_make_fir_filter_ccf (int decimation, const std::vector &taps) -{ - return gr_fir_filter_ccf_sptr (new gr_fir_filter_ccf (decimation, taps)); -} - - -gr_fir_filter_ccf::gr_fir_filter_ccf (int decimation, const std::vector &taps) - : gr_sync_decimator ("fir_filter_ccf", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_updated (false) -{ - d_fir = gr_fir_util::create_gr_fir_ccf (taps); - set_history (d_fir->ntaps ()); -} - -gr_fir_filter_ccf::~gr_fir_filter_ccf () -{ - delete d_fir; -} - -void -gr_fir_filter_ccf::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; -} - -int -gr_fir_filter_ccf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *in = (gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - d_fir->set_taps (d_new_taps); - set_history (d_fir->ntaps ()); - d_updated = false; - return 0; // history requirements may have changed. - } - - if (decimation() == 1) - d_fir->filterN (out, in, noutput_items); - - else - d_fir->filterNdec (out, in, noutput_items, decimation()); - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_ccf.h b/gnuradio-core/src/lib/filter/gr_fir_filter_ccf.h deleted file mode 100644 index 6f74532d..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_ccf.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_FIR_FILTER_CCF_H -#define INCLUDED_GR_FIR_FILTER_CCF_H - -#include - -class gr_fir_filter_ccf; -typedef boost::shared_ptr gr_fir_filter_ccf_sptr; -gr_fir_filter_ccf_sptr gr_make_fir_filter_ccf (int decimation, const std::vector &taps); - -class gr_fir_ccf; - -/*! - * \brief FIR filter with gr_complex input, gr_complex output and float taps - * \ingroup filter_blk - */ -class gr_fir_filter_ccf : public gr_sync_decimator -{ - private: - friend gr_fir_filter_ccf_sptr gr_make_fir_filter_ccf (int decimation, const std::vector &taps); - - gr_fir_ccf *d_fir; - std::vector d_new_taps; - bool d_updated; - - /*! - * Construct a FIR filter with the given taps - */ - gr_fir_filter_ccf (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_ccf (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_fir_filter_ccf.i b/gnuradio-core/src/lib/filter/gr_fir_filter_ccf.i deleted file mode 100644 index ba9cee14..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_ccf.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,fir_filter_ccf) - -gr_fir_filter_ccf_sptr gr_make_fir_filter_ccf (int decimation, const std::vector &taps); - -class gr_fir_filter_ccf : public gr_sync_decimator -{ - private: - gr_fir_filter_ccf (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_ccf (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_fcc.cc b/gnuradio-core/src/lib/filter/gr_fir_filter_fcc.cc deleted file mode 100644 index 1785653e..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_fcc.cc +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_fir_filter_fcc_sptr gr_make_fir_filter_fcc (int decimation, const std::vector &taps) -{ - return gr_fir_filter_fcc_sptr (new gr_fir_filter_fcc (decimation, taps)); -} - - -gr_fir_filter_fcc::gr_fir_filter_fcc (int decimation, const std::vector &taps) - : gr_sync_decimator ("fir_filter_fcc", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_updated (false) -{ - d_fir = gr_fir_util::create_gr_fir_fcc (taps); - set_history (d_fir->ntaps ()); -} - -gr_fir_filter_fcc::~gr_fir_filter_fcc () -{ - delete d_fir; -} - -void -gr_fir_filter_fcc::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; -} - -int -gr_fir_filter_fcc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *in = (float *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - d_fir->set_taps (d_new_taps); - set_history (d_fir->ntaps ()); - d_updated = false; - return 0; // history requirements may have changed. - } - - if (decimation() == 1) - d_fir->filterN (out, in, noutput_items); - - else - d_fir->filterNdec (out, in, noutput_items, decimation()); - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_fcc.h b/gnuradio-core/src/lib/filter/gr_fir_filter_fcc.h deleted file mode 100644 index e9d06d29..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_fcc.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_FIR_FILTER_FCC_H -#define INCLUDED_GR_FIR_FILTER_FCC_H - -#include - -class gr_fir_filter_fcc; -typedef boost::shared_ptr gr_fir_filter_fcc_sptr; -gr_fir_filter_fcc_sptr gr_make_fir_filter_fcc (int decimation, const std::vector &taps); - -class gr_fir_fcc; - -/*! - * \brief FIR filter with float input, gr_complex output and gr_complex taps - * \ingroup filter_blk - */ -class gr_fir_filter_fcc : public gr_sync_decimator -{ - private: - friend gr_fir_filter_fcc_sptr gr_make_fir_filter_fcc (int decimation, const std::vector &taps); - - gr_fir_fcc *d_fir; - std::vector d_new_taps; - bool d_updated; - - /*! - * Construct a FIR filter with the given taps - */ - gr_fir_filter_fcc (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_fcc (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_fir_filter_fcc.i b/gnuradio-core/src/lib/filter/gr_fir_filter_fcc.i deleted file mode 100644 index 7dcbc38a..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_fcc.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,fir_filter_fcc) - -gr_fir_filter_fcc_sptr gr_make_fir_filter_fcc (int decimation, const std::vector &taps); - -class gr_fir_filter_fcc : public gr_sync_decimator -{ - private: - gr_fir_filter_fcc (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_fcc (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_fff.cc b/gnuradio-core/src/lib/filter/gr_fir_filter_fff.cc deleted file mode 100644 index ccd03342..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_fff.cc +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_fir_filter_fff_sptr gr_make_fir_filter_fff (int decimation, const std::vector &taps) -{ - return gr_fir_filter_fff_sptr (new gr_fir_filter_fff (decimation, taps)); -} - - -gr_fir_filter_fff::gr_fir_filter_fff (int decimation, const std::vector &taps) - : gr_sync_decimator ("fir_filter_fff", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (float)), - decimation), - d_updated (false) -{ - d_fir = gr_fir_util::create_gr_fir_fff (taps); - set_history (d_fir->ntaps ()); -} - -gr_fir_filter_fff::~gr_fir_filter_fff () -{ - delete d_fir; -} - -void -gr_fir_filter_fff::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; -} - -int -gr_fir_filter_fff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *in = (float *) input_items[0]; - float *out = (float *) output_items[0]; - - if (d_updated) { - d_fir->set_taps (d_new_taps); - set_history (d_fir->ntaps ()); - d_updated = false; - return 0; // history requirements may have changed. - } - - if (decimation() == 1) - d_fir->filterN (out, in, noutput_items); - - else - d_fir->filterNdec (out, in, noutput_items, decimation()); - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_fff.h b/gnuradio-core/src/lib/filter/gr_fir_filter_fff.h deleted file mode 100644 index d7615144..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_fff.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_FIR_FILTER_FFF_H -#define INCLUDED_GR_FIR_FILTER_FFF_H - -#include - -class gr_fir_filter_fff; -typedef boost::shared_ptr gr_fir_filter_fff_sptr; -gr_fir_filter_fff_sptr gr_make_fir_filter_fff (int decimation, const std::vector &taps); - -class gr_fir_fff; - -/*! - * \brief FIR filter with float input, float output and float taps - * \ingroup filter_blk - */ -class gr_fir_filter_fff : public gr_sync_decimator -{ - private: - friend gr_fir_filter_fff_sptr gr_make_fir_filter_fff (int decimation, const std::vector &taps); - - gr_fir_fff *d_fir; - std::vector d_new_taps; - bool d_updated; - - /*! - * Construct a FIR filter with the given taps - */ - gr_fir_filter_fff (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_fff (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_fir_filter_fff.i b/gnuradio-core/src/lib/filter/gr_fir_filter_fff.i deleted file mode 100644 index 28489434..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_fff.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,fir_filter_fff) - -gr_fir_filter_fff_sptr gr_make_fir_filter_fff (int decimation, const std::vector &taps); - -class gr_fir_filter_fff : public gr_sync_decimator -{ - private: - gr_fir_filter_fff (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_fff (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_fsf.cc b/gnuradio-core/src/lib/filter/gr_fir_filter_fsf.cc deleted file mode 100644 index 25b5a276..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_fsf.cc +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_fir_filter_fsf_sptr gr_make_fir_filter_fsf (int decimation, const std::vector &taps) -{ - return gr_fir_filter_fsf_sptr (new gr_fir_filter_fsf (decimation, taps)); -} - - -gr_fir_filter_fsf::gr_fir_filter_fsf (int decimation, const std::vector &taps) - : gr_sync_decimator ("fir_filter_fsf", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (short)), - decimation), - d_updated (false) -{ - d_fir = gr_fir_util::create_gr_fir_fsf (taps); - set_history (d_fir->ntaps ()); -} - -gr_fir_filter_fsf::~gr_fir_filter_fsf () -{ - delete d_fir; -} - -void -gr_fir_filter_fsf::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; -} - -int -gr_fir_filter_fsf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *in = (float *) input_items[0]; - short *out = (short *) output_items[0]; - - if (d_updated) { - d_fir->set_taps (d_new_taps); - set_history (d_fir->ntaps ()); - d_updated = false; - return 0; // history requirements may have changed. - } - - if (decimation() == 1) - d_fir->filterN (out, in, noutput_items); - - else - d_fir->filterNdec (out, in, noutput_items, decimation()); - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_fsf.h b/gnuradio-core/src/lib/filter/gr_fir_filter_fsf.h deleted file mode 100644 index dcb6e031..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_fsf.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_FIR_FILTER_FSF_H -#define INCLUDED_GR_FIR_FILTER_FSF_H - -#include - -class gr_fir_filter_fsf; -typedef boost::shared_ptr gr_fir_filter_fsf_sptr; -gr_fir_filter_fsf_sptr gr_make_fir_filter_fsf (int decimation, const std::vector &taps); - -class gr_fir_fsf; - -/*! - * \brief FIR filter with float input, short output and float taps - * \ingroup filter_blk - */ -class gr_fir_filter_fsf : public gr_sync_decimator -{ - private: - friend gr_fir_filter_fsf_sptr gr_make_fir_filter_fsf (int decimation, const std::vector &taps); - - gr_fir_fsf *d_fir; - std::vector d_new_taps; - bool d_updated; - - /*! - * Construct a FIR filter with the given taps - */ - gr_fir_filter_fsf (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_fsf (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_fir_filter_fsf.i b/gnuradio-core/src/lib/filter/gr_fir_filter_fsf.i deleted file mode 100644 index 196a98d9..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_fsf.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,fir_filter_fsf) - -gr_fir_filter_fsf_sptr gr_make_fir_filter_fsf (int decimation, const std::vector &taps); - -class gr_fir_filter_fsf : public gr_sync_decimator -{ - private: - gr_fir_filter_fsf (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_fsf (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_scc.cc b/gnuradio-core/src/lib/filter/gr_fir_filter_scc.cc deleted file mode 100644 index a59c7ab2..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_scc.cc +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_fir_filter_scc_sptr gr_make_fir_filter_scc (int decimation, const std::vector &taps) -{ - return gr_fir_filter_scc_sptr (new gr_fir_filter_scc (decimation, taps)); -} - - -gr_fir_filter_scc::gr_fir_filter_scc (int decimation, const std::vector &taps) - : gr_sync_decimator ("fir_filter_scc", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_updated (false) -{ - d_fir = gr_fir_util::create_gr_fir_scc (taps); - set_history (d_fir->ntaps ()); -} - -gr_fir_filter_scc::~gr_fir_filter_scc () -{ - delete d_fir; -} - -void -gr_fir_filter_scc::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; -} - -int -gr_fir_filter_scc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *in = (short *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - d_fir->set_taps (d_new_taps); - set_history (d_fir->ntaps ()); - d_updated = false; - return 0; // history requirements may have changed. - } - - if (decimation() == 1) - d_fir->filterN (out, in, noutput_items); - - else - d_fir->filterNdec (out, in, noutput_items, decimation()); - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_scc.h b/gnuradio-core/src/lib/filter/gr_fir_filter_scc.h deleted file mode 100644 index a48de056..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_scc.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_FIR_FILTER_SCC_H -#define INCLUDED_GR_FIR_FILTER_SCC_H - -#include - -class gr_fir_filter_scc; -typedef boost::shared_ptr gr_fir_filter_scc_sptr; -gr_fir_filter_scc_sptr gr_make_fir_filter_scc (int decimation, const std::vector &taps); - -class gr_fir_scc; - -/*! - * \brief FIR filter with short input, gr_complex output and gr_complex taps - * \ingroup filter_blk - */ -class gr_fir_filter_scc : public gr_sync_decimator -{ - private: - friend gr_fir_filter_scc_sptr gr_make_fir_filter_scc (int decimation, const std::vector &taps); - - gr_fir_scc *d_fir; - std::vector d_new_taps; - bool d_updated; - - /*! - * Construct a FIR filter with the given taps - */ - gr_fir_filter_scc (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_scc (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_fir_filter_scc.i b/gnuradio-core/src/lib/filter/gr_fir_filter_scc.i deleted file mode 100644 index 503870e4..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_scc.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,fir_filter_scc) - -gr_fir_filter_scc_sptr gr_make_fir_filter_scc (int decimation, const std::vector &taps); - -class gr_fir_filter_scc : public gr_sync_decimator -{ - private: - gr_fir_filter_scc (int decimation, const std::vector &taps); - - public: - ~gr_fir_filter_scc (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_fir_fsf.cc b/gnuradio-core/src/lib/filter/gr_fir_fsf.cc deleted file mode 100644 index 1eb7af5f..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fsf.cc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -gr_fir_fsf::~gr_fir_fsf () -{ -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_fsf.h b/gnuradio-core/src/lib/filter/gr_fir_fsf.h deleted file mode 100644 index fba0ff41..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fsf.h +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2003 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_XXX.py - * Any changes made to this file will be overwritten. - */ - - -#ifndef INCLUDED_GR_FIR_FSF_H -#define INCLUDED_GR_FIR_FSF_H - -#include - -#include - -/*! - * \brief Abstract class for FIR with float input, short output and float taps - * \ingroup filter_primitive - * - * This is the abstract class for a Finite Impulse Response filter. - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_fsf { - -protected: - std::vector d_taps; // reversed taps - -public: - - // CONSTRUCTORS - - /*! - * \brief construct new FIR with given taps. - * - * Note that taps must be in forward order, e.g., coefficient 0 is - * stored in new_taps[0], coefficient 1 is stored in - * new_taps[1], etc. - */ - gr_fir_fsf () {} - gr_fir_fsf (const std::vector &taps) : d_taps (gr_reverse(taps)) {} - - virtual ~gr_fir_fsf (); - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual short filter (const float input[]) = 0; - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (short output[], const float input[], - unsigned long n) = 0; - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (short output[], const float input[], - unsigned long n, unsigned decimate) = 0; - - /*! - * \brief install \p new_taps as the current taps. - */ - virtual void set_taps (const std::vector &taps) - { - d_taps = gr_reverse(taps); - } - - // ACCESSORS - - /*! - * \return number of taps in filter. - */ - unsigned ntaps () const { return d_taps.size (); } - - /*! - * \return current taps - */ - virtual const std::vector get_taps () const - { - return gr_reverse(d_taps); - } -}; - -#endif /* INCLUDED_GR_FIR_FSF_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_fsf_generic.cc b/gnuradio-core/src/lib/filter/gr_fir_fsf_generic.cc deleted file mode 100644 index e8f7239d..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fsf_generic.cc +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -#if (4 == 4) - -short -gr_fir_fsf_generic::filter (const float input[]) -{ - static const int N_UNROLL = 4; - - float acc0 = 0; - float acc1 = 0; - float acc2 = 0; - float acc3 = 0; - - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - acc2 += d_taps[i + 2] * input[i + 2]; - acc3 += d_taps[i + 3] * input[i + 3]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (short) (acc0 + acc1 + acc2 + acc3); -} - -#else - -short -gr_fir_fsf_generic::filter (const float input[]) -{ - static const int N_UNROLL = 2; - - float acc0 = 0; - float acc1 = 0; - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * input[i + 0]; - acc1 += d_taps[i + 1] * input[i + 1]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * input[i]; - - return (short) (acc0 + acc1); -} - -#endif // N_UNROLL - -void -gr_fir_fsf_generic::filterN (short output[], - const float input[], - unsigned long n) -{ - for (unsigned i = 0; i < n; i++) - output[i] = filter (&input[i]); -} - -void -gr_fir_fsf_generic::filterNdec (short output[], - const float input[], - unsigned long n, - unsigned decimate) -{ - unsigned j = 0; - for (unsigned i = 0; i < n; i++){ - output[i] = filter (&input[j]); - j += decimate; - } -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_fsf_generic.h b/gnuradio-core/src/lib/filter/gr_fir_fsf_generic.h deleted file mode 100644 index 318c7d9a..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_fsf_generic.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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_FIR_FSF_GENERIC_H -#define INCLUDED_GR_FIR_FSF_GENERIC_H - -#include - -/*! - * \brief Concrete class for generic implementation of FIR with float input, short output and float taps - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_fsf_generic : public gr_fir_fsf { - -public: - - // CREATORS - - gr_fir_fsf_generic () {} - gr_fir_fsf_generic (const std::vector &taps) : gr_fir_fsf (taps) {} - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual short filter (const float input[]); - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (short output[], const float input[], - unsigned long n); - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (short output[], const float input[], - unsigned long n, unsigned decimate); - -}; - -#endif /* INCLUDED_GR_FIR_FSF_GENERIC_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_scc.cc b/gnuradio-core/src/lib/filter/gr_fir_scc.cc deleted file mode 100644 index 5e0342ad..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_scc.cc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -gr_fir_scc::~gr_fir_scc () -{ -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_scc.h b/gnuradio-core/src/lib/filter/gr_fir_scc.h deleted file mode 100644 index 37f0305e..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_scc.h +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2003 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_XXX.py - * Any changes made to this file will be overwritten. - */ - - -#ifndef INCLUDED_GR_FIR_SCC_H -#define INCLUDED_GR_FIR_SCC_H - -#include -#include -#include - -/*! - * \brief Abstract class for FIR with short input, gr_complex output and gr_complex taps - * \ingroup filter_primitive - * - * This is the abstract class for a Finite Impulse Response filter. - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_scc { - -protected: - std::vector d_taps; // reversed taps - -public: - - // CONSTRUCTORS - - /*! - * \brief construct new FIR with given taps. - * - * Note that taps must be in forward order, e.g., coefficient 0 is - * stored in new_taps[0], coefficient 1 is stored in - * new_taps[1], etc. - */ - gr_fir_scc () {} - gr_fir_scc (const std::vector &taps) : d_taps (gr_reverse(taps)) {} - - virtual ~gr_fir_scc (); - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual gr_complex filter (const short input[]) = 0; - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (gr_complex output[], const short input[], - unsigned long n) = 0; - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (gr_complex output[], const short input[], - unsigned long n, unsigned decimate) = 0; - - /*! - * \brief install \p new_taps as the current taps. - */ - virtual void set_taps (const std::vector &taps) - { - d_taps = gr_reverse(taps); - } - - // ACCESSORS - - /*! - * \return number of taps in filter. - */ - unsigned ntaps () const { return d_taps.size (); } - - /*! - * \return current taps - */ - virtual const std::vector get_taps () const - { - return gr_reverse(d_taps); - } -}; - -#endif /* INCLUDED_GR_FIR_SCC_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_scc_generic.cc b/gnuradio-core/src/lib/filter/gr_fir_scc_generic.cc deleted file mode 100644 index 8a2e5ada..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_scc_generic.cc +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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 -#endif -#include - -#if (2 == 4) - -gr_complex -gr_fir_scc_generic::filter (const short input[]) -{ - static const int N_UNROLL = 4; - - gr_complex acc0 = 0; - gr_complex acc1 = 0; - gr_complex acc2 = 0; - gr_complex acc3 = 0; - - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * (float) input[i + 0]; - acc1 += d_taps[i + 1] * (float) input[i + 1]; - acc2 += d_taps[i + 2] * (float) input[i + 2]; - acc3 += d_taps[i + 3] * (float) input[i + 3]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * (float) input[i]; - - return (gr_complex) (acc0 + acc1 + acc2 + acc3); -} - -#else - -gr_complex -gr_fir_scc_generic::filter (const short input[]) -{ - static const int N_UNROLL = 2; - - gr_complex acc0 = 0; - gr_complex acc1 = 0; - - unsigned i = 0; - unsigned n = (ntaps () / N_UNROLL) * N_UNROLL; - - for (i = 0; i < n; i += N_UNROLL){ - acc0 += d_taps[i + 0] * (float) input[i + 0]; - acc1 += d_taps[i + 1] * (float) input[i + 1]; - } - - for (; i < ntaps (); i++) - acc0 += d_taps[i] * (float) input[i]; - - return (gr_complex) (acc0 + acc1); -} - -#endif // N_UNROLL - -void -gr_fir_scc_generic::filterN (gr_complex output[], - const short input[], - unsigned long n) -{ - for (unsigned i = 0; i < n; i++) - output[i] = filter (&input[i]); -} - -void -gr_fir_scc_generic::filterNdec (gr_complex output[], - const short input[], - unsigned long n, - unsigned decimate) -{ - unsigned j = 0; - for (unsigned i = 0; i < n; i++){ - output[i] = filter (&input[j]); - j += decimate; - } -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_scc_generic.h b/gnuradio-core/src/lib/filter/gr_fir_scc_generic.h deleted file mode 100644 index 650c15e2..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_scc_generic.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002 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_FIR_SCC_GENERIC_H -#define INCLUDED_GR_FIR_SCC_GENERIC_H - -#include - -/*! - * \brief Concrete class for generic implementation of FIR with short input, gr_complex output and gr_complex taps - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int) - */ - -class gr_fir_scc_generic : public gr_fir_scc { - -public: - - // CREATORS - - gr_fir_scc_generic () {} - gr_fir_scc_generic (const std::vector &taps) : gr_fir_scc (taps) {} - - // MANIPULATORS - - /*! - * \brief compute a single output value. - * - * \p input must have ntaps() valid entries. - * input[0] .. input[ntaps() - 1] are referenced to compute the output value. - * - * \returns the filtered input value. - */ - virtual gr_complex filter (const short input[]); - - /*! - * \brief compute an array of N output values. - * - * \p input must have (n - 1 + ntaps()) valid entries. - * input[0] .. input[n - 1 + ntaps() - 1] are referenced to compute the output values. - */ - virtual void filterN (gr_complex output[], const short input[], - unsigned long n); - - /*! - * \brief compute an array of N output values, decimating the input - * - * \p input must have (decimate * (n - 1) + ntaps()) valid entries. - * input[0] .. input[decimate * (n - 1) + ntaps() - 1] are referenced to - * compute the output values. - */ - virtual void filterNdec (gr_complex output[], const short input[], - unsigned long n, unsigned decimate); - -}; - -#endif /* INCLUDED_GR_FIR_SCC_GENERIC_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_sysconfig.cc b/gnuradio-core/src/lib/filter/gr_fir_sysconfig.cc deleted file mode 100644 index 947db4ee..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_sysconfig.cc +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_sysconfig.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif -#include - -gr_fir_sysconfig::~gr_fir_sysconfig () -{ -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_sysconfig.h b/gnuradio-core/src/lib/filter/gr_fir_sysconfig.h deleted file mode 100644 index b988e490..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_sysconfig.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_sysconfig.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_FIR_SYSCONFIG_H -#define INCLUDED_GR_FIR_SYSCONFIG_H - -#include - -#include - -/*! - * \brief abstract base class for configuring the automatic selection of the - * fastest gr_fir for your platform. - * - * This is used internally by gr_fir_util. - */ - -class gr_fir_sysconfig { -public: - virtual ~gr_fir_sysconfig (); - - virtual gr_fir_ccf *create_gr_fir_ccf (const std::vector &taps) = 0; - virtual gr_fir_fcc *create_gr_fir_fcc (const std::vector &taps) = 0; - virtual gr_fir_ccc *create_gr_fir_ccc (const std::vector &taps) = 0; - virtual gr_fir_fff *create_gr_fir_fff (const std::vector &taps) = 0; - virtual gr_fir_scc *create_gr_fir_scc (const std::vector &taps) = 0; - virtual gr_fir_fsf *create_gr_fir_fsf (const std::vector &taps) = 0; - - virtual void get_gr_fir_ccf_info (std::vector *info) = 0; - virtual void get_gr_fir_fcc_info (std::vector *info) = 0; - virtual void get_gr_fir_ccc_info (std::vector *info) = 0; - virtual void get_gr_fir_fff_info (std::vector *info) = 0; - virtual void get_gr_fir_scc_info (std::vector *info) = 0; - virtual void get_gr_fir_fsf_info (std::vector *info) = 0; - -}; - -/* - * This returns the single instance of the appropriate derived class. - * This function must be defined only once in the system, and should be defined - * in the platform specific code. - */ - -gr_fir_sysconfig *gr_fir_sysconfig_singleton (); - - -#endif /* INCLUDED_GR_FIR_SYSCONFIG_H */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_generic.cc b/gnuradio-core/src/lib/filter/gr_fir_sysconfig_generic.cc deleted file mode 100644 index f5ba6d4f..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_generic.cc +++ /dev/null @@ -1,180 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_fir_sysconfig_generic.py. - * - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif -#include - -#include -#include -#include -#include -#include -#include - -/* - * ---------------------------------------------------------------- - * static functions that serve as constructors returned by info - * ---------------------------------------------------------------- - */ - -static gr_fir_ccf * -make_gr_fir_ccf (const std::vector &taps) -{ - return new gr_fir_ccf_generic (taps); -} - -static gr_fir_fcc * -make_gr_fir_fcc (const std::vector &taps) -{ - return new gr_fir_fcc_generic (taps); -} - -static gr_fir_ccc * -make_gr_fir_ccc (const std::vector &taps) -{ - return new gr_fir_ccc_generic (taps); -} - -static gr_fir_fff * -make_gr_fir_fff (const std::vector &taps) -{ - return new gr_fir_fff_generic (taps); -} - -static gr_fir_scc * -make_gr_fir_scc (const std::vector &taps) -{ - return new gr_fir_scc_generic (taps); -} - -static gr_fir_fsf * -make_gr_fir_fsf (const std::vector &taps) -{ - return new gr_fir_fsf_generic (taps); -} - -/* - * ---------------------------------------------------------------- - * return instances of the generic C++ versions of these classes. - * ---------------------------------------------------------------- - */ - -gr_fir_ccf * -gr_fir_sysconfig_generic::create_gr_fir_ccf (const std::vector &taps) -{ - return make_gr_fir_ccf (taps); -} - -gr_fir_fcc * -gr_fir_sysconfig_generic::create_gr_fir_fcc (const std::vector &taps) -{ - return make_gr_fir_fcc (taps); -} - -gr_fir_ccc * -gr_fir_sysconfig_generic::create_gr_fir_ccc (const std::vector &taps) -{ - return make_gr_fir_ccc (taps); -} - -gr_fir_fff * -gr_fir_sysconfig_generic::create_gr_fir_fff (const std::vector &taps) -{ - return make_gr_fir_fff (taps); -} - -gr_fir_scc * -gr_fir_sysconfig_generic::create_gr_fir_scc (const std::vector &taps) -{ - return make_gr_fir_scc (taps); -} - -gr_fir_fsf * -gr_fir_sysconfig_generic::create_gr_fir_fsf (const std::vector &taps) -{ - return make_gr_fir_fsf (taps); -} - -/* - * Return info about available implementations. - * - * This is the bottom of the concrete hierarchy, so we set the - * size of the vector to 1, and install our info. Classes derived - * from us invoke us first, then append their own info. - */ - -void -gr_fir_sysconfig_generic::get_gr_fir_ccf_info (std::vector *info) -{ - info->resize (1); - (*info)[0].name = "generic"; - (*info)[0].create = make_gr_fir_ccf; -} - -void -gr_fir_sysconfig_generic::get_gr_fir_fcc_info (std::vector *info) -{ - info->resize (1); - (*info)[0].name = "generic"; - (*info)[0].create = make_gr_fir_fcc; -} - -void -gr_fir_sysconfig_generic::get_gr_fir_ccc_info (std::vector *info) -{ - info->resize (1); - (*info)[0].name = "generic"; - (*info)[0].create = make_gr_fir_ccc; -} - -void -gr_fir_sysconfig_generic::get_gr_fir_fff_info (std::vector *info) -{ - info->resize (1); - (*info)[0].name = "generic"; - (*info)[0].create = make_gr_fir_fff; -} - -void -gr_fir_sysconfig_generic::get_gr_fir_scc_info (std::vector *info) -{ - info->resize (1); - (*info)[0].name = "generic"; - (*info)[0].create = make_gr_fir_scc; -} - -void -gr_fir_sysconfig_generic::get_gr_fir_fsf_info (std::vector *info) -{ - info->resize (1); - (*info)[0].name = "generic"; - (*info)[0].create = make_gr_fir_fsf; -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_generic.h b/gnuradio-core/src/lib/filter/gr_fir_sysconfig_generic.h deleted file mode 100644 index 747c8c03..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_generic.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_fir_sysconfig_generic.py. - * - * Any changes made to this file will be overwritten. - */ - -#ifndef _GR_FIR_SYSCONFIG_GENERIC_H_ -#define _GR_FIR_SYSCONFIG_GENERIC_H_ - -#include - - -class gr_fir_sysconfig_generic : public gr_fir_sysconfig { -public: - virtual gr_fir_ccf *create_gr_fir_ccf (const std::vector &taps); - virtual gr_fir_fcc *create_gr_fir_fcc (const std::vector &taps); - virtual gr_fir_ccc *create_gr_fir_ccc (const std::vector &taps); - virtual gr_fir_fff *create_gr_fir_fff (const std::vector &taps); - virtual gr_fir_scc *create_gr_fir_scc (const std::vector &taps); - virtual gr_fir_fsf *create_gr_fir_fsf (const std::vector &taps); - - virtual void get_gr_fir_ccf_info (std::vector *info); - virtual void get_gr_fir_fcc_info (std::vector *info); - virtual void get_gr_fir_ccc_info (std::vector *info); - virtual void get_gr_fir_fff_info (std::vector *info); - virtual void get_gr_fir_scc_info (std::vector *info); - virtual void get_gr_fir_fsf_info (std::vector *info); - -}; - - -#endif /* _GR_FIR_SYSCONFIG_GENERIC_H_ */ diff --git a/gnuradio-core/src/lib/filter/gr_fir_util.cc b/gnuradio-core/src/lib/filter/gr_fir_util.cc deleted file mode 100644 index 747f56e8..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_util.cc +++ /dev/null @@ -1,111 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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 -#endif -#include -#include - -// -// There's no problem that can't be solved by the addition of -// another layer of indirection... -// - -// --- constructors --- - - -gr_fir_ccf * -gr_fir_util::create_gr_fir_ccf (const std::vector &taps) -{ - return gr_fir_sysconfig_singleton()->create_gr_fir_ccf (taps); -} - -gr_fir_fcc * -gr_fir_util::create_gr_fir_fcc (const std::vector &taps) -{ - return gr_fir_sysconfig_singleton()->create_gr_fir_fcc (taps); -} - -gr_fir_ccc * -gr_fir_util::create_gr_fir_ccc (const std::vector &taps) -{ - return gr_fir_sysconfig_singleton()->create_gr_fir_ccc (taps); -} - -gr_fir_fff * -gr_fir_util::create_gr_fir_fff (const std::vector &taps) -{ - return gr_fir_sysconfig_singleton()->create_gr_fir_fff (taps); -} - -gr_fir_scc * -gr_fir_util::create_gr_fir_scc (const std::vector &taps) -{ - return gr_fir_sysconfig_singleton()->create_gr_fir_scc (taps); -} - -gr_fir_fsf * -gr_fir_util::create_gr_fir_fsf (const std::vector &taps) -{ - return gr_fir_sysconfig_singleton()->create_gr_fir_fsf (taps); -} - -// --- info gatherers --- - - -void -gr_fir_util::get_gr_fir_ccf_info (std::vector *info) -{ - gr_fir_sysconfig_singleton()->get_gr_fir_ccf_info (info); -} - -void -gr_fir_util::get_gr_fir_fcc_info (std::vector *info) -{ - gr_fir_sysconfig_singleton()->get_gr_fir_fcc_info (info); -} - -void -gr_fir_util::get_gr_fir_ccc_info (std::vector *info) -{ - gr_fir_sysconfig_singleton()->get_gr_fir_ccc_info (info); -} - -void -gr_fir_util::get_gr_fir_fff_info (std::vector *info) -{ - gr_fir_sysconfig_singleton()->get_gr_fir_fff_info (info); -} - -void -gr_fir_util::get_gr_fir_scc_info (std::vector *info) -{ - gr_fir_sysconfig_singleton()->get_gr_fir_scc_info (info); -} - -void -gr_fir_util::get_gr_fir_fsf_info (std::vector *info) -{ - gr_fir_sysconfig_singleton()->get_gr_fir_fsf_info (info); -} diff --git a/gnuradio-core/src/lib/filter/gr_fir_util.h b/gnuradio-core/src/lib/filter/gr_fir_util.h deleted file mode 100644 index 2db98bfe..00000000 --- a/gnuradio-core/src/lib/filter/gr_fir_util.h +++ /dev/null @@ -1,117 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_fir_util.py. - * - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_FIR_UTIL_H -#define INCLUDED_GR_FIR_UTIL_H - -/*! - * \brief routines to create gr_fir_XXX's - * - * This class handles selecting the fastest version of the finite - * implulse response filter available for your platform. This - * interface should be used by the rest of the system for creating - * gr_fir_XXX's. - * - * The trailing suffix has the form _IOT where I codes the input type, - * O codes the output type, and T codes the tap type. - * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), - * 'i' (short) - */ - -#include - -class gr_fir_ccf; -class gr_fir_fcc; -class gr_fir_ccc; -class gr_fir_fff; -class gr_fir_scc; -class gr_fir_fsf; - -// structures returned by get_gr_fir_XXX_info methods - - -struct gr_fir_ccf_info { - const char *name; // implementation name, e.g., "generic", "SSE", "3DNow!" - gr_fir_ccf *(*create)(const std::vector &taps); -}; - -struct gr_fir_fcc_info { - const char *name; // implementation name, e.g., "generic", "SSE", "3DNow!" - gr_fir_fcc *(*create)(const std::vector &taps); -}; - -struct gr_fir_ccc_info { - const char *name; // implementation name, e.g., "generic", "SSE", "3DNow!" - gr_fir_ccc *(*create)(const std::vector &taps); -}; - -struct gr_fir_fff_info { - const char *name; // implementation name, e.g., "generic", "SSE", "3DNow!" - gr_fir_fff *(*create)(const std::vector &taps); -}; - -struct gr_fir_scc_info { - const char *name; // implementation name, e.g., "generic", "SSE", "3DNow!" - gr_fir_scc *(*create)(const std::vector &taps); -}; - -struct gr_fir_fsf_info { - const char *name; // implementation name, e.g., "generic", "SSE", "3DNow!" - gr_fir_fsf *(*create)(const std::vector &taps); -}; - -struct gr_fir_util { - - // create a fast version of gr_fir_XXX. - - static gr_fir_ccf *create_gr_fir_ccf (const std::vector &taps); - static gr_fir_fcc *create_gr_fir_fcc (const std::vector &taps); - static gr_fir_ccc *create_gr_fir_ccc (const std::vector &taps); - static gr_fir_fff *create_gr_fir_fff (const std::vector &taps); - static gr_fir_scc *create_gr_fir_scc (const std::vector &taps); - static gr_fir_fsf *create_gr_fir_fsf (const std::vector &taps); - - // Get information about all gr_fir_XXX implementations. - // This is useful for benchmarking, testing, etc without having to - // know a priori what's linked into this image - // - // The caller must pass in a valid pointer to a vector. - // The vector will be filled with structs describing the - // available implementations. - - static void get_gr_fir_ccf_info (std::vector *info); - static void get_gr_fir_fcc_info (std::vector *info); - static void get_gr_fir_ccc_info (std::vector *info); - static void get_gr_fir_fff_info (std::vector *info); - static void get_gr_fir_scc_info (std::vector *info); - static void get_gr_fir_fsf_info (std::vector *info); - -}; - -#endif /* INCLUDED_GR_FIR_UTIL_H */ diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.cc b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.cc deleted file mode 100644 index a27bc1e8..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.cc +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_freq_xlating_fir_filter_ccc_sptr -gr_make_freq_xlating_fir_filter_ccc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq) -{ - return gr_freq_xlating_fir_filter_ccc_sptr (new gr_freq_xlating_fir_filter_ccc (decimation, taps, center_freq, sampling_freq)); -} - - -gr_freq_xlating_fir_filter_ccc::gr_freq_xlating_fir_filter_ccc ( - - int decimation, - const std::vector &taps, - double center_freq, - double sampling_freq) - - : gr_sync_decimator ("freq_xlating_fir_filter_ccc", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_proto_taps (taps), d_center_freq (center_freq), d_sampling_freq (sampling_freq), - d_updated (false) -{ - std::vector dummy_taps; - d_composite_fir = gr_fir_util::create_gr_fir_ccc (dummy_taps); - - set_history (d_proto_taps.size ()); - build_composite_fir (); -} - -gr_freq_xlating_fir_filter_ccc::~gr_freq_xlating_fir_filter_ccc () -{ - delete d_composite_fir; -} - -void -gr_freq_xlating_fir_filter_ccc::build_composite_fir () -{ - std::vector ctaps (d_proto_taps.size ()); - - float fwT0 = 2 * M_PI * d_center_freq / d_sampling_freq; - for (unsigned int i = 0; i < d_proto_taps.size (); i++) - ctaps[i] = d_proto_taps[i] * exp (gr_complex (0, i * fwT0)); - - d_composite_fir->set_taps (gr_reverse(ctaps)); - d_r.set_phase_incr (exp (gr_complex (0, fwT0 * decimation ()))); -} - -void -gr_freq_xlating_fir_filter_ccc::set_center_freq (double center_freq) -{ - d_center_freq = center_freq; - d_updated = true; -} - -void -gr_freq_xlating_fir_filter_ccc::set_taps (const std::vector &taps) -{ - d_proto_taps = taps; - d_updated = true; -} - -int -gr_freq_xlating_fir_filter_ccc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *in = (gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - // rebuild composite FIR if the center freq has changed - - if (d_updated){ - set_history (d_proto_taps.size ()); - build_composite_fir (); - d_updated = false; - return 0; // history requirements may have changed. - } - - unsigned j = 0; - for (int i = 0; i < noutput_items; i++){ - out[i] = d_r.rotate (d_composite_fir->filter (&in[j])); - j += decimation (); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.h b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.h deleted file mode 100644 index 706d9460..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py Any changes made to this file - * will be overwritten. - */ - -#ifndef INCLUDED_GR_FREQ_XLATING_FIR_FILTER_CCC_H -#define INCLUDED_GR_FREQ_XLATING_FIR_FILTER_CCC_H - -#include -#include - -class gr_freq_xlating_fir_filter_ccc; -typedef boost::shared_ptr gr_freq_xlating_fir_filter_ccc_sptr; - -/*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ -gr_freq_xlating_fir_filter_ccc_sptr -gr_make_freq_xlating_fir_filter_ccc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_fir_ccc; - -/*! - * \brief FIR filter combined with frequency translation with gr_complex input, gr_complex output and gr_complex taps - * \ingroup filter_blk - * - * This class efficiently combines a frequency translation - * (typically "down conversion") with a FIR filter (typically low-pass) - * and decimation. It is ideally suited for a "channel selection filter" - * and can be efficiently used to select and decimate a narrow band signal - * out of wide bandwidth input. - * - * Uses a single input array to produce a single output array. - * Additional inputs and/or outputs are ignored. - */ -class gr_freq_xlating_fir_filter_ccc : public gr_sync_decimator -{ - public: - virtual ~gr_freq_xlating_fir_filter_ccc (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - private: - friend gr_freq_xlating_fir_filter_ccc_sptr - gr_make_freq_xlating_fir_filter_ccc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - protected: - std::vector d_proto_taps; - gr_fir_ccc *d_composite_fir; - gr_rotator d_r; - double d_center_freq; - double d_sampling_freq; - bool d_updated; - - virtual void build_composite_fir (); - - /*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ - gr_freq_xlating_fir_filter_ccc (int decimation, - const std::vector &taps, - double center_freq, double sampling_freq); -}; - -#endif /* _gr_freq_xlating_fir_filter_ccc_H_ */ diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.i b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.i deleted file mode 100644 index 0b981f52..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccc.i +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,freq_xlating_fir_filter_ccc) - -gr_freq_xlating_fir_filter_ccc_sptr -gr_make_freq_xlating_fir_filter_ccc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_freq_xlating_fir_filter_ccc : public gr_sync_decimator -{ - protected: - gr_freq_xlating_fir_filter_ccc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - public: - ~gr_freq_xlating_fir_filter_ccc (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.cc b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.cc deleted file mode 100644 index 6f3d9876..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.cc +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_freq_xlating_fir_filter_ccf_sptr -gr_make_freq_xlating_fir_filter_ccf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq) -{ - return gr_freq_xlating_fir_filter_ccf_sptr (new gr_freq_xlating_fir_filter_ccf (decimation, taps, center_freq, sampling_freq)); -} - - -gr_freq_xlating_fir_filter_ccf::gr_freq_xlating_fir_filter_ccf ( - - int decimation, - const std::vector &taps, - double center_freq, - double sampling_freq) - - : gr_sync_decimator ("freq_xlating_fir_filter_ccf", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_proto_taps (taps), d_center_freq (center_freq), d_sampling_freq (sampling_freq), - d_updated (false) -{ - std::vector dummy_taps; - d_composite_fir = gr_fir_util::create_gr_fir_ccc (dummy_taps); - - set_history (d_proto_taps.size ()); - build_composite_fir (); -} - -gr_freq_xlating_fir_filter_ccf::~gr_freq_xlating_fir_filter_ccf () -{ - delete d_composite_fir; -} - -void -gr_freq_xlating_fir_filter_ccf::build_composite_fir () -{ - std::vector ctaps (d_proto_taps.size ()); - - float fwT0 = 2 * M_PI * d_center_freq / d_sampling_freq; - for (unsigned int i = 0; i < d_proto_taps.size (); i++) - ctaps[i] = d_proto_taps[i] * exp (gr_complex (0, i * fwT0)); - - d_composite_fir->set_taps (gr_reverse(ctaps)); - d_r.set_phase_incr (exp (gr_complex (0, fwT0 * decimation ()))); -} - -void -gr_freq_xlating_fir_filter_ccf::set_center_freq (double center_freq) -{ - d_center_freq = center_freq; - d_updated = true; -} - -void -gr_freq_xlating_fir_filter_ccf::set_taps (const std::vector &taps) -{ - d_proto_taps = taps; - d_updated = true; -} - -int -gr_freq_xlating_fir_filter_ccf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *in = (gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - // rebuild composite FIR if the center freq has changed - - if (d_updated){ - set_history (d_proto_taps.size ()); - build_composite_fir (); - d_updated = false; - return 0; // history requirements may have changed. - } - - unsigned j = 0; - for (int i = 0; i < noutput_items; i++){ - out[i] = d_r.rotate (d_composite_fir->filter (&in[j])); - j += decimation (); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.h b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.h deleted file mode 100644 index 681d82bb..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py Any changes made to this file - * will be overwritten. - */ - -#ifndef INCLUDED_GR_FREQ_XLATING_FIR_FILTER_CCF_H -#define INCLUDED_GR_FREQ_XLATING_FIR_FILTER_CCF_H - -#include -#include - -class gr_freq_xlating_fir_filter_ccf; -typedef boost::shared_ptr gr_freq_xlating_fir_filter_ccf_sptr; - -/*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ -gr_freq_xlating_fir_filter_ccf_sptr -gr_make_freq_xlating_fir_filter_ccf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_fir_ccc; - -/*! - * \brief FIR filter combined with frequency translation with gr_complex input, gr_complex output and float taps - * \ingroup filter_blk - * - * This class efficiently combines a frequency translation - * (typically "down conversion") with a FIR filter (typically low-pass) - * and decimation. It is ideally suited for a "channel selection filter" - * and can be efficiently used to select and decimate a narrow band signal - * out of wide bandwidth input. - * - * Uses a single input array to produce a single output array. - * Additional inputs and/or outputs are ignored. - */ -class gr_freq_xlating_fir_filter_ccf : public gr_sync_decimator -{ - public: - virtual ~gr_freq_xlating_fir_filter_ccf (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - private: - friend gr_freq_xlating_fir_filter_ccf_sptr - gr_make_freq_xlating_fir_filter_ccf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - protected: - std::vector d_proto_taps; - gr_fir_ccc *d_composite_fir; - gr_rotator d_r; - double d_center_freq; - double d_sampling_freq; - bool d_updated; - - virtual void build_composite_fir (); - - /*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ - gr_freq_xlating_fir_filter_ccf (int decimation, - const std::vector &taps, - double center_freq, double sampling_freq); -}; - -#endif /* _gr_freq_xlating_fir_filter_ccf_H_ */ diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.i b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.i deleted file mode 100644 index 84e38594..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_ccf.i +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,freq_xlating_fir_filter_ccf) - -gr_freq_xlating_fir_filter_ccf_sptr -gr_make_freq_xlating_fir_filter_ccf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_freq_xlating_fir_filter_ccf : public gr_sync_decimator -{ - protected: - gr_freq_xlating_fir_filter_ccf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - public: - ~gr_freq_xlating_fir_filter_ccf (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.cc b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.cc deleted file mode 100644 index 9adb8701..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.cc +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_freq_xlating_fir_filter_fcc_sptr -gr_make_freq_xlating_fir_filter_fcc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq) -{ - return gr_freq_xlating_fir_filter_fcc_sptr (new gr_freq_xlating_fir_filter_fcc (decimation, taps, center_freq, sampling_freq)); -} - - -gr_freq_xlating_fir_filter_fcc::gr_freq_xlating_fir_filter_fcc ( - - int decimation, - const std::vector &taps, - double center_freq, - double sampling_freq) - - : gr_sync_decimator ("freq_xlating_fir_filter_fcc", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_proto_taps (taps), d_center_freq (center_freq), d_sampling_freq (sampling_freq), - d_updated (false) -{ - std::vector dummy_taps; - d_composite_fir = gr_fir_util::create_gr_fir_fcc (dummy_taps); - - set_history (d_proto_taps.size ()); - build_composite_fir (); -} - -gr_freq_xlating_fir_filter_fcc::~gr_freq_xlating_fir_filter_fcc () -{ - delete d_composite_fir; -} - -void -gr_freq_xlating_fir_filter_fcc::build_composite_fir () -{ - std::vector ctaps (d_proto_taps.size ()); - - float fwT0 = 2 * M_PI * d_center_freq / d_sampling_freq; - for (unsigned int i = 0; i < d_proto_taps.size (); i++) - ctaps[i] = d_proto_taps[i] * exp (gr_complex (0, i * fwT0)); - - d_composite_fir->set_taps (gr_reverse(ctaps)); - d_r.set_phase_incr (exp (gr_complex (0, fwT0 * decimation ()))); -} - -void -gr_freq_xlating_fir_filter_fcc::set_center_freq (double center_freq) -{ - d_center_freq = center_freq; - d_updated = true; -} - -void -gr_freq_xlating_fir_filter_fcc::set_taps (const std::vector &taps) -{ - d_proto_taps = taps; - d_updated = true; -} - -int -gr_freq_xlating_fir_filter_fcc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *in = (float *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - // rebuild composite FIR if the center freq has changed - - if (d_updated){ - set_history (d_proto_taps.size ()); - build_composite_fir (); - d_updated = false; - return 0; // history requirements may have changed. - } - - unsigned j = 0; - for (int i = 0; i < noutput_items; i++){ - out[i] = d_r.rotate (d_composite_fir->filter (&in[j])); - j += decimation (); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.h b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.h deleted file mode 100644 index 0087fb8d..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py Any changes made to this file - * will be overwritten. - */ - -#ifndef INCLUDED_GR_FREQ_XLATING_FIR_FILTER_FCC_H -#define INCLUDED_GR_FREQ_XLATING_FIR_FILTER_FCC_H - -#include -#include - -class gr_freq_xlating_fir_filter_fcc; -typedef boost::shared_ptr gr_freq_xlating_fir_filter_fcc_sptr; - -/*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ -gr_freq_xlating_fir_filter_fcc_sptr -gr_make_freq_xlating_fir_filter_fcc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_fir_fcc; - -/*! - * \brief FIR filter combined with frequency translation with float input, gr_complex output and gr_complex taps - * \ingroup filter_blk - * - * This class efficiently combines a frequency translation - * (typically "down conversion") with a FIR filter (typically low-pass) - * and decimation. It is ideally suited for a "channel selection filter" - * and can be efficiently used to select and decimate a narrow band signal - * out of wide bandwidth input. - * - * Uses a single input array to produce a single output array. - * Additional inputs and/or outputs are ignored. - */ -class gr_freq_xlating_fir_filter_fcc : public gr_sync_decimator -{ - public: - virtual ~gr_freq_xlating_fir_filter_fcc (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - private: - friend gr_freq_xlating_fir_filter_fcc_sptr - gr_make_freq_xlating_fir_filter_fcc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - protected: - std::vector d_proto_taps; - gr_fir_fcc *d_composite_fir; - gr_rotator d_r; - double d_center_freq; - double d_sampling_freq; - bool d_updated; - - virtual void build_composite_fir (); - - /*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ - gr_freq_xlating_fir_filter_fcc (int decimation, - const std::vector &taps, - double center_freq, double sampling_freq); -}; - -#endif /* _gr_freq_xlating_fir_filter_fcc_H_ */ diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.i b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.i deleted file mode 100644 index 7af521d9..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcc.i +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,freq_xlating_fir_filter_fcc) - -gr_freq_xlating_fir_filter_fcc_sptr -gr_make_freq_xlating_fir_filter_fcc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_freq_xlating_fir_filter_fcc : public gr_sync_decimator -{ - protected: - gr_freq_xlating_fir_filter_fcc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - public: - ~gr_freq_xlating_fir_filter_fcc (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.cc b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.cc deleted file mode 100644 index ac1bcbd3..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.cc +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_freq_xlating_fir_filter_fcf_sptr -gr_make_freq_xlating_fir_filter_fcf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq) -{ - return gr_freq_xlating_fir_filter_fcf_sptr (new gr_freq_xlating_fir_filter_fcf (decimation, taps, center_freq, sampling_freq)); -} - - -gr_freq_xlating_fir_filter_fcf::gr_freq_xlating_fir_filter_fcf ( - - int decimation, - const std::vector &taps, - double center_freq, - double sampling_freq) - - : gr_sync_decimator ("freq_xlating_fir_filter_fcf", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_proto_taps (taps), d_center_freq (center_freq), d_sampling_freq (sampling_freq), - d_updated (false) -{ - std::vector dummy_taps; - d_composite_fir = gr_fir_util::create_gr_fir_fcc (dummy_taps); - - set_history (d_proto_taps.size ()); - build_composite_fir (); -} - -gr_freq_xlating_fir_filter_fcf::~gr_freq_xlating_fir_filter_fcf () -{ - delete d_composite_fir; -} - -void -gr_freq_xlating_fir_filter_fcf::build_composite_fir () -{ - std::vector ctaps (d_proto_taps.size ()); - - float fwT0 = 2 * M_PI * d_center_freq / d_sampling_freq; - for (unsigned int i = 0; i < d_proto_taps.size (); i++) - ctaps[i] = d_proto_taps[i] * exp (gr_complex (0, i * fwT0)); - - d_composite_fir->set_taps (gr_reverse(ctaps)); - d_r.set_phase_incr (exp (gr_complex (0, fwT0 * decimation ()))); -} - -void -gr_freq_xlating_fir_filter_fcf::set_center_freq (double center_freq) -{ - d_center_freq = center_freq; - d_updated = true; -} - -void -gr_freq_xlating_fir_filter_fcf::set_taps (const std::vector &taps) -{ - d_proto_taps = taps; - d_updated = true; -} - -int -gr_freq_xlating_fir_filter_fcf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *in = (float *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - // rebuild composite FIR if the center freq has changed - - if (d_updated){ - set_history (d_proto_taps.size ()); - build_composite_fir (); - d_updated = false; - return 0; // history requirements may have changed. - } - - unsigned j = 0; - for (int i = 0; i < noutput_items; i++){ - out[i] = d_r.rotate (d_composite_fir->filter (&in[j])); - j += decimation (); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.h b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.h deleted file mode 100644 index 760ce0ee..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py Any changes made to this file - * will be overwritten. - */ - -#ifndef INCLUDED_GR_FREQ_XLATING_FIR_FILTER_FCF_H -#define INCLUDED_GR_FREQ_XLATING_FIR_FILTER_FCF_H - -#include -#include - -class gr_freq_xlating_fir_filter_fcf; -typedef boost::shared_ptr gr_freq_xlating_fir_filter_fcf_sptr; - -/*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ -gr_freq_xlating_fir_filter_fcf_sptr -gr_make_freq_xlating_fir_filter_fcf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_fir_fcc; - -/*! - * \brief FIR filter combined with frequency translation with float input, gr_complex output and float taps - * \ingroup filter_blk - * - * This class efficiently combines a frequency translation - * (typically "down conversion") with a FIR filter (typically low-pass) - * and decimation. It is ideally suited for a "channel selection filter" - * and can be efficiently used to select and decimate a narrow band signal - * out of wide bandwidth input. - * - * Uses a single input array to produce a single output array. - * Additional inputs and/or outputs are ignored. - */ -class gr_freq_xlating_fir_filter_fcf : public gr_sync_decimator -{ - public: - virtual ~gr_freq_xlating_fir_filter_fcf (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - private: - friend gr_freq_xlating_fir_filter_fcf_sptr - gr_make_freq_xlating_fir_filter_fcf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - protected: - std::vector d_proto_taps; - gr_fir_fcc *d_composite_fir; - gr_rotator d_r; - double d_center_freq; - double d_sampling_freq; - bool d_updated; - - virtual void build_composite_fir (); - - /*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ - gr_freq_xlating_fir_filter_fcf (int decimation, - const std::vector &taps, - double center_freq, double sampling_freq); -}; - -#endif /* _gr_freq_xlating_fir_filter_fcf_H_ */ diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.i b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.i deleted file mode 100644 index fa31a074..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_fcf.i +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,freq_xlating_fir_filter_fcf) - -gr_freq_xlating_fir_filter_fcf_sptr -gr_make_freq_xlating_fir_filter_fcf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_freq_xlating_fir_filter_fcf : public gr_sync_decimator -{ - protected: - gr_freq_xlating_fir_filter_fcf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - public: - ~gr_freq_xlating_fir_filter_fcf (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.cc b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.cc deleted file mode 100644 index f274378e..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.cc +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_freq_xlating_fir_filter_scc_sptr -gr_make_freq_xlating_fir_filter_scc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq) -{ - return gr_freq_xlating_fir_filter_scc_sptr (new gr_freq_xlating_fir_filter_scc (decimation, taps, center_freq, sampling_freq)); -} - - -gr_freq_xlating_fir_filter_scc::gr_freq_xlating_fir_filter_scc ( - - int decimation, - const std::vector &taps, - double center_freq, - double sampling_freq) - - : gr_sync_decimator ("freq_xlating_fir_filter_scc", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_proto_taps (taps), d_center_freq (center_freq), d_sampling_freq (sampling_freq), - d_updated (false) -{ - std::vector dummy_taps; - d_composite_fir = gr_fir_util::create_gr_fir_scc (dummy_taps); - - set_history (d_proto_taps.size ()); - build_composite_fir (); -} - -gr_freq_xlating_fir_filter_scc::~gr_freq_xlating_fir_filter_scc () -{ - delete d_composite_fir; -} - -void -gr_freq_xlating_fir_filter_scc::build_composite_fir () -{ - std::vector ctaps (d_proto_taps.size ()); - - float fwT0 = 2 * M_PI * d_center_freq / d_sampling_freq; - for (unsigned int i = 0; i < d_proto_taps.size (); i++) - ctaps[i] = d_proto_taps[i] * exp (gr_complex (0, i * fwT0)); - - d_composite_fir->set_taps (gr_reverse(ctaps)); - d_r.set_phase_incr (exp (gr_complex (0, fwT0 * decimation ()))); -} - -void -gr_freq_xlating_fir_filter_scc::set_center_freq (double center_freq) -{ - d_center_freq = center_freq; - d_updated = true; -} - -void -gr_freq_xlating_fir_filter_scc::set_taps (const std::vector &taps) -{ - d_proto_taps = taps; - d_updated = true; -} - -int -gr_freq_xlating_fir_filter_scc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *in = (short *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - // rebuild composite FIR if the center freq has changed - - if (d_updated){ - set_history (d_proto_taps.size ()); - build_composite_fir (); - d_updated = false; - return 0; // history requirements may have changed. - } - - unsigned j = 0; - for (int i = 0; i < noutput_items; i++){ - out[i] = d_r.rotate (d_composite_fir->filter (&in[j])); - j += decimation (); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.h b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.h deleted file mode 100644 index 012bc1d5..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py Any changes made to this file - * will be overwritten. - */ - -#ifndef INCLUDED_GR_FREQ_XLATING_FIR_FILTER_SCC_H -#define INCLUDED_GR_FREQ_XLATING_FIR_FILTER_SCC_H - -#include -#include - -class gr_freq_xlating_fir_filter_scc; -typedef boost::shared_ptr gr_freq_xlating_fir_filter_scc_sptr; - -/*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ -gr_freq_xlating_fir_filter_scc_sptr -gr_make_freq_xlating_fir_filter_scc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_fir_scc; - -/*! - * \brief FIR filter combined with frequency translation with short input, gr_complex output and gr_complex taps - * \ingroup filter_blk - * - * This class efficiently combines a frequency translation - * (typically "down conversion") with a FIR filter (typically low-pass) - * and decimation. It is ideally suited for a "channel selection filter" - * and can be efficiently used to select and decimate a narrow band signal - * out of wide bandwidth input. - * - * Uses a single input array to produce a single output array. - * Additional inputs and/or outputs are ignored. - */ -class gr_freq_xlating_fir_filter_scc : public gr_sync_decimator -{ - public: - virtual ~gr_freq_xlating_fir_filter_scc (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - private: - friend gr_freq_xlating_fir_filter_scc_sptr - gr_make_freq_xlating_fir_filter_scc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - protected: - std::vector d_proto_taps; - gr_fir_scc *d_composite_fir; - gr_rotator d_r; - double d_center_freq; - double d_sampling_freq; - bool d_updated; - - virtual void build_composite_fir (); - - /*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ - gr_freq_xlating_fir_filter_scc (int decimation, - const std::vector &taps, - double center_freq, double sampling_freq); -}; - -#endif /* _gr_freq_xlating_fir_filter_scc_H_ */ diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.i b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.i deleted file mode 100644 index 202df87e..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scc.i +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,freq_xlating_fir_filter_scc) - -gr_freq_xlating_fir_filter_scc_sptr -gr_make_freq_xlating_fir_filter_scc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_freq_xlating_fir_filter_scc : public gr_sync_decimator -{ - protected: - gr_freq_xlating_fir_filter_scc (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - public: - ~gr_freq_xlating_fir_filter_scc (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.cc b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.cc deleted file mode 100644 index 96f94245..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.cc +++ /dev/null @@ -1,123 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -gr_freq_xlating_fir_filter_scf_sptr -gr_make_freq_xlating_fir_filter_scf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq) -{ - return gr_freq_xlating_fir_filter_scf_sptr (new gr_freq_xlating_fir_filter_scf (decimation, taps, center_freq, sampling_freq)); -} - - -gr_freq_xlating_fir_filter_scf::gr_freq_xlating_fir_filter_scf ( - - int decimation, - const std::vector &taps, - double center_freq, - double sampling_freq) - - : gr_sync_decimator ("freq_xlating_fir_filter_scf", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decimation), - d_proto_taps (taps), d_center_freq (center_freq), d_sampling_freq (sampling_freq), - d_updated (false) -{ - std::vector dummy_taps; - d_composite_fir = gr_fir_util::create_gr_fir_scc (dummy_taps); - - set_history (d_proto_taps.size ()); - build_composite_fir (); -} - -gr_freq_xlating_fir_filter_scf::~gr_freq_xlating_fir_filter_scf () -{ - delete d_composite_fir; -} - -void -gr_freq_xlating_fir_filter_scf::build_composite_fir () -{ - std::vector ctaps (d_proto_taps.size ()); - - float fwT0 = 2 * M_PI * d_center_freq / d_sampling_freq; - for (unsigned int i = 0; i < d_proto_taps.size (); i++) - ctaps[i] = d_proto_taps[i] * exp (gr_complex (0, i * fwT0)); - - d_composite_fir->set_taps (gr_reverse(ctaps)); - d_r.set_phase_incr (exp (gr_complex (0, fwT0 * decimation ()))); -} - -void -gr_freq_xlating_fir_filter_scf::set_center_freq (double center_freq) -{ - d_center_freq = center_freq; - d_updated = true; -} - -void -gr_freq_xlating_fir_filter_scf::set_taps (const std::vector &taps) -{ - d_proto_taps = taps; - d_updated = true; -} - -int -gr_freq_xlating_fir_filter_scf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *in = (short *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - // rebuild composite FIR if the center freq has changed - - if (d_updated){ - set_history (d_proto_taps.size ()); - build_composite_fir (); - d_updated = false; - return 0; // history requirements may have changed. - } - - unsigned j = 0; - for (int i = 0; i < noutput_items; i++){ - out[i] = d_r.rotate (d_composite_fir->filter (&in[j])); - j += decimation (); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.h b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.h deleted file mode 100644 index e8cb02aa..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.h +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2002,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py Any changes made to this file - * will be overwritten. - */ - -#ifndef INCLUDED_GR_FREQ_XLATING_FIR_FILTER_SCF_H -#define INCLUDED_GR_FREQ_XLATING_FIR_FILTER_SCF_H - -#include -#include - -class gr_freq_xlating_fir_filter_scf; -typedef boost::shared_ptr gr_freq_xlating_fir_filter_scf_sptr; - -/*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ -gr_freq_xlating_fir_filter_scf_sptr -gr_make_freq_xlating_fir_filter_scf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_fir_scc; - -/*! - * \brief FIR filter combined with frequency translation with short input, gr_complex output and float taps - * \ingroup filter_blk - * - * This class efficiently combines a frequency translation - * (typically "down conversion") with a FIR filter (typically low-pass) - * and decimation. It is ideally suited for a "channel selection filter" - * and can be efficiently used to select and decimate a narrow band signal - * out of wide bandwidth input. - * - * Uses a single input array to produce a single output array. - * Additional inputs and/or outputs are ignored. - */ -class gr_freq_xlating_fir_filter_scf : public gr_sync_decimator -{ - public: - virtual ~gr_freq_xlating_fir_filter_scf (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - private: - friend gr_freq_xlating_fir_filter_scf_sptr - gr_make_freq_xlating_fir_filter_scf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - protected: - std::vector d_proto_taps; - gr_fir_scc *d_composite_fir; - gr_rotator d_r; - double d_center_freq; - double d_sampling_freq; - bool d_updated; - - virtual void build_composite_fir (); - - /*! - * Construct a FIR filter with the given taps and a composite frequency - * translation that shifts center_freq down to zero Hz. The frequency - * translation logically comes before the filtering operation. - */ - gr_freq_xlating_fir_filter_scf (int decimation, - const std::vector &taps, - double center_freq, double sampling_freq); -}; - -#endif /* _gr_freq_xlating_fir_filter_scf_H_ */ diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.i b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.i deleted file mode 100644 index 6c128f50..00000000 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_scf.i +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2003,2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_freq_xlating_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,freq_xlating_fir_filter_scf) - -gr_freq_xlating_fir_filter_scf_sptr -gr_make_freq_xlating_fir_filter_scf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - -class gr_freq_xlating_fir_filter_scf : public gr_sync_decimator -{ - protected: - gr_freq_xlating_fir_filter_scf (int decimation, const std::vector &taps, - double center_freq, double sampling_freq); - - public: - ~gr_freq_xlating_fir_filter_scf (); - - void set_center_freq (double center_freq); - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.cc b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.cc deleted file mode 100644 index f1550ad2..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.cc +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_interp_fir_filter_ccc_sptr gr_make_interp_fir_filter_ccc (unsigned interpolation, const std::vector &taps) -{ - return gr_interp_fir_filter_ccc_sptr (new gr_interp_fir_filter_ccc (interpolation, taps)); -} - - -gr_interp_fir_filter_ccc::gr_interp_fir_filter_ccc (unsigned interpolation, const std::vector &taps) - : gr_sync_interpolator ("interp_fir_filter_ccc", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - interpolation), - d_updated (false), d_firs (interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_ccc (dummy_taps); - - set_taps (taps); - install_taps(d_new_taps); -} - -gr_interp_fir_filter_ccc::~gr_interp_fir_filter_ccc () -{ - int interp = interpolation (); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_interp_fir_filter_ccc::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_interp_fir_filter_ccc::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -int -gr_interp_fir_filter_ccc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const gr_complex *in = (const gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirements may have changed. - } - - int nfilters = interpolation (); - int ni = noutput_items / interpolation (); - - for (int i = 0; i < ni; i++){ - for (int nf = 0; nf < nfilters; nf++) - out[nf] = d_firs[nf]->filter (&in[i]); - out += nfilters; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.h b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.h deleted file mode 100644 index 24cd3745..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_INTERP_FIR_FILTER_CCC_H -#define INCLUDED_GR_INTERP_FIR_FILTER_CCC_H - -#include - -class gr_interp_fir_filter_ccc; -typedef boost::shared_ptr gr_interp_fir_filter_ccc_sptr; -gr_interp_fir_filter_ccc_sptr gr_make_interp_fir_filter_ccc (unsigned interpolation, const std::vector &taps); - -class gr_fir_ccc; - -/*! - * \brief Interpolating FIR filter with gr_complex input, gr_complex output and gr_complex taps - * \ingroup filter_blk - */ -class gr_interp_fir_filter_ccc : public gr_sync_interpolator -{ - private: - friend gr_interp_fir_filter_ccc_sptr gr_make_interp_fir_filter_ccc (unsigned interpolation, const std::vector &taps); - - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - /*! - * Construct a FIR filter with the given taps - */ - gr_interp_fir_filter_ccc (unsigned interpolation, const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_interp_fir_filter_ccc (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_interp_fir_filter_ccc.i b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.i deleted file mode 100644 index f128b68b..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccc.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,interp_fir_filter_ccc) - -gr_interp_fir_filter_ccc_sptr gr_make_interp_fir_filter_ccc (int interpolation, const std::vector &taps); - -class gr_interp_fir_filter_ccc : public gr_sync_interpolator -{ - private: - gr_interp_fir_filter_ccc (int interpolation, const std::vector &taps); - - public: - ~gr_interp_fir_filter_ccc (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.cc b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.cc deleted file mode 100644 index 00eed72d..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.cc +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_interp_fir_filter_ccf_sptr gr_make_interp_fir_filter_ccf (unsigned interpolation, const std::vector &taps) -{ - return gr_interp_fir_filter_ccf_sptr (new gr_interp_fir_filter_ccf (interpolation, taps)); -} - - -gr_interp_fir_filter_ccf::gr_interp_fir_filter_ccf (unsigned interpolation, const std::vector &taps) - : gr_sync_interpolator ("interp_fir_filter_ccf", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - interpolation), - d_updated (false), d_firs (interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_ccf (dummy_taps); - - set_taps (taps); - install_taps(d_new_taps); -} - -gr_interp_fir_filter_ccf::~gr_interp_fir_filter_ccf () -{ - int interp = interpolation (); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_interp_fir_filter_ccf::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_interp_fir_filter_ccf::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -int -gr_interp_fir_filter_ccf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const gr_complex *in = (const gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirements may have changed. - } - - int nfilters = interpolation (); - int ni = noutput_items / interpolation (); - - for (int i = 0; i < ni; i++){ - for (int nf = 0; nf < nfilters; nf++) - out[nf] = d_firs[nf]->filter (&in[i]); - out += nfilters; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.h b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.h deleted file mode 100644 index bc97de98..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_INTERP_FIR_FILTER_CCF_H -#define INCLUDED_GR_INTERP_FIR_FILTER_CCF_H - -#include - -class gr_interp_fir_filter_ccf; -typedef boost::shared_ptr gr_interp_fir_filter_ccf_sptr; -gr_interp_fir_filter_ccf_sptr gr_make_interp_fir_filter_ccf (unsigned interpolation, const std::vector &taps); - -class gr_fir_ccf; - -/*! - * \brief Interpolating FIR filter with gr_complex input, gr_complex output and float taps - * \ingroup filter_blk - */ -class gr_interp_fir_filter_ccf : public gr_sync_interpolator -{ - private: - friend gr_interp_fir_filter_ccf_sptr gr_make_interp_fir_filter_ccf (unsigned interpolation, const std::vector &taps); - - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - /*! - * Construct a FIR filter with the given taps - */ - gr_interp_fir_filter_ccf (unsigned interpolation, const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_interp_fir_filter_ccf (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_interp_fir_filter_ccf.i b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.i deleted file mode 100644 index d174601f..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_ccf.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,interp_fir_filter_ccf) - -gr_interp_fir_filter_ccf_sptr gr_make_interp_fir_filter_ccf (int interpolation, const std::vector &taps); - -class gr_interp_fir_filter_ccf : public gr_sync_interpolator -{ - private: - gr_interp_fir_filter_ccf (int interpolation, const std::vector &taps); - - public: - ~gr_interp_fir_filter_ccf (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.cc b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.cc deleted file mode 100644 index deaf8758..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.cc +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_interp_fir_filter_fcc_sptr gr_make_interp_fir_filter_fcc (unsigned interpolation, const std::vector &taps) -{ - return gr_interp_fir_filter_fcc_sptr (new gr_interp_fir_filter_fcc (interpolation, taps)); -} - - -gr_interp_fir_filter_fcc::gr_interp_fir_filter_fcc (unsigned interpolation, const std::vector &taps) - : gr_sync_interpolator ("interp_fir_filter_fcc", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - interpolation), - d_updated (false), d_firs (interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_fcc (dummy_taps); - - set_taps (taps); - install_taps(d_new_taps); -} - -gr_interp_fir_filter_fcc::~gr_interp_fir_filter_fcc () -{ - int interp = interpolation (); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_interp_fir_filter_fcc::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_interp_fir_filter_fcc::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -int -gr_interp_fir_filter_fcc::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]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirements may have changed. - } - - int nfilters = interpolation (); - int ni = noutput_items / interpolation (); - - for (int i = 0; i < ni; i++){ - for (int nf = 0; nf < nfilters; nf++) - out[nf] = d_firs[nf]->filter (&in[i]); - out += nfilters; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.h b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.h deleted file mode 100644 index f4dee3d6..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_INTERP_FIR_FILTER_FCC_H -#define INCLUDED_GR_INTERP_FIR_FILTER_FCC_H - -#include - -class gr_interp_fir_filter_fcc; -typedef boost::shared_ptr gr_interp_fir_filter_fcc_sptr; -gr_interp_fir_filter_fcc_sptr gr_make_interp_fir_filter_fcc (unsigned interpolation, const std::vector &taps); - -class gr_fir_fcc; - -/*! - * \brief Interpolating FIR filter with float input, gr_complex output and gr_complex taps - * \ingroup filter_blk - */ -class gr_interp_fir_filter_fcc : public gr_sync_interpolator -{ - private: - friend gr_interp_fir_filter_fcc_sptr gr_make_interp_fir_filter_fcc (unsigned interpolation, const std::vector &taps); - - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - /*! - * Construct a FIR filter with the given taps - */ - gr_interp_fir_filter_fcc (unsigned interpolation, const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_interp_fir_filter_fcc (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_interp_fir_filter_fcc.i b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.i deleted file mode 100644 index 126bf361..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fcc.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,interp_fir_filter_fcc) - -gr_interp_fir_filter_fcc_sptr gr_make_interp_fir_filter_fcc (int interpolation, const std::vector &taps); - -class gr_interp_fir_filter_fcc : public gr_sync_interpolator -{ - private: - gr_interp_fir_filter_fcc (int interpolation, const std::vector &taps); - - public: - ~gr_interp_fir_filter_fcc (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.cc b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.cc deleted file mode 100644 index 51d76b1e..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.cc +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_interp_fir_filter_fff_sptr gr_make_interp_fir_filter_fff (unsigned interpolation, const std::vector &taps) -{ - return gr_interp_fir_filter_fff_sptr (new gr_interp_fir_filter_fff (interpolation, taps)); -} - - -gr_interp_fir_filter_fff::gr_interp_fir_filter_fff (unsigned interpolation, const std::vector &taps) - : gr_sync_interpolator ("interp_fir_filter_fff", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (float)), - interpolation), - d_updated (false), d_firs (interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_fff (dummy_taps); - - set_taps (taps); - install_taps(d_new_taps); -} - -gr_interp_fir_filter_fff::~gr_interp_fir_filter_fff () -{ - int interp = interpolation (); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_interp_fir_filter_fff::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_interp_fir_filter_fff::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -int -gr_interp_fir_filter_fff::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]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirements may have changed. - } - - int nfilters = interpolation (); - int ni = noutput_items / interpolation (); - - for (int i = 0; i < ni; i++){ - for (int nf = 0; nf < nfilters; nf++) - out[nf] = d_firs[nf]->filter (&in[i]); - out += nfilters; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.h b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.h deleted file mode 100644 index 176c5228..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_INTERP_FIR_FILTER_FFF_H -#define INCLUDED_GR_INTERP_FIR_FILTER_FFF_H - -#include - -class gr_interp_fir_filter_fff; -typedef boost::shared_ptr gr_interp_fir_filter_fff_sptr; -gr_interp_fir_filter_fff_sptr gr_make_interp_fir_filter_fff (unsigned interpolation, const std::vector &taps); - -class gr_fir_fff; - -/*! - * \brief Interpolating FIR filter with float input, float output and float taps - * \ingroup filter_blk - */ -class gr_interp_fir_filter_fff : public gr_sync_interpolator -{ - private: - friend gr_interp_fir_filter_fff_sptr gr_make_interp_fir_filter_fff (unsigned interpolation, const std::vector &taps); - - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - /*! - * Construct a FIR filter with the given taps - */ - gr_interp_fir_filter_fff (unsigned interpolation, const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_interp_fir_filter_fff (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_interp_fir_filter_fff.i b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.i deleted file mode 100644 index 96f42911..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fff.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,interp_fir_filter_fff) - -gr_interp_fir_filter_fff_sptr gr_make_interp_fir_filter_fff (int interpolation, const std::vector &taps); - -class gr_interp_fir_filter_fff : public gr_sync_interpolator -{ - private: - gr_interp_fir_filter_fff (int interpolation, const std::vector &taps); - - public: - ~gr_interp_fir_filter_fff (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.cc b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.cc deleted file mode 100644 index dcdb3fd8..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.cc +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_interp_fir_filter_fsf_sptr gr_make_interp_fir_filter_fsf (unsigned interpolation, const std::vector &taps) -{ - return gr_interp_fir_filter_fsf_sptr (new gr_interp_fir_filter_fsf (interpolation, taps)); -} - - -gr_interp_fir_filter_fsf::gr_interp_fir_filter_fsf (unsigned interpolation, const std::vector &taps) - : gr_sync_interpolator ("interp_fir_filter_fsf", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (short)), - interpolation), - d_updated (false), d_firs (interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_fsf (dummy_taps); - - set_taps (taps); - install_taps(d_new_taps); -} - -gr_interp_fir_filter_fsf::~gr_interp_fir_filter_fsf () -{ - int interp = interpolation (); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_interp_fir_filter_fsf::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_interp_fir_filter_fsf::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -int -gr_interp_fir_filter_fsf::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]; - short *out = (short *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirements may have changed. - } - - int nfilters = interpolation (); - int ni = noutput_items / interpolation (); - - for (int i = 0; i < ni; i++){ - for (int nf = 0; nf < nfilters; nf++) - out[nf] = d_firs[nf]->filter (&in[i]); - out += nfilters; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.h b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.h deleted file mode 100644 index de7333bd..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_INTERP_FIR_FILTER_FSF_H -#define INCLUDED_GR_INTERP_FIR_FILTER_FSF_H - -#include - -class gr_interp_fir_filter_fsf; -typedef boost::shared_ptr gr_interp_fir_filter_fsf_sptr; -gr_interp_fir_filter_fsf_sptr gr_make_interp_fir_filter_fsf (unsigned interpolation, const std::vector &taps); - -class gr_fir_fsf; - -/*! - * \brief Interpolating FIR filter with float input, short output and float taps - * \ingroup filter_blk - */ -class gr_interp_fir_filter_fsf : public gr_sync_interpolator -{ - private: - friend gr_interp_fir_filter_fsf_sptr gr_make_interp_fir_filter_fsf (unsigned interpolation, const std::vector &taps); - - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - /*! - * Construct a FIR filter with the given taps - */ - gr_interp_fir_filter_fsf (unsigned interpolation, const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_interp_fir_filter_fsf (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_interp_fir_filter_fsf.i b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.i deleted file mode 100644 index 6861db47..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_fsf.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,interp_fir_filter_fsf) - -gr_interp_fir_filter_fsf_sptr gr_make_interp_fir_filter_fsf (int interpolation, const std::vector &taps); - -class gr_interp_fir_filter_fsf : public gr_sync_interpolator -{ - private: - gr_interp_fir_filter_fsf (int interpolation, const std::vector &taps); - - public: - ~gr_interp_fir_filter_fsf (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.cc b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.cc deleted file mode 100644 index 65cf2ece..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.cc +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_interp_fir_filter_scc_sptr gr_make_interp_fir_filter_scc (unsigned interpolation, const std::vector &taps) -{ - return gr_interp_fir_filter_scc_sptr (new gr_interp_fir_filter_scc (interpolation, taps)); -} - - -gr_interp_fir_filter_scc::gr_interp_fir_filter_scc (unsigned interpolation, const std::vector &taps) - : gr_sync_interpolator ("interp_fir_filter_scc", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - interpolation), - d_updated (false), d_firs (interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_scc (dummy_taps); - - set_taps (taps); - install_taps(d_new_taps); -} - -gr_interp_fir_filter_scc::~gr_interp_fir_filter_scc () -{ - int interp = interpolation (); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_interp_fir_filter_scc::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_interp_fir_filter_scc::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -int -gr_interp_fir_filter_scc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const short *in = (const short *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirements may have changed. - } - - int nfilters = interpolation (); - int ni = noutput_items / interpolation (); - - for (int i = 0; i < ni; i++){ - for (int nf = 0; nf < nfilters; nf++) - out[nf] = d_firs[nf]->filter (&in[i]); - out += nfilters; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.h b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.h deleted file mode 100644 index bbf427f3..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_gr_fir_filter_XXX.py - * Any changes made to this file will be overwritten. - */ - -#ifndef INCLUDED_GR_INTERP_FIR_FILTER_SCC_H -#define INCLUDED_GR_INTERP_FIR_FILTER_SCC_H - -#include - -class gr_interp_fir_filter_scc; -typedef boost::shared_ptr gr_interp_fir_filter_scc_sptr; -gr_interp_fir_filter_scc_sptr gr_make_interp_fir_filter_scc (unsigned interpolation, const std::vector &taps); - -class gr_fir_scc; - -/*! - * \brief Interpolating FIR filter with short input, gr_complex output and gr_complex taps - * \ingroup filter_blk - */ -class gr_interp_fir_filter_scc : public gr_sync_interpolator -{ - private: - friend gr_interp_fir_filter_scc_sptr gr_make_interp_fir_filter_scc (unsigned interpolation, const std::vector &taps); - - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - /*! - * Construct a FIR filter with the given taps - */ - gr_interp_fir_filter_scc (unsigned interpolation, const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_interp_fir_filter_scc (); - - void set_taps (const std::vector &taps); - - 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/filter/gr_interp_fir_filter_scc.i b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.i deleted file mode 100644 index 5bf3386e..00000000 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_scc.i +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by generate_GrFIRfilterXXX.py - * Any changes made to this file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,interp_fir_filter_scc) - -gr_interp_fir_filter_scc_sptr gr_make_interp_fir_filter_scc (int interpolation, const std::vector &taps); - -class gr_interp_fir_filter_scc : public gr_sync_interpolator -{ - private: - gr_interp_fir_filter_scc (int interpolation, const std::vector &taps); - - public: - ~gr_interp_fir_filter_scc (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.cc b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.cc deleted file mode 100644 index 99d682c1..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.cc +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_rational_resampler_base_ccc_sptr -gr_make_rational_resampler_base_ccc (unsigned interpolation, - unsigned decimation, - const std::vector &taps) -{ - return gr_rational_resampler_base_ccc_sptr (new gr_rational_resampler_base_ccc (interpolation, decimation, taps)); -} - -gr_rational_resampler_base_ccc::gr_rational_resampler_base_ccc (unsigned interpolation, unsigned decimation, - const std::vector &taps) - : gr_block ("rational_resampler_base_ccc", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_history(1), - d_interpolation(interpolation), d_decimation(decimation), - d_ctr(0), d_updated(false), - d_firs(interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - if (decimation == 0) - throw std::out_of_range ("decimation must be > 0"); - - set_relative_rate (1.0 * interpolation / decimation); - set_output_multiple (1); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_ccc (dummy_taps); - - set_taps (taps); - install_taps (d_new_taps); -} - -gr_rational_resampler_base_ccc::~gr_rational_resampler_base_ccc () -{ - int interp = interpolation(); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_rational_resampler_base_ccc::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_rational_resampler_base_ccc::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -void -gr_rational_resampler_base_ccc::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - int nreqd = std::max((unsigned)1, (int)((double) (noutput_items+1) * decimation() / interpolation()) + history() - 1); - unsigned ninputs = ninput_items_required.size (); - for (unsigned i = 0; i < ninputs; i++) - ninput_items_required[i] = nreqd; -} - -int -gr_rational_resampler_base_ccc::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const gr_complex *in = (const gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirement may have increased. - } - - unsigned int ctr = d_ctr; - - int i = 0; - while (i < noutput_items){ - out[i++] = d_firs[ctr]->filter(in); - ctr += decimation(); - while (ctr >= interpolation()){ - ctr -= interpolation(); - in++; - } - } - - d_ctr = ctr; - consume_each(in - (gr_complex *) input_items[0]); - return i; -} diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.h b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.h deleted file mode 100644 index 68a0128b..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.h +++ /dev/null @@ -1,87 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifndef INCLUDED_GR_RATIONAL_RESAMPLER_BASE_CCC_H -#define INCLUDED_GR_RATIONAL_RESAMPLER_BASE_CCC_H - -#include - -class gr_rational_resampler_base_ccc; -typedef boost::shared_ptr gr_rational_resampler_base_ccc_sptr; -gr_rational_resampler_base_ccc_sptr -gr_make_rational_resampler_base_ccc (unsigned interpolation, - unsigned decimation, - const std::vector &taps); - -class gr_fir_ccc; - -/*! - * \brief Rational Resampling Polyphase FIR filter with gr_complex input, gr_complex output and gr_complex taps - * \ingroup filter_blk - */ -class gr_rational_resampler_base_ccc : public gr_block -{ - private: - unsigned d_history; - unsigned d_interpolation, d_decimation; - unsigned d_ctr; - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - friend gr_rational_resampler_base_ccc_sptr - gr_make_rational_resampler_base_ccc (unsigned interpolation, unsigned decimation, const std::vector &taps); - - - /*! - * Construct a FIR filter with the given taps - */ - gr_rational_resampler_base_ccc (unsigned interpolation, unsigned decimation, - const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_rational_resampler_base_ccc (); - unsigned history () const { return d_history; } - void set_history (unsigned history) { d_history = history; } - - unsigned interpolation() const { return d_interpolation; } - unsigned decimation() const { return d_decimation; } - - void set_taps (const std::vector &taps); - - void forecast (int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.i b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.i deleted file mode 100644 index acb7a1ce..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccc.i +++ /dev/null @@ -1,42 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,rational_resampler_base_ccc); - -gr_rational_resampler_base_ccc_sptr gr_make_rational_resampler_base_ccc (int interpolation, int decimation, const std::vector &taps); - -class gr_rational_resampler_base_ccc : public gr_block -{ - private: - gr_rational_resampler_base_ccc (int interpolation, int decimation, const std::vector &taps); - - public: - ~gr_rational_resampler_base_ccc (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.cc b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.cc deleted file mode 100644 index feadb146..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.cc +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_rational_resampler_base_ccf_sptr -gr_make_rational_resampler_base_ccf (unsigned interpolation, - unsigned decimation, - const std::vector &taps) -{ - return gr_rational_resampler_base_ccf_sptr (new gr_rational_resampler_base_ccf (interpolation, decimation, taps)); -} - -gr_rational_resampler_base_ccf::gr_rational_resampler_base_ccf (unsigned interpolation, unsigned decimation, - const std::vector &taps) - : gr_block ("rational_resampler_base_ccf", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_history(1), - d_interpolation(interpolation), d_decimation(decimation), - d_ctr(0), d_updated(false), - d_firs(interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - if (decimation == 0) - throw std::out_of_range ("decimation must be > 0"); - - set_relative_rate (1.0 * interpolation / decimation); - set_output_multiple (1); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_ccf (dummy_taps); - - set_taps (taps); - install_taps (d_new_taps); -} - -gr_rational_resampler_base_ccf::~gr_rational_resampler_base_ccf () -{ - int interp = interpolation(); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_rational_resampler_base_ccf::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_rational_resampler_base_ccf::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -void -gr_rational_resampler_base_ccf::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - int nreqd = std::max((unsigned)1, (int)((double) (noutput_items+1) * decimation() / interpolation()) + history() - 1); - unsigned ninputs = ninput_items_required.size (); - for (unsigned i = 0; i < ninputs; i++) - ninput_items_required[i] = nreqd; -} - -int -gr_rational_resampler_base_ccf::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const gr_complex *in = (const gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirement may have increased. - } - - unsigned int ctr = d_ctr; - - int i = 0; - while (i < noutput_items){ - out[i++] = d_firs[ctr]->filter(in); - ctr += decimation(); - while (ctr >= interpolation()){ - ctr -= interpolation(); - in++; - } - } - - d_ctr = ctr; - consume_each(in - (gr_complex *) input_items[0]); - return i; -} diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.h b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.h deleted file mode 100644 index 48fd3d9d..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.h +++ /dev/null @@ -1,87 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifndef INCLUDED_GR_RATIONAL_RESAMPLER_BASE_CCF_H -#define INCLUDED_GR_RATIONAL_RESAMPLER_BASE_CCF_H - -#include - -class gr_rational_resampler_base_ccf; -typedef boost::shared_ptr gr_rational_resampler_base_ccf_sptr; -gr_rational_resampler_base_ccf_sptr -gr_make_rational_resampler_base_ccf (unsigned interpolation, - unsigned decimation, - const std::vector &taps); - -class gr_fir_ccf; - -/*! - * \brief Rational Resampling Polyphase FIR filter with gr_complex input, gr_complex output and float taps - * \ingroup filter_blk - */ -class gr_rational_resampler_base_ccf : public gr_block -{ - private: - unsigned d_history; - unsigned d_interpolation, d_decimation; - unsigned d_ctr; - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - friend gr_rational_resampler_base_ccf_sptr - gr_make_rational_resampler_base_ccf (unsigned interpolation, unsigned decimation, const std::vector &taps); - - - /*! - * Construct a FIR filter with the given taps - */ - gr_rational_resampler_base_ccf (unsigned interpolation, unsigned decimation, - const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_rational_resampler_base_ccf (); - unsigned history () const { return d_history; } - void set_history (unsigned history) { d_history = history; } - - unsigned interpolation() const { return d_interpolation; } - unsigned decimation() const { return d_decimation; } - - void set_taps (const std::vector &taps); - - void forecast (int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.i b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.i deleted file mode 100644 index 174d73c4..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_ccf.i +++ /dev/null @@ -1,42 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,rational_resampler_base_ccf); - -gr_rational_resampler_base_ccf_sptr gr_make_rational_resampler_base_ccf (int interpolation, int decimation, const std::vector &taps); - -class gr_rational_resampler_base_ccf : public gr_block -{ - private: - gr_rational_resampler_base_ccf (int interpolation, int decimation, const std::vector &taps); - - public: - ~gr_rational_resampler_base_ccf (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.cc b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.cc deleted file mode 100644 index b0065dce..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.cc +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_rational_resampler_base_fcc_sptr -gr_make_rational_resampler_base_fcc (unsigned interpolation, - unsigned decimation, - const std::vector &taps) -{ - return gr_rational_resampler_base_fcc_sptr (new gr_rational_resampler_base_fcc (interpolation, decimation, taps)); -} - -gr_rational_resampler_base_fcc::gr_rational_resampler_base_fcc (unsigned interpolation, unsigned decimation, - const std::vector &taps) - : gr_block ("rational_resampler_base_fcc", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_history(1), - d_interpolation(interpolation), d_decimation(decimation), - d_ctr(0), d_updated(false), - d_firs(interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - if (decimation == 0) - throw std::out_of_range ("decimation must be > 0"); - - set_relative_rate (1.0 * interpolation / decimation); - set_output_multiple (1); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_fcc (dummy_taps); - - set_taps (taps); - install_taps (d_new_taps); -} - -gr_rational_resampler_base_fcc::~gr_rational_resampler_base_fcc () -{ - int interp = interpolation(); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_rational_resampler_base_fcc::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_rational_resampler_base_fcc::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -void -gr_rational_resampler_base_fcc::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - int nreqd = std::max((unsigned)1, (int)((double) (noutput_items+1) * decimation() / interpolation()) + history() - 1); - unsigned ninputs = ninput_items_required.size (); - for (unsigned i = 0; i < ninputs; i++) - ninput_items_required[i] = nreqd; -} - -int -gr_rational_resampler_base_fcc::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const float *in = (const float *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirement may have increased. - } - - unsigned int ctr = d_ctr; - - int i = 0; - while (i < noutput_items){ - out[i++] = d_firs[ctr]->filter(in); - ctr += decimation(); - while (ctr >= interpolation()){ - ctr -= interpolation(); - in++; - } - } - - d_ctr = ctr; - consume_each(in - (float *) input_items[0]); - return i; -} diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.h b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.h deleted file mode 100644 index a3f90ca2..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.h +++ /dev/null @@ -1,87 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifndef INCLUDED_GR_RATIONAL_RESAMPLER_BASE_FCC_H -#define INCLUDED_GR_RATIONAL_RESAMPLER_BASE_FCC_H - -#include - -class gr_rational_resampler_base_fcc; -typedef boost::shared_ptr gr_rational_resampler_base_fcc_sptr; -gr_rational_resampler_base_fcc_sptr -gr_make_rational_resampler_base_fcc (unsigned interpolation, - unsigned decimation, - const std::vector &taps); - -class gr_fir_fcc; - -/*! - * \brief Rational Resampling Polyphase FIR filter with float input, gr_complex output and gr_complex taps - * \ingroup filter_blk - */ -class gr_rational_resampler_base_fcc : public gr_block -{ - private: - unsigned d_history; - unsigned d_interpolation, d_decimation; - unsigned d_ctr; - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - friend gr_rational_resampler_base_fcc_sptr - gr_make_rational_resampler_base_fcc (unsigned interpolation, unsigned decimation, const std::vector &taps); - - - /*! - * Construct a FIR filter with the given taps - */ - gr_rational_resampler_base_fcc (unsigned interpolation, unsigned decimation, - const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_rational_resampler_base_fcc (); - unsigned history () const { return d_history; } - void set_history (unsigned history) { d_history = history; } - - unsigned interpolation() const { return d_interpolation; } - unsigned decimation() const { return d_decimation; } - - void set_taps (const std::vector &taps); - - void forecast (int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.i b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.i deleted file mode 100644 index 0789e785..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fcc.i +++ /dev/null @@ -1,42 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,rational_resampler_base_fcc); - -gr_rational_resampler_base_fcc_sptr gr_make_rational_resampler_base_fcc (int interpolation, int decimation, const std::vector &taps); - -class gr_rational_resampler_base_fcc : public gr_block -{ - private: - gr_rational_resampler_base_fcc (int interpolation, int decimation, const std::vector &taps); - - public: - ~gr_rational_resampler_base_fcc (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.cc b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.cc deleted file mode 100644 index 7320ae3a..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.cc +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_rational_resampler_base_fff_sptr -gr_make_rational_resampler_base_fff (unsigned interpolation, - unsigned decimation, - const std::vector &taps) -{ - return gr_rational_resampler_base_fff_sptr (new gr_rational_resampler_base_fff (interpolation, decimation, taps)); -} - -gr_rational_resampler_base_fff::gr_rational_resampler_base_fff (unsigned interpolation, unsigned decimation, - const std::vector &taps) - : gr_block ("rational_resampler_base_fff", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (float))), - d_history(1), - d_interpolation(interpolation), d_decimation(decimation), - d_ctr(0), d_updated(false), - d_firs(interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - if (decimation == 0) - throw std::out_of_range ("decimation must be > 0"); - - set_relative_rate (1.0 * interpolation / decimation); - set_output_multiple (1); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_fff (dummy_taps); - - set_taps (taps); - install_taps (d_new_taps); -} - -gr_rational_resampler_base_fff::~gr_rational_resampler_base_fff () -{ - int interp = interpolation(); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_rational_resampler_base_fff::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_rational_resampler_base_fff::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -void -gr_rational_resampler_base_fff::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - int nreqd = std::max((unsigned)1, (int)((double) (noutput_items+1) * decimation() / interpolation()) + history() - 1); - unsigned ninputs = ninput_items_required.size (); - for (unsigned i = 0; i < ninputs; i++) - ninput_items_required[i] = nreqd; -} - -int -gr_rational_resampler_base_fff::general_work (int noutput_items, - gr_vector_int &ninput_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]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirement may have increased. - } - - unsigned int ctr = d_ctr; - - int i = 0; - while (i < noutput_items){ - out[i++] = d_firs[ctr]->filter(in); - ctr += decimation(); - while (ctr >= interpolation()){ - ctr -= interpolation(); - in++; - } - } - - d_ctr = ctr; - consume_each(in - (float *) input_items[0]); - return i; -} diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.h b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.h deleted file mode 100644 index 31a5b81d..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.h +++ /dev/null @@ -1,87 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifndef INCLUDED_GR_RATIONAL_RESAMPLER_BASE_FFF_H -#define INCLUDED_GR_RATIONAL_RESAMPLER_BASE_FFF_H - -#include - -class gr_rational_resampler_base_fff; -typedef boost::shared_ptr gr_rational_resampler_base_fff_sptr; -gr_rational_resampler_base_fff_sptr -gr_make_rational_resampler_base_fff (unsigned interpolation, - unsigned decimation, - const std::vector &taps); - -class gr_fir_fff; - -/*! - * \brief Rational Resampling Polyphase FIR filter with float input, float output and float taps - * \ingroup filter_blk - */ -class gr_rational_resampler_base_fff : public gr_block -{ - private: - unsigned d_history; - unsigned d_interpolation, d_decimation; - unsigned d_ctr; - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - friend gr_rational_resampler_base_fff_sptr - gr_make_rational_resampler_base_fff (unsigned interpolation, unsigned decimation, const std::vector &taps); - - - /*! - * Construct a FIR filter with the given taps - */ - gr_rational_resampler_base_fff (unsigned interpolation, unsigned decimation, - const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_rational_resampler_base_fff (); - unsigned history () const { return d_history; } - void set_history (unsigned history) { d_history = history; } - - unsigned interpolation() const { return d_interpolation; } - unsigned decimation() const { return d_decimation; } - - void set_taps (const std::vector &taps); - - void forecast (int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.i b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.i deleted file mode 100644 index 5cb1a380..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fff.i +++ /dev/null @@ -1,42 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,rational_resampler_base_fff); - -gr_rational_resampler_base_fff_sptr gr_make_rational_resampler_base_fff (int interpolation, int decimation, const std::vector &taps); - -class gr_rational_resampler_base_fff : public gr_block -{ - private: - gr_rational_resampler_base_fff (int interpolation, int decimation, const std::vector &taps); - - public: - ~gr_rational_resampler_base_fff (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.cc b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.cc deleted file mode 100644 index 8195f3d6..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.cc +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_rational_resampler_base_fsf_sptr -gr_make_rational_resampler_base_fsf (unsigned interpolation, - unsigned decimation, - const std::vector &taps) -{ - return gr_rational_resampler_base_fsf_sptr (new gr_rational_resampler_base_fsf (interpolation, decimation, taps)); -} - -gr_rational_resampler_base_fsf::gr_rational_resampler_base_fsf (unsigned interpolation, unsigned decimation, - const std::vector &taps) - : gr_block ("rational_resampler_base_fsf", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (short))), - d_history(1), - d_interpolation(interpolation), d_decimation(decimation), - d_ctr(0), d_updated(false), - d_firs(interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - if (decimation == 0) - throw std::out_of_range ("decimation must be > 0"); - - set_relative_rate (1.0 * interpolation / decimation); - set_output_multiple (1); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_fsf (dummy_taps); - - set_taps (taps); - install_taps (d_new_taps); -} - -gr_rational_resampler_base_fsf::~gr_rational_resampler_base_fsf () -{ - int interp = interpolation(); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_rational_resampler_base_fsf::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_rational_resampler_base_fsf::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -void -gr_rational_resampler_base_fsf::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - int nreqd = std::max((unsigned)1, (int)((double) (noutput_items+1) * decimation() / interpolation()) + history() - 1); - unsigned ninputs = ninput_items_required.size (); - for (unsigned i = 0; i < ninputs; i++) - ninput_items_required[i] = nreqd; -} - -int -gr_rational_resampler_base_fsf::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const float *in = (const float *) input_items[0]; - short *out = (short *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirement may have increased. - } - - unsigned int ctr = d_ctr; - - int i = 0; - while (i < noutput_items){ - out[i++] = d_firs[ctr]->filter(in); - ctr += decimation(); - while (ctr >= interpolation()){ - ctr -= interpolation(); - in++; - } - } - - d_ctr = ctr; - consume_each(in - (float *) input_items[0]); - return i; -} diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.h b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.h deleted file mode 100644 index 22654292..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.h +++ /dev/null @@ -1,87 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifndef INCLUDED_GR_RATIONAL_RESAMPLER_BASE_FSF_H -#define INCLUDED_GR_RATIONAL_RESAMPLER_BASE_FSF_H - -#include - -class gr_rational_resampler_base_fsf; -typedef boost::shared_ptr gr_rational_resampler_base_fsf_sptr; -gr_rational_resampler_base_fsf_sptr -gr_make_rational_resampler_base_fsf (unsigned interpolation, - unsigned decimation, - const std::vector &taps); - -class gr_fir_fsf; - -/*! - * \brief Rational Resampling Polyphase FIR filter with float input, short output and float taps - * \ingroup filter_blk - */ -class gr_rational_resampler_base_fsf : public gr_block -{ - private: - unsigned d_history; - unsigned d_interpolation, d_decimation; - unsigned d_ctr; - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - friend gr_rational_resampler_base_fsf_sptr - gr_make_rational_resampler_base_fsf (unsigned interpolation, unsigned decimation, const std::vector &taps); - - - /*! - * Construct a FIR filter with the given taps - */ - gr_rational_resampler_base_fsf (unsigned interpolation, unsigned decimation, - const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_rational_resampler_base_fsf (); - unsigned history () const { return d_history; } - void set_history (unsigned history) { d_history = history; } - - unsigned interpolation() const { return d_interpolation; } - unsigned decimation() const { return d_decimation; } - - void set_taps (const std::vector &taps); - - void forecast (int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.i b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.i deleted file mode 100644 index 636ac0a4..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_fsf.i +++ /dev/null @@ -1,42 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,rational_resampler_base_fsf); - -gr_rational_resampler_base_fsf_sptr gr_make_rational_resampler_base_fsf (int interpolation, int decimation, const std::vector &taps); - -class gr_rational_resampler_base_fsf : public gr_block -{ - private: - gr_rational_resampler_base_fsf (int interpolation, int decimation, const std::vector &taps); - - public: - ~gr_rational_resampler_base_fsf (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.cc b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.cc deleted file mode 100644 index d315e722..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.cc +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include -#include - -gr_rational_resampler_base_scc_sptr -gr_make_rational_resampler_base_scc (unsigned interpolation, - unsigned decimation, - const std::vector &taps) -{ - return gr_rational_resampler_base_scc_sptr (new gr_rational_resampler_base_scc (interpolation, decimation, taps)); -} - -gr_rational_resampler_base_scc::gr_rational_resampler_base_scc (unsigned interpolation, unsigned decimation, - const std::vector &taps) - : gr_block ("rational_resampler_base_scc", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_history(1), - d_interpolation(interpolation), d_decimation(decimation), - d_ctr(0), d_updated(false), - d_firs(interpolation) -{ - if (interpolation == 0) - throw std::out_of_range ("interpolation must be > 0"); - if (decimation == 0) - throw std::out_of_range ("decimation must be > 0"); - - set_relative_rate (1.0 * interpolation / decimation); - set_output_multiple (1); - - std::vector dummy_taps; - - for (unsigned i = 0; i < interpolation; i++) - d_firs[i] = gr_fir_util::create_gr_fir_scc (dummy_taps); - - set_taps (taps); - install_taps (d_new_taps); -} - -gr_rational_resampler_base_scc::~gr_rational_resampler_base_scc () -{ - int interp = interpolation(); - for (int i = 0; i < interp; i++) - delete d_firs[i]; -} - -void -gr_rational_resampler_base_scc::set_taps (const std::vector &taps) -{ - d_new_taps = taps; - d_updated = true; - - // round up length to a multiple of the interpolation factor - int n = taps.size () % interpolation (); - if (n > 0){ - n = interpolation () - n; - while (n-- > 0) - d_new_taps.insert(d_new_taps.begin(), 0); - } - - assert (d_new_taps.size () % interpolation () == 0); -} - - -void -gr_rational_resampler_base_scc::install_taps (const std::vector &taps) -{ - int nfilters = interpolation (); - int nt = taps.size () / nfilters; - - assert (nt * nfilters == (int) taps.size ()); - - std::vector< std::vector > xtaps (nfilters); - - for (int n = 0; n < nfilters; n++) - xtaps[n].resize (nt); - - for (int i = 0; i < (int) taps.size(); i++) - xtaps[i % nfilters][i / nfilters] = taps[i]; - - for (int n = 0; n < nfilters; n++) - d_firs[n]->set_taps (xtaps[n]); - - set_history (nt); - d_updated = false; - -#if 0 - for (int i = 0; i < nfilters; i++){ - std::cout << "filter[" << i << "] = "; - for (int j = 0; j < nt; j++) - std::cout << xtaps[i][j] << " "; - - std::cout << "\n"; - } -#endif - -} - -void -gr_rational_resampler_base_scc::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - int nreqd = std::max((unsigned)1, (int)((double) (noutput_items+1) * decimation() / interpolation()) + history() - 1); - unsigned ninputs = ninput_items_required.size (); - for (unsigned i = 0; i < ninputs; i++) - ninput_items_required[i] = nreqd; -} - -int -gr_rational_resampler_base_scc::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const short *in = (const short *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - if (d_updated) { - install_taps (d_new_taps); - return 0; // history requirement may have increased. - } - - unsigned int ctr = d_ctr; - - int i = 0; - while (i < noutput_items){ - out[i++] = d_firs[ctr]->filter(in); - ctr += decimation(); - while (ctr >= interpolation()){ - ctr -= interpolation(); - in++; - } - } - - d_ctr = ctr; - consume_each(in - (short *) input_items[0]); - return i; -} diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.h b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.h deleted file mode 100644 index c90295ea..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.h +++ /dev/null @@ -1,87 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -#ifndef INCLUDED_GR_RATIONAL_RESAMPLER_BASE_SCC_H -#define INCLUDED_GR_RATIONAL_RESAMPLER_BASE_SCC_H - -#include - -class gr_rational_resampler_base_scc; -typedef boost::shared_ptr gr_rational_resampler_base_scc_sptr; -gr_rational_resampler_base_scc_sptr -gr_make_rational_resampler_base_scc (unsigned interpolation, - unsigned decimation, - const std::vector &taps); - -class gr_fir_scc; - -/*! - * \brief Rational Resampling Polyphase FIR filter with short input, gr_complex output and gr_complex taps - * \ingroup filter_blk - */ -class gr_rational_resampler_base_scc : public gr_block -{ - private: - unsigned d_history; - unsigned d_interpolation, d_decimation; - unsigned d_ctr; - std::vector d_new_taps; - bool d_updated; - std::vector d_firs; - - friend gr_rational_resampler_base_scc_sptr - gr_make_rational_resampler_base_scc (unsigned interpolation, unsigned decimation, const std::vector &taps); - - - /*! - * Construct a FIR filter with the given taps - */ - gr_rational_resampler_base_scc (unsigned interpolation, unsigned decimation, - const std::vector &taps); - - void install_taps (const std::vector &taps); - - public: - ~gr_rational_resampler_base_scc (); - unsigned history () const { return d_history; } - void set_history (unsigned history) { d_history = history; } - - unsigned interpolation() const { return d_interpolation; } - unsigned decimation() const { return d_decimation; } - - void set_taps (const std::vector &taps); - - void forecast (int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.i b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.i deleted file mode 100644 index 4180794f..00000000 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_scc.i +++ /dev/null @@ -1,42 +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. - */ - -/* - * WARNING: This file is automatically generated by - * generate_gr_rational_resampler_base_XXX.py Any changes made to this - * file will be overwritten. - */ - -GR_SWIG_BLOCK_MAGIC(gr,rational_resampler_base_scc); - -gr_rational_resampler_base_scc_sptr gr_make_rational_resampler_base_scc (int interpolation, int decimation, const std::vector &taps); - -class gr_rational_resampler_base_scc : public gr_block -{ - private: - gr_rational_resampler_base_scc (int interpolation, int decimation, const std::vector &taps); - - public: - ~gr_rational_resampler_base_scc (); - - void set_taps (const std::vector &taps); -}; diff --git a/gnuradio-core/src/lib/filter/stamp-sources-generate b/gnuradio-core/src/lib/filter/stamp-sources-generate deleted file mode 100644 index e69de29b..00000000 diff --git a/gnuradio-core/src/lib/g72x/Makefile.in b/gnuradio-core/src/lib/g72x/Makefile.in index 9e728a46..a2f70961 100644 --- a/gnuradio-core/src/lib/g72x/Makefile.in +++ b/gnuradio-core/src/lib/g72x/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -202,6 +202,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@ @@ -209,6 +210,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@ @@ -227,6 +232,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -236,20 +242,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@ @@ -272,6 +281,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@ @@ -333,6 +344,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@ @@ -345,17 +357,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@ @@ -371,7 +383,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@ @@ -423,6 +434,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@ @@ -453,6 +469,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@ @@ -474,6 +495,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@ @@ -556,26 +587,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@ @@ -606,7 +622,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@ @@ -616,23 +631,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 @@ -644,7 +662,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, @@ -652,10 +670,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@ @@ -671,18 +685,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@ @@ -697,15 +699,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 = diff --git a/gnuradio-core/src/lib/general/Makefile.in b/gnuradio-core/src/lib/general/Makefile.in index 78f205b9..26319373 100644 --- a/gnuradio-core/src/lib/general/Makefile.in +++ b/gnuradio-core/src/lib/general/Makefile.in @@ -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@ diff --git a/gnuradio-core/src/lib/gengen/Makefile.in b/gnuradio-core/src/lib/gengen/Makefile.in index c0430990..b8dcd1fd 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.in +++ b/gnuradio-core/src/lib/gengen/Makefile.in @@ -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 # @@ -123,9 +123,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.gen $(srcdir)/Makefile.in \ - $(swiginclude_HEADERS) $(top_srcdir)/Makefile.common \ +DIST_COMMON = $(am__swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.gen \ + $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common \ $(top_srcdir)/Makefile.gen.gen $(top_srcdir)/Makefile.par.gen subdir = gnuradio-core/src/lib/gengen ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -140,36 +140,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 \ @@ -183,9 +186,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 \ @@ -288,6 +288,43 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(grincludedir)" \ "$(DESTDIR)$(swigincludedir)" +am__swiginclude_HEADERS_DIST = gr_add_cc.i gr_add_const_cc.i \ + gr_add_const_ff.i gr_add_const_ii.i gr_add_const_sf.i \ + gr_add_const_ss.i gr_add_const_vcc.i gr_add_const_vff.i \ + gr_add_const_vii.i gr_add_const_vss.i gr_add_ff.i gr_add_ii.i \ + gr_add_ss.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 \ + gr_argmax_is.i gr_argmax_ss.i gr_chunks_to_symbols_bc.i \ + gr_chunks_to_symbols_bf.i gr_chunks_to_symbols_ic.i \ + gr_chunks_to_symbols_if.i gr_chunks_to_symbols_sc.i \ + gr_chunks_to_symbols_sf.i gr_divide_cc.i gr_divide_ff.i \ + gr_divide_ii.i gr_divide_ss.i gr_integrate_cc.i \ + gr_integrate_ff.i gr_integrate_ii.i gr_integrate_ss.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 gr_multiply_const_ii.i \ + gr_multiply_const_ss.i gr_multiply_const_vcc.i \ + gr_multiply_const_vff.i gr_multiply_const_vii.i \ + gr_multiply_const_vss.i gr_multiply_ff.i gr_multiply_ii.i \ + gr_multiply_ss.i gr_mute_cc.i gr_mute_ff.i gr_mute_ii.i \ + gr_mute_ss.i gr_noise_source_c.i gr_noise_source_f.i \ + gr_noise_source_i.i gr_noise_source_s.i gr_not_bb.i \ + gr_not_ii.i gr_not_ss.i gr_or_bb.i gr_or_ii.i gr_or_ss.i \ + gr_packed_to_unpacked_bb.i gr_packed_to_unpacked_ii.i \ + gr_packed_to_unpacked_ss.i gr_peak_detector_fb.i \ + gr_peak_detector_ib.i gr_peak_detector_sb.i \ + gr_sample_and_hold_bb.i gr_sample_and_hold_ff.i \ + gr_sample_and_hold_ii.i gr_sample_and_hold_ss.i \ + gr_sig_source_c.i gr_sig_source_f.i gr_sig_source_i.i \ + gr_sig_source_s.i gr_sub_cc.i gr_sub_ff.i gr_sub_ii.i \ + gr_sub_ss.i gr_unpacked_to_packed_bb.i \ + gr_unpacked_to_packed_ii.i gr_unpacked_to_packed_ss.i \ + gr_vector_sink_b.i gr_vector_sink_c.i gr_vector_sink_f.i \ + gr_vector_sink_i.i gr_vector_sink_s.i gr_vector_source_b.i \ + gr_vector_source_c.i gr_vector_source_f.i gr_vector_source_i.i \ + gr_vector_source_s.i gr_xor_bb.i gr_xor_ii.i gr_xor_ss.i \ + gr_endianness.i gengen.i gengen_generated.i HEADERS = $(grinclude_HEADERS) $(swiginclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -311,6 +348,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@ @@ -318,6 +356,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@ @@ -336,6 +378,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -345,20 +388,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@ @@ -381,6 +427,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@ @@ -442,6 +490,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@ @@ -454,17 +503,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@ @@ -480,7 +529,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@ @@ -532,6 +580,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@ @@ -562,6 +615,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@ @@ -583,6 +641,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@ @@ -665,26 +733,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@ @@ -715,7 +768,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@ @@ -725,23 +777,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 @@ -753,7 +808,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, @@ -761,10 +816,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@ @@ -780,18 +831,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@ @@ -806,15 +845,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 = $(DEPDIR)/Makefile.gen-generate-generate-* \ @@ -933,11 +974,11 @@ grinclude_HEADERS = \ gr_noise_type.h \ gr_sig_source_waveform.h -swiginclude_HEADERS = \ - $(GENERATED_I) \ - gr_endianness.i \ - gengen.i \ - gengen_generated.i +@PYTHON_TRUE@swiginclude_HEADERS = \ +@PYTHON_TRUE@ $(GENERATED_I) \ +@PYTHON_TRUE@ gr_endianness.i \ +@PYTHON_TRUE@ gengen.i \ +@PYTHON_TRUE@ gengen_generated.i # diff --git a/gnuradio-core/src/lib/gengen/gengen_generated.i b/gnuradio-core/src/lib/gengen/gengen_generated.i deleted file mode 100644 index 3013b7b3..00000000 --- a/gnuradio-core/src/lib/gengen/gengen_generated.i +++ /dev/null @@ -1,212 +0,0 @@ -// -// This file is machine generated. All edits will be overwritten -// -%{ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -%} - -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include diff --git a/gnuradio-core/src/lib/gengen/gr_add_cc.cc b/gnuradio-core/src/lib/gengen/gr_add_cc.cc deleted file mode 100644 index 26b33fea..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_cc.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_cc_sptr -gr_make_add_cc (size_t vlen) -{ - return gr_add_cc_sptr (new gr_add_cc (vlen)); -} - -gr_add_cc::gr_add_cc (size_t vlen) - : gr_sync_block ("add_cc", - gr_make_io_signature (1, -1, sizeof (gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof (gr_complex)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_add_cc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *optr = (gr_complex *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items*d_vlen; i++){ - gr_complex acc = ((gr_complex *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc += ((gr_complex *) input_items[j])[i]; - - *optr++ = (gr_complex) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_cc.h b/gnuradio-core/src/lib/gengen/gr_add_cc.h deleted file mode 100644 index 5f8a0848..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_cc.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CC_H -#define INCLUDED_GR_ADD_CC_H - -#include - -class gr_add_cc; -typedef boost::shared_ptr gr_add_cc_sptr; - -gr_add_cc_sptr gr_make_add_cc (size_t vlen = 1); - -/*! - * \brief output = sum (input_0, input_1, ...) - * \ingroup math_blk - * - * Add across all input streams. - */ -class gr_add_cc : public gr_sync_block -{ - friend gr_add_cc_sptr gr_make_add_cc (size_t vlen); - - gr_add_cc (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_add_cc.i b/gnuradio-core/src/lib/gengen/gr_add_cc.i deleted file mode 100644 index 71b4b5b7..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_cc.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_cc) - -gr_add_cc_sptr gr_make_add_cc (size_t vlen = 1); - -class gr_add_cc : public gr_sync_block -{ - private: - gr_add_cc (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_cc.cc b/gnuradio-core/src/lib/gengen/gr_add_const_cc.cc deleted file mode 100644 index 6dbfc8a2..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_cc.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_const_cc_sptr -gr_make_add_const_cc (gr_complex k) -{ - return gr_add_const_cc_sptr (new gr_add_const_cc (k)); -} - -gr_add_const_cc::gr_add_const_cc (gr_complex k) - : gr_sync_block ("add_const_cc", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_k (k) -{ -} - -int -gr_add_const_cc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *iptr = (gr_complex *) input_items[0]; - gr_complex *optr = (gr_complex *) output_items[0]; - - int size = noutput_items; - - while (size >= 8){ - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ + d_k; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_cc.h b/gnuradio-core/src/lib/gengen/gr_add_const_cc.h deleted file mode 100644 index f155eb8b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_cc.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CONST_CC_H -#define INCLUDED_GR_ADD_CONST_CC_H - -#include - -class gr_add_const_cc; -typedef boost::shared_ptr gr_add_const_cc_sptr; - -gr_add_const_cc_sptr gr_make_add_const_cc (gr_complex k); - -/*! - * \brief output = input + constant - * \ingroup math_blk - */ -class gr_add_const_cc : public gr_sync_block -{ - friend gr_add_const_cc_sptr gr_make_add_const_cc (gr_complex k); - - gr_complex d_k; // the constant - gr_add_const_cc (gr_complex k); - - public: - gr_complex k () const { return d_k; } - void set_k (gr_complex k) { d_k = k; } - - 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/gengen/gr_add_const_cc.i b/gnuradio-core/src/lib/gengen/gr_add_const_cc.i deleted file mode 100644 index 4de00afd..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_cc.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_const_cc) - -gr_add_const_cc_sptr gr_make_add_const_cc (gr_complex k); - -class gr_add_const_cc : public gr_sync_block -{ - private: - gr_add_const_cc (gr_complex k); - - public: - gr_complex k () const { return d_k; } - void set_k (gr_complex k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_ff.cc b/gnuradio-core/src/lib/gengen/gr_add_const_ff.cc deleted file mode 100644 index 09478771..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_ff.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_const_ff_sptr -gr_make_add_const_ff (float k) -{ - return gr_add_const_ff_sptr (new gr_add_const_ff (k)); -} - -gr_add_const_ff::gr_add_const_ff (float k) - : gr_sync_block ("add_const_ff", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (float))), - d_k (k) -{ -} - -int -gr_add_const_ff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *iptr = (float *) input_items[0]; - float *optr = (float *) output_items[0]; - - int size = noutput_items; - - while (size >= 8){ - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ + d_k; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_ff.h b/gnuradio-core/src/lib/gengen/gr_add_const_ff.h deleted file mode 100644 index de32a6ed..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_ff.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CONST_FF_H -#define INCLUDED_GR_ADD_CONST_FF_H - -#include - -class gr_add_const_ff; -typedef boost::shared_ptr gr_add_const_ff_sptr; - -gr_add_const_ff_sptr gr_make_add_const_ff (float k); - -/*! - * \brief output = input + constant - * \ingroup math_blk - */ -class gr_add_const_ff : public gr_sync_block -{ - friend gr_add_const_ff_sptr gr_make_add_const_ff (float k); - - float d_k; // the constant - gr_add_const_ff (float k); - - public: - float k () const { return d_k; } - void set_k (float k) { d_k = k; } - - 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/gengen/gr_add_const_ff.i b/gnuradio-core/src/lib/gengen/gr_add_const_ff.i deleted file mode 100644 index 02f047b6..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_ff.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_const_ff) - -gr_add_const_ff_sptr gr_make_add_const_ff (float k); - -class gr_add_const_ff : public gr_sync_block -{ - private: - gr_add_const_ff (float k); - - public: - float k () const { return d_k; } - void set_k (float k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_ii.cc b/gnuradio-core/src/lib/gengen/gr_add_const_ii.cc deleted file mode 100644 index 799446df..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_ii.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_const_ii_sptr -gr_make_add_const_ii (int k) -{ - return gr_add_const_ii_sptr (new gr_add_const_ii (k)); -} - -gr_add_const_ii::gr_add_const_ii (int k) - : gr_sync_block ("add_const_ii", - gr_make_io_signature (1, 1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))), - d_k (k) -{ -} - -int -gr_add_const_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *iptr = (int *) input_items[0]; - int *optr = (int *) output_items[0]; - - int size = noutput_items; - - while (size >= 8){ - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ + d_k; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_ii.h b/gnuradio-core/src/lib/gengen/gr_add_const_ii.h deleted file mode 100644 index 285d24b3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_ii.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CONST_II_H -#define INCLUDED_GR_ADD_CONST_II_H - -#include - -class gr_add_const_ii; -typedef boost::shared_ptr gr_add_const_ii_sptr; - -gr_add_const_ii_sptr gr_make_add_const_ii (int k); - -/*! - * \brief output = input + constant - * \ingroup math_blk - */ -class gr_add_const_ii : public gr_sync_block -{ - friend gr_add_const_ii_sptr gr_make_add_const_ii (int k); - - int d_k; // the constant - gr_add_const_ii (int k); - - public: - int k () const { return d_k; } - void set_k (int k) { d_k = k; } - - 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/gengen/gr_add_const_ii.i b/gnuradio-core/src/lib/gengen/gr_add_const_ii.i deleted file mode 100644 index 1bc1baca..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_ii.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_const_ii) - -gr_add_const_ii_sptr gr_make_add_const_ii (int k); - -class gr_add_const_ii : public gr_sync_block -{ - private: - gr_add_const_ii (int k); - - public: - int k () const { return d_k; } - void set_k (int k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_sf.cc b/gnuradio-core/src/lib/gengen/gr_add_const_sf.cc deleted file mode 100644 index e1f39193..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_sf.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_const_sf_sptr -gr_make_add_const_sf (float k) -{ - return gr_add_const_sf_sptr (new gr_add_const_sf (k)); -} - -gr_add_const_sf::gr_add_const_sf (float k) - : gr_sync_block ("add_const_sf", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (float))), - d_k (k) -{ -} - -int -gr_add_const_sf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *) input_items[0]; - float *optr = (float *) output_items[0]; - - int size = noutput_items; - - while (size >= 8){ - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ + d_k; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_sf.h b/gnuradio-core/src/lib/gengen/gr_add_const_sf.h deleted file mode 100644 index 859af8b2..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_sf.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CONST_SF_H -#define INCLUDED_GR_ADD_CONST_SF_H - -#include - -class gr_add_const_sf; -typedef boost::shared_ptr gr_add_const_sf_sptr; - -gr_add_const_sf_sptr gr_make_add_const_sf (float k); - -/*! - * \brief output = input + constant - * \ingroup math_blk - */ -class gr_add_const_sf : public gr_sync_block -{ - friend gr_add_const_sf_sptr gr_make_add_const_sf (float k); - - float d_k; // the constant - gr_add_const_sf (float k); - - public: - float k () const { return d_k; } - void set_k (float k) { d_k = k; } - - 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/gengen/gr_add_const_sf.i b/gnuradio-core/src/lib/gengen/gr_add_const_sf.i deleted file mode 100644 index 9dfaa8e8..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_sf.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_const_sf) - -gr_add_const_sf_sptr gr_make_add_const_sf (short k); - -class gr_add_const_sf : public gr_sync_block -{ - private: - gr_add_const_sf (short k); - - public: - short k () const { return d_k; } - void set_k (short k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_ss.cc b/gnuradio-core/src/lib/gengen/gr_add_const_ss.cc deleted file mode 100644 index 30882391..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_ss.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_const_ss_sptr -gr_make_add_const_ss (short k) -{ - return gr_add_const_ss_sptr (new gr_add_const_ss (k)); -} - -gr_add_const_ss::gr_add_const_ss (short k) - : gr_sync_block ("add_const_ss", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))), - d_k (k) -{ -} - -int -gr_add_const_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *) input_items[0]; - short *optr = (short *) output_items[0]; - - int size = noutput_items; - - while (size >= 8){ - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - *optr++ = *iptr++ + d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ + d_k; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_ss.h b/gnuradio-core/src/lib/gengen/gr_add_const_ss.h deleted file mode 100644 index de79c3de..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_ss.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CONST_SS_H -#define INCLUDED_GR_ADD_CONST_SS_H - -#include - -class gr_add_const_ss; -typedef boost::shared_ptr gr_add_const_ss_sptr; - -gr_add_const_ss_sptr gr_make_add_const_ss (short k); - -/*! - * \brief output = input + constant - * \ingroup math_blk - */ -class gr_add_const_ss : public gr_sync_block -{ - friend gr_add_const_ss_sptr gr_make_add_const_ss (short k); - - short d_k; // the constant - gr_add_const_ss (short k); - - public: - short k () const { return d_k; } - void set_k (short k) { d_k = k; } - - 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/gengen/gr_add_const_ss.i b/gnuradio-core/src/lib/gengen/gr_add_const_ss.i deleted file mode 100644 index ff093e9b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_ss.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_const_ss) - -gr_add_const_ss_sptr gr_make_add_const_ss (short k); - -class gr_add_const_ss : public gr_sync_block -{ - private: - gr_add_const_ss (short k); - - public: - short k () const { return d_k; } - void set_k (short k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vcc.cc b/gnuradio-core/src/lib/gengen/gr_add_const_vcc.cc deleted file mode 100644 index 1dad044d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vcc.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_const_vcc_sptr -gr_make_add_const_vcc (const std::vector k) -{ - return gr_add_const_vcc_sptr (new gr_add_const_vcc (k)); -} - -gr_add_const_vcc::gr_add_const_vcc (const std::vector k) - : gr_sync_block ("add_const_vcc", - gr_make_io_signature (1, 1, sizeof(gr_complex)*k.size()), - gr_make_io_signature (1, 1, sizeof(gr_complex)*k.size())) -{ - d_k = k; -} - -int -gr_add_const_vcc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *iptr = (gr_complex *)input_items[0]; - gr_complex *optr = (gr_complex *)output_items[0]; - - int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(gr_complex); - - for (int i = 0; i < noutput_items; i++) - for (int j = 0; j < nitems_per_block; j++) - *optr++ = *iptr++ + d_k[j]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vcc.h b/gnuradio-core/src/lib/gengen/gr_add_const_vcc.h deleted file mode 100644 index 50a79dec..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vcc.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CONST_VCC_H -#define INCLUDED_GR_ADD_CONST_VCC_H - -#include - -class gr_add_const_vcc; -typedef boost::shared_ptr gr_add_const_vcc_sptr; - -gr_add_const_vcc_sptr gr_make_add_const_vcc (const std::vector k); - -/*! - * \brief output vector = input vector + constant vector - * \ingroup math_blk - */ -class gr_add_const_vcc : public gr_sync_block -{ - friend gr_add_const_vcc_sptr gr_make_add_const_vcc (const std::vector k); - - std::vector d_k; // the constant - gr_add_const_vcc (const std::vector k); - - public: - const std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } - - 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/gengen/gr_add_const_vcc.i b/gnuradio-core/src/lib/gengen/gr_add_const_vcc.i deleted file mode 100644 index af25d679..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vcc.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_const_vcc) - -gr_add_const_vcc_sptr gr_make_add_const_vcc (const std::vector k); - -class gr_add_const_vcc : public gr_sync_block -{ - private: - gr_add_const_vcc (const std::vector k); - - public: - std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vff.cc b/gnuradio-core/src/lib/gengen/gr_add_const_vff.cc deleted file mode 100644 index 145c7d14..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vff.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_const_vff_sptr -gr_make_add_const_vff (const std::vector k) -{ - return gr_add_const_vff_sptr (new gr_add_const_vff (k)); -} - -gr_add_const_vff::gr_add_const_vff (const std::vector k) - : gr_sync_block ("add_const_vff", - gr_make_io_signature (1, 1, sizeof(float)*k.size()), - gr_make_io_signature (1, 1, sizeof(float)*k.size())) -{ - d_k = k; -} - -int -gr_add_const_vff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *iptr = (float *)input_items[0]; - float *optr = (float *)output_items[0]; - - int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(float); - - for (int i = 0; i < noutput_items; i++) - for (int j = 0; j < nitems_per_block; j++) - *optr++ = *iptr++ + d_k[j]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vff.h b/gnuradio-core/src/lib/gengen/gr_add_const_vff.h deleted file mode 100644 index 70f52c9a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vff.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CONST_VFF_H -#define INCLUDED_GR_ADD_CONST_VFF_H - -#include - -class gr_add_const_vff; -typedef boost::shared_ptr gr_add_const_vff_sptr; - -gr_add_const_vff_sptr gr_make_add_const_vff (const std::vector k); - -/*! - * \brief output vector = input vector + constant vector - * \ingroup math_blk - */ -class gr_add_const_vff : public gr_sync_block -{ - friend gr_add_const_vff_sptr gr_make_add_const_vff (const std::vector k); - - std::vector d_k; // the constant - gr_add_const_vff (const std::vector k); - - public: - const std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } - - 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/gengen/gr_add_const_vff.i b/gnuradio-core/src/lib/gengen/gr_add_const_vff.i deleted file mode 100644 index 54ac5600..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vff.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_const_vff) - -gr_add_const_vff_sptr gr_make_add_const_vff (const std::vector k); - -class gr_add_const_vff : public gr_sync_block -{ - private: - gr_add_const_vff (const std::vector k); - - public: - std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vii.cc b/gnuradio-core/src/lib/gengen/gr_add_const_vii.cc deleted file mode 100644 index 9421c224..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vii.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_const_vii_sptr -gr_make_add_const_vii (const std::vector k) -{ - return gr_add_const_vii_sptr (new gr_add_const_vii (k)); -} - -gr_add_const_vii::gr_add_const_vii (const std::vector k) - : gr_sync_block ("add_const_vii", - gr_make_io_signature (1, 1, sizeof(int)*k.size()), - gr_make_io_signature (1, 1, sizeof(int)*k.size())) -{ - d_k = k; -} - -int -gr_add_const_vii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *iptr = (int *)input_items[0]; - int *optr = (int *)output_items[0]; - - int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(int); - - for (int i = 0; i < noutput_items; i++) - for (int j = 0; j < nitems_per_block; j++) - *optr++ = *iptr++ + d_k[j]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vii.h b/gnuradio-core/src/lib/gengen/gr_add_const_vii.h deleted file mode 100644 index c0ac8d2f..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vii.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CONST_VII_H -#define INCLUDED_GR_ADD_CONST_VII_H - -#include - -class gr_add_const_vii; -typedef boost::shared_ptr gr_add_const_vii_sptr; - -gr_add_const_vii_sptr gr_make_add_const_vii (const std::vector k); - -/*! - * \brief output vector = input vector + constant vector - * \ingroup math_blk - */ -class gr_add_const_vii : public gr_sync_block -{ - friend gr_add_const_vii_sptr gr_make_add_const_vii (const std::vector k); - - std::vector d_k; // the constant - gr_add_const_vii (const std::vector k); - - public: - const std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } - - 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/gengen/gr_add_const_vii.i b/gnuradio-core/src/lib/gengen/gr_add_const_vii.i deleted file mode 100644 index 8ade8664..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vii.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_const_vii) - -gr_add_const_vii_sptr gr_make_add_const_vii (const std::vector k); - -class gr_add_const_vii : public gr_sync_block -{ - private: - gr_add_const_vii (const std::vector k); - - public: - std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vss.cc b/gnuradio-core/src/lib/gengen/gr_add_const_vss.cc deleted file mode 100644 index 8fd55bb3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vss.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_const_vss_sptr -gr_make_add_const_vss (const std::vector k) -{ - return gr_add_const_vss_sptr (new gr_add_const_vss (k)); -} - -gr_add_const_vss::gr_add_const_vss (const std::vector k) - : gr_sync_block ("add_const_vss", - gr_make_io_signature (1, 1, sizeof(short)*k.size()), - gr_make_io_signature (1, 1, sizeof(short)*k.size())) -{ - d_k = k; -} - -int -gr_add_const_vss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *)input_items[0]; - short *optr = (short *)output_items[0]; - - int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(short); - - for (int i = 0; i < noutput_items; i++) - for (int j = 0; j < nitems_per_block; j++) - *optr++ = *iptr++ + d_k[j]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vss.h b/gnuradio-core/src/lib/gengen/gr_add_const_vss.h deleted file mode 100644 index 54b61ca9..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vss.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_CONST_VSS_H -#define INCLUDED_GR_ADD_CONST_VSS_H - -#include - -class gr_add_const_vss; -typedef boost::shared_ptr gr_add_const_vss_sptr; - -gr_add_const_vss_sptr gr_make_add_const_vss (const std::vector k); - -/*! - * \brief output vector = input vector + constant vector - * \ingroup math_blk - */ -class gr_add_const_vss : public gr_sync_block -{ - friend gr_add_const_vss_sptr gr_make_add_const_vss (const std::vector k); - - std::vector d_k; // the constant - gr_add_const_vss (const std::vector k); - - public: - const std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } - - 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/gengen/gr_add_const_vss.i b/gnuradio-core/src/lib/gengen/gr_add_const_vss.i deleted file mode 100644 index d92bfe4a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_const_vss.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_const_vss) - -gr_add_const_vss_sptr gr_make_add_const_vss (const std::vector k); - -class gr_add_const_vss : public gr_sync_block -{ - private: - gr_add_const_vss (const std::vector k); - - public: - std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_ff.cc b/gnuradio-core/src/lib/gengen/gr_add_ff.cc deleted file mode 100644 index 18207c5b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_ff.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_ff_sptr -gr_make_add_ff (size_t vlen) -{ - return gr_add_ff_sptr (new gr_add_ff (vlen)); -} - -gr_add_ff::gr_add_ff (size_t vlen) - : gr_sync_block ("add_ff", - gr_make_io_signature (1, -1, sizeof (float)*vlen), - gr_make_io_signature (1, 1, sizeof (float)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_add_ff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *optr = (float *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items*d_vlen; i++){ - float acc = ((float *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc += ((float *) input_items[j])[i]; - - *optr++ = (float) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_ff.h b/gnuradio-core/src/lib/gengen/gr_add_ff.h deleted file mode 100644 index 0e25d46a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_ff.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_FF_H -#define INCLUDED_GR_ADD_FF_H - -#include - -class gr_add_ff; -typedef boost::shared_ptr gr_add_ff_sptr; - -gr_add_ff_sptr gr_make_add_ff (size_t vlen = 1); - -/*! - * \brief output = sum (input_0, input_1, ...) - * \ingroup math_blk - * - * Add across all input streams. - */ -class gr_add_ff : public gr_sync_block -{ - friend gr_add_ff_sptr gr_make_add_ff (size_t vlen); - - gr_add_ff (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_add_ff.i b/gnuradio-core/src/lib/gengen/gr_add_ff.i deleted file mode 100644 index 9d8f4c81..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_ff.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_ff) - -gr_add_ff_sptr gr_make_add_ff (size_t vlen = 1); - -class gr_add_ff : public gr_sync_block -{ - private: - gr_add_ff (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_ii.cc b/gnuradio-core/src/lib/gengen/gr_add_ii.cc deleted file mode 100644 index bbc5fc74..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_ii.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_ii_sptr -gr_make_add_ii (size_t vlen) -{ - return gr_add_ii_sptr (new gr_add_ii (vlen)); -} - -gr_add_ii::gr_add_ii (size_t vlen) - : gr_sync_block ("add_ii", - gr_make_io_signature (1, -1, sizeof (int)*vlen), - gr_make_io_signature (1, 1, sizeof (int)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_add_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items*d_vlen; i++){ - int acc = ((int *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc += ((int *) input_items[j])[i]; - - *optr++ = (int) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_ii.h b/gnuradio-core/src/lib/gengen/gr_add_ii.h deleted file mode 100644 index 694675cd..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_ii.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_II_H -#define INCLUDED_GR_ADD_II_H - -#include - -class gr_add_ii; -typedef boost::shared_ptr gr_add_ii_sptr; - -gr_add_ii_sptr gr_make_add_ii (size_t vlen = 1); - -/*! - * \brief output = sum (input_0, input_1, ...) - * \ingroup math_blk - * - * Add across all input streams. - */ -class gr_add_ii : public gr_sync_block -{ - friend gr_add_ii_sptr gr_make_add_ii (size_t vlen); - - gr_add_ii (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_add_ii.i b/gnuradio-core/src/lib/gengen/gr_add_ii.i deleted file mode 100644 index 0519468f..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_ii) - -gr_add_ii_sptr gr_make_add_ii (size_t vlen = 1); - -class gr_add_ii : public gr_sync_block -{ - private: - gr_add_ii (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_add_ss.cc b/gnuradio-core/src/lib/gengen/gr_add_ss.cc deleted file mode 100644 index 4af4fec2..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_ss.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_add_ss_sptr -gr_make_add_ss (size_t vlen) -{ - return gr_add_ss_sptr (new gr_add_ss (vlen)); -} - -gr_add_ss::gr_add_ss (size_t vlen) - : gr_sync_block ("add_ss", - gr_make_io_signature (1, -1, sizeof (short)*vlen), - gr_make_io_signature (1, 1, sizeof (short)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_add_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items*d_vlen; i++){ - short acc = ((short *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc += ((short *) input_items[j])[i]; - - *optr++ = (short) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_add_ss.h b/gnuradio-core/src/lib/gengen/gr_add_ss.h deleted file mode 100644 index 49322e3a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_ss.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ADD_SS_H -#define INCLUDED_GR_ADD_SS_H - -#include - -class gr_add_ss; -typedef boost::shared_ptr gr_add_ss_sptr; - -gr_add_ss_sptr gr_make_add_ss (size_t vlen = 1); - -/*! - * \brief output = sum (input_0, input_1, ...) - * \ingroup math_blk - * - * Add across all input streams. - */ -class gr_add_ss : public gr_sync_block -{ - friend gr_add_ss_sptr gr_make_add_ss (size_t vlen); - - gr_add_ss (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_add_ss.i b/gnuradio-core/src/lib/gengen/gr_add_ss.i deleted file mode 100644 index 1f60fb65..00000000 --- a/gnuradio-core/src/lib/gengen/gr_add_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,add_ss) - -gr_add_ss_sptr gr_make_add_ss (size_t vlen = 1); - -class gr_add_ss : public gr_sync_block -{ - private: - gr_add_ss (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_and_bb.cc b/gnuradio-core/src/lib/gengen/gr_and_bb.cc deleted file mode 100644 index 17437559..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_bb.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_and_bb_sptr -gr_make_and_bb () -{ - return gr_and_bb_sptr (new gr_and_bb ()); -} - -gr_and_bb::gr_and_bb () - : gr_sync_block ("and_bb", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, 1, sizeof (unsigned char))) -{ -} - -int -gr_and_bb::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned char *optr = (unsigned char *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items; i++) { - unsigned char acc = ((unsigned char *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc = acc & ((unsigned char *) input_items[j])[i]; - - *optr++ = (unsigned char) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_and_bb.h b/gnuradio-core/src/lib/gengen/gr_and_bb.h deleted file mode 100644 index 70fc3884..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_bb.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_AND_BB_H -#define INCLUDED_GR_AND_BB_H - -#include - -class gr_and_bb; -typedef boost::shared_ptr gr_and_bb_sptr; - -gr_and_bb_sptr gr_make_and_bb (); - -/*! - * \brief output = input_0 & input_1 & , ... & input_N) - * \ingroup math_blk - * - * bitwise boolean and across all input streams. - */ -class gr_and_bb : public gr_sync_block -{ - friend gr_and_bb_sptr gr_make_and_bb (); - - gr_and_bb (); - - public: - - 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/gengen/gr_and_bb.i b/gnuradio-core/src/lib/gengen/gr_and_bb.i deleted file mode 100644 index c0eefb00..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_bb.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,and_bb) - -gr_and_bb_sptr gr_make_and_bb (); - -class gr_and_bb : public gr_sync_block -{ - private: - gr_and_bb (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_and_const_bb.cc b/gnuradio-core/src/lib/gengen/gr_and_const_bb.cc deleted file mode 100644 index 818396f7..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_const_bb.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_and_const_bb_sptr -gr_make_and_const_bb (unsigned char k) -{ - return gr_and_const_bb_sptr (new gr_and_const_bb (k)); -}; - -gr_and_const_bb::gr_and_const_bb (unsigned char k) - : gr_sync_block ("and_const_bb", - gr_make_io_signature (1, 1, sizeof (unsigned char)), - gr_make_io_signature (1, 1, sizeof (unsigned char))), - d_k (k) -{ -} - -int -gr_and_const_bb::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned char *iptr = (unsigned char *) input_items[0]; - unsigned char *optr = (unsigned char *) output_items[0]; - - int size = noutput_items; - - while (size >= 8) { - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ & d_k; - - return (noutput_items); -} diff --git a/gnuradio-core/src/lib/gengen/gr_and_const_bb.h b/gnuradio-core/src/lib/gengen/gr_and_const_bb.h deleted file mode 100644 index 80e8ea28..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_const_bb.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_AND_CONST_BB_H -#define INCLUDED_GR_AND_CONST_BB_H - -#include - -class gr_and_const_bb; -typedef boost::shared_ptr gr_and_const_bb_sptr; - -gr_and_const_bb_sptr gr_make_and_const_bb (unsigned char k); - -/*! - * \brief output_N = input_N & value - * \ingroup math_blk - * - * bitwise boolean and of const to the data stream. - */ -class gr_and_const_bb : public gr_sync_block -{ - friend gr_and_const_bb_sptr gr_make_and_const_bb (unsigned char k); - - unsigned char d_k; // the constant - gr_and_const_bb (unsigned char k); - - public: - unsigned char k () const { return d_k; } - void set_k (unsigned char k) { d_k = k; } - - 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/gengen/gr_and_const_bb.i b/gnuradio-core/src/lib/gengen/gr_and_const_bb.i deleted file mode 100644 index 3456e7ca..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_const_bb.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,and_const_bb) - -gr_and_const_bb_sptr gr_make_and_const_bb (unsigned char k); - -class gr_and_const_bb : public gr_sync_block -{ - private: - gr_and_const_bb (unsigned char k); - - public: - unsigned char k () const { return d_k; } - void set_k (unsigned char k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_and_const_ii.cc b/gnuradio-core/src/lib/gengen/gr_and_const_ii.cc deleted file mode 100644 index 8b01c95d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_const_ii.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_and_const_ii_sptr -gr_make_and_const_ii (int k) -{ - return gr_and_const_ii_sptr (new gr_and_const_ii (k)); -}; - -gr_and_const_ii::gr_and_const_ii (int k) - : gr_sync_block ("and_const_ii", - gr_make_io_signature (1, 1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))), - d_k (k) -{ -} - -int -gr_and_const_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *iptr = (int *) input_items[0]; - int *optr = (int *) output_items[0]; - - int size = noutput_items; - - while (size >= 8) { - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ & d_k; - - return (noutput_items); -} diff --git a/gnuradio-core/src/lib/gengen/gr_and_const_ii.h b/gnuradio-core/src/lib/gengen/gr_and_const_ii.h deleted file mode 100644 index 80c01765..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_const_ii.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_AND_CONST_II_H -#define INCLUDED_GR_AND_CONST_II_H - -#include - -class gr_and_const_ii; -typedef boost::shared_ptr gr_and_const_ii_sptr; - -gr_and_const_ii_sptr gr_make_and_const_ii (int k); - -/*! - * \brief output_N = input_N & value - * \ingroup math_blk - * - * bitwise boolean and of const to the data stream. - */ -class gr_and_const_ii : public gr_sync_block -{ - friend gr_and_const_ii_sptr gr_make_and_const_ii (int k); - - int d_k; // the constant - gr_and_const_ii (int k); - - public: - int k () const { return d_k; } - void set_k (int k) { d_k = k; } - - 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/gengen/gr_and_const_ii.i b/gnuradio-core/src/lib/gengen/gr_and_const_ii.i deleted file mode 100644 index c637c22c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_const_ii.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,and_const_ii) - -gr_and_const_ii_sptr gr_make_and_const_ii (int k); - -class gr_and_const_ii : public gr_sync_block -{ - private: - gr_and_const_ii (int k); - - public: - int k () const { return d_k; } - void set_k (int k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_and_const_ss.cc b/gnuradio-core/src/lib/gengen/gr_and_const_ss.cc deleted file mode 100644 index a27c8112..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_const_ss.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_and_const_ss_sptr -gr_make_and_const_ss (short k) -{ - return gr_and_const_ss_sptr (new gr_and_const_ss (k)); -}; - -gr_and_const_ss::gr_and_const_ss (short k) - : gr_sync_block ("and_const_ss", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))), - d_k (k) -{ -} - -int -gr_and_const_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *) input_items[0]; - short *optr = (short *) output_items[0]; - - int size = noutput_items; - - while (size >= 8) { - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - *optr++ = *iptr++ & d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ & d_k; - - return (noutput_items); -} diff --git a/gnuradio-core/src/lib/gengen/gr_and_const_ss.h b/gnuradio-core/src/lib/gengen/gr_and_const_ss.h deleted file mode 100644 index cb3b2d72..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_const_ss.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_AND_CONST_SS_H -#define INCLUDED_GR_AND_CONST_SS_H - -#include - -class gr_and_const_ss; -typedef boost::shared_ptr gr_and_const_ss_sptr; - -gr_and_const_ss_sptr gr_make_and_const_ss (short k); - -/*! - * \brief output_N = input_N & value - * \ingroup math_blk - * - * bitwise boolean and of const to the data stream. - */ -class gr_and_const_ss : public gr_sync_block -{ - friend gr_and_const_ss_sptr gr_make_and_const_ss (short k); - - short d_k; // the constant - gr_and_const_ss (short k); - - public: - short k () const { return d_k; } - void set_k (short k) { d_k = k; } - - 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/gengen/gr_and_const_ss.i b/gnuradio-core/src/lib/gengen/gr_and_const_ss.i deleted file mode 100644 index c2934387..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_const_ss.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,and_const_ss) - -gr_and_const_ss_sptr gr_make_and_const_ss (short k); - -class gr_and_const_ss : public gr_sync_block -{ - private: - gr_and_const_ss (short k); - - public: - short k () const { return d_k; } - void set_k (short k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_and_ii.cc b/gnuradio-core/src/lib/gengen/gr_and_ii.cc deleted file mode 100644 index a38aaf10..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_ii.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_and_ii_sptr -gr_make_and_ii () -{ - return gr_and_ii_sptr (new gr_and_ii ()); -} - -gr_and_ii::gr_and_ii () - : gr_sync_block ("and_ii", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))) -{ -} - -int -gr_and_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items; i++) { - int acc = ((int *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc = acc & ((int *) input_items[j])[i]; - - *optr++ = (int) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_and_ii.h b/gnuradio-core/src/lib/gengen/gr_and_ii.h deleted file mode 100644 index 2e772576..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_ii.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_AND_II_H -#define INCLUDED_GR_AND_II_H - -#include - -class gr_and_ii; -typedef boost::shared_ptr gr_and_ii_sptr; - -gr_and_ii_sptr gr_make_and_ii (); - -/*! - * \brief output = input_0 & input_1 & , ... & input_N) - * \ingroup math_blk - * - * bitwise boolean and across all input streams. - */ -class gr_and_ii : public gr_sync_block -{ - friend gr_and_ii_sptr gr_make_and_ii (); - - gr_and_ii (); - - public: - - 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/gengen/gr_and_ii.i b/gnuradio-core/src/lib/gengen/gr_and_ii.i deleted file mode 100644 index c45d7e1d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,and_ii) - -gr_and_ii_sptr gr_make_and_ii (); - -class gr_and_ii : public gr_sync_block -{ - private: - gr_and_ii (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_and_ss.cc b/gnuradio-core/src/lib/gengen/gr_and_ss.cc deleted file mode 100644 index 5fd4f21c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_ss.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_and_ss_sptr -gr_make_and_ss () -{ - return gr_and_ss_sptr (new gr_and_ss ()); -} - -gr_and_ss::gr_and_ss () - : gr_sync_block ("and_ss", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))) -{ -} - -int -gr_and_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items; i++) { - short acc = ((short *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc = acc & ((short *) input_items[j])[i]; - - *optr++ = (short) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_and_ss.h b/gnuradio-core/src/lib/gengen/gr_and_ss.h deleted file mode 100644 index a35a9f9e..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_ss.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_AND_SS_H -#define INCLUDED_GR_AND_SS_H - -#include - -class gr_and_ss; -typedef boost::shared_ptr gr_and_ss_sptr; - -gr_and_ss_sptr gr_make_and_ss (); - -/*! - * \brief output = input_0 & input_1 & , ... & input_N) - * \ingroup math_blk - * - * bitwise boolean and across all input streams. - */ -class gr_and_ss : public gr_sync_block -{ - friend gr_and_ss_sptr gr_make_and_ss (); - - gr_and_ss (); - - public: - - 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/gengen/gr_and_ss.i b/gnuradio-core/src/lib/gengen/gr_and_ss.i deleted file mode 100644 index 46f196f3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_and_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,and_ss) - -gr_and_ss_sptr gr_make_and_ss (); - -class gr_and_ss : public gr_sync_block -{ - private: - gr_and_ss (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_fs.cc b/gnuradio-core/src/lib/gengen/gr_argmax_fs.cc deleted file mode 100644 index 1e974def..00000000 --- a/gnuradio-core/src/lib/gengen/gr_argmax_fs.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_argmax_fs_sptr -gr_make_argmax_fs ( size_t vlen ) -{ - return gr_argmax_fs_sptr ( new gr_argmax_fs(vlen)); -} - -gr_argmax_fs::gr_argmax_fs( size_t vlen) - : gr_sync_block ( "argmax_fs", - gr_make_io_signature (1, -1, vlen*sizeof (float)), - gr_make_io_signature (2, 2, sizeof (short))), - d_vlen(vlen) -{ -} - - -int -gr_argmax_fs::work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - - int ninputs = input_items.size (); - - short *x_optr = (short *) output_items[0]; - short *y_optr = (short *) output_items[1]; - - for (int i=0; i max) { - max = ((float *) input_items[k])[i*d_vlen + j]; - x = j; - y = k; - } - } - } - - *x_optr++ = (short) x; - *y_optr++ = (short) y; - } - return noutput_items; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_fs.h b/gnuradio-core/src/lib/gengen/gr_argmax_fs.h deleted file mode 100644 index de1099d3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_argmax_fs.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ARGMAX_FS_H -#define INCLUDED_GR_ARGMAX_FS_H - -#include - -class gr_argmax_fs; -typedef boost::shared_ptr gr_argmax_fs_sptr; - -gr_argmax_fs_sptr gr_make_argmax_fs (size_t vlen); - - -class gr_argmax_fs : public gr_sync_block -{ - friend gr_argmax_fs_sptr gr_make_argmax_fs (size_t vlen); - - gr_argmax_fs (size_t vlen); - size_t d_vlen; - - public: - - 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/gengen/gr_argmax_fs.i b/gnuradio-core/src/lib/gengen/gr_argmax_fs.i deleted file mode 100644 index 2c2ff22e..00000000 --- a/gnuradio-core/src/lib/gengen/gr_argmax_fs.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,argmax_fs) - -gr_argmax_fs_sptr gr_make_argmax_fs (size_t vlen); - -class gr_argmax_fs : public gr_sync_block -{ - private: - gr_argmax_fs (size_t vlen); - size_t d_vlen; -}; diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_is.cc b/gnuradio-core/src/lib/gengen/gr_argmax_is.cc deleted file mode 100644 index 09c4b15d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_argmax_is.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_argmax_is_sptr -gr_make_argmax_is ( size_t vlen ) -{ - return gr_argmax_is_sptr ( new gr_argmax_is(vlen)); -} - -gr_argmax_is::gr_argmax_is( size_t vlen) - : gr_sync_block ( "argmax_is", - gr_make_io_signature (1, -1, vlen*sizeof (int)), - gr_make_io_signature (2, 2, sizeof (short))), - d_vlen(vlen) -{ -} - - -int -gr_argmax_is::work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - - int ninputs = input_items.size (); - - short *x_optr = (short *) output_items[0]; - short *y_optr = (short *) output_items[1]; - - for (int i=0; i max) { - max = ((int *) input_items[k])[i*d_vlen + j]; - x = j; - y = k; - } - } - } - - *x_optr++ = (short) x; - *y_optr++ = (short) y; - } - return noutput_items; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_is.h b/gnuradio-core/src/lib/gengen/gr_argmax_is.h deleted file mode 100644 index 2e7595ac..00000000 --- a/gnuradio-core/src/lib/gengen/gr_argmax_is.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ARGMAX_IS_H -#define INCLUDED_GR_ARGMAX_IS_H - -#include - -class gr_argmax_is; -typedef boost::shared_ptr gr_argmax_is_sptr; - -gr_argmax_is_sptr gr_make_argmax_is (size_t vlen); - - -class gr_argmax_is : public gr_sync_block -{ - friend gr_argmax_is_sptr gr_make_argmax_is (size_t vlen); - - gr_argmax_is (size_t vlen); - size_t d_vlen; - - public: - - 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/gengen/gr_argmax_is.i b/gnuradio-core/src/lib/gengen/gr_argmax_is.i deleted file mode 100644 index b5b64e8d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_argmax_is.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,argmax_is) - -gr_argmax_is_sptr gr_make_argmax_is (size_t vlen); - -class gr_argmax_is : public gr_sync_block -{ - private: - gr_argmax_is (size_t vlen); - size_t d_vlen; -}; diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_ss.cc b/gnuradio-core/src/lib/gengen/gr_argmax_ss.cc deleted file mode 100644 index 0008a6dc..00000000 --- a/gnuradio-core/src/lib/gengen/gr_argmax_ss.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_argmax_ss_sptr -gr_make_argmax_ss ( size_t vlen ) -{ - return gr_argmax_ss_sptr ( new gr_argmax_ss(vlen)); -} - -gr_argmax_ss::gr_argmax_ss( size_t vlen) - : gr_sync_block ( "argmax_ss", - gr_make_io_signature (1, -1, vlen*sizeof (short)), - gr_make_io_signature (2, 2, sizeof (short))), - d_vlen(vlen) -{ -} - - -int -gr_argmax_ss::work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - - int ninputs = input_items.size (); - - short *x_optr = (short *) output_items[0]; - short *y_optr = (short *) output_items[1]; - - for (int i=0; i max) { - max = ((short *) input_items[k])[i*d_vlen + j]; - x = j; - y = k; - } - } - } - - *x_optr++ = (short) x; - *y_optr++ = (short) y; - } - return noutput_items; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_ss.h b/gnuradio-core/src/lib/gengen/gr_argmax_ss.h deleted file mode 100644 index 182fb77a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_argmax_ss.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_ARGMAX_SS_H -#define INCLUDED_GR_ARGMAX_SS_H - -#include - -class gr_argmax_ss; -typedef boost::shared_ptr gr_argmax_ss_sptr; - -gr_argmax_ss_sptr gr_make_argmax_ss (size_t vlen); - - -class gr_argmax_ss : public gr_sync_block -{ - friend gr_argmax_ss_sptr gr_make_argmax_ss (size_t vlen); - - gr_argmax_ss (size_t vlen); - size_t d_vlen; - - public: - - 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/gengen/gr_argmax_ss.i b/gnuradio-core/src/lib/gengen/gr_argmax_ss.i deleted file mode 100644 index 9905d460..00000000 --- a/gnuradio-core/src/lib/gengen/gr_argmax_ss.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,argmax_ss) - -gr_argmax_ss_sptr gr_make_argmax_ss (size_t vlen); - -class gr_argmax_ss : public gr_sync_block -{ - private: - gr_argmax_ss (size_t vlen); - size_t d_vlen; -}; diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc deleted file mode 100644 index bc7e34a3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - -gr_chunks_to_symbols_bc_sptr -gr_make_chunks_to_symbols_bc (const std::vector &symbol_table, const int D) -{ - return gr_chunks_to_symbols_bc_sptr (new gr_chunks_to_symbols_bc (symbol_table,D)); -} - -gr_chunks_to_symbols_bc::gr_chunks_to_symbols_bc (const std::vector &symbol_table, const int D) - : gr_sync_interpolator ("chunks_to_symbols_bc", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, -1, sizeof (gr_complex)), - D), - d_D (D), - d_symbol_table (symbol_table) -{ -} - -int -gr_chunks_to_symbols_bc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (noutput_items % d_D == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class gr_chunks_to_symbols_bc; -typedef boost::shared_ptr gr_chunks_to_symbols_bc_sptr; - -gr_chunks_to_symbols_bc_sptr gr_make_chunks_to_symbols_bc (const std::vector &symbol_table, const int D = 1); - -/*! - * \brief Map a stream of symbol indexes (unpacked bytes or shorts) to stream of float or complex onstellation points.in \p D dimensions (\p D = 1 by default) - * \ingroup converter_blk - * - * input: stream of unsigned char; output: stream of gr_complex - * - * out[n D + k] = symbol_table[in[n] D + k], k=0,1,...,D-1 - * - * The combination of gr_packed_to_unpacked_XX followed by - * gr_chunks_to_symbols_XY handles the general case of mapping - * from a stream of bytes or shorts into arbitrary float - * or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ - -class gr_chunks_to_symbols_bc : public gr_sync_interpolator -{ - friend gr_chunks_to_symbols_bc_sptr gr_make_chunks_to_symbols_bc (const std::vector &symbol_table, const int D); - - int d_D; - std::vector d_symbol_table; - gr_chunks_to_symbols_bc (const std::vector &symbol_table, const int D = 1); - - public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.i b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.i deleted file mode 100644 index e8f23748..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,chunks_to_symbols_bc); - -gr_chunks_to_symbols_bc_sptr gr_make_chunks_to_symbols_bc (const std::vector &symbol_table, const int D = 1); - -class gr_chunks_to_symbols_bc : public gr_sync_interpolator -{ -private: - gr_chunks_to_symbols_bc (const std::vector &symbol_table, const int D = 1); - -public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc deleted file mode 100644 index 25ee9cb6..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - -gr_chunks_to_symbols_bf_sptr -gr_make_chunks_to_symbols_bf (const std::vector &symbol_table, const int D) -{ - return gr_chunks_to_symbols_bf_sptr (new gr_chunks_to_symbols_bf (symbol_table,D)); -} - -gr_chunks_to_symbols_bf::gr_chunks_to_symbols_bf (const std::vector &symbol_table, const int D) - : gr_sync_interpolator ("chunks_to_symbols_bf", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, -1, sizeof (float)), - D), - d_D (D), - d_symbol_table (symbol_table) -{ -} - -int -gr_chunks_to_symbols_bf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (noutput_items % d_D == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class gr_chunks_to_symbols_bf; -typedef boost::shared_ptr gr_chunks_to_symbols_bf_sptr; - -gr_chunks_to_symbols_bf_sptr gr_make_chunks_to_symbols_bf (const std::vector &symbol_table, const int D = 1); - -/*! - * \brief Map a stream of symbol indexes (unpacked bytes or shorts) to stream of float or complex onstellation points.in \p D dimensions (\p D = 1 by default) - * \ingroup converter_blk - * - * input: stream of unsigned char; output: stream of float - * - * out[n D + k] = symbol_table[in[n] D + k], k=0,1,...,D-1 - * - * The combination of gr_packed_to_unpacked_XX followed by - * gr_chunks_to_symbols_XY handles the general case of mapping - * from a stream of bytes or shorts into arbitrary float - * or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ - -class gr_chunks_to_symbols_bf : public gr_sync_interpolator -{ - friend gr_chunks_to_symbols_bf_sptr gr_make_chunks_to_symbols_bf (const std::vector &symbol_table, const int D); - - int d_D; - std::vector d_symbol_table; - gr_chunks_to_symbols_bf (const std::vector &symbol_table, const int D = 1); - - public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.i b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.i deleted file mode 100644 index 31e176a5..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,chunks_to_symbols_bf); - -gr_chunks_to_symbols_bf_sptr gr_make_chunks_to_symbols_bf (const std::vector &symbol_table, const int D = 1); - -class gr_chunks_to_symbols_bf : public gr_sync_interpolator -{ -private: - gr_chunks_to_symbols_bf (const std::vector &symbol_table, const int D = 1); - -public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc deleted file mode 100644 index fd706c31..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - -gr_chunks_to_symbols_ic_sptr -gr_make_chunks_to_symbols_ic (const std::vector &symbol_table, const int D) -{ - return gr_chunks_to_symbols_ic_sptr (new gr_chunks_to_symbols_ic (symbol_table,D)); -} - -gr_chunks_to_symbols_ic::gr_chunks_to_symbols_ic (const std::vector &symbol_table, const int D) - : gr_sync_interpolator ("chunks_to_symbols_ic", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, -1, sizeof (gr_complex)), - D), - d_D (D), - d_symbol_table (symbol_table) -{ -} - -int -gr_chunks_to_symbols_ic::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (noutput_items % d_D == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class gr_chunks_to_symbols_ic; -typedef boost::shared_ptr gr_chunks_to_symbols_ic_sptr; - -gr_chunks_to_symbols_ic_sptr gr_make_chunks_to_symbols_ic (const std::vector &symbol_table, const int D = 1); - -/*! - * \brief Map a stream of symbol indexes (unpacked bytes or shorts) to stream of float or complex onstellation points.in \p D dimensions (\p D = 1 by default) - * \ingroup converter_blk - * - * input: stream of int; output: stream of gr_complex - * - * out[n D + k] = symbol_table[in[n] D + k], k=0,1,...,D-1 - * - * The combination of gr_packed_to_unpacked_XX followed by - * gr_chunks_to_symbols_XY handles the general case of mapping - * from a stream of bytes or shorts into arbitrary float - * or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ - -class gr_chunks_to_symbols_ic : public gr_sync_interpolator -{ - friend gr_chunks_to_symbols_ic_sptr gr_make_chunks_to_symbols_ic (const std::vector &symbol_table, const int D); - - int d_D; - std::vector d_symbol_table; - gr_chunks_to_symbols_ic (const std::vector &symbol_table, const int D = 1); - - public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.i b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.i deleted file mode 100644 index 571e2eb1..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,chunks_to_symbols_ic); - -gr_chunks_to_symbols_ic_sptr gr_make_chunks_to_symbols_ic (const std::vector &symbol_table, const int D = 1); - -class gr_chunks_to_symbols_ic : public gr_sync_interpolator -{ -private: - gr_chunks_to_symbols_ic (const std::vector &symbol_table, const int D = 1); - -public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc deleted file mode 100644 index 5751f737..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - -gr_chunks_to_symbols_if_sptr -gr_make_chunks_to_symbols_if (const std::vector &symbol_table, const int D) -{ - return gr_chunks_to_symbols_if_sptr (new gr_chunks_to_symbols_if (symbol_table,D)); -} - -gr_chunks_to_symbols_if::gr_chunks_to_symbols_if (const std::vector &symbol_table, const int D) - : gr_sync_interpolator ("chunks_to_symbols_if", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, -1, sizeof (float)), - D), - d_D (D), - d_symbol_table (symbol_table) -{ -} - -int -gr_chunks_to_symbols_if::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (noutput_items % d_D == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class gr_chunks_to_symbols_if; -typedef boost::shared_ptr gr_chunks_to_symbols_if_sptr; - -gr_chunks_to_symbols_if_sptr gr_make_chunks_to_symbols_if (const std::vector &symbol_table, const int D = 1); - -/*! - * \brief Map a stream of symbol indexes (unpacked bytes or shorts) to stream of float or complex onstellation points.in \p D dimensions (\p D = 1 by default) - * \ingroup converter_blk - * - * input: stream of int; output: stream of float - * - * out[n D + k] = symbol_table[in[n] D + k], k=0,1,...,D-1 - * - * The combination of gr_packed_to_unpacked_XX followed by - * gr_chunks_to_symbols_XY handles the general case of mapping - * from a stream of bytes or shorts into arbitrary float - * or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ - -class gr_chunks_to_symbols_if : public gr_sync_interpolator -{ - friend gr_chunks_to_symbols_if_sptr gr_make_chunks_to_symbols_if (const std::vector &symbol_table, const int D); - - int d_D; - std::vector d_symbol_table; - gr_chunks_to_symbols_if (const std::vector &symbol_table, const int D = 1); - - public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.i b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.i deleted file mode 100644 index 4ead6b43..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,chunks_to_symbols_if); - -gr_chunks_to_symbols_if_sptr gr_make_chunks_to_symbols_if (const std::vector &symbol_table, const int D = 1); - -class gr_chunks_to_symbols_if : public gr_sync_interpolator -{ -private: - gr_chunks_to_symbols_if (const std::vector &symbol_table, const int D = 1); - -public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc deleted file mode 100644 index 32f6c6ee..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - -gr_chunks_to_symbols_sc_sptr -gr_make_chunks_to_symbols_sc (const std::vector &symbol_table, const int D) -{ - return gr_chunks_to_symbols_sc_sptr (new gr_chunks_to_symbols_sc (symbol_table,D)); -} - -gr_chunks_to_symbols_sc::gr_chunks_to_symbols_sc (const std::vector &symbol_table, const int D) - : gr_sync_interpolator ("chunks_to_symbols_sc", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (gr_complex)), - D), - d_D (D), - d_symbol_table (symbol_table) -{ -} - -int -gr_chunks_to_symbols_sc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (noutput_items % d_D == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class gr_chunks_to_symbols_sc; -typedef boost::shared_ptr gr_chunks_to_symbols_sc_sptr; - -gr_chunks_to_symbols_sc_sptr gr_make_chunks_to_symbols_sc (const std::vector &symbol_table, const int D = 1); - -/*! - * \brief Map a stream of symbol indexes (unpacked bytes or shorts) to stream of float or complex onstellation points.in \p D dimensions (\p D = 1 by default) - * \ingroup converter_blk - * - * input: stream of short; output: stream of gr_complex - * - * out[n D + k] = symbol_table[in[n] D + k], k=0,1,...,D-1 - * - * The combination of gr_packed_to_unpacked_XX followed by - * gr_chunks_to_symbols_XY handles the general case of mapping - * from a stream of bytes or shorts into arbitrary float - * or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ - -class gr_chunks_to_symbols_sc : public gr_sync_interpolator -{ - friend gr_chunks_to_symbols_sc_sptr gr_make_chunks_to_symbols_sc (const std::vector &symbol_table, const int D); - - int d_D; - std::vector d_symbol_table; - gr_chunks_to_symbols_sc (const std::vector &symbol_table, const int D = 1); - - public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.i b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.i deleted file mode 100644 index fa67b031..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,chunks_to_symbols_sc); - -gr_chunks_to_symbols_sc_sptr gr_make_chunks_to_symbols_sc (const std::vector &symbol_table, const int D = 1); - -class gr_chunks_to_symbols_sc : public gr_sync_interpolator -{ -private: - gr_chunks_to_symbols_sc (const std::vector &symbol_table, const int D = 1); - -public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc deleted file mode 100644 index 079c4c05..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - -gr_chunks_to_symbols_sf_sptr -gr_make_chunks_to_symbols_sf (const std::vector &symbol_table, const int D) -{ - return gr_chunks_to_symbols_sf_sptr (new gr_chunks_to_symbols_sf (symbol_table,D)); -} - -gr_chunks_to_symbols_sf::gr_chunks_to_symbols_sf (const std::vector &symbol_table, const int D) - : gr_sync_interpolator ("chunks_to_symbols_sf", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (float)), - D), - d_D (D), - d_symbol_table (symbol_table) -{ -} - -int -gr_chunks_to_symbols_sf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (noutput_items % d_D == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class gr_chunks_to_symbols_sf; -typedef boost::shared_ptr gr_chunks_to_symbols_sf_sptr; - -gr_chunks_to_symbols_sf_sptr gr_make_chunks_to_symbols_sf (const std::vector &symbol_table, const int D = 1); - -/*! - * \brief Map a stream of symbol indexes (unpacked bytes or shorts) to stream of float or complex onstellation points.in \p D dimensions (\p D = 1 by default) - * \ingroup converter_blk - * - * input: stream of short; output: stream of float - * - * out[n D + k] = symbol_table[in[n] D + k], k=0,1,...,D-1 - * - * The combination of gr_packed_to_unpacked_XX followed by - * gr_chunks_to_symbols_XY handles the general case of mapping - * from a stream of bytes or shorts into arbitrary float - * or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ - -class gr_chunks_to_symbols_sf : public gr_sync_interpolator -{ - friend gr_chunks_to_symbols_sf_sptr gr_make_chunks_to_symbols_sf (const std::vector &symbol_table, const int D); - - int d_D; - std::vector d_symbol_table; - gr_chunks_to_symbols_sf (const std::vector &symbol_table, const int D = 1); - - public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.i b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.i deleted file mode 100644 index fb3a74dc..00000000 --- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,chunks_to_symbols_sf); - -gr_chunks_to_symbols_sf_sptr gr_make_chunks_to_symbols_sf (const std::vector &symbol_table, const int D = 1); - -class gr_chunks_to_symbols_sf : public gr_sync_interpolator -{ -private: - gr_chunks_to_symbols_sf (const std::vector &symbol_table, const int D = 1); - -public: - int D () const { return d_D; } - std::vector symbol_table () const { return d_symbol_table; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_divide_cc.cc b/gnuradio-core/src/lib/gengen/gr_divide_cc.cc deleted file mode 100644 index 4ab9aa5a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_cc.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_divide_cc_sptr -gr_make_divide_cc (size_t vlen) -{ - return gr_divide_cc_sptr (new gr_divide_cc (vlen)); -} - -gr_divide_cc::gr_divide_cc (size_t vlen) - : gr_sync_block ("divide_cc", - gr_make_io_signature (1, -1, sizeof (gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof (gr_complex)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_divide_cc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *optr = (gr_complex *) output_items[0]; - - int ninputs = input_items.size (); - - if (ninputs == 1){ // compute reciprocal - for (int i = 0; i < noutput_items*d_vlen; i++) - *optr++ = (gr_complex) ((gr_complex) 1 / - ((gr_complex *) input_items[0])[i]); - } - - else { - for (int i = 0; i < noutput_items*d_vlen; i++){ - gr_complex acc = ((gr_complex *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc /= ((gr_complex *) input_items[j])[i]; - - *optr++ = (gr_complex) acc; - } - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_divide_cc.h b/gnuradio-core/src/lib/gengen/gr_divide_cc.h deleted file mode 100644 index f0e7f7fe..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_cc.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_DIVIDE_CC_H -#define INCLUDED_GR_DIVIDE_CC_H - -#include - -class gr_divide_cc; -typedef boost::shared_ptr gr_divide_cc_sptr; - -gr_divide_cc_sptr gr_make_divide_cc (size_t vlen = 1); - -/*! - * \brief output = input_0 / input_1 / input_x ...) - * \ingroup math_blk - * - * Divide across all input streams. - */ -class gr_divide_cc : public gr_sync_block -{ - friend gr_divide_cc_sptr gr_make_divide_cc (size_t vlen); - - gr_divide_cc (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_divide_cc.i b/gnuradio-core/src/lib/gengen/gr_divide_cc.i deleted file mode 100644 index 64b0cd79..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_cc.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,divide_cc) - -gr_divide_cc_sptr gr_make_divide_cc (size_t vlen = 1); - -class gr_divide_cc : public gr_sync_block -{ - private: - gr_divide_cc (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_divide_ff.cc b/gnuradio-core/src/lib/gengen/gr_divide_ff.cc deleted file mode 100644 index a33cbf52..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_ff.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_divide_ff_sptr -gr_make_divide_ff (size_t vlen) -{ - return gr_divide_ff_sptr (new gr_divide_ff (vlen)); -} - -gr_divide_ff::gr_divide_ff (size_t vlen) - : gr_sync_block ("divide_ff", - gr_make_io_signature (1, -1, sizeof (float)*vlen), - gr_make_io_signature (1, 1, sizeof (float)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_divide_ff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *optr = (float *) output_items[0]; - - int ninputs = input_items.size (); - - if (ninputs == 1){ // compute reciprocal - for (int i = 0; i < noutput_items*d_vlen; i++) - *optr++ = (float) ((float) 1 / - ((float *) input_items[0])[i]); - } - - else { - for (int i = 0; i < noutput_items*d_vlen; i++){ - float acc = ((float *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc /= ((float *) input_items[j])[i]; - - *optr++ = (float) acc; - } - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_divide_ff.h b/gnuradio-core/src/lib/gengen/gr_divide_ff.h deleted file mode 100644 index 67c6a7f3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_ff.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_DIVIDE_FF_H -#define INCLUDED_GR_DIVIDE_FF_H - -#include - -class gr_divide_ff; -typedef boost::shared_ptr gr_divide_ff_sptr; - -gr_divide_ff_sptr gr_make_divide_ff (size_t vlen = 1); - -/*! - * \brief output = input_0 / input_1 / input_x ...) - * \ingroup math_blk - * - * Divide across all input streams. - */ -class gr_divide_ff : public gr_sync_block -{ - friend gr_divide_ff_sptr gr_make_divide_ff (size_t vlen); - - gr_divide_ff (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_divide_ff.i b/gnuradio-core/src/lib/gengen/gr_divide_ff.i deleted file mode 100644 index c88cae15..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_ff.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,divide_ff) - -gr_divide_ff_sptr gr_make_divide_ff (size_t vlen = 1); - -class gr_divide_ff : public gr_sync_block -{ - private: - gr_divide_ff (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_divide_ii.cc b/gnuradio-core/src/lib/gengen/gr_divide_ii.cc deleted file mode 100644 index e4d82131..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_ii.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_divide_ii_sptr -gr_make_divide_ii (size_t vlen) -{ - return gr_divide_ii_sptr (new gr_divide_ii (vlen)); -} - -gr_divide_ii::gr_divide_ii (size_t vlen) - : gr_sync_block ("divide_ii", - gr_make_io_signature (1, -1, sizeof (int)*vlen), - gr_make_io_signature (1, 1, sizeof (int)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_divide_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - - int ninputs = input_items.size (); - - if (ninputs == 1){ // compute reciprocal - for (int i = 0; i < noutput_items*d_vlen; i++) - *optr++ = (int) ((int) 1 / - ((int *) input_items[0])[i]); - } - - else { - for (int i = 0; i < noutput_items*d_vlen; i++){ - int acc = ((int *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc /= ((int *) input_items[j])[i]; - - *optr++ = (int) acc; - } - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_divide_ii.h b/gnuradio-core/src/lib/gengen/gr_divide_ii.h deleted file mode 100644 index 8c73288c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_ii.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_DIVIDE_II_H -#define INCLUDED_GR_DIVIDE_II_H - -#include - -class gr_divide_ii; -typedef boost::shared_ptr gr_divide_ii_sptr; - -gr_divide_ii_sptr gr_make_divide_ii (size_t vlen = 1); - -/*! - * \brief output = input_0 / input_1 / input_x ...) - * \ingroup math_blk - * - * Divide across all input streams. - */ -class gr_divide_ii : public gr_sync_block -{ - friend gr_divide_ii_sptr gr_make_divide_ii (size_t vlen); - - gr_divide_ii (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_divide_ii.i b/gnuradio-core/src/lib/gengen/gr_divide_ii.i deleted file mode 100644 index db42d271..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,divide_ii) - -gr_divide_ii_sptr gr_make_divide_ii (size_t vlen = 1); - -class gr_divide_ii : public gr_sync_block -{ - private: - gr_divide_ii (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_divide_ss.cc b/gnuradio-core/src/lib/gengen/gr_divide_ss.cc deleted file mode 100644 index 53f6cef7..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_ss.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_divide_ss_sptr -gr_make_divide_ss (size_t vlen) -{ - return gr_divide_ss_sptr (new gr_divide_ss (vlen)); -} - -gr_divide_ss::gr_divide_ss (size_t vlen) - : gr_sync_block ("divide_ss", - gr_make_io_signature (1, -1, sizeof (short)*vlen), - gr_make_io_signature (1, 1, sizeof (short)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_divide_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - - int ninputs = input_items.size (); - - if (ninputs == 1){ // compute reciprocal - for (int i = 0; i < noutput_items*d_vlen; i++) - *optr++ = (short) ((short) 1 / - ((short *) input_items[0])[i]); - } - - else { - for (int i = 0; i < noutput_items*d_vlen; i++){ - short acc = ((short *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc /= ((short *) input_items[j])[i]; - - *optr++ = (short) acc; - } - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_divide_ss.h b/gnuradio-core/src/lib/gengen/gr_divide_ss.h deleted file mode 100644 index cbda2ed0..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_ss.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_DIVIDE_SS_H -#define INCLUDED_GR_DIVIDE_SS_H - -#include - -class gr_divide_ss; -typedef boost::shared_ptr gr_divide_ss_sptr; - -gr_divide_ss_sptr gr_make_divide_ss (size_t vlen = 1); - -/*! - * \brief output = input_0 / input_1 / input_x ...) - * \ingroup math_blk - * - * Divide across all input streams. - */ -class gr_divide_ss : public gr_sync_block -{ - friend gr_divide_ss_sptr gr_make_divide_ss (size_t vlen); - - gr_divide_ss (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_divide_ss.i b/gnuradio-core/src/lib/gengen/gr_divide_ss.i deleted file mode 100644 index a4d06282..00000000 --- a/gnuradio-core/src/lib/gengen/gr_divide_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,divide_ss) - -gr_divide_ss_sptr gr_make_divide_ss (size_t vlen = 1); - -class gr_divide_ss : public gr_sync_block -{ - private: - gr_divide_ss (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_cc.cc b/gnuradio-core/src/lib/gengen/gr_integrate_cc.cc deleted file mode 100644 index 44527131..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_cc.cc +++ /dev/null @@ -1,67 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_integrate_cc_sptr -gr_make_integrate_cc (int decim) -{ - return gr_integrate_cc_sptr (new gr_integrate_cc (decim)); -} - -gr_integrate_cc::gr_integrate_cc (int decim) - : gr_sync_decimator ("integrate_cc", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex)), - decim), - d_decim(decim), - d_count(0) -{ -} - -gr_integrate_cc::~gr_integrate_cc () -{ -} - -int -gr_integrate_cc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const gr_complex *in = (const gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - for (int i = 0; i < noutput_items; i++) { - out[i] = (gr_complex)0; - for (int j = 0; j < d_decim; j++) - out[i] += in[i*d_decim+j]; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_cc.h b/gnuradio-core/src/lib/gengen/gr_integrate_cc.h deleted file mode 100644 index 40719531..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_cc.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_INTEGRATE_CC_H -#define INCLUDED_GR_INTEGRATE_CC_H - -#include - -class gr_integrate_cc; - -typedef boost::shared_ptr gr_integrate_cc_sptr; - -gr_integrate_cc_sptr gr_make_integrate_cc (int decim); - -/*! - * \brief output = sum(input[0]...input[n]) - * \ingroup math_blk - * - * Integrate successive samples in input stream and decimate - */ -class gr_integrate_cc : public gr_sync_decimator -{ -private: - friend gr_integrate_cc_sptr gr_make_integrate_cc(int decim); - - gr_integrate_cc (int decim); - - int d_decim; - int d_count; - -public: - ~gr_integrate_cc (); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif /* INCLUDED_GR_INTEGRATE_CC_H */ diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_cc.i b/gnuradio-core/src/lib/gengen/gr_integrate_cc.i deleted file mode 100644 index b3657f62..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_cc.i +++ /dev/null @@ -1,33 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,integrate_cc); - -gr_integrate_cc_sptr gr_make_integrate_cc (int decim); - -class gr_integrate_cc : public gr_sync_decimator -{ -private: - gr_integrate_cc (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_ff.cc b/gnuradio-core/src/lib/gengen/gr_integrate_ff.cc deleted file mode 100644 index 7794255a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_ff.cc +++ /dev/null @@ -1,67 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_integrate_ff_sptr -gr_make_integrate_ff (int decim) -{ - return gr_integrate_ff_sptr (new gr_integrate_ff (decim)); -} - -gr_integrate_ff::gr_integrate_ff (int decim) - : gr_sync_decimator ("integrate_ff", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (float)), - decim), - d_decim(decim), - d_count(0) -{ -} - -gr_integrate_ff::~gr_integrate_ff () -{ -} - -int -gr_integrate_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 i = 0; i < noutput_items; i++) { - out[i] = (float)0; - for (int j = 0; j < d_decim; j++) - out[i] += in[i*d_decim+j]; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_ff.h b/gnuradio-core/src/lib/gengen/gr_integrate_ff.h deleted file mode 100644 index e9ada5d3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_ff.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_INTEGRATE_FF_H -#define INCLUDED_GR_INTEGRATE_FF_H - -#include - -class gr_integrate_ff; - -typedef boost::shared_ptr gr_integrate_ff_sptr; - -gr_integrate_ff_sptr gr_make_integrate_ff (int decim); - -/*! - * \brief output = sum(input[0]...input[n]) - * \ingroup math_blk - * - * Integrate successive samples in input stream and decimate - */ -class gr_integrate_ff : public gr_sync_decimator -{ -private: - friend gr_integrate_ff_sptr gr_make_integrate_ff(int decim); - - gr_integrate_ff (int decim); - - int d_decim; - int d_count; - -public: - ~gr_integrate_ff (); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif /* INCLUDED_GR_INTEGRATE_FF_H */ diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_ff.i b/gnuradio-core/src/lib/gengen/gr_integrate_ff.i deleted file mode 100644 index 7557516f..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_ff.i +++ /dev/null @@ -1,33 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,integrate_ff); - -gr_integrate_ff_sptr gr_make_integrate_ff (int decim); - -class gr_integrate_ff : public gr_sync_decimator -{ -private: - gr_integrate_ff (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_ii.cc b/gnuradio-core/src/lib/gengen/gr_integrate_ii.cc deleted file mode 100644 index 473a3e26..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_ii.cc +++ /dev/null @@ -1,67 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_integrate_ii_sptr -gr_make_integrate_ii (int decim) -{ - return gr_integrate_ii_sptr (new gr_integrate_ii (decim)); -} - -gr_integrate_ii::gr_integrate_ii (int decim) - : gr_sync_decimator ("integrate_ii", - gr_make_io_signature (1, 1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int)), - decim), - d_decim(decim), - d_count(0) -{ -} - -gr_integrate_ii::~gr_integrate_ii () -{ -} - -int -gr_integrate_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const int *in = (const int *) input_items[0]; - int *out = (int *) output_items[0]; - - for (int i = 0; i < noutput_items; i++) { - out[i] = (int)0; - for (int j = 0; j < d_decim; j++) - out[i] += in[i*d_decim+j]; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_ii.h b/gnuradio-core/src/lib/gengen/gr_integrate_ii.h deleted file mode 100644 index 822b2425..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_ii.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_INTEGRATE_II_H -#define INCLUDED_GR_INTEGRATE_II_H - -#include - -class gr_integrate_ii; - -typedef boost::shared_ptr gr_integrate_ii_sptr; - -gr_integrate_ii_sptr gr_make_integrate_ii (int decim); - -/*! - * \brief output = sum(input[0]...input[n]) - * \ingroup math_blk - * - * Integrate successive samples in input stream and decimate - */ -class gr_integrate_ii : public gr_sync_decimator -{ -private: - friend gr_integrate_ii_sptr gr_make_integrate_ii(int decim); - - gr_integrate_ii (int decim); - - int d_decim; - int d_count; - -public: - ~gr_integrate_ii (); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif /* INCLUDED_GR_INTEGRATE_II_H */ diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_ii.i b/gnuradio-core/src/lib/gengen/gr_integrate_ii.i deleted file mode 100644 index 30745bf2..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_ii.i +++ /dev/null @@ -1,33 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,integrate_ii); - -gr_integrate_ii_sptr gr_make_integrate_ii (int decim); - -class gr_integrate_ii : public gr_sync_decimator -{ -private: - gr_integrate_ii (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_ss.cc b/gnuradio-core/src/lib/gengen/gr_integrate_ss.cc deleted file mode 100644 index bda6e38e..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_ss.cc +++ /dev/null @@ -1,67 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_integrate_ss_sptr -gr_make_integrate_ss (int decim) -{ - return gr_integrate_ss_sptr (new gr_integrate_ss (decim)); -} - -gr_integrate_ss::gr_integrate_ss (int decim) - : gr_sync_decimator ("integrate_ss", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short)), - decim), - d_decim(decim), - d_count(0) -{ -} - -gr_integrate_ss::~gr_integrate_ss () -{ -} - -int -gr_integrate_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const short *in = (const short *) input_items[0]; - short *out = (short *) output_items[0]; - - for (int i = 0; i < noutput_items; i++) { - out[i] = (short)0; - for (int j = 0; j < d_decim; j++) - out[i] += in[i*d_decim+j]; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_ss.h b/gnuradio-core/src/lib/gengen/gr_integrate_ss.h deleted file mode 100644 index cf3a06b2..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_ss.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_INTEGRATE_SS_H -#define INCLUDED_GR_INTEGRATE_SS_H - -#include - -class gr_integrate_ss; - -typedef boost::shared_ptr gr_integrate_ss_sptr; - -gr_integrate_ss_sptr gr_make_integrate_ss (int decim); - -/*! - * \brief output = sum(input[0]...input[n]) - * \ingroup math_blk - * - * Integrate successive samples in input stream and decimate - */ -class gr_integrate_ss : public gr_sync_decimator -{ -private: - friend gr_integrate_ss_sptr gr_make_integrate_ss(int decim); - - gr_integrate_ss (int decim); - - int d_decim; - int d_count; - -public: - ~gr_integrate_ss (); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif /* INCLUDED_GR_INTEGRATE_SS_H */ diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_ss.i b/gnuradio-core/src/lib/gengen/gr_integrate_ss.i deleted file mode 100644 index c00149b0..00000000 --- a/gnuradio-core/src/lib/gengen/gr_integrate_ss.i +++ /dev/null @@ -1,33 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,integrate_ss); - -gr_integrate_ss_sptr gr_make_integrate_ss (int decim); - -class gr_integrate_ss : public gr_sync_decimator -{ -private: - gr_integrate_ss (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_max_ff.cc b/gnuradio-core/src/lib/gengen/gr_max_ff.cc deleted file mode 100644 index b370c66d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_max_ff.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_max_ff_sptr -gr_make_max_ff ( size_t vlen ) -{ - return gr_max_ff_sptr ( new gr_max_ff(vlen)); -} - -gr_max_ff::gr_max_ff( size_t vlen) - : gr_sync_block ( "max_ff", - gr_make_io_signature (1, -1, vlen*sizeof (float)), - gr_make_io_signature (1, 1, sizeof (float))), - d_vlen(vlen) -{ -} - -int -gr_max_ff::work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *optr = (float *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i=0; i max) { - max = ((float*) input_items[k])[i*d_vlen + j]; - } - } - } - - *optr++ = (float) max; - } - return noutput_items; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_max_ff.h b/gnuradio-core/src/lib/gengen/gr_max_ff.h deleted file mode 100644 index ce0b0555..00000000 --- a/gnuradio-core/src/lib/gengen/gr_max_ff.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MAX_FF_H -#define INCLUDED_GR_MAX_FF_H - -#include - -class gr_max_ff; -typedef boost::shared_ptr gr_max_ff_sptr; - -gr_max_ff_sptr gr_make_max_ff (size_t vlen); - - -class gr_max_ff : public gr_sync_block -{ - friend gr_max_ff_sptr gr_make_max_ff (size_t vlen); - - gr_max_ff (size_t vlen); - size_t d_vlen; - - public: - - 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/gengen/gr_max_ff.i b/gnuradio-core/src/lib/gengen/gr_max_ff.i deleted file mode 100644 index 06e8885b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_max_ff.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,max_ff) - -gr_max_ff_sptr gr_make_max_ff (size_t vlen); - -class gr_max_ff : public gr_sync_block -{ - private: - gr_max_ff (size_t vlen); - size_t d_vlen; -}; diff --git a/gnuradio-core/src/lib/gengen/gr_max_ii.cc b/gnuradio-core/src/lib/gengen/gr_max_ii.cc deleted file mode 100644 index 6933ad52..00000000 --- a/gnuradio-core/src/lib/gengen/gr_max_ii.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_max_ii_sptr -gr_make_max_ii ( size_t vlen ) -{ - return gr_max_ii_sptr ( new gr_max_ii(vlen)); -} - -gr_max_ii::gr_max_ii( size_t vlen) - : gr_sync_block ( "max_ii", - gr_make_io_signature (1, -1, vlen*sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))), - d_vlen(vlen) -{ -} - -int -gr_max_ii::work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i=0; i max) { - max = ((int*) input_items[k])[i*d_vlen + j]; - } - } - } - - *optr++ = (int) max; - } - return noutput_items; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_max_ii.h b/gnuradio-core/src/lib/gengen/gr_max_ii.h deleted file mode 100644 index ebffdaae..00000000 --- a/gnuradio-core/src/lib/gengen/gr_max_ii.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MAX_II_H -#define INCLUDED_GR_MAX_II_H - -#include - -class gr_max_ii; -typedef boost::shared_ptr gr_max_ii_sptr; - -gr_max_ii_sptr gr_make_max_ii (size_t vlen); - - -class gr_max_ii : public gr_sync_block -{ - friend gr_max_ii_sptr gr_make_max_ii (size_t vlen); - - gr_max_ii (size_t vlen); - size_t d_vlen; - - public: - - 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/gengen/gr_max_ii.i b/gnuradio-core/src/lib/gengen/gr_max_ii.i deleted file mode 100644 index 050b9022..00000000 --- a/gnuradio-core/src/lib/gengen/gr_max_ii.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,max_ii) - -gr_max_ii_sptr gr_make_max_ii (size_t vlen); - -class gr_max_ii : public gr_sync_block -{ - private: - gr_max_ii (size_t vlen); - size_t d_vlen; -}; diff --git a/gnuradio-core/src/lib/gengen/gr_max_ss.cc b/gnuradio-core/src/lib/gengen/gr_max_ss.cc deleted file mode 100644 index 9121344c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_max_ss.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_max_ss_sptr -gr_make_max_ss ( size_t vlen ) -{ - return gr_max_ss_sptr ( new gr_max_ss(vlen)); -} - -gr_max_ss::gr_max_ss( size_t vlen) - : gr_sync_block ( "max_ss", - gr_make_io_signature (1, -1, vlen*sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))), - d_vlen(vlen) -{ -} - -int -gr_max_ss::work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i=0; i max) { - max = ((short*) input_items[k])[i*d_vlen + j]; - } - } - } - - *optr++ = (short) max; - } - return noutput_items; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_max_ss.h b/gnuradio-core/src/lib/gengen/gr_max_ss.h deleted file mode 100644 index ae68e4f1..00000000 --- a/gnuradio-core/src/lib/gengen/gr_max_ss.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MAX_SS_H -#define INCLUDED_GR_MAX_SS_H - -#include - -class gr_max_ss; -typedef boost::shared_ptr gr_max_ss_sptr; - -gr_max_ss_sptr gr_make_max_ss (size_t vlen); - - -class gr_max_ss : public gr_sync_block -{ - friend gr_max_ss_sptr gr_make_max_ss (size_t vlen); - - gr_max_ss (size_t vlen); - size_t d_vlen; - - public: - - 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/gengen/gr_max_ss.i b/gnuradio-core/src/lib/gengen/gr_max_ss.i deleted file mode 100644 index a081326d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_max_ss.i +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,max_ss) - -gr_max_ss_sptr gr_make_max_ss (size_t vlen); - -class gr_max_ss : public gr_sync_block -{ - private: - gr_max_ss (size_t vlen); - size_t d_vlen; -}; diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_cc.cc b/gnuradio-core/src/lib/gengen/gr_moving_average_cc.cc deleted file mode 100644 index 96c5d561..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_cc.cc +++ /dev/null @@ -1,93 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_moving_average_cc_sptr -gr_make_moving_average_cc (int length, gr_complex scale, int max_iter) -{ - return gr_moving_average_cc_sptr (new gr_moving_average_cc (length, scale, max_iter)); -} - -gr_moving_average_cc::gr_moving_average_cc (int length, gr_complex scale, int max_iter) - : gr_sync_block ("moving_average_cc", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_length(length), - d_scale(scale), - d_max_iter(max_iter), - d_new_length(length), - d_new_scale(scale), - d_updated(false) -{ - set_history(length); -} - -gr_moving_average_cc::~gr_moving_average_cc () -{ -} - -void -gr_moving_average_cc::set_length_and_scale(int length, gr_complex scale) -{ - d_new_length = length; - d_new_scale = scale; - d_updated = true; -} - -int -gr_moving_average_cc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - if (d_updated) { - d_length = d_new_length; - d_scale = d_new_scale; - set_history(d_length); - d_updated = false; - return 0; // history requirements might have changed - } - - const gr_complex *in = (const gr_complex *) input_items[0]; - gr_complex *out = (gr_complex *) output_items[0]; - - gr_complex sum = 0; - int num_iter = (noutput_items>d_max_iter) ? d_max_iter : noutput_items; - for (int i = 0; i < d_length-1 ; i++) { - sum += in[i]; - } - - for (int i = 0; i < num_iter; i++) { - sum += in[i+d_length-1]; - out[i] = sum * d_scale; - sum -= in[i]; - } - - return num_iter; -} diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_cc.h b/gnuradio-core/src/lib/gengen/gr_moving_average_cc.h deleted file mode 100644 index 981933d1..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_cc.h +++ /dev/null @@ -1,71 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MOVING_AVERAGE_CC_H -#define INCLUDED_GR_MOVING_AVERAGE_CC_H - -#include - -class gr_moving_average_cc; - -typedef boost::shared_ptr gr_moving_average_cc_sptr; - -gr_moving_average_cc_sptr gr_make_moving_average_cc (int length, gr_complex scale, int max_iter = 4096); - -/*! - * \brief output is the moving sum of the last N samples, scaled by the scale factor - * \ingroup filter_blk - * - * max_iter limits how long we go without flushing the accumulator - * This is necessary to avoid numerical instability for float and complex. - */ -class gr_moving_average_cc : public gr_sync_block -{ -private: - friend gr_moving_average_cc_sptr gr_make_moving_average_cc(int length, gr_complex scale, int max_iter); - - gr_moving_average_cc (int length, gr_complex scale, int max_iter = 4096); - - int d_length; - gr_complex d_scale; - int d_max_iter; - - int d_new_length; - gr_complex d_new_scale; - bool d_updated; - -public: - ~gr_moving_average_cc (); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - int length() const { return d_new_length; } - gr_complex scale() const { return d_new_scale; } - - void set_length_and_scale(int length, gr_complex scale); -}; - -#endif /* INCLUDED_GR_MOVING_AVERAGE_CC_H */ diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_cc.i b/gnuradio-core/src/lib/gengen/gr_moving_average_cc.i deleted file mode 100644 index 8102e55c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_cc.i +++ /dev/null @@ -1,38 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,moving_average_cc); - -gr_moving_average_cc_sptr gr_make_moving_average_cc (int length, gr_complex scale, int max_iter=4096); - -class gr_moving_average_cc : public gr_sync_block -{ -private: - gr_moving_average_cc (); - - public: - int length() const; - gr_complex scale() const; - void set_length_and_scale(int length, gr_complex scale); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_ff.cc b/gnuradio-core/src/lib/gengen/gr_moving_average_ff.cc deleted file mode 100644 index 364c905b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_ff.cc +++ /dev/null @@ -1,93 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_moving_average_ff_sptr -gr_make_moving_average_ff (int length, float scale, int max_iter) -{ - return gr_moving_average_ff_sptr (new gr_moving_average_ff (length, scale, max_iter)); -} - -gr_moving_average_ff::gr_moving_average_ff (int length, float scale, int max_iter) - : gr_sync_block ("moving_average_ff", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (float))), - d_length(length), - d_scale(scale), - d_max_iter(max_iter), - d_new_length(length), - d_new_scale(scale), - d_updated(false) -{ - set_history(length); -} - -gr_moving_average_ff::~gr_moving_average_ff () -{ -} - -void -gr_moving_average_ff::set_length_and_scale(int length, float scale) -{ - d_new_length = length; - d_new_scale = scale; - d_updated = true; -} - -int -gr_moving_average_ff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - if (d_updated) { - d_length = d_new_length; - d_scale = d_new_scale; - set_history(d_length); - d_updated = false; - return 0; // history requirements might have changed - } - - const float *in = (const float *) input_items[0]; - float *out = (float *) output_items[0]; - - float sum = 0; - int num_iter = (noutput_items>d_max_iter) ? d_max_iter : noutput_items; - for (int i = 0; i < d_length-1 ; i++) { - sum += in[i]; - } - - for (int i = 0; i < num_iter; i++) { - sum += in[i+d_length-1]; - out[i] = sum * d_scale; - sum -= in[i]; - } - - return num_iter; -} diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_ff.h b/gnuradio-core/src/lib/gengen/gr_moving_average_ff.h deleted file mode 100644 index 404fd147..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_ff.h +++ /dev/null @@ -1,71 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MOVING_AVERAGE_FF_H -#define INCLUDED_GR_MOVING_AVERAGE_FF_H - -#include - -class gr_moving_average_ff; - -typedef boost::shared_ptr gr_moving_average_ff_sptr; - -gr_moving_average_ff_sptr gr_make_moving_average_ff (int length, float scale, int max_iter = 4096); - -/*! - * \brief output is the moving sum of the last N samples, scaled by the scale factor - * \ingroup filter_blk - * - * max_iter limits how long we go without flushing the accumulator - * This is necessary to avoid numerical instability for float and complex. - */ -class gr_moving_average_ff : public gr_sync_block -{ -private: - friend gr_moving_average_ff_sptr gr_make_moving_average_ff(int length, float scale, int max_iter); - - gr_moving_average_ff (int length, float scale, int max_iter = 4096); - - int d_length; - float d_scale; - int d_max_iter; - - int d_new_length; - float d_new_scale; - bool d_updated; - -public: - ~gr_moving_average_ff (); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - int length() const { return d_new_length; } - float scale() const { return d_new_scale; } - - void set_length_and_scale(int length, float scale); -}; - -#endif /* INCLUDED_GR_MOVING_AVERAGE_FF_H */ diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_ff.i b/gnuradio-core/src/lib/gengen/gr_moving_average_ff.i deleted file mode 100644 index 1e3a6706..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_ff.i +++ /dev/null @@ -1,38 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,moving_average_ff); - -gr_moving_average_ff_sptr gr_make_moving_average_ff (int length, float scale, int max_iter=4096); - -class gr_moving_average_ff : public gr_sync_block -{ -private: - gr_moving_average_ff (); - - public: - int length() const; - float scale() const; - void set_length_and_scale(int length, float scale); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_ii.cc b/gnuradio-core/src/lib/gengen/gr_moving_average_ii.cc deleted file mode 100644 index 4cb6470c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_ii.cc +++ /dev/null @@ -1,93 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_moving_average_ii_sptr -gr_make_moving_average_ii (int length, int scale, int max_iter) -{ - return gr_moving_average_ii_sptr (new gr_moving_average_ii (length, scale, max_iter)); -} - -gr_moving_average_ii::gr_moving_average_ii (int length, int scale, int max_iter) - : gr_sync_block ("moving_average_ii", - gr_make_io_signature (1, 1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))), - d_length(length), - d_scale(scale), - d_max_iter(max_iter), - d_new_length(length), - d_new_scale(scale), - d_updated(false) -{ - set_history(length); -} - -gr_moving_average_ii::~gr_moving_average_ii () -{ -} - -void -gr_moving_average_ii::set_length_and_scale(int length, int scale) -{ - d_new_length = length; - d_new_scale = scale; - d_updated = true; -} - -int -gr_moving_average_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - if (d_updated) { - d_length = d_new_length; - d_scale = d_new_scale; - set_history(d_length); - d_updated = false; - return 0; // history requirements might have changed - } - - const int *in = (const int *) input_items[0]; - int *out = (int *) output_items[0]; - - int sum = 0; - int num_iter = (noutput_items>d_max_iter) ? d_max_iter : noutput_items; - for (int i = 0; i < d_length-1 ; i++) { - sum += in[i]; - } - - for (int i = 0; i < num_iter; i++) { - sum += in[i+d_length-1]; - out[i] = sum * d_scale; - sum -= in[i]; - } - - return num_iter; -} diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_ii.h b/gnuradio-core/src/lib/gengen/gr_moving_average_ii.h deleted file mode 100644 index b979b0e6..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_ii.h +++ /dev/null @@ -1,71 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MOVING_AVERAGE_II_H -#define INCLUDED_GR_MOVING_AVERAGE_II_H - -#include - -class gr_moving_average_ii; - -typedef boost::shared_ptr gr_moving_average_ii_sptr; - -gr_moving_average_ii_sptr gr_make_moving_average_ii (int length, int scale, int max_iter = 4096); - -/*! - * \brief output is the moving sum of the last N samples, scaled by the scale factor - * \ingroup filter_blk - * - * max_iter limits how long we go without flushing the accumulator - * This is necessary to avoid numerical instability for float and complex. - */ -class gr_moving_average_ii : public gr_sync_block -{ -private: - friend gr_moving_average_ii_sptr gr_make_moving_average_ii(int length, int scale, int max_iter); - - gr_moving_average_ii (int length, int scale, int max_iter = 4096); - - int d_length; - int d_scale; - int d_max_iter; - - int d_new_length; - int d_new_scale; - bool d_updated; - -public: - ~gr_moving_average_ii (); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - int length() const { return d_new_length; } - int scale() const { return d_new_scale; } - - void set_length_and_scale(int length, int scale); -}; - -#endif /* INCLUDED_GR_MOVING_AVERAGE_II_H */ diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_ii.i b/gnuradio-core/src/lib/gengen/gr_moving_average_ii.i deleted file mode 100644 index 3306f3f9..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_ii.i +++ /dev/null @@ -1,38 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,moving_average_ii); - -gr_moving_average_ii_sptr gr_make_moving_average_ii (int length, int scale, int max_iter=4096); - -class gr_moving_average_ii : public gr_sync_block -{ -private: - gr_moving_average_ii (); - - public: - int length() const; - int scale() const; - void set_length_and_scale(int length, int scale); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_ss.cc b/gnuradio-core/src/lib/gengen/gr_moving_average_ss.cc deleted file mode 100644 index 3ce01750..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_ss.cc +++ /dev/null @@ -1,93 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_moving_average_ss_sptr -gr_make_moving_average_ss (int length, short scale, int max_iter) -{ - return gr_moving_average_ss_sptr (new gr_moving_average_ss (length, scale, max_iter)); -} - -gr_moving_average_ss::gr_moving_average_ss (int length, short scale, int max_iter) - : gr_sync_block ("moving_average_ss", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))), - d_length(length), - d_scale(scale), - d_max_iter(max_iter), - d_new_length(length), - d_new_scale(scale), - d_updated(false) -{ - set_history(length); -} - -gr_moving_average_ss::~gr_moving_average_ss () -{ -} - -void -gr_moving_average_ss::set_length_and_scale(int length, short scale) -{ - d_new_length = length; - d_new_scale = scale; - d_updated = true; -} - -int -gr_moving_average_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - if (d_updated) { - d_length = d_new_length; - d_scale = d_new_scale; - set_history(d_length); - d_updated = false; - return 0; // history requirements might have changed - } - - const short *in = (const short *) input_items[0]; - short *out = (short *) output_items[0]; - - short sum = 0; - int num_iter = (noutput_items>d_max_iter) ? d_max_iter : noutput_items; - for (int i = 0; i < d_length-1 ; i++) { - sum += in[i]; - } - - for (int i = 0; i < num_iter; i++) { - sum += in[i+d_length-1]; - out[i] = sum * d_scale; - sum -= in[i]; - } - - return num_iter; -} diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_ss.h b/gnuradio-core/src/lib/gengen/gr_moving_average_ss.h deleted file mode 100644 index bbb9d9fb..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_ss.h +++ /dev/null @@ -1,71 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MOVING_AVERAGE_SS_H -#define INCLUDED_GR_MOVING_AVERAGE_SS_H - -#include - -class gr_moving_average_ss; - -typedef boost::shared_ptr gr_moving_average_ss_sptr; - -gr_moving_average_ss_sptr gr_make_moving_average_ss (int length, short scale, int max_iter = 4096); - -/*! - * \brief output is the moving sum of the last N samples, scaled by the scale factor - * \ingroup filter_blk - * - * max_iter limits how long we go without flushing the accumulator - * This is necessary to avoid numerical instability for float and complex. - */ -class gr_moving_average_ss : public gr_sync_block -{ -private: - friend gr_moving_average_ss_sptr gr_make_moving_average_ss(int length, short scale, int max_iter); - - gr_moving_average_ss (int length, short scale, int max_iter = 4096); - - int d_length; - short d_scale; - int d_max_iter; - - int d_new_length; - short d_new_scale; - bool d_updated; - -public: - ~gr_moving_average_ss (); - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - int length() const { return d_new_length; } - short scale() const { return d_new_scale; } - - void set_length_and_scale(int length, short scale); -}; - -#endif /* INCLUDED_GR_MOVING_AVERAGE_SS_H */ diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_ss.i b/gnuradio-core/src/lib/gengen/gr_moving_average_ss.i deleted file mode 100644 index 1473892c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_ss.i +++ /dev/null @@ -1,38 +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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,moving_average_ss); - -gr_moving_average_ss_sptr gr_make_moving_average_ss (int length, short scale, int max_iter=4096); - -class gr_moving_average_ss : public gr_sync_block -{ -private: - gr_moving_average_ss (); - - public: - int length() const; - short scale() const; - void set_length_and_scale(int length, short scale); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_cc.cc b/gnuradio-core/src/lib/gengen/gr_multiply_cc.cc deleted file mode 100644 index 05b42118..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_cc.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_cc_sptr -gr_make_multiply_cc (size_t vlen) -{ - return gr_multiply_cc_sptr (new gr_multiply_cc (vlen)); -} - -gr_multiply_cc::gr_multiply_cc (size_t vlen) - : gr_sync_block ("multiply_cc", - gr_make_io_signature (1, -1, sizeof (gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof (gr_complex)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_multiply_cc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *optr = (gr_complex *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items*d_vlen; i++){ - gr_complex acc = ((gr_complex *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc *= ((gr_complex *) input_items[j])[i]; - - *optr++ = (gr_complex) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_cc.h b/gnuradio-core/src/lib/gengen/gr_multiply_cc.h deleted file mode 100644 index 4c072aad..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_cc.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_CC_H -#define INCLUDED_GR_MULTIPLY_CC_H - -#include - -class gr_multiply_cc; -typedef boost::shared_ptr gr_multiply_cc_sptr; - -gr_multiply_cc_sptr gr_make_multiply_cc (size_t vlen = 1); - -/*! - * \brief output = prod (input_0, input_1, ...) - * \ingroup math_blk - * - * Multiply across all input streams. - */ -class gr_multiply_cc : public gr_sync_block -{ - friend gr_multiply_cc_sptr gr_make_multiply_cc (size_t vlen); - - gr_multiply_cc (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_multiply_cc.i b/gnuradio-core/src/lib/gengen/gr_multiply_cc.i deleted file mode 100644 index 43e02302..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_cc.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_cc) - -gr_multiply_cc_sptr gr_make_multiply_cc (size_t vlen = 1); - -class gr_multiply_cc : public gr_sync_block -{ - private: - gr_multiply_cc (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_cc.cc b/gnuradio-core/src/lib/gengen/gr_multiply_const_cc.cc deleted file mode 100644 index a409e6ff..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_cc.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_const_cc_sptr -gr_make_multiply_const_cc (gr_complex k) -{ - return gr_multiply_const_cc_sptr (new gr_multiply_const_cc (k)); -} - -gr_multiply_const_cc::gr_multiply_const_cc (gr_complex k) - : gr_sync_block ("multiply_const_cc", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_k (k) -{ -} - -int -gr_multiply_const_cc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *iptr = (gr_complex *) input_items[0]; - gr_complex *optr = (gr_complex *) output_items[0]; - - int size = noutput_items; - - while (size >= 8){ - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ * d_k; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_cc.h b/gnuradio-core/src/lib/gengen/gr_multiply_const_cc.h deleted file mode 100644 index 31d8e989..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_cc.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_CONST_CC_H -#define INCLUDED_GR_MULTIPLY_CONST_CC_H - -#include - -class gr_multiply_const_cc; -typedef boost::shared_ptr gr_multiply_const_cc_sptr; - -gr_multiply_const_cc_sptr gr_make_multiply_const_cc (gr_complex k); - -/*! - * \brief output = input * constant - * \ingroup math_blk - */ -class gr_multiply_const_cc : public gr_sync_block -{ - friend gr_multiply_const_cc_sptr gr_make_multiply_const_cc (gr_complex k); - - gr_complex d_k; // the constant - gr_multiply_const_cc (gr_complex k); - - public: - gr_complex k () const { return d_k; } - void set_k (gr_complex k) { d_k = k; } - - 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/gengen/gr_multiply_const_cc.i b/gnuradio-core/src/lib/gengen/gr_multiply_const_cc.i deleted file mode 100644 index 7e19be59..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_cc.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_const_cc) - -gr_multiply_const_cc_sptr gr_make_multiply_const_cc (gr_complex k); - -class gr_multiply_const_cc : public gr_sync_block -{ - private: - gr_multiply_const_cc (gr_complex k); - - public: - gr_complex k () const { return d_k; } - void set_k (gr_complex k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_ff.cc b/gnuradio-core/src/lib/gengen/gr_multiply_const_ff.cc deleted file mode 100644 index 69b0adb1..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_ff.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_const_ff_sptr -gr_make_multiply_const_ff (float k) -{ - return gr_multiply_const_ff_sptr (new gr_multiply_const_ff (k)); -} - -gr_multiply_const_ff::gr_multiply_const_ff (float k) - : gr_sync_block ("multiply_const_ff", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (float))), - d_k (k) -{ -} - -int -gr_multiply_const_ff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *iptr = (float *) input_items[0]; - float *optr = (float *) output_items[0]; - - int size = noutput_items; - - while (size >= 8){ - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ * d_k; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_ff.h b/gnuradio-core/src/lib/gengen/gr_multiply_const_ff.h deleted file mode 100644 index 75eccbc3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_ff.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_CONST_FF_H -#define INCLUDED_GR_MULTIPLY_CONST_FF_H - -#include - -class gr_multiply_const_ff; -typedef boost::shared_ptr gr_multiply_const_ff_sptr; - -gr_multiply_const_ff_sptr gr_make_multiply_const_ff (float k); - -/*! - * \brief output = input * constant - * \ingroup math_blk - */ -class gr_multiply_const_ff : public gr_sync_block -{ - friend gr_multiply_const_ff_sptr gr_make_multiply_const_ff (float k); - - float d_k; // the constant - gr_multiply_const_ff (float k); - - public: - float k () const { return d_k; } - void set_k (float k) { d_k = k; } - - 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/gengen/gr_multiply_const_ff.i b/gnuradio-core/src/lib/gengen/gr_multiply_const_ff.i deleted file mode 100644 index 734d2fc4..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_ff.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_const_ff) - -gr_multiply_const_ff_sptr gr_make_multiply_const_ff (float k); - -class gr_multiply_const_ff : public gr_sync_block -{ - private: - gr_multiply_const_ff (float k); - - public: - float k () const { return d_k; } - void set_k (float k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_ii.cc b/gnuradio-core/src/lib/gengen/gr_multiply_const_ii.cc deleted file mode 100644 index 634681f1..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_ii.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_const_ii_sptr -gr_make_multiply_const_ii (int k) -{ - return gr_multiply_const_ii_sptr (new gr_multiply_const_ii (k)); -} - -gr_multiply_const_ii::gr_multiply_const_ii (int k) - : gr_sync_block ("multiply_const_ii", - gr_make_io_signature (1, 1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))), - d_k (k) -{ -} - -int -gr_multiply_const_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *iptr = (int *) input_items[0]; - int *optr = (int *) output_items[0]; - - int size = noutput_items; - - while (size >= 8){ - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ * d_k; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_ii.h b/gnuradio-core/src/lib/gengen/gr_multiply_const_ii.h deleted file mode 100644 index 3ca5cf43..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_ii.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_CONST_II_H -#define INCLUDED_GR_MULTIPLY_CONST_II_H - -#include - -class gr_multiply_const_ii; -typedef boost::shared_ptr gr_multiply_const_ii_sptr; - -gr_multiply_const_ii_sptr gr_make_multiply_const_ii (int k); - -/*! - * \brief output = input * constant - * \ingroup math_blk - */ -class gr_multiply_const_ii : public gr_sync_block -{ - friend gr_multiply_const_ii_sptr gr_make_multiply_const_ii (int k); - - int d_k; // the constant - gr_multiply_const_ii (int k); - - public: - int k () const { return d_k; } - void set_k (int k) { d_k = k; } - - 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/gengen/gr_multiply_const_ii.i b/gnuradio-core/src/lib/gengen/gr_multiply_const_ii.i deleted file mode 100644 index 620941c4..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_ii.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_const_ii) - -gr_multiply_const_ii_sptr gr_make_multiply_const_ii (int k); - -class gr_multiply_const_ii : public gr_sync_block -{ - private: - gr_multiply_const_ii (int k); - - public: - int k () const { return d_k; } - void set_k (int k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_ss.cc b/gnuradio-core/src/lib/gengen/gr_multiply_const_ss.cc deleted file mode 100644 index ad539273..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_ss.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_const_ss_sptr -gr_make_multiply_const_ss (short k) -{ - return gr_multiply_const_ss_sptr (new gr_multiply_const_ss (k)); -} - -gr_multiply_const_ss::gr_multiply_const_ss (short k) - : gr_sync_block ("multiply_const_ss", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))), - d_k (k) -{ -} - -int -gr_multiply_const_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *) input_items[0]; - short *optr = (short *) output_items[0]; - - int size = noutput_items; - - while (size >= 8){ - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - *optr++ = *iptr++ * d_k; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++ * d_k; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_ss.h b/gnuradio-core/src/lib/gengen/gr_multiply_const_ss.h deleted file mode 100644 index 150be9b0..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_ss.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_CONST_SS_H -#define INCLUDED_GR_MULTIPLY_CONST_SS_H - -#include - -class gr_multiply_const_ss; -typedef boost::shared_ptr gr_multiply_const_ss_sptr; - -gr_multiply_const_ss_sptr gr_make_multiply_const_ss (short k); - -/*! - * \brief output = input * constant - * \ingroup math_blk - */ -class gr_multiply_const_ss : public gr_sync_block -{ - friend gr_multiply_const_ss_sptr gr_make_multiply_const_ss (short k); - - short d_k; // the constant - gr_multiply_const_ss (short k); - - public: - short k () const { return d_k; } - void set_k (short k) { d_k = k; } - - 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/gengen/gr_multiply_const_ss.i b/gnuradio-core/src/lib/gengen/gr_multiply_const_ss.i deleted file mode 100644 index eb4fb7ff..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_ss.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_const_ss) - -gr_multiply_const_ss_sptr gr_make_multiply_const_ss (short k); - -class gr_multiply_const_ss : public gr_sync_block -{ - private: - gr_multiply_const_ss (short k); - - public: - short k () const { return d_k; } - void set_k (short k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.cc b/gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.cc deleted file mode 100644 index 686a1f42..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_const_vcc_sptr -gr_make_multiply_const_vcc (const std::vector k) -{ - return gr_multiply_const_vcc_sptr (new gr_multiply_const_vcc (k)); -} - -gr_multiply_const_vcc::gr_multiply_const_vcc (const std::vector k) - : gr_sync_block ("multiply_const_vcc", - gr_make_io_signature (1, 1, sizeof(gr_complex)*k.size()), - gr_make_io_signature (1, 1, sizeof(gr_complex)*k.size())) -{ - d_k = k; -} - -int -gr_multiply_const_vcc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *iptr = (gr_complex *)input_items[0]; - gr_complex *optr = (gr_complex *)output_items[0]; - - int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(gr_complex); - - for (int i = 0; i < noutput_items; i++) - for (int j = 0; j < nitems_per_block; j++) - *optr++ = *iptr++ * d_k[j]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.h b/gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.h deleted file mode 100644 index c30f2492..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_CONST_VCC_H -#define INCLUDED_GR_MULTIPLY_CONST_VCC_H - -#include - -class gr_multiply_const_vcc; -typedef boost::shared_ptr gr_multiply_const_vcc_sptr; - -gr_multiply_const_vcc_sptr gr_make_multiply_const_vcc (const std::vector k); - -/*! - * \brief output vector = input vector * constant vector (element-wise) - * \ingroup math_blk - */ -class gr_multiply_const_vcc : public gr_sync_block -{ - friend gr_multiply_const_vcc_sptr gr_make_multiply_const_vcc (const std::vector k); - - std::vector d_k; // the constant - gr_multiply_const_vcc (const std::vector k); - - public: - const std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } - - 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/gengen/gr_multiply_const_vcc.i b/gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.i deleted file mode 100644 index dbe4e43d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vcc.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_const_vcc) - -gr_multiply_const_vcc_sptr gr_make_multiply_const_vcc (const std::vector k); - -class gr_multiply_const_vcc : public gr_sync_block -{ - private: - gr_multiply_const_vcc (const std::vector k); - - public: - std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vff.cc b/gnuradio-core/src/lib/gengen/gr_multiply_const_vff.cc deleted file mode 100644 index b4315c2a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vff.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_const_vff_sptr -gr_make_multiply_const_vff (const std::vector k) -{ - return gr_multiply_const_vff_sptr (new gr_multiply_const_vff (k)); -} - -gr_multiply_const_vff::gr_multiply_const_vff (const std::vector k) - : gr_sync_block ("multiply_const_vff", - gr_make_io_signature (1, 1, sizeof(float)*k.size()), - gr_make_io_signature (1, 1, sizeof(float)*k.size())) -{ - d_k = k; -} - -int -gr_multiply_const_vff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *iptr = (float *)input_items[0]; - float *optr = (float *)output_items[0]; - - int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(float); - - for (int i = 0; i < noutput_items; i++) - for (int j = 0; j < nitems_per_block; j++) - *optr++ = *iptr++ * d_k[j]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vff.h b/gnuradio-core/src/lib/gengen/gr_multiply_const_vff.h deleted file mode 100644 index fb5a67ba..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vff.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_CONST_VFF_H -#define INCLUDED_GR_MULTIPLY_CONST_VFF_H - -#include - -class gr_multiply_const_vff; -typedef boost::shared_ptr gr_multiply_const_vff_sptr; - -gr_multiply_const_vff_sptr gr_make_multiply_const_vff (const std::vector k); - -/*! - * \brief output vector = input vector * constant vector (element-wise) - * \ingroup math_blk - */ -class gr_multiply_const_vff : public gr_sync_block -{ - friend gr_multiply_const_vff_sptr gr_make_multiply_const_vff (const std::vector k); - - std::vector d_k; // the constant - gr_multiply_const_vff (const std::vector k); - - public: - const std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } - - 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/gengen/gr_multiply_const_vff.i b/gnuradio-core/src/lib/gengen/gr_multiply_const_vff.i deleted file mode 100644 index 2c9d9112..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vff.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_const_vff) - -gr_multiply_const_vff_sptr gr_make_multiply_const_vff (const std::vector k); - -class gr_multiply_const_vff : public gr_sync_block -{ - private: - gr_multiply_const_vff (const std::vector k); - - public: - std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vii.cc b/gnuradio-core/src/lib/gengen/gr_multiply_const_vii.cc deleted file mode 100644 index 19092ba3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vii.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_const_vii_sptr -gr_make_multiply_const_vii (const std::vector k) -{ - return gr_multiply_const_vii_sptr (new gr_multiply_const_vii (k)); -} - -gr_multiply_const_vii::gr_multiply_const_vii (const std::vector k) - : gr_sync_block ("multiply_const_vii", - gr_make_io_signature (1, 1, sizeof(int)*k.size()), - gr_make_io_signature (1, 1, sizeof(int)*k.size())) -{ - d_k = k; -} - -int -gr_multiply_const_vii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *iptr = (int *)input_items[0]; - int *optr = (int *)output_items[0]; - - int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(int); - - for (int i = 0; i < noutput_items; i++) - for (int j = 0; j < nitems_per_block; j++) - *optr++ = *iptr++ * d_k[j]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vii.h b/gnuradio-core/src/lib/gengen/gr_multiply_const_vii.h deleted file mode 100644 index 2117c261..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vii.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_CONST_VII_H -#define INCLUDED_GR_MULTIPLY_CONST_VII_H - -#include - -class gr_multiply_const_vii; -typedef boost::shared_ptr gr_multiply_const_vii_sptr; - -gr_multiply_const_vii_sptr gr_make_multiply_const_vii (const std::vector k); - -/*! - * \brief output vector = input vector * constant vector (element-wise) - * \ingroup math_blk - */ -class gr_multiply_const_vii : public gr_sync_block -{ - friend gr_multiply_const_vii_sptr gr_make_multiply_const_vii (const std::vector k); - - std::vector d_k; // the constant - gr_multiply_const_vii (const std::vector k); - - public: - const std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } - - 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/gengen/gr_multiply_const_vii.i b/gnuradio-core/src/lib/gengen/gr_multiply_const_vii.i deleted file mode 100644 index 4b79288d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vii.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_const_vii) - -gr_multiply_const_vii_sptr gr_make_multiply_const_vii (const std::vector k); - -class gr_multiply_const_vii : public gr_sync_block -{ - private: - gr_multiply_const_vii (const std::vector k); - - public: - std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vss.cc b/gnuradio-core/src/lib/gengen/gr_multiply_const_vss.cc deleted file mode 100644 index d2bde15e..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vss.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_const_vss_sptr -gr_make_multiply_const_vss (const std::vector k) -{ - return gr_multiply_const_vss_sptr (new gr_multiply_const_vss (k)); -} - -gr_multiply_const_vss::gr_multiply_const_vss (const std::vector k) - : gr_sync_block ("multiply_const_vss", - gr_make_io_signature (1, 1, sizeof(short)*k.size()), - gr_make_io_signature (1, 1, sizeof(short)*k.size())) -{ - d_k = k; -} - -int -gr_multiply_const_vss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *)input_items[0]; - short *optr = (short *)output_items[0]; - - int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(short); - - for (int i = 0; i < noutput_items; i++) - for (int j = 0; j < nitems_per_block; j++) - *optr++ = *iptr++ * d_k[j]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vss.h b/gnuradio-core/src/lib/gengen/gr_multiply_const_vss.h deleted file mode 100644 index d1411481..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vss.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_CONST_VSS_H -#define INCLUDED_GR_MULTIPLY_CONST_VSS_H - -#include - -class gr_multiply_const_vss; -typedef boost::shared_ptr gr_multiply_const_vss_sptr; - -gr_multiply_const_vss_sptr gr_make_multiply_const_vss (const std::vector k); - -/*! - * \brief output vector = input vector * constant vector (element-wise) - * \ingroup math_blk - */ -class gr_multiply_const_vss : public gr_sync_block -{ - friend gr_multiply_const_vss_sptr gr_make_multiply_const_vss (const std::vector k); - - std::vector d_k; // the constant - gr_multiply_const_vss (const std::vector k); - - public: - const std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } - - 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/gengen/gr_multiply_const_vss.i b/gnuradio-core/src/lib/gengen/gr_multiply_const_vss.i deleted file mode 100644 index f00ca305..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vss.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_const_vss) - -gr_multiply_const_vss_sptr gr_make_multiply_const_vss (const std::vector k); - -class gr_multiply_const_vss : public gr_sync_block -{ - private: - gr_multiply_const_vss (const std::vector k); - - public: - std::vector k () const { return d_k; } - void set_k (const std::vector k) { d_k = k; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_ff.cc b/gnuradio-core/src/lib/gengen/gr_multiply_ff.cc deleted file mode 100644 index 72779429..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_ff.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_ff_sptr -gr_make_multiply_ff (size_t vlen) -{ - return gr_multiply_ff_sptr (new gr_multiply_ff (vlen)); -} - -gr_multiply_ff::gr_multiply_ff (size_t vlen) - : gr_sync_block ("multiply_ff", - gr_make_io_signature (1, -1, sizeof (float)*vlen), - gr_make_io_signature (1, 1, sizeof (float)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_multiply_ff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *optr = (float *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items*d_vlen; i++){ - float acc = ((float *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc *= ((float *) input_items[j])[i]; - - *optr++ = (float) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_ff.h b/gnuradio-core/src/lib/gengen/gr_multiply_ff.h deleted file mode 100644 index c60a8543..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_ff.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_FF_H -#define INCLUDED_GR_MULTIPLY_FF_H - -#include - -class gr_multiply_ff; -typedef boost::shared_ptr gr_multiply_ff_sptr; - -gr_multiply_ff_sptr gr_make_multiply_ff (size_t vlen = 1); - -/*! - * \brief output = prod (input_0, input_1, ...) - * \ingroup math_blk - * - * Multiply across all input streams. - */ -class gr_multiply_ff : public gr_sync_block -{ - friend gr_multiply_ff_sptr gr_make_multiply_ff (size_t vlen); - - gr_multiply_ff (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_multiply_ff.i b/gnuradio-core/src/lib/gengen/gr_multiply_ff.i deleted file mode 100644 index 5af9209b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_ff.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_ff) - -gr_multiply_ff_sptr gr_make_multiply_ff (size_t vlen = 1); - -class gr_multiply_ff : public gr_sync_block -{ - private: - gr_multiply_ff (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_ii.cc b/gnuradio-core/src/lib/gengen/gr_multiply_ii.cc deleted file mode 100644 index 3032339a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_ii.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_ii_sptr -gr_make_multiply_ii (size_t vlen) -{ - return gr_multiply_ii_sptr (new gr_multiply_ii (vlen)); -} - -gr_multiply_ii::gr_multiply_ii (size_t vlen) - : gr_sync_block ("multiply_ii", - gr_make_io_signature (1, -1, sizeof (int)*vlen), - gr_make_io_signature (1, 1, sizeof (int)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_multiply_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items*d_vlen; i++){ - int acc = ((int *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc *= ((int *) input_items[j])[i]; - - *optr++ = (int) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_ii.h b/gnuradio-core/src/lib/gengen/gr_multiply_ii.h deleted file mode 100644 index 420e82ba..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_ii.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_II_H -#define INCLUDED_GR_MULTIPLY_II_H - -#include - -class gr_multiply_ii; -typedef boost::shared_ptr gr_multiply_ii_sptr; - -gr_multiply_ii_sptr gr_make_multiply_ii (size_t vlen = 1); - -/*! - * \brief output = prod (input_0, input_1, ...) - * \ingroup math_blk - * - * Multiply across all input streams. - */ -class gr_multiply_ii : public gr_sync_block -{ - friend gr_multiply_ii_sptr gr_make_multiply_ii (size_t vlen); - - gr_multiply_ii (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_multiply_ii.i b/gnuradio-core/src/lib/gengen/gr_multiply_ii.i deleted file mode 100644 index cbcc7375..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_ii) - -gr_multiply_ii_sptr gr_make_multiply_ii (size_t vlen = 1); - -class gr_multiply_ii : public gr_sync_block -{ - private: - gr_multiply_ii (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_ss.cc b/gnuradio-core/src/lib/gengen/gr_multiply_ss.cc deleted file mode 100644 index 6b379d8e..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_ss.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_multiply_ss_sptr -gr_make_multiply_ss (size_t vlen) -{ - return gr_multiply_ss_sptr (new gr_multiply_ss (vlen)); -} - -gr_multiply_ss::gr_multiply_ss (size_t vlen) - : gr_sync_block ("multiply_ss", - gr_make_io_signature (1, -1, sizeof (short)*vlen), - gr_make_io_signature (1, 1, sizeof (short)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_multiply_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items*d_vlen; i++){ - short acc = ((short *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc *= ((short *) input_items[j])[i]; - - *optr++ = (short) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_ss.h b/gnuradio-core/src/lib/gengen/gr_multiply_ss.h deleted file mode 100644 index 8dceb947..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_ss.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MULTIPLY_SS_H -#define INCLUDED_GR_MULTIPLY_SS_H - -#include - -class gr_multiply_ss; -typedef boost::shared_ptr gr_multiply_ss_sptr; - -gr_multiply_ss_sptr gr_make_multiply_ss (size_t vlen = 1); - -/*! - * \brief output = prod (input_0, input_1, ...) - * \ingroup math_blk - * - * Multiply across all input streams. - */ -class gr_multiply_ss : public gr_sync_block -{ - friend gr_multiply_ss_sptr gr_make_multiply_ss (size_t vlen); - - gr_multiply_ss (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_multiply_ss.i b/gnuradio-core/src/lib/gengen/gr_multiply_ss.i deleted file mode 100644 index 461a8fc9..00000000 --- a/gnuradio-core/src/lib/gengen/gr_multiply_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,multiply_ss) - -gr_multiply_ss_sptr gr_make_multiply_ss (size_t vlen = 1); - -class gr_multiply_ss : public gr_sync_block -{ - private: - gr_multiply_ss (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_mute_cc.cc b/gnuradio-core/src/lib/gengen/gr_mute_cc.cc deleted file mode 100644 index 0de4e288..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_cc.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - - -gr_mute_cc_sptr -gr_make_mute_cc (bool mute) -{ - return gr_mute_cc_sptr (new gr_mute_cc (mute)); -} - -gr_mute_cc::gr_mute_cc (bool mute) - : gr_sync_block ("mute_cc", - gr_make_io_signature (1, 1, sizeof (gr_complex)), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_mute (mute) -{ -} - -int -gr_mute_cc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *iptr = (gr_complex *) input_items[0]; - gr_complex *optr = (gr_complex *) output_items[0]; - - int size = noutput_items; - - if (d_mute){ - memset (optr, 0, noutput_items * sizeof(gr_complex)); - } - else { - while (size >= 8){ - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_mute_cc.h b/gnuradio-core/src/lib/gengen/gr_mute_cc.h deleted file mode 100644 index 51e5dc41..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_cc.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MUTE_CC_H -#define INCLUDED_GR_MUTE_CC_H - -#include - -class gr_mute_cc; -typedef boost::shared_ptr gr_mute_cc_sptr; - -gr_mute_cc_sptr gr_make_mute_cc (bool mute=false); - -/*! - * \brief output = input or zero if muted. - * \ingroup level_blk - */ -class gr_mute_cc : public gr_sync_block -{ - friend gr_mute_cc_sptr gr_make_mute_cc (bool mute); - - bool d_mute; - gr_mute_cc (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } - - 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/gengen/gr_mute_cc.i b/gnuradio-core/src/lib/gengen/gr_mute_cc.i deleted file mode 100644 index e527762a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_cc.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,mute_cc) - -gr_mute_cc_sptr gr_make_mute_cc(bool mute=false); - -class gr_mute_cc : public gr_sync_block -{ - private: - gr_mute_cc (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_mute_ff.cc b/gnuradio-core/src/lib/gengen/gr_mute_ff.cc deleted file mode 100644 index 59f819b3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_ff.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - - -gr_mute_ff_sptr -gr_make_mute_ff (bool mute) -{ - return gr_mute_ff_sptr (new gr_mute_ff (mute)); -} - -gr_mute_ff::gr_mute_ff (bool mute) - : gr_sync_block ("mute_ff", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (float))), - d_mute (mute) -{ -} - -int -gr_mute_ff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *iptr = (float *) input_items[0]; - float *optr = (float *) output_items[0]; - - int size = noutput_items; - - if (d_mute){ - memset (optr, 0, noutput_items * sizeof(float)); - } - else { - while (size >= 8){ - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_mute_ff.h b/gnuradio-core/src/lib/gengen/gr_mute_ff.h deleted file mode 100644 index 3a76fd8d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_ff.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MUTE_FF_H -#define INCLUDED_GR_MUTE_FF_H - -#include - -class gr_mute_ff; -typedef boost::shared_ptr gr_mute_ff_sptr; - -gr_mute_ff_sptr gr_make_mute_ff (bool mute=false); - -/*! - * \brief output = input or zero if muted. - * \ingroup level_blk - */ -class gr_mute_ff : public gr_sync_block -{ - friend gr_mute_ff_sptr gr_make_mute_ff (bool mute); - - bool d_mute; - gr_mute_ff (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } - - 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/gengen/gr_mute_ff.i b/gnuradio-core/src/lib/gengen/gr_mute_ff.i deleted file mode 100644 index 63bf0a1b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_ff.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,mute_ff) - -gr_mute_ff_sptr gr_make_mute_ff(bool mute=false); - -class gr_mute_ff : public gr_sync_block -{ - private: - gr_mute_ff (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_mute_ii.cc b/gnuradio-core/src/lib/gengen/gr_mute_ii.cc deleted file mode 100644 index 94f5ea8c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_ii.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - - -gr_mute_ii_sptr -gr_make_mute_ii (bool mute) -{ - return gr_mute_ii_sptr (new gr_mute_ii (mute)); -} - -gr_mute_ii::gr_mute_ii (bool mute) - : gr_sync_block ("mute_ii", - gr_make_io_signature (1, 1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))), - d_mute (mute) -{ -} - -int -gr_mute_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *iptr = (int *) input_items[0]; - int *optr = (int *) output_items[0]; - - int size = noutput_items; - - if (d_mute){ - memset (optr, 0, noutput_items * sizeof(int)); - } - else { - while (size >= 8){ - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_mute_ii.h b/gnuradio-core/src/lib/gengen/gr_mute_ii.h deleted file mode 100644 index d809f8e6..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_ii.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MUTE_II_H -#define INCLUDED_GR_MUTE_II_H - -#include - -class gr_mute_ii; -typedef boost::shared_ptr gr_mute_ii_sptr; - -gr_mute_ii_sptr gr_make_mute_ii (bool mute=false); - -/*! - * \brief output = input or zero if muted. - * \ingroup level_blk - */ -class gr_mute_ii : public gr_sync_block -{ - friend gr_mute_ii_sptr gr_make_mute_ii (bool mute); - - bool d_mute; - gr_mute_ii (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } - - 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/gengen/gr_mute_ii.i b/gnuradio-core/src/lib/gengen/gr_mute_ii.i deleted file mode 100644 index c52c56ff..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_ii.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,mute_ii) - -gr_mute_ii_sptr gr_make_mute_ii(bool mute=false); - -class gr_mute_ii : public gr_sync_block -{ - private: - gr_mute_ii (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_mute_ss.cc b/gnuradio-core/src/lib/gengen/gr_mute_ss.cc deleted file mode 100644 index cb912ea1..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_ss.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - - -gr_mute_ss_sptr -gr_make_mute_ss (bool mute) -{ - return gr_mute_ss_sptr (new gr_mute_ss (mute)); -} - -gr_mute_ss::gr_mute_ss (bool mute) - : gr_sync_block ("mute_ss", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))), - d_mute (mute) -{ -} - -int -gr_mute_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *) input_items[0]; - short *optr = (short *) output_items[0]; - - int size = noutput_items; - - if (d_mute){ - memset (optr, 0, noutput_items * sizeof(short)); - } - else { - while (size >= 8){ - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_mute_ss.h b/gnuradio-core/src/lib/gengen/gr_mute_ss.h deleted file mode 100644 index 80ca5f96..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_ss.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_MUTE_SS_H -#define INCLUDED_GR_MUTE_SS_H - -#include - -class gr_mute_ss; -typedef boost::shared_ptr gr_mute_ss_sptr; - -gr_mute_ss_sptr gr_make_mute_ss (bool mute=false); - -/*! - * \brief output = input or zero if muted. - * \ingroup level_blk - */ -class gr_mute_ss : public gr_sync_block -{ - friend gr_mute_ss_sptr gr_make_mute_ss (bool mute); - - bool d_mute; - gr_mute_ss (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } - - 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/gengen/gr_mute_ss.i b/gnuradio-core/src/lib/gengen/gr_mute_ss.i deleted file mode 100644 index 580b943b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_ss.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,mute_ss) - -gr_mute_ss_sptr gr_make_mute_ss(bool mute=false); - -class gr_mute_ss : public gr_sync_block -{ - private: - gr_mute_ss (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_c.cc b/gnuradio-core/src/lib/gengen/gr_noise_source_c.cc deleted file mode 100644 index 04ab4d73..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_c.cc +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include - - -gr_noise_source_c_sptr -gr_make_noise_source_c (gr_noise_type_t type, float ampl, long seed) -{ - return gr_noise_source_c_sptr (new gr_noise_source_c (type, ampl, seed)); -} - - -gr_noise_source_c::gr_noise_source_c (gr_noise_type_t type, float ampl, long seed) - : gr_sync_block ("noise_source_c", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_type (type), - d_ampl (ampl), - d_rng (seed) -{ -} - -int -gr_noise_source_c::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *out = (gr_complex *) output_items[0]; - - switch (d_type){ -#if 1 // complex? - - case GR_UNIFORM: - for (int i = 0; i < noutput_items; i++) - out[i] = gr_complex (d_ampl * ((d_rng.ran1 () * 2.0) - 1.0), - d_ampl * ((d_rng.ran1 () * 2.0) - 1.0)); - break; - - case GR_GAUSSIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = d_ampl * d_rng.rayleigh_complex (); - break; - -#else // nope... - - case GR_UNIFORM: - for (int i = 0; i < noutput_items; i++) - out[i] = (gr_complex)(d_ampl * ((d_rng.ran1 () * 2.0) - 1.0)); - break; - - case GR_GAUSSIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = (gr_complex)(d_ampl * d_rng.gasdev ()); - break; - - case GR_LAPLACIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = (gr_complex)(d_ampl * d_rng.laplacian ()); - break; - - case GR_IMPULSE: // FIXME changeable impulse settings - for (int i = 0; i < noutput_items; i++) - out[i] = (gr_complex)(d_ampl * d_rng.impulse (9)); - break; -#endif - - default: - throw std::runtime_error ("invalid type"); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_c.h b/gnuradio-core/src/lib/gengen/gr_noise_source_c.h deleted file mode 100644 index 6d5cc2d0..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_c.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_NOISE_SOURCE_C_H -#define INCLUDED_GR_NOISE_SOURCE_C_H - -#include -#include -#include - - -class gr_noise_source_c; -typedef boost::shared_ptr gr_noise_source_c_sptr; - -gr_noise_source_c_sptr -gr_make_noise_source_c (gr_noise_type_t type, float ampl, long seed = 3021); - -/*! - * \brief random number source - * \ingroup source_blk - */ -class gr_noise_source_c : public gr_sync_block { - friend gr_noise_source_c_sptr - gr_make_noise_source_c (gr_noise_type_t type, float ampl, long seed); - - gr_noise_type_t d_type; - float d_ampl; - gr_random d_rng; - - gr_noise_source_c (gr_noise_type_t type, float ampl, long seed = 3021); - - public: - void set_type (gr_noise_type_t type) { d_type = type; } - void set_amplitude (float ampl) { d_ampl = ampl; } - - virtual 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/gengen/gr_noise_source_c.i b/gnuradio-core/src/lib/gengen/gr_noise_source_c.i deleted file mode 100644 index 6687b850..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_c.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,noise_source_c); - -gr_noise_source_c_sptr -gr_make_noise_source_c (gr_noise_type_t type, float ampl, long seed = 3021); - -class gr_noise_source_c : public gr_block { - private: - gr_noise_source_c (gr_noise_type_t type, float ampl, long seed = 3021); - - public: - void set_type (gr_noise_type_t type) { d_type = type; } - void set_amplitude (float ampl) { d_ampl = ampl; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_f.cc b/gnuradio-core/src/lib/gengen/gr_noise_source_f.cc deleted file mode 100644 index 1067c9d4..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_f.cc +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include - - -gr_noise_source_f_sptr -gr_make_noise_source_f (gr_noise_type_t type, float ampl, long seed) -{ - return gr_noise_source_f_sptr (new gr_noise_source_f (type, ampl, seed)); -} - - -gr_noise_source_f::gr_noise_source_f (gr_noise_type_t type, float ampl, long seed) - : gr_sync_block ("noise_source_f", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (float))), - d_type (type), - d_ampl (ampl), - d_rng (seed) -{ -} - -int -gr_noise_source_f::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *out = (float *) output_items[0]; - - switch (d_type){ -#if 0 // complex? - - case GR_UNIFORM: - for (int i = 0; i < noutput_items; i++) - out[i] = gr_complex (d_ampl * ((d_rng.ran1 () * 2.0) - 1.0), - d_ampl * ((d_rng.ran1 () * 2.0) - 1.0)); - break; - - case GR_GAUSSIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = d_ampl * d_rng.rayleigh_complex (); - break; - -#else // nope... - - case GR_UNIFORM: - for (int i = 0; i < noutput_items; i++) - out[i] = (float)(d_ampl * ((d_rng.ran1 () * 2.0) - 1.0)); - break; - - case GR_GAUSSIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = (float)(d_ampl * d_rng.gasdev ()); - break; - - case GR_LAPLACIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = (float)(d_ampl * d_rng.laplacian ()); - break; - - case GR_IMPULSE: // FIXME changeable impulse settings - for (int i = 0; i < noutput_items; i++) - out[i] = (float)(d_ampl * d_rng.impulse (9)); - break; -#endif - - default: - throw std::runtime_error ("invalid type"); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_f.h b/gnuradio-core/src/lib/gengen/gr_noise_source_f.h deleted file mode 100644 index d07361eb..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_f.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_NOISE_SOURCE_F_H -#define INCLUDED_GR_NOISE_SOURCE_F_H - -#include -#include -#include - - -class gr_noise_source_f; -typedef boost::shared_ptr gr_noise_source_f_sptr; - -gr_noise_source_f_sptr -gr_make_noise_source_f (gr_noise_type_t type, float ampl, long seed = 3021); - -/*! - * \brief random number source - * \ingroup source_blk - */ -class gr_noise_source_f : public gr_sync_block { - friend gr_noise_source_f_sptr - gr_make_noise_source_f (gr_noise_type_t type, float ampl, long seed); - - gr_noise_type_t d_type; - float d_ampl; - gr_random d_rng; - - gr_noise_source_f (gr_noise_type_t type, float ampl, long seed = 3021); - - public: - void set_type (gr_noise_type_t type) { d_type = type; } - void set_amplitude (float ampl) { d_ampl = ampl; } - - virtual 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/gengen/gr_noise_source_f.i b/gnuradio-core/src/lib/gengen/gr_noise_source_f.i deleted file mode 100644 index 0fb3326c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_f.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,noise_source_f); - -gr_noise_source_f_sptr -gr_make_noise_source_f (gr_noise_type_t type, float ampl, long seed = 3021); - -class gr_noise_source_f : public gr_block { - private: - gr_noise_source_f (gr_noise_type_t type, float ampl, long seed = 3021); - - public: - void set_type (gr_noise_type_t type) { d_type = type; } - void set_amplitude (float ampl) { d_ampl = ampl; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_i.cc b/gnuradio-core/src/lib/gengen/gr_noise_source_i.cc deleted file mode 100644 index a191ccaa..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_i.cc +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include - - -gr_noise_source_i_sptr -gr_make_noise_source_i (gr_noise_type_t type, float ampl, long seed) -{ - return gr_noise_source_i_sptr (new gr_noise_source_i (type, ampl, seed)); -} - - -gr_noise_source_i::gr_noise_source_i (gr_noise_type_t type, float ampl, long seed) - : gr_sync_block ("noise_source_i", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (int))), - d_type (type), - d_ampl (ampl), - d_rng (seed) -{ -} - -int -gr_noise_source_i::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *out = (int *) output_items[0]; - - switch (d_type){ -#if 0 // complex? - - case GR_UNIFORM: - for (int i = 0; i < noutput_items; i++) - out[i] = gr_complex (d_ampl * ((d_rng.ran1 () * 2.0) - 1.0), - d_ampl * ((d_rng.ran1 () * 2.0) - 1.0)); - break; - - case GR_GAUSSIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = d_ampl * d_rng.rayleigh_complex (); - break; - -#else // nope... - - case GR_UNIFORM: - for (int i = 0; i < noutput_items; i++) - out[i] = (int)(d_ampl * ((d_rng.ran1 () * 2.0) - 1.0)); - break; - - case GR_GAUSSIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = (int)(d_ampl * d_rng.gasdev ()); - break; - - case GR_LAPLACIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = (int)(d_ampl * d_rng.laplacian ()); - break; - - case GR_IMPULSE: // FIXME changeable impulse settings - for (int i = 0; i < noutput_items; i++) - out[i] = (int)(d_ampl * d_rng.impulse (9)); - break; -#endif - - default: - throw std::runtime_error ("invalid type"); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_i.h b/gnuradio-core/src/lib/gengen/gr_noise_source_i.h deleted file mode 100644 index b3272370..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_i.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_NOISE_SOURCE_I_H -#define INCLUDED_GR_NOISE_SOURCE_I_H - -#include -#include -#include - - -class gr_noise_source_i; -typedef boost::shared_ptr gr_noise_source_i_sptr; - -gr_noise_source_i_sptr -gr_make_noise_source_i (gr_noise_type_t type, float ampl, long seed = 3021); - -/*! - * \brief random number source - * \ingroup source_blk - */ -class gr_noise_source_i : public gr_sync_block { - friend gr_noise_source_i_sptr - gr_make_noise_source_i (gr_noise_type_t type, float ampl, long seed); - - gr_noise_type_t d_type; - float d_ampl; - gr_random d_rng; - - gr_noise_source_i (gr_noise_type_t type, float ampl, long seed = 3021); - - public: - void set_type (gr_noise_type_t type) { d_type = type; } - void set_amplitude (float ampl) { d_ampl = ampl; } - - virtual 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/gengen/gr_noise_source_i.i b/gnuradio-core/src/lib/gengen/gr_noise_source_i.i deleted file mode 100644 index e18d81cc..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_i.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,noise_source_i); - -gr_noise_source_i_sptr -gr_make_noise_source_i (gr_noise_type_t type, float ampl, long seed = 3021); - -class gr_noise_source_i : public gr_block { - private: - gr_noise_source_i (gr_noise_type_t type, float ampl, long seed = 3021); - - public: - void set_type (gr_noise_type_t type) { d_type = type; } - void set_amplitude (float ampl) { d_ampl = ampl; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_s.cc b/gnuradio-core/src/lib/gengen/gr_noise_source_s.cc deleted file mode 100644 index 6ccafcf9..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_s.cc +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include - - -gr_noise_source_s_sptr -gr_make_noise_source_s (gr_noise_type_t type, float ampl, long seed) -{ - return gr_noise_source_s_sptr (new gr_noise_source_s (type, ampl, seed)); -} - - -gr_noise_source_s::gr_noise_source_s (gr_noise_type_t type, float ampl, long seed) - : gr_sync_block ("noise_source_s", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (short))), - d_type (type), - d_ampl (ampl), - d_rng (seed) -{ -} - -int -gr_noise_source_s::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *out = (short *) output_items[0]; - - switch (d_type){ -#if 0 // complex? - - case GR_UNIFORM: - for (int i = 0; i < noutput_items; i++) - out[i] = gr_complex (d_ampl * ((d_rng.ran1 () * 2.0) - 1.0), - d_ampl * ((d_rng.ran1 () * 2.0) - 1.0)); - break; - - case GR_GAUSSIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = d_ampl * d_rng.rayleigh_complex (); - break; - -#else // nope... - - case GR_UNIFORM: - for (int i = 0; i < noutput_items; i++) - out[i] = (short)(d_ampl * ((d_rng.ran1 () * 2.0) - 1.0)); - break; - - case GR_GAUSSIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = (short)(d_ampl * d_rng.gasdev ()); - break; - - case GR_LAPLACIAN: - for (int i = 0; i < noutput_items; i++) - out[i] = (short)(d_ampl * d_rng.laplacian ()); - break; - - case GR_IMPULSE: // FIXME changeable impulse settings - for (int i = 0; i < noutput_items; i++) - out[i] = (short)(d_ampl * d_rng.impulse (9)); - break; -#endif - - default: - throw std::runtime_error ("invalid type"); - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_s.h b/gnuradio-core/src/lib/gengen/gr_noise_source_s.h deleted file mode 100644 index 25bbe517..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_s.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_NOISE_SOURCE_S_H -#define INCLUDED_GR_NOISE_SOURCE_S_H - -#include -#include -#include - - -class gr_noise_source_s; -typedef boost::shared_ptr gr_noise_source_s_sptr; - -gr_noise_source_s_sptr -gr_make_noise_source_s (gr_noise_type_t type, float ampl, long seed = 3021); - -/*! - * \brief random number source - * \ingroup source_blk - */ -class gr_noise_source_s : public gr_sync_block { - friend gr_noise_source_s_sptr - gr_make_noise_source_s (gr_noise_type_t type, float ampl, long seed); - - gr_noise_type_t d_type; - float d_ampl; - gr_random d_rng; - - gr_noise_source_s (gr_noise_type_t type, float ampl, long seed = 3021); - - public: - void set_type (gr_noise_type_t type) { d_type = type; } - void set_amplitude (float ampl) { d_ampl = ampl; } - - virtual 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/gengen/gr_noise_source_s.i b/gnuradio-core/src/lib/gengen/gr_noise_source_s.i deleted file mode 100644 index 32c10dee..00000000 --- a/gnuradio-core/src/lib/gengen/gr_noise_source_s.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,noise_source_s); - -gr_noise_source_s_sptr -gr_make_noise_source_s (gr_noise_type_t type, float ampl, long seed = 3021); - -class gr_noise_source_s : public gr_block { - private: - gr_noise_source_s (gr_noise_type_t type, float ampl, long seed = 3021); - - public: - void set_type (gr_noise_type_t type) { d_type = type; } - void set_amplitude (float ampl) { d_ampl = ampl; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_not_bb.cc b/gnuradio-core/src/lib/gengen/gr_not_bb.cc deleted file mode 100644 index 11252c19..00000000 --- a/gnuradio-core/src/lib/gengen/gr_not_bb.cc +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_not_bb_sptr -gr_make_not_bb () -{ - return gr_not_bb_sptr (new gr_not_bb ()); -} - -gr_not_bb::gr_not_bb () - : gr_sync_block ("not_bb", - gr_make_io_signature (1, 1, sizeof (unsigned char)), - gr_make_io_signature (1, 1, sizeof (unsigned char))) -{ -} - -int -gr_not_bb::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned char *optr = (unsigned char *) output_items[0]; - const unsigned char *inptr = (const unsigned char *) input_items[0]; - - - for (int i = 0; i < noutput_items; i++) { - *optr++ = ~(inptr[i]); - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_not_bb.h b/gnuradio-core/src/lib/gengen/gr_not_bb.h deleted file mode 100644 index 8e51b977..00000000 --- a/gnuradio-core/src/lib/gengen/gr_not_bb.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_NOT_BB_H -#define INCLUDED_GR_NOT_BB_H - -#include - -class gr_not_bb; -typedef boost::shared_ptr gr_not_bb_sptr; - -gr_not_bb_sptr gr_make_not_bb (); - -/*! - * \brief output = ~input_0 - * \ingroup math_blk - * - * bitwise boolean not across input stream. - */ -class gr_not_bb : public gr_sync_block -{ - friend gr_not_bb_sptr gr_make_not_bb (); - - gr_not_bb (); - - public: - - 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/gengen/gr_not_bb.i b/gnuradio-core/src/lib/gengen/gr_not_bb.i deleted file mode 100644 index b6ed3bc0..00000000 --- a/gnuradio-core/src/lib/gengen/gr_not_bb.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,not_bb) - -gr_not_bb_sptr gr_make_not_bb (); - -class gr_not_bb : public gr_sync_block -{ - private: - gr_not_bb (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_not_ii.cc b/gnuradio-core/src/lib/gengen/gr_not_ii.cc deleted file mode 100644 index abd06578..00000000 --- a/gnuradio-core/src/lib/gengen/gr_not_ii.cc +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_not_ii_sptr -gr_make_not_ii () -{ - return gr_not_ii_sptr (new gr_not_ii ()); -} - -gr_not_ii::gr_not_ii () - : gr_sync_block ("not_ii", - gr_make_io_signature (1, 1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))) -{ -} - -int -gr_not_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - const int *inptr = (const int *) input_items[0]; - - - for (int i = 0; i < noutput_items; i++) { - *optr++ = ~(inptr[i]); - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_not_ii.h b/gnuradio-core/src/lib/gengen/gr_not_ii.h deleted file mode 100644 index 6d1781dc..00000000 --- a/gnuradio-core/src/lib/gengen/gr_not_ii.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_NOT_II_H -#define INCLUDED_GR_NOT_II_H - -#include - -class gr_not_ii; -typedef boost::shared_ptr gr_not_ii_sptr; - -gr_not_ii_sptr gr_make_not_ii (); - -/*! - * \brief output = ~input_0 - * \ingroup math_blk - * - * bitwise boolean not across input stream. - */ -class gr_not_ii : public gr_sync_block -{ - friend gr_not_ii_sptr gr_make_not_ii (); - - gr_not_ii (); - - public: - - 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/gengen/gr_not_ii.i b/gnuradio-core/src/lib/gengen/gr_not_ii.i deleted file mode 100644 index 18ecd9a4..00000000 --- a/gnuradio-core/src/lib/gengen/gr_not_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,not_ii) - -gr_not_ii_sptr gr_make_not_ii (); - -class gr_not_ii : public gr_sync_block -{ - private: - gr_not_ii (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_not_ss.cc b/gnuradio-core/src/lib/gengen/gr_not_ss.cc deleted file mode 100644 index 77a7d6dd..00000000 --- a/gnuradio-core/src/lib/gengen/gr_not_ss.cc +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_not_ss_sptr -gr_make_not_ss () -{ - return gr_not_ss_sptr (new gr_not_ss ()); -} - -gr_not_ss::gr_not_ss () - : gr_sync_block ("not_ss", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))) -{ -} - -int -gr_not_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - const short *inptr = (const short *) input_items[0]; - - - for (int i = 0; i < noutput_items; i++) { - *optr++ = ~(inptr[i]); - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_not_ss.h b/gnuradio-core/src/lib/gengen/gr_not_ss.h deleted file mode 100644 index 439ba85c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_not_ss.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_NOT_SS_H -#define INCLUDED_GR_NOT_SS_H - -#include - -class gr_not_ss; -typedef boost::shared_ptr gr_not_ss_sptr; - -gr_not_ss_sptr gr_make_not_ss (); - -/*! - * \brief output = ~input_0 - * \ingroup math_blk - * - * bitwise boolean not across input stream. - */ -class gr_not_ss : public gr_sync_block -{ - friend gr_not_ss_sptr gr_make_not_ss (); - - gr_not_ss (); - - public: - - 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/gengen/gr_not_ss.i b/gnuradio-core/src/lib/gengen/gr_not_ss.i deleted file mode 100644 index 9407d4f6..00000000 --- a/gnuradio-core/src/lib/gengen/gr_not_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,not_ss) - -gr_not_ss_sptr gr_make_not_ss (); - -class gr_not_ss : public gr_sync_block -{ - private: - gr_not_ss (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_or_bb.cc b/gnuradio-core/src/lib/gengen/gr_or_bb.cc deleted file mode 100644 index a983e36e..00000000 --- a/gnuradio-core/src/lib/gengen/gr_or_bb.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_or_bb_sptr -gr_make_or_bb () -{ - return gr_or_bb_sptr (new gr_or_bb ()); -} - -gr_or_bb::gr_or_bb () - : gr_sync_block ("or_bb", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, 1, sizeof (unsigned char))) -{ -} - -int -gr_or_bb::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned char *optr = (unsigned char *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items; i++) { - unsigned char acc = ((unsigned char *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc = acc | ((unsigned char *) input_items[j])[i]; - - *optr++ = (unsigned char) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_or_bb.h b/gnuradio-core/src/lib/gengen/gr_or_bb.h deleted file mode 100644 index 0f23f084..00000000 --- a/gnuradio-core/src/lib/gengen/gr_or_bb.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_OR_BB_H -#define INCLUDED_GR_OR_BB_H - -#include - -class gr_or_bb; -typedef boost::shared_ptr gr_or_bb_sptr; - -gr_or_bb_sptr gr_make_or_bb (); - -/*! - * \brief output = input_0 | input_1 | , ... | input_N) - * \ingroup math_blk - * - * bitwise boolean or across all input streams. - */ -class gr_or_bb : public gr_sync_block -{ - friend gr_or_bb_sptr gr_make_or_bb (); - - gr_or_bb (); - - public: - - 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/gengen/gr_or_bb.i b/gnuradio-core/src/lib/gengen/gr_or_bb.i deleted file mode 100644 index 05a0526c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_or_bb.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,or_bb) - -gr_or_bb_sptr gr_make_or_bb (); - -class gr_or_bb : public gr_sync_block -{ - private: - gr_or_bb (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_or_ii.cc b/gnuradio-core/src/lib/gengen/gr_or_ii.cc deleted file mode 100644 index f1c66402..00000000 --- a/gnuradio-core/src/lib/gengen/gr_or_ii.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_or_ii_sptr -gr_make_or_ii () -{ - return gr_or_ii_sptr (new gr_or_ii ()); -} - -gr_or_ii::gr_or_ii () - : gr_sync_block ("or_ii", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))) -{ -} - -int -gr_or_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items; i++) { - int acc = ((int *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc = acc | ((int *) input_items[j])[i]; - - *optr++ = (int) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_or_ii.h b/gnuradio-core/src/lib/gengen/gr_or_ii.h deleted file mode 100644 index 1977c902..00000000 --- a/gnuradio-core/src/lib/gengen/gr_or_ii.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_OR_II_H -#define INCLUDED_GR_OR_II_H - -#include - -class gr_or_ii; -typedef boost::shared_ptr gr_or_ii_sptr; - -gr_or_ii_sptr gr_make_or_ii (); - -/*! - * \brief output = input_0 | input_1 | , ... | input_N) - * \ingroup math_blk - * - * bitwise boolean or across all input streams. - */ -class gr_or_ii : public gr_sync_block -{ - friend gr_or_ii_sptr gr_make_or_ii (); - - gr_or_ii (); - - public: - - 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/gengen/gr_or_ii.i b/gnuradio-core/src/lib/gengen/gr_or_ii.i deleted file mode 100644 index 8715bf9c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_or_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,or_ii) - -gr_or_ii_sptr gr_make_or_ii (); - -class gr_or_ii : public gr_sync_block -{ - private: - gr_or_ii (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_or_ss.cc b/gnuradio-core/src/lib/gengen/gr_or_ss.cc deleted file mode 100644 index 21b9821f..00000000 --- a/gnuradio-core/src/lib/gengen/gr_or_ss.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_or_ss_sptr -gr_make_or_ss () -{ - return gr_or_ss_sptr (new gr_or_ss ()); -} - -gr_or_ss::gr_or_ss () - : gr_sync_block ("or_ss", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))) -{ -} - -int -gr_or_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items; i++) { - short acc = ((short *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc = acc | ((short *) input_items[j])[i]; - - *optr++ = (short) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_or_ss.h b/gnuradio-core/src/lib/gengen/gr_or_ss.h deleted file mode 100644 index 4d2f5e21..00000000 --- a/gnuradio-core/src/lib/gengen/gr_or_ss.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_OR_SS_H -#define INCLUDED_GR_OR_SS_H - -#include - -class gr_or_ss; -typedef boost::shared_ptr gr_or_ss_sptr; - -gr_or_ss_sptr gr_make_or_ss (); - -/*! - * \brief output = input_0 | input_1 | , ... | input_N) - * \ingroup math_blk - * - * bitwise boolean or across all input streams. - */ -class gr_or_ss : public gr_sync_block -{ - friend gr_or_ss_sptr gr_make_or_ss (); - - gr_or_ss (); - - public: - - 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/gengen/gr_or_ss.i b/gnuradio-core/src/lib/gengen/gr_or_ss.i deleted file mode 100644 index 60aa183b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_or_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,or_ss) - -gr_or_ss_sptr gr_make_or_ss (); - -class gr_or_ss : public gr_sync_block -{ - private: - gr_or_ss (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.cc b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.cc deleted file mode 100644 index dced2978..00000000 --- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.cc +++ /dev/null @@ -1,137 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const unsigned int BITS_PER_TYPE = sizeof(unsigned char) * 8; -static const unsigned int LOG2_L_TYPE = gr_log2_const(); - - -gr_packed_to_unpacked_bb_sptr -gr_make_packed_to_unpacked_bb (unsigned int bits_per_chunk, gr_endianness_t endianness) -{ - return gr_packed_to_unpacked_bb_sptr - (new gr_packed_to_unpacked_bb (bits_per_chunk,endianness)); -} - -gr_packed_to_unpacked_bb::gr_packed_to_unpacked_bb (unsigned int bits_per_chunk, - gr_endianness_t endianness) - : gr_block ("packed_to_unpacked_bb", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, -1, sizeof (unsigned char))), - d_bits_per_chunk(bits_per_chunk),d_endianness(endianness),d_index(0) -{ - assert (bits_per_chunk <= BITS_PER_TYPE); - assert (bits_per_chunk > 0); - - set_relative_rate ((1.0 * BITS_PER_TYPE) / bits_per_chunk); -} - -void -gr_packed_to_unpacked_bb::forecast(int noutput_items, gr_vector_int &ninput_items_required) -{ - - int input_required = (int) ceil((d_index + noutput_items * d_bits_per_chunk) / (1.0 * BITS_PER_TYPE)); - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - //printf("Forecast wants %d needs %d\n",noutput_items,ninput_items_required[i]); - } -} - -unsigned int -get_bit_le (const unsigned char *in_vector,unsigned int bit_addr) -{ - unsigned char x = in_vector[bit_addr>>LOG2_L_TYPE]; - return (x>>(bit_addr&(BITS_PER_TYPE-1)))&1; -} - -unsigned int -get_bit_be (const unsigned char *in_vector,unsigned int bit_addr) -{ - unsigned char x = in_vector[bit_addr>>LOG2_L_TYPE]; - return (x>>((BITS_PER_TYPE-1)-(bit_addr&(BITS_PER_TYPE-1))))&1; -} - -int -gr_packed_to_unpacked_bb::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned int index_tmp = d_index; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0; m < nstreams; m++){ - const unsigned char *in = (unsigned char *) input_items[m]; - unsigned char *out = (unsigned char *) output_items[m]; - index_tmp = d_index; - - // per stream processing - - switch (d_endianness){ - - case GR_MSB_FIRST: - for (int i = 0; i < noutput_items; i++){ - //printf("here msb %d\n",i); - unsigned char x = 0; - for(unsigned int j=0; j= (int) ((d_index+(BITS_PER_TYPE-1))>>LOG2_L_TYPE)); - } - - d_index = index_tmp; - consume_each (d_index >> LOG2_L_TYPE); - d_index = d_index & (BITS_PER_TYPE-1); - //printf("got to end\n"); - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.h b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.h deleted file mode 100644 index 7a15761a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.h +++ /dev/null @@ -1,84 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_PACKED_TO_UNPACKED_BB_H -#define INCLUDED_GR_PACKED_TO_UNPACKED_BB_H - -#include -#include - -class gr_packed_to_unpacked_bb; -typedef boost::shared_ptr gr_packed_to_unpacked_bb_sptr; - -gr_packed_to_unpacked_bb_sptr -gr_make_packed_to_unpacked_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); - -/*! - * \brief Convert a stream of packed bytes or shorts to stream of unpacked bytes or shorts. - * \ingroup converter_blk - * - * input: stream of unsigned char; output: stream of unsigned char - * - * This is the inverse of gr_unpacked_to_packed_XX. - * - * The bits in the bytes or shorts input stream are grouped into chunks of - * \p bits_per_chunk bits and each resulting chunk is written right- - * justified to the output stream of bytes or shorts. - * All b or 16 bits of the each input bytes or short are processed. - * The right thing is done if bits_per_chunk is not a power of two. - * - * The combination of gr_packed_to_unpacked_XX_ followed by - * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the - * general case of mapping from a stream of bytes or shorts into - * arbitrary float or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ - -class gr_packed_to_unpacked_bb : public gr_block -{ - friend gr_packed_to_unpacked_bb_sptr - gr_make_packed_to_unpacked_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); - - gr_packed_to_unpacked_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); - - unsigned int d_bits_per_chunk; - gr_endianness_t d_endianness; - unsigned int d_index; - - public: - void forecast(int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } - -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.i b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.i deleted file mode 100644 index c4eeb448..00000000 --- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_bb.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,packed_to_unpacked_bb); - -gr_packed_to_unpacked_bb_sptr -gr_make_packed_to_unpacked_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); - -class gr_packed_to_unpacked_bb : public gr_block -{ - gr_packed_to_unpacked_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.cc b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.cc deleted file mode 100644 index f3c6eceb..00000000 --- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.cc +++ /dev/null @@ -1,137 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const unsigned int BITS_PER_TYPE = sizeof(int) * 8; -static const unsigned int LOG2_L_TYPE = gr_log2_const(); - - -gr_packed_to_unpacked_ii_sptr -gr_make_packed_to_unpacked_ii (unsigned int bits_per_chunk, gr_endianness_t endianness) -{ - return gr_packed_to_unpacked_ii_sptr - (new gr_packed_to_unpacked_ii (bits_per_chunk,endianness)); -} - -gr_packed_to_unpacked_ii::gr_packed_to_unpacked_ii (unsigned int bits_per_chunk, - gr_endianness_t endianness) - : gr_block ("packed_to_unpacked_ii", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, -1, sizeof (int))), - d_bits_per_chunk(bits_per_chunk),d_endianness(endianness),d_index(0) -{ - assert (bits_per_chunk <= BITS_PER_TYPE); - assert (bits_per_chunk > 0); - - set_relative_rate ((1.0 * BITS_PER_TYPE) / bits_per_chunk); -} - -void -gr_packed_to_unpacked_ii::forecast(int noutput_items, gr_vector_int &ninput_items_required) -{ - - int input_required = (int) ceil((d_index + noutput_items * d_bits_per_chunk) / (1.0 * BITS_PER_TYPE)); - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - //printf("Forecast wants %d needs %d\n",noutput_items,ninput_items_required[i]); - } -} - -unsigned int -get_bit_le (const int *in_vector,unsigned int bit_addr) -{ - int x = in_vector[bit_addr>>LOG2_L_TYPE]; - return (x>>(bit_addr&(BITS_PER_TYPE-1)))&1; -} - -unsigned int -get_bit_be (const int *in_vector,unsigned int bit_addr) -{ - int x = in_vector[bit_addr>>LOG2_L_TYPE]; - return (x>>((BITS_PER_TYPE-1)-(bit_addr&(BITS_PER_TYPE-1))))&1; -} - -int -gr_packed_to_unpacked_ii::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned int index_tmp = d_index; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0; m < nstreams; m++){ - const int *in = (int *) input_items[m]; - int *out = (int *) output_items[m]; - index_tmp = d_index; - - // per stream processing - - switch (d_endianness){ - - case GR_MSB_FIRST: - for (int i = 0; i < noutput_items; i++){ - //printf("here msb %d\n",i); - int x = 0; - for(unsigned int j=0; j= (int) ((d_index+(BITS_PER_TYPE-1))>>LOG2_L_TYPE)); - } - - d_index = index_tmp; - consume_each (d_index >> LOG2_L_TYPE); - d_index = d_index & (BITS_PER_TYPE-1); - //printf("got to end\n"); - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.h b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.h deleted file mode 100644 index cfbc6c84..00000000 --- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.h +++ /dev/null @@ -1,84 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_PACKED_TO_UNPACKED_II_H -#define INCLUDED_GR_PACKED_TO_UNPACKED_II_H - -#include -#include - -class gr_packed_to_unpacked_ii; -typedef boost::shared_ptr gr_packed_to_unpacked_ii_sptr; - -gr_packed_to_unpacked_ii_sptr -gr_make_packed_to_unpacked_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); - -/*! - * \brief Convert a stream of packed bytes or shorts to stream of unpacked bytes or shorts. - * \ingroup converter_blk - * - * input: stream of int; output: stream of int - * - * This is the inverse of gr_unpacked_to_packed_XX. - * - * The bits in the bytes or shorts input stream are grouped into chunks of - * \p bits_per_chunk bits and each resulting chunk is written right- - * justified to the output stream of bytes or shorts. - * All b or 16 bits of the each input bytes or short are processed. - * The right thing is done if bits_per_chunk is not a power of two. - * - * The combination of gr_packed_to_unpacked_XX_ followed by - * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the - * general case of mapping from a stream of bytes or shorts into - * arbitrary float or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ - -class gr_packed_to_unpacked_ii : public gr_block -{ - friend gr_packed_to_unpacked_ii_sptr - gr_make_packed_to_unpacked_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); - - gr_packed_to_unpacked_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); - - unsigned int d_bits_per_chunk; - gr_endianness_t d_endianness; - unsigned int d_index; - - public: - void forecast(int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } - -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.i b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.i deleted file mode 100644 index a3bd8e65..00000000 --- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,packed_to_unpacked_ii); - -gr_packed_to_unpacked_ii_sptr -gr_make_packed_to_unpacked_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); - -class gr_packed_to_unpacked_ii : public gr_block -{ - gr_packed_to_unpacked_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.cc b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.cc deleted file mode 100644 index 9d46b049..00000000 --- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.cc +++ /dev/null @@ -1,137 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const unsigned int BITS_PER_TYPE = sizeof(short) * 8; -static const unsigned int LOG2_L_TYPE = gr_log2_const(); - - -gr_packed_to_unpacked_ss_sptr -gr_make_packed_to_unpacked_ss (unsigned int bits_per_chunk, gr_endianness_t endianness) -{ - return gr_packed_to_unpacked_ss_sptr - (new gr_packed_to_unpacked_ss (bits_per_chunk,endianness)); -} - -gr_packed_to_unpacked_ss::gr_packed_to_unpacked_ss (unsigned int bits_per_chunk, - gr_endianness_t endianness) - : gr_block ("packed_to_unpacked_ss", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (short))), - d_bits_per_chunk(bits_per_chunk),d_endianness(endianness),d_index(0) -{ - assert (bits_per_chunk <= BITS_PER_TYPE); - assert (bits_per_chunk > 0); - - set_relative_rate ((1.0 * BITS_PER_TYPE) / bits_per_chunk); -} - -void -gr_packed_to_unpacked_ss::forecast(int noutput_items, gr_vector_int &ninput_items_required) -{ - - int input_required = (int) ceil((d_index + noutput_items * d_bits_per_chunk) / (1.0 * BITS_PER_TYPE)); - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - //printf("Forecast wants %d needs %d\n",noutput_items,ninput_items_required[i]); - } -} - -unsigned int -get_bit_le (const short *in_vector,unsigned int bit_addr) -{ - short x = in_vector[bit_addr>>LOG2_L_TYPE]; - return (x>>(bit_addr&(BITS_PER_TYPE-1)))&1; -} - -unsigned int -get_bit_be (const short *in_vector,unsigned int bit_addr) -{ - short x = in_vector[bit_addr>>LOG2_L_TYPE]; - return (x>>((BITS_PER_TYPE-1)-(bit_addr&(BITS_PER_TYPE-1))))&1; -} - -int -gr_packed_to_unpacked_ss::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned int index_tmp = d_index; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0; m < nstreams; m++){ - const short *in = (short *) input_items[m]; - short *out = (short *) output_items[m]; - index_tmp = d_index; - - // per stream processing - - switch (d_endianness){ - - case GR_MSB_FIRST: - for (int i = 0; i < noutput_items; i++){ - //printf("here msb %d\n",i); - short x = 0; - for(unsigned int j=0; j= (int) ((d_index+(BITS_PER_TYPE-1))>>LOG2_L_TYPE)); - } - - d_index = index_tmp; - consume_each (d_index >> LOG2_L_TYPE); - d_index = d_index & (BITS_PER_TYPE-1); - //printf("got to end\n"); - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.h b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.h deleted file mode 100644 index aa4e71d7..00000000 --- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.h +++ /dev/null @@ -1,84 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_PACKED_TO_UNPACKED_SS_H -#define INCLUDED_GR_PACKED_TO_UNPACKED_SS_H - -#include -#include - -class gr_packed_to_unpacked_ss; -typedef boost::shared_ptr gr_packed_to_unpacked_ss_sptr; - -gr_packed_to_unpacked_ss_sptr -gr_make_packed_to_unpacked_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); - -/*! - * \brief Convert a stream of packed bytes or shorts to stream of unpacked bytes or shorts. - * \ingroup converter_blk - * - * input: stream of short; output: stream of short - * - * This is the inverse of gr_unpacked_to_packed_XX. - * - * The bits in the bytes or shorts input stream are grouped into chunks of - * \p bits_per_chunk bits and each resulting chunk is written right- - * justified to the output stream of bytes or shorts. - * All b or 16 bits of the each input bytes or short are processed. - * The right thing is done if bits_per_chunk is not a power of two. - * - * The combination of gr_packed_to_unpacked_XX_ followed by - * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the - * general case of mapping from a stream of bytes or shorts into - * arbitrary float or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ - -class gr_packed_to_unpacked_ss : public gr_block -{ - friend gr_packed_to_unpacked_ss_sptr - gr_make_packed_to_unpacked_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); - - gr_packed_to_unpacked_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); - - unsigned int d_bits_per_chunk; - gr_endianness_t d_endianness; - unsigned int d_index; - - public: - void forecast(int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } - -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.i b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.i deleted file mode 100644 index e6018f0f..00000000 --- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,packed_to_unpacked_ss); - -gr_packed_to_unpacked_ss_sptr -gr_make_packed_to_unpacked_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); - -class gr_packed_to_unpacked_ss : public gr_block -{ - gr_packed_to_unpacked_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc b/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc deleted file mode 100644 index 2c7b0d48..00000000 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc +++ /dev/null @@ -1,111 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -gr_peak_detector_fb_sptr -gr_make_peak_detector_fb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha) -{ - return gr_peak_detector_fb_sptr (new gr_peak_detector_fb (threshold_factor_rise, - threshold_factor_fall, - look_ahead, alpha)); -} - -gr_peak_detector_fb::gr_peak_detector_fb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha) - : gr_sync_block ("peak_detector_fb", - gr_make_io_signature (1, 1, sizeof (float)), - gr_make_io_signature (1, 1, sizeof (char))), - d_threshold_factor_rise(threshold_factor_rise), - d_threshold_factor_fall(threshold_factor_fall), - d_look_ahead(look_ahead), d_avg_alpha(alpha), d_avg(0), d_found(0) -{ -} - -int -gr_peak_detector_fb::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *iptr = (float *) input_items[0]; - char *optr = (char *) output_items[0]; - - memset(optr, 0, noutput_items*sizeof(char)); - - float peak_val = -(float)INFINITY; - int peak_ind = 0; - unsigned char state = 0; - int i = 0; - - //printf("noutput_items %d\n",noutput_items); - while(i < noutput_items) { - if(state == 0) { // below threshold - if(iptr[i] > d_avg*d_threshold_factor_rise) { - state = 1; - } - else { - d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg; - i++; - } - } - else if(state == 1) { // above threshold, have not found peak - //printf("Entered State 1: %f i: %d noutput_items: %d\n", iptr[i], i, noutput_items); - if(iptr[i] > peak_val) { - peak_val = iptr[i]; - peak_ind = i; - d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg; - i++; - } - else if (iptr[i] > d_avg*d_threshold_factor_fall) { - d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg; - i++; - } - else { - optr[peak_ind] = 1; - state = 0; - peak_val = -(float)INFINITY; - //printf("Leaving State 1: Peak: %f Peak Ind: %d i: %d noutput_items: %d\n", - //peak_val, peak_ind, i, noutput_items); - } - } - } - - if(state == 0) { - //printf("Leave in State 0, produced %d\n",noutput_items); - return noutput_items; - } - else { // only return up to passing the threshold - //printf("Leave in State 1, only produced %d of %d\n",peak_ind,noutput_items); - return peak_ind+1; - } -} diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.h b/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.h deleted file mode 100644 index 2b5ba46d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.h +++ /dev/null @@ -1,125 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_PEAK_DETECTOR_FB_H -#define INCLUDED_GR_PEAK_DETECTOR_FB_H - -#include - -class gr_peak_detector_fb; -typedef boost::shared_ptr gr_peak_detector_fb_sptr; - -gr_peak_detector_fb_sptr gr_make_peak_detector_fb (float threshold_factor_rise = 0.25, - float threshold_factor_fall = 0.40, - int look_ahead = 10, - float alpha = 0.001); - -/*! - * \brief Detect the peak of a signal - * \ingroup level_blk - * - * If a peak is detected, this block outputs a 1, - * or it outputs 0's. - * - * \param threshold_factor_rise The threshold factor determins when a peak - * has started. An average of the signal is calculated and when the - * value of the signal goes over threshold_factor_rise*average, we - * start looking for a peak. - * \param threshold_factor_fall The threshold factor determins when a peak - * has ended. An average of the signal is calculated and when the - * value of the signal goes bellow threshold_factor_fall*average, we - * stop looking for a peak. - * \param look_ahead The look-ahead value is used when the threshold is - * found to look if there another peak within this step range. - * If there is a larger value, we set that as the peak and look ahead - * again. This is continued until the highest point is found with - * This look-ahead range. - * \param alpha The gain value of a moving average filter - */ -class gr_peak_detector_fb : public gr_sync_block -{ - friend gr_peak_detector_fb_sptr gr_make_peak_detector_fb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha); - - gr_peak_detector_fb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha); - - private: - float d_threshold_factor_rise; - float d_threshold_factor_fall; - int d_look_ahead; - float d_avg_alpha; - float d_avg; - unsigned char d_found; - - public: - - /*! \brief Set the threshold factor value for the rise time - * \param thr new threshold factor - */ - void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; } - - /*! \brief Set the threshold factor value for the fall time - * \param thr new threshold factor - */ - void set_threshold_factor_fall(float thr) { d_threshold_factor_fall = thr; } - - /*! \brief Set the look-ahead factor - * \param look new look-ahead factor - */ - void set_look_ahead(int look) { d_look_ahead = look; } - - /*! \brief Set the running average alpha - * \param alpha new alpha for running average - */ - void set_alpha(int alpha) { d_avg_alpha = alpha; } - - /*! \brief Get the threshold factor value for the rise time - * \return threshold factor - */ - float threshold_factor_rise() { return d_threshold_factor_rise; } - - /*! \brief Get the threshold factor value for the fall time - * \return threshold factor - */ - float threshold_factor_fall() { return d_threshold_factor_fall; } - - /*! \brief Get the look-ahead factor value - * \return look-ahead factor - */ - int look_ahead() { return d_look_ahead; } - - /*! \brief Get the alpha value of the running average - * \return alpha - */ - float alpha() { return d_avg_alpha; } - - 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/gengen/gr_peak_detector_fb.i b/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.i deleted file mode 100644 index 5bee4410..00000000 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.i +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,peak_detector_fb) - -gr_peak_detector_fb_sptr gr_make_peak_detector_fb (float threshold_factor_rise = 0.25, - float threshold_factor_fall = 0.40, - int look_ahead = 10, - float alpha=0.001); - -class gr_peak_detector_fb : public gr_sync_block -{ - private: - gr_peak_detector_fb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha); - - public: - void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; } - void set_threshold_factor_fall(float thr) { d_threshold_factor_fall = thr; } - void set_look_ahead(int look) { d_look_ahead = look; } - void set_alpha(int alpha) { d_avg_alpha = alpha; } - - float threshold_factor_rise() { return d_threshold_factor_rise; } - float threshold_factor_fall() { return d_threshold_factor_fall; } - int look_ahead() { return d_look_ahead; } - float alpha() { return d_avg_alpha; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc b/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc deleted file mode 100644 index 19c1def4..00000000 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc +++ /dev/null @@ -1,111 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -gr_peak_detector_ib_sptr -gr_make_peak_detector_ib (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha) -{ - return gr_peak_detector_ib_sptr (new gr_peak_detector_ib (threshold_factor_rise, - threshold_factor_fall, - look_ahead, alpha)); -} - -gr_peak_detector_ib::gr_peak_detector_ib (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha) - : gr_sync_block ("peak_detector_ib", - gr_make_io_signature (1, 1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (char))), - d_threshold_factor_rise(threshold_factor_rise), - d_threshold_factor_fall(threshold_factor_fall), - d_look_ahead(look_ahead), d_avg_alpha(alpha), d_avg(0), d_found(0) -{ -} - -int -gr_peak_detector_ib::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *iptr = (int *) input_items[0]; - char *optr = (char *) output_items[0]; - - memset(optr, 0, noutput_items*sizeof(char)); - - int peak_val = -(int)INFINITY; - int peak_ind = 0; - unsigned char state = 0; - int i = 0; - - //printf("noutput_items %d\n",noutput_items); - while(i < noutput_items) { - if(state == 0) { // below threshold - if(iptr[i] > d_avg*d_threshold_factor_rise) { - state = 1; - } - else { - d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg; - i++; - } - } - else if(state == 1) { // above threshold, have not found peak - //printf("Entered State 1: %f i: %d noutput_items: %d\n", iptr[i], i, noutput_items); - if(iptr[i] > peak_val) { - peak_val = iptr[i]; - peak_ind = i; - d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg; - i++; - } - else if (iptr[i] > d_avg*d_threshold_factor_fall) { - d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg; - i++; - } - else { - optr[peak_ind] = 1; - state = 0; - peak_val = -(int)INFINITY; - //printf("Leaving State 1: Peak: %f Peak Ind: %d i: %d noutput_items: %d\n", - //peak_val, peak_ind, i, noutput_items); - } - } - } - - if(state == 0) { - //printf("Leave in State 0, produced %d\n",noutput_items); - return noutput_items; - } - else { // only return up to passing the threshold - //printf("Leave in State 1, only produced %d of %d\n",peak_ind,noutput_items); - return peak_ind+1; - } -} diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.h b/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.h deleted file mode 100644 index 97fcc4f8..00000000 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.h +++ /dev/null @@ -1,125 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_PEAK_DETECTOR_IB_H -#define INCLUDED_GR_PEAK_DETECTOR_IB_H - -#include - -class gr_peak_detector_ib; -typedef boost::shared_ptr gr_peak_detector_ib_sptr; - -gr_peak_detector_ib_sptr gr_make_peak_detector_ib (float threshold_factor_rise = 0.25, - float threshold_factor_fall = 0.40, - int look_ahead = 10, - float alpha = 0.001); - -/*! - * \brief Detect the peak of a signal - * \ingroup level_blk - * - * If a peak is detected, this block outputs a 1, - * or it outputs 0's. - * - * \param threshold_factor_rise The threshold factor determins when a peak - * has started. An average of the signal is calculated and when the - * value of the signal goes over threshold_factor_rise*average, we - * start looking for a peak. - * \param threshold_factor_fall The threshold factor determins when a peak - * has ended. An average of the signal is calculated and when the - * value of the signal goes bellow threshold_factor_fall*average, we - * stop looking for a peak. - * \param look_ahead The look-ahead value is used when the threshold is - * found to look if there another peak within this step range. - * If there is a larger value, we set that as the peak and look ahead - * again. This is continued until the highest point is found with - * This look-ahead range. - * \param alpha The gain value of a moving average filter - */ -class gr_peak_detector_ib : public gr_sync_block -{ - friend gr_peak_detector_ib_sptr gr_make_peak_detector_ib (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha); - - gr_peak_detector_ib (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha); - - private: - float d_threshold_factor_rise; - float d_threshold_factor_fall; - int d_look_ahead; - float d_avg_alpha; - float d_avg; - unsigned char d_found; - - public: - - /*! \brief Set the threshold factor value for the rise time - * \param thr new threshold factor - */ - void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; } - - /*! \brief Set the threshold factor value for the fall time - * \param thr new threshold factor - */ - void set_threshold_factor_fall(float thr) { d_threshold_factor_fall = thr; } - - /*! \brief Set the look-ahead factor - * \param look new look-ahead factor - */ - void set_look_ahead(int look) { d_look_ahead = look; } - - /*! \brief Set the running average alpha - * \param alpha new alpha for running average - */ - void set_alpha(int alpha) { d_avg_alpha = alpha; } - - /*! \brief Get the threshold factor value for the rise time - * \return threshold factor - */ - float threshold_factor_rise() { return d_threshold_factor_rise; } - - /*! \brief Get the threshold factor value for the fall time - * \return threshold factor - */ - float threshold_factor_fall() { return d_threshold_factor_fall; } - - /*! \brief Get the look-ahead factor value - * \return look-ahead factor - */ - int look_ahead() { return d_look_ahead; } - - /*! \brief Get the alpha value of the running average - * \return alpha - */ - float alpha() { return d_avg_alpha; } - - 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/gengen/gr_peak_detector_ib.i b/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.i deleted file mode 100644 index c21c43db..00000000 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.i +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,peak_detector_ib) - -gr_peak_detector_ib_sptr gr_make_peak_detector_ib (float threshold_factor_rise = 0.25, - float threshold_factor_fall = 0.40, - int look_ahead = 10, - float alpha=0.001); - -class gr_peak_detector_ib : public gr_sync_block -{ - private: - gr_peak_detector_ib (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha); - - public: - void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; } - void set_threshold_factor_fall(float thr) { d_threshold_factor_fall = thr; } - void set_look_ahead(int look) { d_look_ahead = look; } - void set_alpha(int alpha) { d_avg_alpha = alpha; } - - float threshold_factor_rise() { return d_threshold_factor_rise; } - float threshold_factor_fall() { return d_threshold_factor_fall; } - int look_ahead() { return d_look_ahead; } - float alpha() { return d_avg_alpha; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc b/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc deleted file mode 100644 index 63abb84c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc +++ /dev/null @@ -1,111 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -gr_peak_detector_sb_sptr -gr_make_peak_detector_sb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha) -{ - return gr_peak_detector_sb_sptr (new gr_peak_detector_sb (threshold_factor_rise, - threshold_factor_fall, - look_ahead, alpha)); -} - -gr_peak_detector_sb::gr_peak_detector_sb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha) - : gr_sync_block ("peak_detector_sb", - gr_make_io_signature (1, 1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (char))), - d_threshold_factor_rise(threshold_factor_rise), - d_threshold_factor_fall(threshold_factor_fall), - d_look_ahead(look_ahead), d_avg_alpha(alpha), d_avg(0), d_found(0) -{ -} - -int -gr_peak_detector_sb::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *) input_items[0]; - char *optr = (char *) output_items[0]; - - memset(optr, 0, noutput_items*sizeof(char)); - - short peak_val = -(short)INFINITY; - int peak_ind = 0; - unsigned char state = 0; - int i = 0; - - //printf("noutput_items %d\n",noutput_items); - while(i < noutput_items) { - if(state == 0) { // below threshold - if(iptr[i] > d_avg*d_threshold_factor_rise) { - state = 1; - } - else { - d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg; - i++; - } - } - else if(state == 1) { // above threshold, have not found peak - //printf("Entered State 1: %f i: %d noutput_items: %d\n", iptr[i], i, noutput_items); - if(iptr[i] > peak_val) { - peak_val = iptr[i]; - peak_ind = i; - d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg; - i++; - } - else if (iptr[i] > d_avg*d_threshold_factor_fall) { - d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg; - i++; - } - else { - optr[peak_ind] = 1; - state = 0; - peak_val = -(short)INFINITY; - //printf("Leaving State 1: Peak: %f Peak Ind: %d i: %d noutput_items: %d\n", - //peak_val, peak_ind, i, noutput_items); - } - } - } - - if(state == 0) { - //printf("Leave in State 0, produced %d\n",noutput_items); - return noutput_items; - } - else { // only return up to passing the threshold - //printf("Leave in State 1, only produced %d of %d\n",peak_ind,noutput_items); - return peak_ind+1; - } -} diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.h b/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.h deleted file mode 100644 index 6ceabb90..00000000 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.h +++ /dev/null @@ -1,125 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_PEAK_DETECTOR_SB_H -#define INCLUDED_GR_PEAK_DETECTOR_SB_H - -#include - -class gr_peak_detector_sb; -typedef boost::shared_ptr gr_peak_detector_sb_sptr; - -gr_peak_detector_sb_sptr gr_make_peak_detector_sb (float threshold_factor_rise = 0.25, - float threshold_factor_fall = 0.40, - int look_ahead = 10, - float alpha = 0.001); - -/*! - * \brief Detect the peak of a signal - * \ingroup level_blk - * - * If a peak is detected, this block outputs a 1, - * or it outputs 0's. - * - * \param threshold_factor_rise The threshold factor determins when a peak - * has started. An average of the signal is calculated and when the - * value of the signal goes over threshold_factor_rise*average, we - * start looking for a peak. - * \param threshold_factor_fall The threshold factor determins when a peak - * has ended. An average of the signal is calculated and when the - * value of the signal goes bellow threshold_factor_fall*average, we - * stop looking for a peak. - * \param look_ahead The look-ahead value is used when the threshold is - * found to look if there another peak within this step range. - * If there is a larger value, we set that as the peak and look ahead - * again. This is continued until the highest point is found with - * This look-ahead range. - * \param alpha The gain value of a moving average filter - */ -class gr_peak_detector_sb : public gr_sync_block -{ - friend gr_peak_detector_sb_sptr gr_make_peak_detector_sb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha); - - gr_peak_detector_sb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha); - - private: - float d_threshold_factor_rise; - float d_threshold_factor_fall; - int d_look_ahead; - float d_avg_alpha; - float d_avg; - unsigned char d_found; - - public: - - /*! \brief Set the threshold factor value for the rise time - * \param thr new threshold factor - */ - void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; } - - /*! \brief Set the threshold factor value for the fall time - * \param thr new threshold factor - */ - void set_threshold_factor_fall(float thr) { d_threshold_factor_fall = thr; } - - /*! \brief Set the look-ahead factor - * \param look new look-ahead factor - */ - void set_look_ahead(int look) { d_look_ahead = look; } - - /*! \brief Set the running average alpha - * \param alpha new alpha for running average - */ - void set_alpha(int alpha) { d_avg_alpha = alpha; } - - /*! \brief Get the threshold factor value for the rise time - * \return threshold factor - */ - float threshold_factor_rise() { return d_threshold_factor_rise; } - - /*! \brief Get the threshold factor value for the fall time - * \return threshold factor - */ - float threshold_factor_fall() { return d_threshold_factor_fall; } - - /*! \brief Get the look-ahead factor value - * \return look-ahead factor - */ - int look_ahead() { return d_look_ahead; } - - /*! \brief Get the alpha value of the running average - * \return alpha - */ - float alpha() { return d_avg_alpha; } - - 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/gengen/gr_peak_detector_sb.i b/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.i deleted file mode 100644 index 83dfc0cb..00000000 --- a/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.i +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,peak_detector_sb) - -gr_peak_detector_sb_sptr gr_make_peak_detector_sb (float threshold_factor_rise = 0.25, - float threshold_factor_fall = 0.40, - int look_ahead = 10, - float alpha=0.001); - -class gr_peak_detector_sb : public gr_sync_block -{ - private: - gr_peak_detector_sb (float threshold_factor_rise, - float threshold_factor_fall, - int look_ahead, float alpha); - - public: - void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; } - void set_threshold_factor_fall(float thr) { d_threshold_factor_fall = thr; } - void set_look_ahead(int look) { d_look_ahead = look; } - void set_alpha(int alpha) { d_avg_alpha = alpha; } - - float threshold_factor_rise() { return d_threshold_factor_rise; } - float threshold_factor_fall() { return d_threshold_factor_fall; } - int look_ahead() { return d_look_ahead; } - float alpha() { return d_avg_alpha; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.cc b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.cc deleted file mode 100644 index 2d7d6e23..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_sample_and_hold_bb_sptr -gr_make_sample_and_hold_bb () -{ - return gr_sample_and_hold_bb_sptr (new gr_sample_and_hold_bb ()); -} - -gr_sample_and_hold_bb::gr_sample_and_hold_bb () - : gr_sync_block ("sample_and_hold_bb", - gr_make_io_signature2 (2, 2, sizeof (unsigned char), sizeof(char)), - gr_make_io_signature (1, 1, sizeof (unsigned char))), - d_data(0) -{ -} - -int -gr_sample_and_hold_bb::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned char *iptr = (unsigned char *) input_items[0]; - const char *ctrl = (const char *) input_items[1]; - unsigned char *optr = (unsigned char *) output_items[0]; - - for (int i = 0; i < noutput_items; i++){ - if(ctrl[i]) { - d_data = iptr[i]; - } - optr[i] = d_data; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.h b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.h deleted file mode 100644 index 278eef06..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SAMPLE_AND_HOLD_BB_H -#define INCLUDED_GR_SAMPLE_AND_HOLD_BB_H - -#include - -class gr_sample_and_hold_bb; -typedef boost::shared_ptr gr_sample_and_hold_bb_sptr; - -gr_sample_and_hold_bb_sptr gr_make_sample_and_hold_bb (); - -/*! - * \brief sample and hold circuit - * \ingroup level_blk - * - * Samples the data stream (input stream 0) and holds the value - * if the control signal is 1 (intput stream 1). - */ -class gr_sample_and_hold_bb : public gr_sync_block -{ - friend gr_sample_and_hold_bb_sptr gr_make_sample_and_hold_bb (); - - gr_sample_and_hold_bb (); - - private: - unsigned char d_data; - - public: - 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/gengen/gr_sample_and_hold_bb.i b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.i deleted file mode 100644 index 3f33e37a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_bb.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sample_and_hold_bb) - -gr_sample_and_hold_bb_sptr gr_make_sample_and_hold_bb (); - -class gr_sample_and_hold_bb : public gr_sync_block -{ - private: - gr_sample_and_hold_bb (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.cc b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.cc deleted file mode 100644 index a3042e7a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_sample_and_hold_ff_sptr -gr_make_sample_and_hold_ff () -{ - return gr_sample_and_hold_ff_sptr (new gr_sample_and_hold_ff ()); -} - -gr_sample_and_hold_ff::gr_sample_and_hold_ff () - : gr_sync_block ("sample_and_hold_ff", - gr_make_io_signature2 (2, 2, sizeof (float), sizeof(char)), - gr_make_io_signature (1, 1, sizeof (float))), - d_data(0) -{ -} - -int -gr_sample_and_hold_ff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *iptr = (float *) input_items[0]; - const char *ctrl = (const char *) input_items[1]; - float *optr = (float *) output_items[0]; - - for (int i = 0; i < noutput_items; i++){ - if(ctrl[i]) { - d_data = iptr[i]; - } - optr[i] = d_data; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.h b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.h deleted file mode 100644 index c91ed8c6..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SAMPLE_AND_HOLD_FF_H -#define INCLUDED_GR_SAMPLE_AND_HOLD_FF_H - -#include - -class gr_sample_and_hold_ff; -typedef boost::shared_ptr gr_sample_and_hold_ff_sptr; - -gr_sample_and_hold_ff_sptr gr_make_sample_and_hold_ff (); - -/*! - * \brief sample and hold circuit - * \ingroup level_blk - * - * Samples the data stream (input stream 0) and holds the value - * if the control signal is 1 (intput stream 1). - */ -class gr_sample_and_hold_ff : public gr_sync_block -{ - friend gr_sample_and_hold_ff_sptr gr_make_sample_and_hold_ff (); - - gr_sample_and_hold_ff (); - - private: - float d_data; - - public: - 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/gengen/gr_sample_and_hold_ff.i b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.i deleted file mode 100644 index d54c314e..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ff.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sample_and_hold_ff) - -gr_sample_and_hold_ff_sptr gr_make_sample_and_hold_ff (); - -class gr_sample_and_hold_ff : public gr_sync_block -{ - private: - gr_sample_and_hold_ff (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.cc b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.cc deleted file mode 100644 index 149d98dd..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_sample_and_hold_ii_sptr -gr_make_sample_and_hold_ii () -{ - return gr_sample_and_hold_ii_sptr (new gr_sample_and_hold_ii ()); -} - -gr_sample_and_hold_ii::gr_sample_and_hold_ii () - : gr_sync_block ("sample_and_hold_ii", - gr_make_io_signature2 (2, 2, sizeof (int), sizeof(char)), - gr_make_io_signature (1, 1, sizeof (int))), - d_data(0) -{ -} - -int -gr_sample_and_hold_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *iptr = (int *) input_items[0]; - const char *ctrl = (const char *) input_items[1]; - int *optr = (int *) output_items[0]; - - for (int i = 0; i < noutput_items; i++){ - if(ctrl[i]) { - d_data = iptr[i]; - } - optr[i] = d_data; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.h b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.h deleted file mode 100644 index a3e79b72..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SAMPLE_AND_HOLD_II_H -#define INCLUDED_GR_SAMPLE_AND_HOLD_II_H - -#include - -class gr_sample_and_hold_ii; -typedef boost::shared_ptr gr_sample_and_hold_ii_sptr; - -gr_sample_and_hold_ii_sptr gr_make_sample_and_hold_ii (); - -/*! - * \brief sample and hold circuit - * \ingroup level_blk - * - * Samples the data stream (input stream 0) and holds the value - * if the control signal is 1 (intput stream 1). - */ -class gr_sample_and_hold_ii : public gr_sync_block -{ - friend gr_sample_and_hold_ii_sptr gr_make_sample_and_hold_ii (); - - gr_sample_and_hold_ii (); - - private: - int d_data; - - public: - 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/gengen/gr_sample_and_hold_ii.i b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.i deleted file mode 100644 index bee2b931..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sample_and_hold_ii) - -gr_sample_and_hold_ii_sptr gr_make_sample_and_hold_ii (); - -class gr_sample_and_hold_ii : public gr_sync_block -{ - private: - gr_sample_and_hold_ii (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.cc b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.cc deleted file mode 100644 index 9f23d10c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_sample_and_hold_ss_sptr -gr_make_sample_and_hold_ss () -{ - return gr_sample_and_hold_ss_sptr (new gr_sample_and_hold_ss ()); -} - -gr_sample_and_hold_ss::gr_sample_and_hold_ss () - : gr_sync_block ("sample_and_hold_ss", - gr_make_io_signature2 (2, 2, sizeof (short), sizeof(char)), - gr_make_io_signature (1, 1, sizeof (short))), - d_data(0) -{ -} - -int -gr_sample_and_hold_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *) input_items[0]; - const char *ctrl = (const char *) input_items[1]; - short *optr = (short *) output_items[0]; - - for (int i = 0; i < noutput_items; i++){ - if(ctrl[i]) { - d_data = iptr[i]; - } - optr[i] = d_data; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.h b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.h deleted file mode 100644 index 2053c620..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SAMPLE_AND_HOLD_SS_H -#define INCLUDED_GR_SAMPLE_AND_HOLD_SS_H - -#include - -class gr_sample_and_hold_ss; -typedef boost::shared_ptr gr_sample_and_hold_ss_sptr; - -gr_sample_and_hold_ss_sptr gr_make_sample_and_hold_ss (); - -/*! - * \brief sample and hold circuit - * \ingroup level_blk - * - * Samples the data stream (input stream 0) and holds the value - * if the control signal is 1 (intput stream 1). - */ -class gr_sample_and_hold_ss : public gr_sync_block -{ - friend gr_sample_and_hold_ss_sptr gr_make_sample_and_hold_ss (); - - gr_sample_and_hold_ss (); - - private: - short d_data; - - public: - 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/gengen/gr_sample_and_hold_ss.i b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.i deleted file mode 100644 index f3c04a43..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sample_and_hold_ss) - -gr_sample_and_hold_ss_sptr gr_make_sample_and_hold_ss (); - -class gr_sample_and_hold_ss : public gr_sync_block -{ - private: - gr_sample_and_hold_ss (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_c.cc b/gnuradio-core/src/lib/gengen/gr_sig_source_c.cc deleted file mode 100644 index 154e1d4b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_c.cc +++ /dev/null @@ -1,242 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include -#include - - -gr_sig_source_c::gr_sig_source_c (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, gr_complex offset) - : gr_sync_block ("sig_source_c", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (gr_complex))), - d_sampling_freq (sampling_freq), d_waveform (waveform), d_frequency (frequency), - d_ampl (ampl), d_offset (offset) -{ - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -gr_sig_source_c_sptr -gr_make_sig_source_c (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, gr_complex offset) -{ - return gr_sig_source_c_sptr (new gr_sig_source_c (sampling_freq, waveform, frequency, ampl, offset)); -} - -int -gr_sig_source_c::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *optr = (gr_complex *) output_items[0]; - gr_complex t; - - switch (d_waveform){ - -#if 1 // complex? - - case GR_CONST_WAVE: - t = (gr_complex) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++) // FIXME unroll - optr[i] = t; - break; - - case GR_SIN_WAVE: - case GR_COS_WAVE: - d_nco.sincos (optr, noutput_items, d_ampl); - if (d_offset == gr_complex(0,0)) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - /* Implements a real square wave high from -PI to 0. - * The imaginary square wave leads by 90 deg. - */ - case GR_SQR_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2) - optr[i] = gr_complex(d_ampl, 0)+d_offset; - else if (d_nco.get_phase() < 0) - optr[i] = gr_complex(d_ampl, d_ampl)+d_offset; - else if (d_nco.get_phase() < M_PI/2) - optr[i] = gr_complex(0, d_ampl)+d_offset; - else - optr[i] = d_offset; - d_nco.step(); - } - break; - - /* Implements a real triangle wave rising from -PI to 0 and - * falling from 0 to PI. The imaginary triangle wave leads by 90 deg. - */ - case GR_TRI_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/M_PI + d_ampl, - -1*d_ampl*d_nco.get_phase()/M_PI - d_ampl/2)+d_offset; - } - else if (d_nco.get_phase() < 0){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/M_PI + d_ampl, - d_ampl*d_nco.get_phase()/M_PI + d_ampl/2)+d_offset; - } - else if (d_nco.get_phase() < M_PI/2){ - optr[i] = gr_complex(-1*d_ampl*d_nco.get_phase()/M_PI + d_ampl, - d_ampl*d_nco.get_phase()/M_PI + d_ampl/2)+d_offset; - } - else{ - optr[i] = gr_complex(-1*d_ampl*d_nco.get_phase()/M_PI + d_ampl, - -1*d_ampl*d_nco.get_phase()/M_PI + 3*d_ampl/2)+d_offset; - } - d_nco.step(); - } - break; - - /* Implements a real saw tooth wave rising from -PI to PI. - * The imaginary saw tooth wave leads by 90 deg. - */ - case GR_SAW_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2, - d_ampl*d_nco.get_phase()/(2*M_PI) + 5*d_ampl/4)+d_offset; - } - else{ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2, - d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/4)+d_offset; - } - d_nco.step(); - } - break; - -#else // nope... - - case GR_CONST_WAVE: - t = (gr_complex) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++) // FIXME unroll - optr[i] = t; - break; - - case GR_SIN_WAVE: - d_nco.sin (optr, noutput_items, d_ampl); - if (d_offset == 0) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - case GR_COS_WAVE: - d_nco.cos (optr, noutput_items, d_ampl); - if (d_offset == 0) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - /* The square wave is high from -PI to 0. */ - case GR_SQR_WAVE: - t = (gr_complex) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < 0) - optr[i] = t; - else - optr[i] = d_offset; - d_nco.step(); - } - break; - - /* The triangle wave rises from -PI to 0 and falls from 0 to PI. */ - case GR_TRI_WAVE: - for (int i = 0; i < noutput_items; i++){ - double t = d_ampl*d_nco.get_phase()/M_PI; - if (d_nco.get_phase() < 0) - optr[i] = static_cast(t + d_ampl + d_offset); - else - optr[i] = static_cast(-1*t + d_ampl + d_offset); - d_nco.step(); - } - break; - - /* The saw tooth wave rises from -PI to PI. */ - case GR_SAW_WAVE: - for (int i = 0; i < noutput_items; i++){ - t = static_cast(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2 + d_offset); - optr[i] = t; - d_nco.step(); - } - break; - -#endif - - default: - throw std::runtime_error ("gr_sig_source: invalid waveform"); - } - - return noutput_items; -} - -void -gr_sig_source_c::set_sampling_freq (double sampling_freq) -{ - d_sampling_freq = sampling_freq; - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -void -gr_sig_source_c::set_waveform (gr_waveform_t waveform) -{ - d_waveform = waveform; -} - -void -gr_sig_source_c::set_frequency (double frequency) -{ - d_frequency = frequency; - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -void -gr_sig_source_c::set_amplitude (double ampl) -{ - d_ampl = ampl; -} - -void -gr_sig_source_c::set_offset (gr_complex offset) -{ - d_offset = offset; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_c.h b/gnuradio-core/src/lib/gengen/gr_sig_source_c.h deleted file mode 100644 index 49c43d76..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_c.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SIG_SOURCE_C_H -#define INCLUDED_GR_SIG_SOURCE_C_H - -#include -#include -#include - -class gr_sig_source_c; -typedef boost::shared_ptr gr_sig_source_c_sptr; - -/*! - * \brief signal generator with gr_complex output. - * \ingroup source_blk - */ - -class gr_sig_source_c : public gr_sync_block { - friend gr_sig_source_c_sptr - gr_make_sig_source_c (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, gr_complex offset); - - double d_sampling_freq; - gr_waveform_t d_waveform; - double d_frequency; - double d_ampl; - gr_complex d_offset; - gr_fxpt_nco d_nco; - - - gr_sig_source_c (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, gr_complex offset); - - public: - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - // ACCESSORS - double sampling_freq () const { return d_sampling_freq; } - gr_waveform_t waveform () const { return d_waveform; } - double frequency () const { return d_frequency; } - double amplitude () const { return d_ampl; } - gr_complex offset () const { return d_offset; } - - // MANIPULATORS - void set_sampling_freq (double sampling_freq); - void set_waveform (gr_waveform_t waveform); - void set_frequency (double frequency); - void set_amplitude (double ampl); - void set_offset (gr_complex offset); -}; - -gr_sig_source_c_sptr -gr_make_sig_source_c (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, gr_complex offset = 0); - - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_c.i b/gnuradio-core/src/lib/gengen/gr_sig_source_c.i deleted file mode 100644 index e02b1c89..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_c.i +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sig_source_c); - -gr_sig_source_c_sptr -gr_make_sig_source_c (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, gr_complex offset = 0); - - -class gr_sig_source_c : public gr_sync_block { - private: - gr_sig_source_c (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, gr_complex offset); - - public: - - // ACCESSORS - double sampling_freq () const { return d_sampling_freq; } - gr_waveform_t waveform () const { return d_waveform; } - double frequency () const { return d_frequency; } - double amplitude () const { return d_ampl; } - gr_complex offset () const { return d_offset; } - - // MANIPULATORS - void set_sampling_freq (double sampling_freq); - void set_waveform (gr_waveform_t waveform); - void set_frequency (double frequency); - void set_amplitude (double ampl); - void set_offset (gr_complex offset); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_f.cc b/gnuradio-core/src/lib/gengen/gr_sig_source_f.cc deleted file mode 100644 index 33f7140a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_f.cc +++ /dev/null @@ -1,242 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include -#include - - -gr_sig_source_f::gr_sig_source_f (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, float offset) - : gr_sync_block ("sig_source_f", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (float))), - d_sampling_freq (sampling_freq), d_waveform (waveform), d_frequency (frequency), - d_ampl (ampl), d_offset (offset) -{ - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -gr_sig_source_f_sptr -gr_make_sig_source_f (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, float offset) -{ - return gr_sig_source_f_sptr (new gr_sig_source_f (sampling_freq, waveform, frequency, ampl, offset)); -} - -int -gr_sig_source_f::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *optr = (float *) output_items[0]; - float t; - - switch (d_waveform){ - -#if 0 // complex? - - case GR_CONST_WAVE: - t = (gr_complex) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++) // FIXME unroll - optr[i] = t; - break; - - case GR_SIN_WAVE: - case GR_COS_WAVE: - d_nco.sincos (optr, noutput_items, d_ampl); - if (d_offset == gr_complex(0,0)) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - /* Implements a real square wave high from -PI to 0. - * The imaginary square wave leads by 90 deg. - */ - case GR_SQR_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2) - optr[i] = gr_complex(d_ampl, 0)+d_offset; - else if (d_nco.get_phase() < 0) - optr[i] = gr_complex(d_ampl, d_ampl)+d_offset; - else if (d_nco.get_phase() < M_PI/2) - optr[i] = gr_complex(0, d_ampl)+d_offset; - else - optr[i] = d_offset; - d_nco.step(); - } - break; - - /* Implements a real triangle wave rising from -PI to 0 and - * falling from 0 to PI. The imaginary triangle wave leads by 90 deg. - */ - case GR_TRI_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/M_PI + d_ampl, - -1*d_ampl*d_nco.get_phase()/M_PI - d_ampl/2)+d_offset; - } - else if (d_nco.get_phase() < 0){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/M_PI + d_ampl, - d_ampl*d_nco.get_phase()/M_PI + d_ampl/2)+d_offset; - } - else if (d_nco.get_phase() < M_PI/2){ - optr[i] = gr_complex(-1*d_ampl*d_nco.get_phase()/M_PI + d_ampl, - d_ampl*d_nco.get_phase()/M_PI + d_ampl/2)+d_offset; - } - else{ - optr[i] = gr_complex(-1*d_ampl*d_nco.get_phase()/M_PI + d_ampl, - -1*d_ampl*d_nco.get_phase()/M_PI + 3*d_ampl/2)+d_offset; - } - d_nco.step(); - } - break; - - /* Implements a real saw tooth wave rising from -PI to PI. - * The imaginary saw tooth wave leads by 90 deg. - */ - case GR_SAW_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2, - d_ampl*d_nco.get_phase()/(2*M_PI) + 5*d_ampl/4)+d_offset; - } - else{ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2, - d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/4)+d_offset; - } - d_nco.step(); - } - break; - -#else // nope... - - case GR_CONST_WAVE: - t = (float) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++) // FIXME unroll - optr[i] = t; - break; - - case GR_SIN_WAVE: - d_nco.sin (optr, noutput_items, d_ampl); - if (d_offset == 0) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - case GR_COS_WAVE: - d_nco.cos (optr, noutput_items, d_ampl); - if (d_offset == 0) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - /* The square wave is high from -PI to 0. */ - case GR_SQR_WAVE: - t = (float) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < 0) - optr[i] = t; - else - optr[i] = d_offset; - d_nco.step(); - } - break; - - /* The triangle wave rises from -PI to 0 and falls from 0 to PI. */ - case GR_TRI_WAVE: - for (int i = 0; i < noutput_items; i++){ - double t = d_ampl*d_nco.get_phase()/M_PI; - if (d_nco.get_phase() < 0) - optr[i] = static_cast(t + d_ampl + d_offset); - else - optr[i] = static_cast(-1*t + d_ampl + d_offset); - d_nco.step(); - } - break; - - /* The saw tooth wave rises from -PI to PI. */ - case GR_SAW_WAVE: - for (int i = 0; i < noutput_items; i++){ - t = static_cast(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2 + d_offset); - optr[i] = t; - d_nco.step(); - } - break; - -#endif - - default: - throw std::runtime_error ("gr_sig_source: invalid waveform"); - } - - return noutput_items; -} - -void -gr_sig_source_f::set_sampling_freq (double sampling_freq) -{ - d_sampling_freq = sampling_freq; - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -void -gr_sig_source_f::set_waveform (gr_waveform_t waveform) -{ - d_waveform = waveform; -} - -void -gr_sig_source_f::set_frequency (double frequency) -{ - d_frequency = frequency; - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -void -gr_sig_source_f::set_amplitude (double ampl) -{ - d_ampl = ampl; -} - -void -gr_sig_source_f::set_offset (float offset) -{ - d_offset = offset; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_f.h b/gnuradio-core/src/lib/gengen/gr_sig_source_f.h deleted file mode 100644 index d90ca6d3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_f.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SIG_SOURCE_F_H -#define INCLUDED_GR_SIG_SOURCE_F_H - -#include -#include -#include - -class gr_sig_source_f; -typedef boost::shared_ptr gr_sig_source_f_sptr; - -/*! - * \brief signal generator with float output. - * \ingroup source_blk - */ - -class gr_sig_source_f : public gr_sync_block { - friend gr_sig_source_f_sptr - gr_make_sig_source_f (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, float offset); - - double d_sampling_freq; - gr_waveform_t d_waveform; - double d_frequency; - double d_ampl; - float d_offset; - gr_fxpt_nco d_nco; - - - gr_sig_source_f (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, float offset); - - public: - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - // ACCESSORS - double sampling_freq () const { return d_sampling_freq; } - gr_waveform_t waveform () const { return d_waveform; } - double frequency () const { return d_frequency; } - double amplitude () const { return d_ampl; } - float offset () const { return d_offset; } - - // MANIPULATORS - void set_sampling_freq (double sampling_freq); - void set_waveform (gr_waveform_t waveform); - void set_frequency (double frequency); - void set_amplitude (double ampl); - void set_offset (float offset); -}; - -gr_sig_source_f_sptr -gr_make_sig_source_f (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, float offset = 0); - - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_f.i b/gnuradio-core/src/lib/gengen/gr_sig_source_f.i deleted file mode 100644 index 612e7684..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_f.i +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sig_source_f); - -gr_sig_source_f_sptr -gr_make_sig_source_f (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, float offset = 0); - - -class gr_sig_source_f : public gr_sync_block { - private: - gr_sig_source_f (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, float offset); - - public: - - // ACCESSORS - double sampling_freq () const { return d_sampling_freq; } - gr_waveform_t waveform () const { return d_waveform; } - double frequency () const { return d_frequency; } - double amplitude () const { return d_ampl; } - float offset () const { return d_offset; } - - // MANIPULATORS - void set_sampling_freq (double sampling_freq); - void set_waveform (gr_waveform_t waveform); - void set_frequency (double frequency); - void set_amplitude (double ampl); - void set_offset (float offset); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_i.cc b/gnuradio-core/src/lib/gengen/gr_sig_source_i.cc deleted file mode 100644 index b4b04695..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_i.cc +++ /dev/null @@ -1,242 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include -#include - - -gr_sig_source_i::gr_sig_source_i (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, int offset) - : gr_sync_block ("sig_source_i", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (int))), - d_sampling_freq (sampling_freq), d_waveform (waveform), d_frequency (frequency), - d_ampl (ampl), d_offset (offset) -{ - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -gr_sig_source_i_sptr -gr_make_sig_source_i (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, int offset) -{ - return gr_sig_source_i_sptr (new gr_sig_source_i (sampling_freq, waveform, frequency, ampl, offset)); -} - -int -gr_sig_source_i::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - int t; - - switch (d_waveform){ - -#if 0 // complex? - - case GR_CONST_WAVE: - t = (gr_complex) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++) // FIXME unroll - optr[i] = t; - break; - - case GR_SIN_WAVE: - case GR_COS_WAVE: - d_nco.sincos (optr, noutput_items, d_ampl); - if (d_offset == gr_complex(0,0)) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - /* Implements a real square wave high from -PI to 0. - * The imaginary square wave leads by 90 deg. - */ - case GR_SQR_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2) - optr[i] = gr_complex(d_ampl, 0)+d_offset; - else if (d_nco.get_phase() < 0) - optr[i] = gr_complex(d_ampl, d_ampl)+d_offset; - else if (d_nco.get_phase() < M_PI/2) - optr[i] = gr_complex(0, d_ampl)+d_offset; - else - optr[i] = d_offset; - d_nco.step(); - } - break; - - /* Implements a real triangle wave rising from -PI to 0 and - * falling from 0 to PI. The imaginary triangle wave leads by 90 deg. - */ - case GR_TRI_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/M_PI + d_ampl, - -1*d_ampl*d_nco.get_phase()/M_PI - d_ampl/2)+d_offset; - } - else if (d_nco.get_phase() < 0){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/M_PI + d_ampl, - d_ampl*d_nco.get_phase()/M_PI + d_ampl/2)+d_offset; - } - else if (d_nco.get_phase() < M_PI/2){ - optr[i] = gr_complex(-1*d_ampl*d_nco.get_phase()/M_PI + d_ampl, - d_ampl*d_nco.get_phase()/M_PI + d_ampl/2)+d_offset; - } - else{ - optr[i] = gr_complex(-1*d_ampl*d_nco.get_phase()/M_PI + d_ampl, - -1*d_ampl*d_nco.get_phase()/M_PI + 3*d_ampl/2)+d_offset; - } - d_nco.step(); - } - break; - - /* Implements a real saw tooth wave rising from -PI to PI. - * The imaginary saw tooth wave leads by 90 deg. - */ - case GR_SAW_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2, - d_ampl*d_nco.get_phase()/(2*M_PI) + 5*d_ampl/4)+d_offset; - } - else{ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2, - d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/4)+d_offset; - } - d_nco.step(); - } - break; - -#else // nope... - - case GR_CONST_WAVE: - t = (int) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++) // FIXME unroll - optr[i] = t; - break; - - case GR_SIN_WAVE: - d_nco.sin (optr, noutput_items, d_ampl); - if (d_offset == 0) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - case GR_COS_WAVE: - d_nco.cos (optr, noutput_items, d_ampl); - if (d_offset == 0) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - /* The square wave is high from -PI to 0. */ - case GR_SQR_WAVE: - t = (int) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < 0) - optr[i] = t; - else - optr[i] = d_offset; - d_nco.step(); - } - break; - - /* The triangle wave rises from -PI to 0 and falls from 0 to PI. */ - case GR_TRI_WAVE: - for (int i = 0; i < noutput_items; i++){ - double t = d_ampl*d_nco.get_phase()/M_PI; - if (d_nco.get_phase() < 0) - optr[i] = static_cast(t + d_ampl + d_offset); - else - optr[i] = static_cast(-1*t + d_ampl + d_offset); - d_nco.step(); - } - break; - - /* The saw tooth wave rises from -PI to PI. */ - case GR_SAW_WAVE: - for (int i = 0; i < noutput_items; i++){ - t = static_cast(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2 + d_offset); - optr[i] = t; - d_nco.step(); - } - break; - -#endif - - default: - throw std::runtime_error ("gr_sig_source: invalid waveform"); - } - - return noutput_items; -} - -void -gr_sig_source_i::set_sampling_freq (double sampling_freq) -{ - d_sampling_freq = sampling_freq; - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -void -gr_sig_source_i::set_waveform (gr_waveform_t waveform) -{ - d_waveform = waveform; -} - -void -gr_sig_source_i::set_frequency (double frequency) -{ - d_frequency = frequency; - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -void -gr_sig_source_i::set_amplitude (double ampl) -{ - d_ampl = ampl; -} - -void -gr_sig_source_i::set_offset (int offset) -{ - d_offset = offset; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_i.h b/gnuradio-core/src/lib/gengen/gr_sig_source_i.h deleted file mode 100644 index ca83c5a7..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_i.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SIG_SOURCE_I_H -#define INCLUDED_GR_SIG_SOURCE_I_H - -#include -#include -#include - -class gr_sig_source_i; -typedef boost::shared_ptr gr_sig_source_i_sptr; - -/*! - * \brief signal generator with int output. - * \ingroup source_blk - */ - -class gr_sig_source_i : public gr_sync_block { - friend gr_sig_source_i_sptr - gr_make_sig_source_i (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, int offset); - - double d_sampling_freq; - gr_waveform_t d_waveform; - double d_frequency; - double d_ampl; - int d_offset; - gr_fxpt_nco d_nco; - - - gr_sig_source_i (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, int offset); - - public: - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - // ACCESSORS - double sampling_freq () const { return d_sampling_freq; } - gr_waveform_t waveform () const { return d_waveform; } - double frequency () const { return d_frequency; } - double amplitude () const { return d_ampl; } - int offset () const { return d_offset; } - - // MANIPULATORS - void set_sampling_freq (double sampling_freq); - void set_waveform (gr_waveform_t waveform); - void set_frequency (double frequency); - void set_amplitude (double ampl); - void set_offset (int offset); -}; - -gr_sig_source_i_sptr -gr_make_sig_source_i (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, int offset = 0); - - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_i.i b/gnuradio-core/src/lib/gengen/gr_sig_source_i.i deleted file mode 100644 index b4afdc36..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_i.i +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sig_source_i); - -gr_sig_source_i_sptr -gr_make_sig_source_i (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, int offset = 0); - - -class gr_sig_source_i : public gr_sync_block { - private: - gr_sig_source_i (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, int offset); - - public: - - // ACCESSORS - double sampling_freq () const { return d_sampling_freq; } - gr_waveform_t waveform () const { return d_waveform; } - double frequency () const { return d_frequency; } - double amplitude () const { return d_ampl; } - int offset () const { return d_offset; } - - // MANIPULATORS - void set_sampling_freq (double sampling_freq); - void set_waveform (gr_waveform_t waveform); - void set_frequency (double frequency); - void set_amplitude (double ampl); - void set_offset (int offset); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_s.cc b/gnuradio-core/src/lib/gengen/gr_sig_source_s.cc deleted file mode 100644 index 08a0dcf4..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_s.cc +++ /dev/null @@ -1,242 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include -#include - - -gr_sig_source_s::gr_sig_source_s (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, short offset) - : gr_sync_block ("sig_source_s", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (short))), - d_sampling_freq (sampling_freq), d_waveform (waveform), d_frequency (frequency), - d_ampl (ampl), d_offset (offset) -{ - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -gr_sig_source_s_sptr -gr_make_sig_source_s (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, short offset) -{ - return gr_sig_source_s_sptr (new gr_sig_source_s (sampling_freq, waveform, frequency, ampl, offset)); -} - -int -gr_sig_source_s::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - short t; - - switch (d_waveform){ - -#if 0 // complex? - - case GR_CONST_WAVE: - t = (gr_complex) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++) // FIXME unroll - optr[i] = t; - break; - - case GR_SIN_WAVE: - case GR_COS_WAVE: - d_nco.sincos (optr, noutput_items, d_ampl); - if (d_offset == gr_complex(0,0)) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - /* Implements a real square wave high from -PI to 0. - * The imaginary square wave leads by 90 deg. - */ - case GR_SQR_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2) - optr[i] = gr_complex(d_ampl, 0)+d_offset; - else if (d_nco.get_phase() < 0) - optr[i] = gr_complex(d_ampl, d_ampl)+d_offset; - else if (d_nco.get_phase() < M_PI/2) - optr[i] = gr_complex(0, d_ampl)+d_offset; - else - optr[i] = d_offset; - d_nco.step(); - } - break; - - /* Implements a real triangle wave rising from -PI to 0 and - * falling from 0 to PI. The imaginary triangle wave leads by 90 deg. - */ - case GR_TRI_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/M_PI + d_ampl, - -1*d_ampl*d_nco.get_phase()/M_PI - d_ampl/2)+d_offset; - } - else if (d_nco.get_phase() < 0){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/M_PI + d_ampl, - d_ampl*d_nco.get_phase()/M_PI + d_ampl/2)+d_offset; - } - else if (d_nco.get_phase() < M_PI/2){ - optr[i] = gr_complex(-1*d_ampl*d_nco.get_phase()/M_PI + d_ampl, - d_ampl*d_nco.get_phase()/M_PI + d_ampl/2)+d_offset; - } - else{ - optr[i] = gr_complex(-1*d_ampl*d_nco.get_phase()/M_PI + d_ampl, - -1*d_ampl*d_nco.get_phase()/M_PI + 3*d_ampl/2)+d_offset; - } - d_nco.step(); - } - break; - - /* Implements a real saw tooth wave rising from -PI to PI. - * The imaginary saw tooth wave leads by 90 deg. - */ - case GR_SAW_WAVE: - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < -1*M_PI/2){ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2, - d_ampl*d_nco.get_phase()/(2*M_PI) + 5*d_ampl/4)+d_offset; - } - else{ - optr[i] = gr_complex(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2, - d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/4)+d_offset; - } - d_nco.step(); - } - break; - -#else // nope... - - case GR_CONST_WAVE: - t = (short) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++) // FIXME unroll - optr[i] = t; - break; - - case GR_SIN_WAVE: - d_nco.sin (optr, noutput_items, d_ampl); - if (d_offset == 0) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - case GR_COS_WAVE: - d_nco.cos (optr, noutput_items, d_ampl); - if (d_offset == 0) - break; - - for (int i = 0; i < noutput_items; i++){ - optr[i] += d_offset; - } - break; - - /* The square wave is high from -PI to 0. */ - case GR_SQR_WAVE: - t = (short) d_ampl + d_offset; - for (int i = 0; i < noutput_items; i++){ - if (d_nco.get_phase() < 0) - optr[i] = t; - else - optr[i] = d_offset; - d_nco.step(); - } - break; - - /* The triangle wave rises from -PI to 0 and falls from 0 to PI. */ - case GR_TRI_WAVE: - for (int i = 0; i < noutput_items; i++){ - double t = d_ampl*d_nco.get_phase()/M_PI; - if (d_nco.get_phase() < 0) - optr[i] = static_cast(t + d_ampl + d_offset); - else - optr[i] = static_cast(-1*t + d_ampl + d_offset); - d_nco.step(); - } - break; - - /* The saw tooth wave rises from -PI to PI. */ - case GR_SAW_WAVE: - for (int i = 0; i < noutput_items; i++){ - t = static_cast(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2 + d_offset); - optr[i] = t; - d_nco.step(); - } - break; - -#endif - - default: - throw std::runtime_error ("gr_sig_source: invalid waveform"); - } - - return noutput_items; -} - -void -gr_sig_source_s::set_sampling_freq (double sampling_freq) -{ - d_sampling_freq = sampling_freq; - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -void -gr_sig_source_s::set_waveform (gr_waveform_t waveform) -{ - d_waveform = waveform; -} - -void -gr_sig_source_s::set_frequency (double frequency) -{ - d_frequency = frequency; - d_nco.set_freq (2 * M_PI * d_frequency / d_sampling_freq); -} - -void -gr_sig_source_s::set_amplitude (double ampl) -{ - d_ampl = ampl; -} - -void -gr_sig_source_s::set_offset (short offset) -{ - d_offset = offset; -} - diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_s.h b/gnuradio-core/src/lib/gengen/gr_sig_source_s.h deleted file mode 100644 index 6a6cab1b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_s.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SIG_SOURCE_S_H -#define INCLUDED_GR_SIG_SOURCE_S_H - -#include -#include -#include - -class gr_sig_source_s; -typedef boost::shared_ptr gr_sig_source_s_sptr; - -/*! - * \brief signal generator with short output. - * \ingroup source_blk - */ - -class gr_sig_source_s : public gr_sync_block { - friend gr_sig_source_s_sptr - gr_make_sig_source_s (double sampling_freq, gr_waveform_t waveform, - double frequency, double ampl, short offset); - - double d_sampling_freq; - gr_waveform_t d_waveform; - double d_frequency; - double d_ampl; - short d_offset; - gr_fxpt_nco d_nco; - - - gr_sig_source_s (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, short offset); - - public: - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - // ACCESSORS - double sampling_freq () const { return d_sampling_freq; } - gr_waveform_t waveform () const { return d_waveform; } - double frequency () const { return d_frequency; } - double amplitude () const { return d_ampl; } - short offset () const { return d_offset; } - - // MANIPULATORS - void set_sampling_freq (double sampling_freq); - void set_waveform (gr_waveform_t waveform); - void set_frequency (double frequency); - void set_amplitude (double ampl); - void set_offset (short offset); -}; - -gr_sig_source_s_sptr -gr_make_sig_source_s (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, short offset = 0); - - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_s.i b/gnuradio-core/src/lib/gengen/gr_sig_source_s.i deleted file mode 100644 index 2fbdbe30..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_s.i +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sig_source_s); - -gr_sig_source_s_sptr -gr_make_sig_source_s (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, short offset = 0); - - -class gr_sig_source_s : public gr_sync_block { - private: - gr_sig_source_s (double sampling_freq, gr_waveform_t waveform, - double wave_freq, double ampl, short offset); - - public: - - // ACCESSORS - double sampling_freq () const { return d_sampling_freq; } - gr_waveform_t waveform () const { return d_waveform; } - double frequency () const { return d_frequency; } - double amplitude () const { return d_ampl; } - short offset () const { return d_offset; } - - // MANIPULATORS - void set_sampling_freq (double sampling_freq); - void set_waveform (gr_waveform_t waveform); - void set_frequency (double frequency); - void set_amplitude (double ampl); - void set_offset (short offset); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sub_cc.cc b/gnuradio-core/src/lib/gengen/gr_sub_cc.cc deleted file mode 100644 index 764ab38e..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_cc.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_sub_cc_sptr -gr_make_sub_cc (size_t vlen) -{ - return gr_sub_cc_sptr (new gr_sub_cc (vlen)); -} - -gr_sub_cc::gr_sub_cc (size_t vlen) - : gr_sync_block ("sub_cc", - gr_make_io_signature (1, -1, sizeof (gr_complex)*vlen), - gr_make_io_signature (1, 1, sizeof (gr_complex)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_sub_cc::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *optr = (gr_complex *) output_items[0]; - - int ninputs = input_items.size (); - - if (ninputs == 1){ // negate - for (int i = 0; i < noutput_items*d_vlen; i++) - *optr++ = (gr_complex) -((gr_complex *) input_items[0])[i]; - } - - else { - for (int i = 0; i < noutput_items*d_vlen; i++){ - gr_complex acc = ((gr_complex *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc -= ((gr_complex *) input_items[j])[i]; - - *optr++ = (gr_complex) acc; - } - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_sub_cc.h b/gnuradio-core/src/lib/gengen/gr_sub_cc.h deleted file mode 100644 index a1ac0a44..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_cc.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SUB_CC_H -#define INCLUDED_GR_SUB_CC_H - -#include - -class gr_sub_cc; -typedef boost::shared_ptr gr_sub_cc_sptr; - -gr_sub_cc_sptr gr_make_sub_cc (size_t vlen = 1); - -/*! - * \brief output = input_0 - input_1 - ...) - * \ingroup math_blk - * - * Subtract across all input streams. - */ -class gr_sub_cc : public gr_sync_block -{ - friend gr_sub_cc_sptr gr_make_sub_cc (size_t vlen); - - gr_sub_cc (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_sub_cc.i b/gnuradio-core/src/lib/gengen/gr_sub_cc.i deleted file mode 100644 index f5f1adb5..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_cc.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sub_cc) - -gr_sub_cc_sptr gr_make_sub_cc (size_t vlen = 1); - -class gr_sub_cc : public gr_sync_block -{ - private: - gr_sub_cc (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sub_ff.cc b/gnuradio-core/src/lib/gengen/gr_sub_ff.cc deleted file mode 100644 index cc275ec7..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_ff.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_sub_ff_sptr -gr_make_sub_ff (size_t vlen) -{ - return gr_sub_ff_sptr (new gr_sub_ff (vlen)); -} - -gr_sub_ff::gr_sub_ff (size_t vlen) - : gr_sync_block ("sub_ff", - gr_make_io_signature (1, -1, sizeof (float)*vlen), - gr_make_io_signature (1, 1, sizeof (float)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_sub_ff::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *optr = (float *) output_items[0]; - - int ninputs = input_items.size (); - - if (ninputs == 1){ // negate - for (int i = 0; i < noutput_items*d_vlen; i++) - *optr++ = (float) -((float *) input_items[0])[i]; - } - - else { - for (int i = 0; i < noutput_items*d_vlen; i++){ - float acc = ((float *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc -= ((float *) input_items[j])[i]; - - *optr++ = (float) acc; - } - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_sub_ff.h b/gnuradio-core/src/lib/gengen/gr_sub_ff.h deleted file mode 100644 index eb66a84f..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_ff.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SUB_FF_H -#define INCLUDED_GR_SUB_FF_H - -#include - -class gr_sub_ff; -typedef boost::shared_ptr gr_sub_ff_sptr; - -gr_sub_ff_sptr gr_make_sub_ff (size_t vlen = 1); - -/*! - * \brief output = input_0 - input_1 - ...) - * \ingroup math_blk - * - * Subtract across all input streams. - */ -class gr_sub_ff : public gr_sync_block -{ - friend gr_sub_ff_sptr gr_make_sub_ff (size_t vlen); - - gr_sub_ff (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_sub_ff.i b/gnuradio-core/src/lib/gengen/gr_sub_ff.i deleted file mode 100644 index 354d1356..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_ff.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sub_ff) - -gr_sub_ff_sptr gr_make_sub_ff (size_t vlen = 1); - -class gr_sub_ff : public gr_sync_block -{ - private: - gr_sub_ff (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sub_ii.cc b/gnuradio-core/src/lib/gengen/gr_sub_ii.cc deleted file mode 100644 index c095d49a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_ii.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_sub_ii_sptr -gr_make_sub_ii (size_t vlen) -{ - return gr_sub_ii_sptr (new gr_sub_ii (vlen)); -} - -gr_sub_ii::gr_sub_ii (size_t vlen) - : gr_sync_block ("sub_ii", - gr_make_io_signature (1, -1, sizeof (int)*vlen), - gr_make_io_signature (1, 1, sizeof (int)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_sub_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - - int ninputs = input_items.size (); - - if (ninputs == 1){ // negate - for (int i = 0; i < noutput_items*d_vlen; i++) - *optr++ = (int) -((int *) input_items[0])[i]; - } - - else { - for (int i = 0; i < noutput_items*d_vlen; i++){ - int acc = ((int *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc -= ((int *) input_items[j])[i]; - - *optr++ = (int) acc; - } - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_sub_ii.h b/gnuradio-core/src/lib/gengen/gr_sub_ii.h deleted file mode 100644 index ef2032fe..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_ii.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SUB_II_H -#define INCLUDED_GR_SUB_II_H - -#include - -class gr_sub_ii; -typedef boost::shared_ptr gr_sub_ii_sptr; - -gr_sub_ii_sptr gr_make_sub_ii (size_t vlen = 1); - -/*! - * \brief output = input_0 - input_1 - ...) - * \ingroup math_blk - * - * Subtract across all input streams. - */ -class gr_sub_ii : public gr_sync_block -{ - friend gr_sub_ii_sptr gr_make_sub_ii (size_t vlen); - - gr_sub_ii (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_sub_ii.i b/gnuradio-core/src/lib/gengen/gr_sub_ii.i deleted file mode 100644 index 82382c8b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sub_ii) - -gr_sub_ii_sptr gr_make_sub_ii (size_t vlen = 1); - -class gr_sub_ii : public gr_sync_block -{ - private: - gr_sub_ii (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sub_ss.cc b/gnuradio-core/src/lib/gengen/gr_sub_ss.cc deleted file mode 100644 index d3837c25..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_ss.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_sub_ss_sptr -gr_make_sub_ss (size_t vlen) -{ - return gr_sub_ss_sptr (new gr_sub_ss (vlen)); -} - -gr_sub_ss::gr_sub_ss (size_t vlen) - : gr_sync_block ("sub_ss", - gr_make_io_signature (1, -1, sizeof (short)*vlen), - gr_make_io_signature (1, 1, sizeof (short)*vlen)), - d_vlen (vlen) -{ -} - -int -gr_sub_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - - int ninputs = input_items.size (); - - if (ninputs == 1){ // negate - for (int i = 0; i < noutput_items*d_vlen; i++) - *optr++ = (short) -((short *) input_items[0])[i]; - } - - else { - for (int i = 0; i < noutput_items*d_vlen; i++){ - short acc = ((short *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc -= ((short *) input_items[j])[i]; - - *optr++ = (short) acc; - } - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_sub_ss.h b/gnuradio-core/src/lib/gengen/gr_sub_ss.h deleted file mode 100644 index e48ddc08..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_ss.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_SUB_SS_H -#define INCLUDED_GR_SUB_SS_H - -#include - -class gr_sub_ss; -typedef boost::shared_ptr gr_sub_ss_sptr; - -gr_sub_ss_sptr gr_make_sub_ss (size_t vlen = 1); - -/*! - * \brief output = input_0 - input_1 - ...) - * \ingroup math_blk - * - * Subtract across all input streams. - */ -class gr_sub_ss : public gr_sync_block -{ - friend gr_sub_ss_sptr gr_make_sub_ss (size_t vlen); - - gr_sub_ss (size_t vlen); - - size_t d_vlen; - - public: - - 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/gengen/gr_sub_ss.i b/gnuradio-core/src/lib/gengen/gr_sub_ss.i deleted file mode 100644 index 45b1f32a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_sub_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004, 2009 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,sub_ss) - -gr_sub_ss_sptr gr_make_sub_ss (size_t vlen = 1); - -class gr_sub_ss : public gr_sync_block -{ - private: - gr_sub_ss (size_t vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.cc b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.cc deleted file mode 100644 index bcf54968..00000000 --- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.cc +++ /dev/null @@ -1,129 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -static const unsigned int BITS_PER_TYPE = sizeof(unsigned char) * 8; - - -gr_unpacked_to_packed_bb_sptr -gr_make_unpacked_to_packed_bb (unsigned int bits_per_chunk, gr_endianness_t endianness) -{ - return gr_unpacked_to_packed_bb_sptr - (new gr_unpacked_to_packed_bb (bits_per_chunk,endianness)); -} - -gr_unpacked_to_packed_bb::gr_unpacked_to_packed_bb (unsigned int bits_per_chunk, - gr_endianness_t endianness) - : gr_block ("unpacked_to_packed_bb", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, -1, sizeof (unsigned char))), - d_bits_per_chunk(bits_per_chunk),d_endianness(endianness),d_index(0) -{ - assert (bits_per_chunk <= BITS_PER_TYPE); - assert (bits_per_chunk > 0); - - set_relative_rate (bits_per_chunk/(1.0 * BITS_PER_TYPE)); -} - -void -gr_unpacked_to_packed_bb::forecast(int noutput_items, gr_vector_int &ninput_items_required) -{ - int input_required = (int) ceil( (d_index+noutput_items * 1.0 * BITS_PER_TYPE)/d_bits_per_chunk); - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - -unsigned int -get_bit_be1 (const unsigned char *in_vector,unsigned int bit_addr, unsigned int bits_per_chunk) { - unsigned int byte_addr = (int)bit_addr/bits_per_chunk; - unsigned char x = in_vector[byte_addr]; - unsigned int residue = bit_addr - byte_addr * bits_per_chunk; - //printf("Bit addr %d byte addr %d residue %d val %d\n",bit_addr,byte_addr,residue,(x>>(bits_per_chunk-1-residue))&1); - return (x >> (bits_per_chunk-1-residue))&1; -} - -int -gr_unpacked_to_packed_bb::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned int index_tmp = d_index; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0; m< nstreams; m++) { - const unsigned char *in = (unsigned char *) input_items[m]; - unsigned char *out = (unsigned char *) output_items[m]; - index_tmp=d_index; - - // per stream processing - - //assert((ninput_items[m]-d_index)*d_bits_per_chunk >= noutput_items*BITS_PER_TYPE); - - switch(d_endianness){ - - case GR_MSB_FIRST: - for(int i=0;i>1)| (get_bit_be1(in,index_tmp,d_bits_per_chunk)<<(BITS_PER_TYPE-1)); - index_tmp++; - } - out[i] = tmp; - } - break; - - default: - assert(0); - } - } - - d_index = index_tmp; - consume_each ((int)(d_index/d_bits_per_chunk)); - d_index = d_index%d_bits_per_chunk; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.h b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.h deleted file mode 100644 index c628a55c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_UNPACKED_TO_PACKED_BB_H -#define INCLUDED_GR_UNPACKED_TO_PACKED_BB_H - -#include -#include - -class gr_unpacked_to_packed_bb; -typedef boost::shared_ptr gr_unpacked_to_packed_bb_sptr; - -gr_unpacked_to_packed_bb_sptr -gr_make_unpacked_to_packed_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); - -/*! - * \brief Convert a stream of unpacked bytes or shorts into a stream of packed bytes or shorts. - * \ingroup converter_blk - * - * input: stream of unsigned char; output: stream of unsigned char - * - * This is the inverse of gr_packed_to_unpacked_XX. - * - * The low \p bits_per_chunk bits are extracted from each input byte or short. - * These bits are then packed densely into the output bytes or shorts, such that - * all 8 or 16 bits of the output bytes or shorts are filled with valid input bits. - * The right thing is done if bits_per_chunk is not a power of two. - * - * The combination of gr_packed_to_unpacked_XX followed by - * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the - * general case of mapping from a stream of bytes or shorts into arbitrary float - * or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ -class gr_unpacked_to_packed_bb : public gr_block -{ - friend gr_unpacked_to_packed_bb_sptr - gr_make_unpacked_to_packed_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); - - gr_unpacked_to_packed_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); - - unsigned int d_bits_per_chunk; - gr_endianness_t d_endianness; - unsigned int d_index; - - public: - void forecast(int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.i b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.i deleted file mode 100644 index 50b3a07a..00000000 --- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_bb.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,unpacked_to_packed_bb); - -gr_unpacked_to_packed_bb_sptr -gr_make_unpacked_to_packed_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); - -class gr_unpacked_to_packed_bb : public gr_block -{ - gr_unpacked_to_packed_bb (unsigned int bits_per_chunk, gr_endianness_t endianness); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.cc b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.cc deleted file mode 100644 index f23dfc36..00000000 --- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.cc +++ /dev/null @@ -1,129 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -static const unsigned int BITS_PER_TYPE = sizeof(int) * 8; - - -gr_unpacked_to_packed_ii_sptr -gr_make_unpacked_to_packed_ii (unsigned int bits_per_chunk, gr_endianness_t endianness) -{ - return gr_unpacked_to_packed_ii_sptr - (new gr_unpacked_to_packed_ii (bits_per_chunk,endianness)); -} - -gr_unpacked_to_packed_ii::gr_unpacked_to_packed_ii (unsigned int bits_per_chunk, - gr_endianness_t endianness) - : gr_block ("unpacked_to_packed_ii", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, -1, sizeof (int))), - d_bits_per_chunk(bits_per_chunk),d_endianness(endianness),d_index(0) -{ - assert (bits_per_chunk <= BITS_PER_TYPE); - assert (bits_per_chunk > 0); - - set_relative_rate (bits_per_chunk/(1.0 * BITS_PER_TYPE)); -} - -void -gr_unpacked_to_packed_ii::forecast(int noutput_items, gr_vector_int &ninput_items_required) -{ - int input_required = (int) ceil( (d_index+noutput_items * 1.0 * BITS_PER_TYPE)/d_bits_per_chunk); - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - -unsigned int -get_bit_be1 (const int *in_vector,unsigned int bit_addr, unsigned int bits_per_chunk) { - unsigned int byte_addr = (int)bit_addr/bits_per_chunk; - int x = in_vector[byte_addr]; - unsigned int residue = bit_addr - byte_addr * bits_per_chunk; - //printf("Bit addr %d byte addr %d residue %d val %d\n",bit_addr,byte_addr,residue,(x>>(bits_per_chunk-1-residue))&1); - return (x >> (bits_per_chunk-1-residue))&1; -} - -int -gr_unpacked_to_packed_ii::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned int index_tmp = d_index; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0; m< nstreams; m++) { - const int *in = (int *) input_items[m]; - int *out = (int *) output_items[m]; - index_tmp=d_index; - - // per stream processing - - //assert((ninput_items[m]-d_index)*d_bits_per_chunk >= noutput_items*BITS_PER_TYPE); - - switch(d_endianness){ - - case GR_MSB_FIRST: - for(int i=0;i>1)| (get_bit_be1(in,index_tmp,d_bits_per_chunk)<<(BITS_PER_TYPE-1)); - index_tmp++; - } - out[i] = tmp; - } - break; - - default: - assert(0); - } - } - - d_index = index_tmp; - consume_each ((int)(d_index/d_bits_per_chunk)); - d_index = d_index%d_bits_per_chunk; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.h b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.h deleted file mode 100644 index b299bf1c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_UNPACKED_TO_PACKED_II_H -#define INCLUDED_GR_UNPACKED_TO_PACKED_II_H - -#include -#include - -class gr_unpacked_to_packed_ii; -typedef boost::shared_ptr gr_unpacked_to_packed_ii_sptr; - -gr_unpacked_to_packed_ii_sptr -gr_make_unpacked_to_packed_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); - -/*! - * \brief Convert a stream of unpacked bytes or shorts into a stream of packed bytes or shorts. - * \ingroup converter_blk - * - * input: stream of int; output: stream of int - * - * This is the inverse of gr_packed_to_unpacked_XX. - * - * The low \p bits_per_chunk bits are extracted from each input byte or short. - * These bits are then packed densely into the output bytes or shorts, such that - * all 8 or 16 bits of the output bytes or shorts are filled with valid input bits. - * The right thing is done if bits_per_chunk is not a power of two. - * - * The combination of gr_packed_to_unpacked_XX followed by - * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the - * general case of mapping from a stream of bytes or shorts into arbitrary float - * or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ -class gr_unpacked_to_packed_ii : public gr_block -{ - friend gr_unpacked_to_packed_ii_sptr - gr_make_unpacked_to_packed_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); - - gr_unpacked_to_packed_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); - - unsigned int d_bits_per_chunk; - gr_endianness_t d_endianness; - unsigned int d_index; - - public: - void forecast(int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.i b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.i deleted file mode 100644 index c2f76d2d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,unpacked_to_packed_ii); - -gr_unpacked_to_packed_ii_sptr -gr_make_unpacked_to_packed_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); - -class gr_unpacked_to_packed_ii : public gr_block -{ - gr_unpacked_to_packed_ii (unsigned int bits_per_chunk, gr_endianness_t endianness); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.cc b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.cc deleted file mode 100644 index 9527e825..00000000 --- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.cc +++ /dev/null @@ -1,129 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -static const unsigned int BITS_PER_TYPE = sizeof(short) * 8; - - -gr_unpacked_to_packed_ss_sptr -gr_make_unpacked_to_packed_ss (unsigned int bits_per_chunk, gr_endianness_t endianness) -{ - return gr_unpacked_to_packed_ss_sptr - (new gr_unpacked_to_packed_ss (bits_per_chunk,endianness)); -} - -gr_unpacked_to_packed_ss::gr_unpacked_to_packed_ss (unsigned int bits_per_chunk, - gr_endianness_t endianness) - : gr_block ("unpacked_to_packed_ss", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (short))), - d_bits_per_chunk(bits_per_chunk),d_endianness(endianness),d_index(0) -{ - assert (bits_per_chunk <= BITS_PER_TYPE); - assert (bits_per_chunk > 0); - - set_relative_rate (bits_per_chunk/(1.0 * BITS_PER_TYPE)); -} - -void -gr_unpacked_to_packed_ss::forecast(int noutput_items, gr_vector_int &ninput_items_required) -{ - int input_required = (int) ceil( (d_index+noutput_items * 1.0 * BITS_PER_TYPE)/d_bits_per_chunk); - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - -unsigned int -get_bit_be1 (const short *in_vector,unsigned int bit_addr, unsigned int bits_per_chunk) { - unsigned int byte_addr = (int)bit_addr/bits_per_chunk; - short x = in_vector[byte_addr]; - unsigned int residue = bit_addr - byte_addr * bits_per_chunk; - //printf("Bit addr %d byte addr %d residue %d val %d\n",bit_addr,byte_addr,residue,(x>>(bits_per_chunk-1-residue))&1); - return (x >> (bits_per_chunk-1-residue))&1; -} - -int -gr_unpacked_to_packed_ss::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned int index_tmp = d_index; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0; m< nstreams; m++) { - const short *in = (short *) input_items[m]; - short *out = (short *) output_items[m]; - index_tmp=d_index; - - // per stream processing - - //assert((ninput_items[m]-d_index)*d_bits_per_chunk >= noutput_items*BITS_PER_TYPE); - - switch(d_endianness){ - - case GR_MSB_FIRST: - for(int i=0;i>1)| (get_bit_be1(in,index_tmp,d_bits_per_chunk)<<(BITS_PER_TYPE-1)); - index_tmp++; - } - out[i] = tmp; - } - break; - - default: - assert(0); - } - } - - d_index = index_tmp; - consume_each ((int)(d_index/d_bits_per_chunk)); - d_index = d_index%d_bits_per_chunk; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.h b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.h deleted file mode 100644 index 797ef714..00000000 --- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_UNPACKED_TO_PACKED_SS_H -#define INCLUDED_GR_UNPACKED_TO_PACKED_SS_H - -#include -#include - -class gr_unpacked_to_packed_ss; -typedef boost::shared_ptr gr_unpacked_to_packed_ss_sptr; - -gr_unpacked_to_packed_ss_sptr -gr_make_unpacked_to_packed_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); - -/*! - * \brief Convert a stream of unpacked bytes or shorts into a stream of packed bytes or shorts. - * \ingroup converter_blk - * - * input: stream of short; output: stream of short - * - * This is the inverse of gr_packed_to_unpacked_XX. - * - * The low \p bits_per_chunk bits are extracted from each input byte or short. - * These bits are then packed densely into the output bytes or shorts, such that - * all 8 or 16 bits of the output bytes or shorts are filled with valid input bits. - * The right thing is done if bits_per_chunk is not a power of two. - * - * The combination of gr_packed_to_unpacked_XX followed by - * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the - * general case of mapping from a stream of bytes or shorts into arbitrary float - * or complex symbols. - * - * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb, - * \sa gr_packed_to_unpacked_ss, gr_unpacked_to_packed_ss, - * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc. - * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc. - */ -class gr_unpacked_to_packed_ss : public gr_block -{ - friend gr_unpacked_to_packed_ss_sptr - gr_make_unpacked_to_packed_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); - - gr_unpacked_to_packed_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); - - unsigned int d_bits_per_chunk; - gr_endianness_t d_endianness; - unsigned int d_index; - - public: - void forecast(int noutput_items, gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - bool check_topology(int ninputs, int noutputs) { return ninputs == noutputs; } -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.i b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.i deleted file mode 100644 index bf3b211b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,unpacked_to_packed_ss); - -gr_unpacked_to_packed_ss_sptr -gr_make_unpacked_to_packed_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); - -class gr_unpacked_to_packed_ss : public gr_block -{ - gr_unpacked_to_packed_ss (unsigned int bits_per_chunk, gr_endianness_t endianness); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_b.cc b/gnuradio-core/src/lib/gengen/gr_vector_sink_b.cc deleted file mode 100644 index 8c53b57d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_b.cc +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include - - -gr_vector_sink_b::gr_vector_sink_b (int vlen) - : gr_sync_block ("vector_sink_b", - gr_make_io_signature (1, 1, sizeof (unsigned char) * vlen), - gr_make_io_signature (0, 0, 0)), - d_vlen(vlen) -{ -} - -int -gr_vector_sink_b::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned char *iptr = (unsigned char *) input_items[0]; - for (int i = 0; i < noutput_items * d_vlen; i++) - d_data.push_back (iptr[i]); - - return noutput_items; -} - - -gr_vector_sink_b_sptr -gr_make_vector_sink_b (int vlen) -{ - return gr_vector_sink_b_sptr (new gr_vector_sink_b (vlen)); -} - -std::vector -gr_vector_sink_b::data () const -{ - return d_data; -} diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_b.h b/gnuradio-core/src/lib/gengen/gr_vector_sink_b.h deleted file mode 100644 index f989a5da..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_b.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SINK_B_H -#define INCLUDED_GR_VECTOR_SINK_B_H - -#include - -class gr_vector_sink_b; -typedef boost::shared_ptr gr_vector_sink_b_sptr; - -gr_vector_sink_b_sptr -gr_make_vector_sink_b (int vlen = 1); - - -/*! - * \brief unsigned char sink that writes to a vector - * \ingroup sink_blk - */ - -class gr_vector_sink_b : public gr_sync_block { - friend gr_vector_sink_b_sptr gr_make_vector_sink_b (int vlen); - std::vector d_data; - int d_vlen; - gr_vector_sink_b (int vlen); - - public: - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - void clear() {d_data.clear();} - std::vector data () const; -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_b.i b/gnuradio-core/src/lib/gengen/gr_vector_sink_b.i deleted file mode 100644 index 56de8f61..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_b.i +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - - -GR_SWIG_BLOCK_MAGIC(gr,vector_sink_b); - -gr_vector_sink_b_sptr gr_make_vector_sink_b (int vlen = 1); - -class gr_vector_sink_b : public gr_sync_block { - private: - gr_vector_sink_b (int vlen); - - public: - void clear() {d_data.clear();} - std::vector data () const; -}; - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_c.cc b/gnuradio-core/src/lib/gengen/gr_vector_sink_c.cc deleted file mode 100644 index 7c99c18b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_c.cc +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include - - -gr_vector_sink_c::gr_vector_sink_c (int vlen) - : gr_sync_block ("vector_sink_c", - gr_make_io_signature (1, 1, sizeof (gr_complex) * vlen), - gr_make_io_signature (0, 0, 0)), - d_vlen(vlen) -{ -} - -int -gr_vector_sink_c::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *iptr = (gr_complex *) input_items[0]; - for (int i = 0; i < noutput_items * d_vlen; i++) - d_data.push_back (iptr[i]); - - return noutput_items; -} - - -gr_vector_sink_c_sptr -gr_make_vector_sink_c (int vlen) -{ - return gr_vector_sink_c_sptr (new gr_vector_sink_c (vlen)); -} - -std::vector -gr_vector_sink_c::data () const -{ - return d_data; -} diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_c.h b/gnuradio-core/src/lib/gengen/gr_vector_sink_c.h deleted file mode 100644 index e1aae569..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_c.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SINK_C_H -#define INCLUDED_GR_VECTOR_SINK_C_H - -#include - -class gr_vector_sink_c; -typedef boost::shared_ptr gr_vector_sink_c_sptr; - -gr_vector_sink_c_sptr -gr_make_vector_sink_c (int vlen = 1); - - -/*! - * \brief gr_complex sink that writes to a vector - * \ingroup sink_blk - */ - -class gr_vector_sink_c : public gr_sync_block { - friend gr_vector_sink_c_sptr gr_make_vector_sink_c (int vlen); - std::vector d_data; - int d_vlen; - gr_vector_sink_c (int vlen); - - public: - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - void clear() {d_data.clear();} - std::vector data () const; -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_c.i b/gnuradio-core/src/lib/gengen/gr_vector_sink_c.i deleted file mode 100644 index c7bf5c29..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_c.i +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - - -GR_SWIG_BLOCK_MAGIC(gr,vector_sink_c); - -gr_vector_sink_c_sptr gr_make_vector_sink_c (int vlen = 1); - -class gr_vector_sink_c : public gr_sync_block { - private: - gr_vector_sink_c (int vlen); - - public: - void clear() {d_data.clear();} - std::vector data () const; -}; - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_f.cc b/gnuradio-core/src/lib/gengen/gr_vector_sink_f.cc deleted file mode 100644 index c27bb992..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_f.cc +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include - - -gr_vector_sink_f::gr_vector_sink_f (int vlen) - : gr_sync_block ("vector_sink_f", - gr_make_io_signature (1, 1, sizeof (float) * vlen), - gr_make_io_signature (0, 0, 0)), - d_vlen(vlen) -{ -} - -int -gr_vector_sink_f::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *iptr = (float *) input_items[0]; - for (int i = 0; i < noutput_items * d_vlen; i++) - d_data.push_back (iptr[i]); - - return noutput_items; -} - - -gr_vector_sink_f_sptr -gr_make_vector_sink_f (int vlen) -{ - return gr_vector_sink_f_sptr (new gr_vector_sink_f (vlen)); -} - -std::vector -gr_vector_sink_f::data () const -{ - return d_data; -} diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_f.h b/gnuradio-core/src/lib/gengen/gr_vector_sink_f.h deleted file mode 100644 index 66885ee0..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_f.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SINK_F_H -#define INCLUDED_GR_VECTOR_SINK_F_H - -#include - -class gr_vector_sink_f; -typedef boost::shared_ptr gr_vector_sink_f_sptr; - -gr_vector_sink_f_sptr -gr_make_vector_sink_f (int vlen = 1); - - -/*! - * \brief float sink that writes to a vector - * \ingroup sink_blk - */ - -class gr_vector_sink_f : public gr_sync_block { - friend gr_vector_sink_f_sptr gr_make_vector_sink_f (int vlen); - std::vector d_data; - int d_vlen; - gr_vector_sink_f (int vlen); - - public: - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - void clear() {d_data.clear();} - std::vector data () const; -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_f.i b/gnuradio-core/src/lib/gengen/gr_vector_sink_f.i deleted file mode 100644 index dd868e4f..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_f.i +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - - -GR_SWIG_BLOCK_MAGIC(gr,vector_sink_f); - -gr_vector_sink_f_sptr gr_make_vector_sink_f (int vlen = 1); - -class gr_vector_sink_f : public gr_sync_block { - private: - gr_vector_sink_f (int vlen); - - public: - void clear() {d_data.clear();} - std::vector data () const; -}; - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_i.cc b/gnuradio-core/src/lib/gengen/gr_vector_sink_i.cc deleted file mode 100644 index 731bc2f4..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_i.cc +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include - - -gr_vector_sink_i::gr_vector_sink_i (int vlen) - : gr_sync_block ("vector_sink_i", - gr_make_io_signature (1, 1, sizeof (int) * vlen), - gr_make_io_signature (0, 0, 0)), - d_vlen(vlen) -{ -} - -int -gr_vector_sink_i::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *iptr = (int *) input_items[0]; - for (int i = 0; i < noutput_items * d_vlen; i++) - d_data.push_back (iptr[i]); - - return noutput_items; -} - - -gr_vector_sink_i_sptr -gr_make_vector_sink_i (int vlen) -{ - return gr_vector_sink_i_sptr (new gr_vector_sink_i (vlen)); -} - -std::vector -gr_vector_sink_i::data () const -{ - return d_data; -} diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_i.h b/gnuradio-core/src/lib/gengen/gr_vector_sink_i.h deleted file mode 100644 index ec6156cb..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_i.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SINK_I_H -#define INCLUDED_GR_VECTOR_SINK_I_H - -#include - -class gr_vector_sink_i; -typedef boost::shared_ptr gr_vector_sink_i_sptr; - -gr_vector_sink_i_sptr -gr_make_vector_sink_i (int vlen = 1); - - -/*! - * \brief int sink that writes to a vector - * \ingroup sink_blk - */ - -class gr_vector_sink_i : public gr_sync_block { - friend gr_vector_sink_i_sptr gr_make_vector_sink_i (int vlen); - std::vector d_data; - int d_vlen; - gr_vector_sink_i (int vlen); - - public: - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - void clear() {d_data.clear();} - std::vector data () const; -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_i.i b/gnuradio-core/src/lib/gengen/gr_vector_sink_i.i deleted file mode 100644 index 24de561c..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_i.i +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - - -GR_SWIG_BLOCK_MAGIC(gr,vector_sink_i); - -gr_vector_sink_i_sptr gr_make_vector_sink_i (int vlen = 1); - -class gr_vector_sink_i : public gr_sync_block { - private: - gr_vector_sink_i (int vlen); - - public: - void clear() {d_data.clear();} - std::vector data () const; -}; - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_s.cc b/gnuradio-core/src/lib/gengen/gr_vector_sink_s.cc deleted file mode 100644 index b5c6a5cf..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_s.cc +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include - - -gr_vector_sink_s::gr_vector_sink_s (int vlen) - : gr_sync_block ("vector_sink_s", - gr_make_io_signature (1, 1, sizeof (short) * vlen), - gr_make_io_signature (0, 0, 0)), - d_vlen(vlen) -{ -} - -int -gr_vector_sink_s::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *iptr = (short *) input_items[0]; - for (int i = 0; i < noutput_items * d_vlen; i++) - d_data.push_back (iptr[i]); - - return noutput_items; -} - - -gr_vector_sink_s_sptr -gr_make_vector_sink_s (int vlen) -{ - return gr_vector_sink_s_sptr (new gr_vector_sink_s (vlen)); -} - -std::vector -gr_vector_sink_s::data () const -{ - return d_data; -} diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_s.h b/gnuradio-core/src/lib/gengen/gr_vector_sink_s.h deleted file mode 100644 index 5b2168c8..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_s.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SINK_S_H -#define INCLUDED_GR_VECTOR_SINK_S_H - -#include - -class gr_vector_sink_s; -typedef boost::shared_ptr gr_vector_sink_s_sptr; - -gr_vector_sink_s_sptr -gr_make_vector_sink_s (int vlen = 1); - - -/*! - * \brief short sink that writes to a vector - * \ingroup sink_blk - */ - -class gr_vector_sink_s : public gr_sync_block { - friend gr_vector_sink_s_sptr gr_make_vector_sink_s (int vlen); - std::vector d_data; - int d_vlen; - gr_vector_sink_s (int vlen); - - public: - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - void clear() {d_data.clear();} - std::vector data () const; -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_s.i b/gnuradio-core/src/lib/gengen/gr_vector_sink_s.i deleted file mode 100644 index c301245b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_sink_s.i +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - - -GR_SWIG_BLOCK_MAGIC(gr,vector_sink_s); - -gr_vector_sink_s_sptr gr_make_vector_sink_s (int vlen = 1); - -class gr_vector_sink_s : public gr_sync_block { - private: - gr_vector_sink_s (int vlen); - - public: - void clear() {d_data.clear();} - std::vector data () const; -}; - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_b.cc b/gnuradio-core/src/lib/gengen/gr_vector_source_b.cc deleted file mode 100644 index 3cff2fd5..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_b.cc +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include - - -gr_vector_source_b::gr_vector_source_b (const std::vector &data, bool repeat, int vlen) - : gr_sync_block ("vector_source_b", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (unsigned char) * vlen)), - d_data (data), - d_repeat (repeat), - d_offset (0), - d_vlen (vlen) -{ - if ((data.size() % vlen) != 0) - throw std::invalid_argument("data length must be a multiple of vlen"); -} - -int -gr_vector_source_b::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned char *optr = (unsigned char *) output_items[0]; - - if (d_repeat){ - unsigned int size = d_data.size (); - unsigned int offset = d_offset; - - if (size == 0) - return -1; - - for (int i = 0; i < noutput_items*d_vlen; i++){ - optr[i] = d_data[offset++]; - if (offset >= size) - offset = 0; - } - d_offset = offset; - return noutput_items; - } - - else { - if (d_offset >= d_data.size ()) - return -1; // Done! - - unsigned n = std::min ((unsigned) d_data.size () - d_offset, - (unsigned) noutput_items*d_vlen); - for (unsigned i = 0; i < n; i++) - optr[i] = d_data[d_offset + i]; - - d_offset += n; - return n/d_vlen; - } -} - -gr_vector_source_b_sptr -gr_make_vector_source_b (const std::vector &data, bool repeat, int vlen) -{ - return gr_vector_source_b_sptr (new gr_vector_source_b (data, repeat, vlen)); -} - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_b.h b/gnuradio-core/src/lib/gengen/gr_vector_source_b.h deleted file mode 100644 index d1544b77..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_b.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SOURCE_B_H -#define INCLUDED_GR_VECTOR_SOURCE_B_H - -#include - -class gr_vector_source_b; -typedef boost::shared_ptr gr_vector_source_b_sptr; - -/*! - * \brief source of unsigned char's that gets its data from a vector - * \ingroup source_blk - */ - -class gr_vector_source_b : public gr_sync_block { - friend gr_vector_source_b_sptr - gr_make_vector_source_b (const std::vector &data, bool repeat, int vlen); - - std::vector d_data; - bool d_repeat; - unsigned int d_offset; - int d_vlen; - - gr_vector_source_b (const std::vector &data, bool repeat, int vlen); - - public: - void rewind() {d_offset=0;} - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -gr_vector_source_b_sptr -gr_make_vector_source_b (const std::vector &data, bool repeat = false, int vlen = 1); - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_b.i b/gnuradio-core/src/lib/gengen/gr_vector_source_b.i deleted file mode 100644 index f794917b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_b.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,vector_source_b); - -gr_vector_source_b_sptr -gr_make_vector_source_b (const std::vector &data, bool repeat = false, int vlen = 1) - throw(std::invalid_argument); - -class gr_vector_source_b : public gr_sync_block { - public: - void rewind() {d_offset=0;} - private: - gr_vector_source_b (const std::vector &data, int vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_c.cc b/gnuradio-core/src/lib/gengen/gr_vector_source_c.cc deleted file mode 100644 index 5eb12d7d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_c.cc +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include - - -gr_vector_source_c::gr_vector_source_c (const std::vector &data, bool repeat, int vlen) - : gr_sync_block ("vector_source_c", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (gr_complex) * vlen)), - d_data (data), - d_repeat (repeat), - d_offset (0), - d_vlen (vlen) -{ - if ((data.size() % vlen) != 0) - throw std::invalid_argument("data length must be a multiple of vlen"); -} - -int -gr_vector_source_c::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - gr_complex *optr = (gr_complex *) output_items[0]; - - if (d_repeat){ - unsigned int size = d_data.size (); - unsigned int offset = d_offset; - - if (size == 0) - return -1; - - for (int i = 0; i < noutput_items*d_vlen; i++){ - optr[i] = d_data[offset++]; - if (offset >= size) - offset = 0; - } - d_offset = offset; - return noutput_items; - } - - else { - if (d_offset >= d_data.size ()) - return -1; // Done! - - unsigned n = std::min ((unsigned) d_data.size () - d_offset, - (unsigned) noutput_items*d_vlen); - for (unsigned i = 0; i < n; i++) - optr[i] = d_data[d_offset + i]; - - d_offset += n; - return n/d_vlen; - } -} - -gr_vector_source_c_sptr -gr_make_vector_source_c (const std::vector &data, bool repeat, int vlen) -{ - return gr_vector_source_c_sptr (new gr_vector_source_c (data, repeat, vlen)); -} - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_c.h b/gnuradio-core/src/lib/gengen/gr_vector_source_c.h deleted file mode 100644 index 6911433e..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_c.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SOURCE_C_H -#define INCLUDED_GR_VECTOR_SOURCE_C_H - -#include - -class gr_vector_source_c; -typedef boost::shared_ptr gr_vector_source_c_sptr; - -/*! - * \brief source of gr_complex's that gets its data from a vector - * \ingroup source_blk - */ - -class gr_vector_source_c : public gr_sync_block { - friend gr_vector_source_c_sptr - gr_make_vector_source_c (const std::vector &data, bool repeat, int vlen); - - std::vector d_data; - bool d_repeat; - unsigned int d_offset; - int d_vlen; - - gr_vector_source_c (const std::vector &data, bool repeat, int vlen); - - public: - void rewind() {d_offset=0;} - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -gr_vector_source_c_sptr -gr_make_vector_source_c (const std::vector &data, bool repeat = false, int vlen = 1); - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_c.i b/gnuradio-core/src/lib/gengen/gr_vector_source_c.i deleted file mode 100644 index 7fa5f192..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_c.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,vector_source_c); - -gr_vector_source_c_sptr -gr_make_vector_source_c (const std::vector &data, bool repeat = false, int vlen = 1) - throw(std::invalid_argument); - -class gr_vector_source_c : public gr_sync_block { - public: - void rewind() {d_offset=0;} - private: - gr_vector_source_c (const std::vector &data, int vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_f.cc b/gnuradio-core/src/lib/gengen/gr_vector_source_f.cc deleted file mode 100644 index c5d5e257..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_f.cc +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include - - -gr_vector_source_f::gr_vector_source_f (const std::vector &data, bool repeat, int vlen) - : gr_sync_block ("vector_source_f", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (float) * vlen)), - d_data (data), - d_repeat (repeat), - d_offset (0), - d_vlen (vlen) -{ - if ((data.size() % vlen) != 0) - throw std::invalid_argument("data length must be a multiple of vlen"); -} - -int -gr_vector_source_f::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *optr = (float *) output_items[0]; - - if (d_repeat){ - unsigned int size = d_data.size (); - unsigned int offset = d_offset; - - if (size == 0) - return -1; - - for (int i = 0; i < noutput_items*d_vlen; i++){ - optr[i] = d_data[offset++]; - if (offset >= size) - offset = 0; - } - d_offset = offset; - return noutput_items; - } - - else { - if (d_offset >= d_data.size ()) - return -1; // Done! - - unsigned n = std::min ((unsigned) d_data.size () - d_offset, - (unsigned) noutput_items*d_vlen); - for (unsigned i = 0; i < n; i++) - optr[i] = d_data[d_offset + i]; - - d_offset += n; - return n/d_vlen; - } -} - -gr_vector_source_f_sptr -gr_make_vector_source_f (const std::vector &data, bool repeat, int vlen) -{ - return gr_vector_source_f_sptr (new gr_vector_source_f (data, repeat, vlen)); -} - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_f.h b/gnuradio-core/src/lib/gengen/gr_vector_source_f.h deleted file mode 100644 index 206ff4f3..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_f.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SOURCE_F_H -#define INCLUDED_GR_VECTOR_SOURCE_F_H - -#include - -class gr_vector_source_f; -typedef boost::shared_ptr gr_vector_source_f_sptr; - -/*! - * \brief source of float's that gets its data from a vector - * \ingroup source_blk - */ - -class gr_vector_source_f : public gr_sync_block { - friend gr_vector_source_f_sptr - gr_make_vector_source_f (const std::vector &data, bool repeat, int vlen); - - std::vector d_data; - bool d_repeat; - unsigned int d_offset; - int d_vlen; - - gr_vector_source_f (const std::vector &data, bool repeat, int vlen); - - public: - void rewind() {d_offset=0;} - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -gr_vector_source_f_sptr -gr_make_vector_source_f (const std::vector &data, bool repeat = false, int vlen = 1); - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_f.i b/gnuradio-core/src/lib/gengen/gr_vector_source_f.i deleted file mode 100644 index b0ec77a5..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_f.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,vector_source_f); - -gr_vector_source_f_sptr -gr_make_vector_source_f (const std::vector &data, bool repeat = false, int vlen = 1) - throw(std::invalid_argument); - -class gr_vector_source_f : public gr_sync_block { - public: - void rewind() {d_offset=0;} - private: - gr_vector_source_f (const std::vector &data, int vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_i.cc b/gnuradio-core/src/lib/gengen/gr_vector_source_i.cc deleted file mode 100644 index 3b889522..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_i.cc +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include - - -gr_vector_source_i::gr_vector_source_i (const std::vector &data, bool repeat, int vlen) - : gr_sync_block ("vector_source_i", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (int) * vlen)), - d_data (data), - d_repeat (repeat), - d_offset (0), - d_vlen (vlen) -{ - if ((data.size() % vlen) != 0) - throw std::invalid_argument("data length must be a multiple of vlen"); -} - -int -gr_vector_source_i::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - - if (d_repeat){ - unsigned int size = d_data.size (); - unsigned int offset = d_offset; - - if (size == 0) - return -1; - - for (int i = 0; i < noutput_items*d_vlen; i++){ - optr[i] = d_data[offset++]; - if (offset >= size) - offset = 0; - } - d_offset = offset; - return noutput_items; - } - - else { - if (d_offset >= d_data.size ()) - return -1; // Done! - - unsigned n = std::min ((unsigned) d_data.size () - d_offset, - (unsigned) noutput_items*d_vlen); - for (unsigned i = 0; i < n; i++) - optr[i] = d_data[d_offset + i]; - - d_offset += n; - return n/d_vlen; - } -} - -gr_vector_source_i_sptr -gr_make_vector_source_i (const std::vector &data, bool repeat, int vlen) -{ - return gr_vector_source_i_sptr (new gr_vector_source_i (data, repeat, vlen)); -} - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_i.h b/gnuradio-core/src/lib/gengen/gr_vector_source_i.h deleted file mode 100644 index bde52321..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_i.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SOURCE_I_H -#define INCLUDED_GR_VECTOR_SOURCE_I_H - -#include - -class gr_vector_source_i; -typedef boost::shared_ptr gr_vector_source_i_sptr; - -/*! - * \brief source of int's that gets its data from a vector - * \ingroup source_blk - */ - -class gr_vector_source_i : public gr_sync_block { - friend gr_vector_source_i_sptr - gr_make_vector_source_i (const std::vector &data, bool repeat, int vlen); - - std::vector d_data; - bool d_repeat; - unsigned int d_offset; - int d_vlen; - - gr_vector_source_i (const std::vector &data, bool repeat, int vlen); - - public: - void rewind() {d_offset=0;} - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -gr_vector_source_i_sptr -gr_make_vector_source_i (const std::vector &data, bool repeat = false, int vlen = 1); - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_i.i b/gnuradio-core/src/lib/gengen/gr_vector_source_i.i deleted file mode 100644 index bcd06741..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_i.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,vector_source_i); - -gr_vector_source_i_sptr -gr_make_vector_source_i (const std::vector &data, bool repeat = false, int vlen = 1) - throw(std::invalid_argument); - -class gr_vector_source_i : public gr_sync_block { - public: - void rewind() {d_offset=0;} - private: - gr_vector_source_i (const std::vector &data, int vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_s.cc b/gnuradio-core/src/lib/gengen/gr_vector_source_s.cc deleted file mode 100644 index f38189c1..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_s.cc +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include - - -gr_vector_source_s::gr_vector_source_s (const std::vector &data, bool repeat, int vlen) - : gr_sync_block ("vector_source_s", - gr_make_io_signature (0, 0, 0), - gr_make_io_signature (1, 1, sizeof (short) * vlen)), - d_data (data), - d_repeat (repeat), - d_offset (0), - d_vlen (vlen) -{ - if ((data.size() % vlen) != 0) - throw std::invalid_argument("data length must be a multiple of vlen"); -} - -int -gr_vector_source_s::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - - if (d_repeat){ - unsigned int size = d_data.size (); - unsigned int offset = d_offset; - - if (size == 0) - return -1; - - for (int i = 0; i < noutput_items*d_vlen; i++){ - optr[i] = d_data[offset++]; - if (offset >= size) - offset = 0; - } - d_offset = offset; - return noutput_items; - } - - else { - if (d_offset >= d_data.size ()) - return -1; // Done! - - unsigned n = std::min ((unsigned) d_data.size () - d_offset, - (unsigned) noutput_items*d_vlen); - for (unsigned i = 0; i < n; i++) - optr[i] = d_data[d_offset + i]; - - d_offset += n; - return n/d_vlen; - } -} - -gr_vector_source_s_sptr -gr_make_vector_source_s (const std::vector &data, bool repeat, int vlen) -{ - return gr_vector_source_s_sptr (new gr_vector_source_s (data, repeat, vlen)); -} - diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_s.h b/gnuradio-core/src/lib/gengen/gr_vector_source_s.h deleted file mode 100644 index 5db181f7..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_s.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_VECTOR_SOURCE_S_H -#define INCLUDED_GR_VECTOR_SOURCE_S_H - -#include - -class gr_vector_source_s; -typedef boost::shared_ptr gr_vector_source_s_sptr; - -/*! - * \brief source of short's that gets its data from a vector - * \ingroup source_blk - */ - -class gr_vector_source_s : public gr_sync_block { - friend gr_vector_source_s_sptr - gr_make_vector_source_s (const std::vector &data, bool repeat, int vlen); - - std::vector d_data; - bool d_repeat; - unsigned int d_offset; - int d_vlen; - - gr_vector_source_s (const std::vector &data, bool repeat, int vlen); - - public: - void rewind() {d_offset=0;} - virtual int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -gr_vector_source_s_sptr -gr_make_vector_source_s (const std::vector &data, bool repeat = false, int vlen = 1); - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_s.i b/gnuradio-core/src/lib/gengen/gr_vector_source_s.i deleted file mode 100644 index 415825e4..00000000 --- a/gnuradio-core/src/lib/gengen/gr_vector_source_s.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,vector_source_s); - -gr_vector_source_s_sptr -gr_make_vector_source_s (const std::vector &data, bool repeat = false, int vlen = 1) - throw(std::invalid_argument); - -class gr_vector_source_s : public gr_sync_block { - public: - void rewind() {d_offset=0;} - private: - gr_vector_source_s (const std::vector &data, int vlen); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_xor_bb.cc b/gnuradio-core/src/lib/gengen/gr_xor_bb.cc deleted file mode 100644 index 8d2e1c1d..00000000 --- a/gnuradio-core/src/lib/gengen/gr_xor_bb.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_xor_bb_sptr -gr_make_xor_bb () -{ - return gr_xor_bb_sptr (new gr_xor_bb ()); -} - -gr_xor_bb::gr_xor_bb () - : gr_sync_block ("xor_bb", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, 1, sizeof (unsigned char))) -{ -} - -int -gr_xor_bb::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - unsigned char *optr = (unsigned char *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items; i++) { - unsigned char acc = ((unsigned char *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc = acc ^ ((unsigned char *) input_items[j])[i]; - - *optr++ = (unsigned char) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_xor_bb.h b/gnuradio-core/src/lib/gengen/gr_xor_bb.h deleted file mode 100644 index b4600a29..00000000 --- a/gnuradio-core/src/lib/gengen/gr_xor_bb.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_XOR_BB_H -#define INCLUDED_GR_XOR_BB_H - -#include - -class gr_xor_bb; -typedef boost::shared_ptr gr_xor_bb_sptr; - -gr_xor_bb_sptr gr_make_xor_bb (); - -/*! - * \brief output = input_0 ^ input_1 ^ , ... ^ input_N) - * \ingroup math_blk - * - * bitwise boolean xor across all input streams. - */ -class gr_xor_bb : public gr_sync_block -{ - friend gr_xor_bb_sptr gr_make_xor_bb (); - - gr_xor_bb (); - - public: - - 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/gengen/gr_xor_bb.i b/gnuradio-core/src/lib/gengen/gr_xor_bb.i deleted file mode 100644 index 23942070..00000000 --- a/gnuradio-core/src/lib/gengen/gr_xor_bb.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,xor_bb) - -gr_xor_bb_sptr gr_make_xor_bb (); - -class gr_xor_bb : public gr_sync_block -{ - private: - gr_xor_bb (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_xor_ii.cc b/gnuradio-core/src/lib/gengen/gr_xor_ii.cc deleted file mode 100644 index 8cc8000b..00000000 --- a/gnuradio-core/src/lib/gengen/gr_xor_ii.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_xor_ii_sptr -gr_make_xor_ii () -{ - return gr_xor_ii_sptr (new gr_xor_ii ()); -} - -gr_xor_ii::gr_xor_ii () - : gr_sync_block ("xor_ii", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, 1, sizeof (int))) -{ -} - -int -gr_xor_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int *optr = (int *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items; i++) { - int acc = ((int *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc = acc ^ ((int *) input_items[j])[i]; - - *optr++ = (int) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_xor_ii.h b/gnuradio-core/src/lib/gengen/gr_xor_ii.h deleted file mode 100644 index 2444d940..00000000 --- a/gnuradio-core/src/lib/gengen/gr_xor_ii.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_XOR_II_H -#define INCLUDED_GR_XOR_II_H - -#include - -class gr_xor_ii; -typedef boost::shared_ptr gr_xor_ii_sptr; - -gr_xor_ii_sptr gr_make_xor_ii (); - -/*! - * \brief output = input_0 ^ input_1 ^ , ... ^ input_N) - * \ingroup math_blk - * - * bitwise boolean xor across all input streams. - */ -class gr_xor_ii : public gr_sync_block -{ - friend gr_xor_ii_sptr gr_make_xor_ii (); - - gr_xor_ii (); - - public: - - 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/gengen/gr_xor_ii.i b/gnuradio-core/src/lib/gengen/gr_xor_ii.i deleted file mode 100644 index 22f234f9..00000000 --- a/gnuradio-core/src/lib/gengen/gr_xor_ii.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,xor_ii) - -gr_xor_ii_sptr gr_make_xor_ii (); - -class gr_xor_ii : public gr_sync_block -{ - private: - gr_xor_ii (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_xor_ss.cc b/gnuradio-core/src/lib/gengen/gr_xor_ss.cc deleted file mode 100644 index dc366f55..00000000 --- a/gnuradio-core/src/lib/gengen/gr_xor_ss.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -gr_xor_ss_sptr -gr_make_xor_ss () -{ - return gr_xor_ss_sptr (new gr_xor_ss ()); -} - -gr_xor_ss::gr_xor_ss () - : gr_sync_block ("xor_ss", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, 1, sizeof (short))) -{ -} - -int -gr_xor_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - short *optr = (short *) output_items[0]; - - int ninputs = input_items.size (); - - for (int i = 0; i < noutput_items; i++) { - short acc = ((short *) input_items[0])[i]; - for (int j = 1; j < ninputs; j++) - acc = acc ^ ((short *) input_items[j])[i]; - - *optr++ = (short) acc; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_xor_ss.h b/gnuradio-core/src/lib/gengen/gr_xor_ss.h deleted file mode 100644 index e7bb4403..00000000 --- a/gnuradio-core/src/lib/gengen/gr_xor_ss.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef INCLUDED_GR_XOR_SS_H -#define INCLUDED_GR_XOR_SS_H - -#include - -class gr_xor_ss; -typedef boost::shared_ptr gr_xor_ss_sptr; - -gr_xor_ss_sptr gr_make_xor_ss (); - -/*! - * \brief output = input_0 ^ input_1 ^ , ... ^ input_N) - * \ingroup math_blk - * - * bitwise boolean xor across all input streams. - */ -class gr_xor_ss : public gr_sync_block -{ - friend gr_xor_ss_sptr gr_make_xor_ss (); - - gr_xor_ss (); - - public: - - 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/gengen/gr_xor_ss.i b/gnuradio-core/src/lib/gengen/gr_xor_ss.i deleted file mode 100644 index 95d6b7d1..00000000 --- a/gnuradio-core/src/lib/gengen/gr_xor_ss.i +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(gr,xor_ss) - -gr_xor_ss_sptr gr_make_xor_ss (); - -class gr_xor_ss : public gr_sync_block -{ - private: - gr_xor_ss (); -}; diff --git a/gnuradio-core/src/lib/gengen/stamp-sources-generate b/gnuradio-core/src/lib/gengen/stamp-sources-generate deleted file mode 100644 index e69de29b..00000000 diff --git a/gnuradio-core/src/lib/hier/Makefile.in b/gnuradio-core/src/lib/hier/Makefile.in index 21304d0b..4cf68361 100644 --- a/gnuradio-core/src/lib/hier/Makefile.in +++ b/gnuradio-core/src/lib/hier/Makefile.in @@ -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,8 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(swiginclude_HEADERS) \ +DIST_COMMON = $(am__swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.common subdir = gnuradio-core/src/lib/hier ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -205,6 +205,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(grincludedir)" \ "$(DESTDIR)$(swigincludedir)" +am__swiginclude_HEADERS_DIST = hier.i gr_channel_model.i HEADERS = $(grinclude_HEADERS) $(swiginclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -228,6 +229,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@ @@ -235,6 +237,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@ @@ -253,6 +259,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -262,20 +269,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@ @@ -298,6 +308,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@ @@ -359,6 +371,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@ @@ -371,17 +384,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@ @@ -397,7 +410,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@ @@ -449,6 +461,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@ @@ -479,6 +496,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@ @@ -500,6 +522,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@ @@ -582,26 +614,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@ @@ -632,7 +649,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@ @@ -642,23 +658,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 @@ -670,7 +689,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, @@ -678,10 +697,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@ @@ -697,18 +712,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@ @@ -723,15 +726,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 = @@ -744,9 +749,9 @@ libhier_la_SOURCES = \ grinclude_HEADERS = \ gr_channel_model.h -swiginclude_HEADERS = \ - hier.i \ - gr_channel_model.i +@PYTHON_TRUE@swiginclude_HEADERS = \ +@PYTHON_TRUE@ hier.i \ +@PYTHON_TRUE@ gr_channel_model.i all: all-am diff --git a/gnuradio-core/src/lib/io/Makefile.in b/gnuradio-core/src/lib/io/Makefile.in index 82897a96..020f3e2d 100644 --- a/gnuradio-core/src/lib/io/Makefile.in +++ b/gnuradio-core/src/lib/io/Makefile.in @@ -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,8 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(swiginclude_HEADERS) \ +DIST_COMMON = $(am__swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.common subdir = gnuradio-core/src/lib/io ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -169,13 +169,12 @@ am_libio_la_OBJECTS = gr_file_sink.lo gr_file_sink_base.lo \ gr_file_source.lo gr_file_descriptor_sink.lo \ gr_file_descriptor_source.lo gr_histo_sink_f.lo \ gr_message_sink.lo gr_message_source.lo gr_oscope_guts.lo \ - gr_oscope_sink_f.lo gr_oscope_sink_x.lo gri_logger.lo i2c.lo \ - i2c_bitbang.lo i2c_bbio.lo i2c_bbio_pp.lo microtune_4702.lo \ - microtune_4937.lo microtune_4702_eval_board.lo \ - microtune_4937_eval_board.lo microtune_xxxx.lo \ - microtune_xxxx_eval_board.lo ppio.lo ppio_ppdev.lo sdr_1000.lo \ - gr_udp_sink.lo gr_udp_source.lo gr_wavfile_sink.lo \ - gr_wavfile_source.lo gri_wavfile.lo + gr_oscope_sink_f.lo gr_oscope_sink_x.lo i2c.lo i2c_bitbang.lo \ + i2c_bbio.lo i2c_bbio_pp.lo microtune_4702.lo microtune_4937.lo \ + microtune_4702_eval_board.lo microtune_4937_eval_board.lo \ + microtune_xxxx.lo microtune_xxxx_eval_board.lo ppio.lo \ + ppio_ppdev.lo sdr_1000.lo gr_udp_sink.lo gr_udp_source.lo \ + gr_wavfile_sink.lo gr_wavfile_source.lo gri_wavfile.lo libio_la_OBJECTS = $(am_libio_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -215,6 +214,13 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(grincludedir)" \ "$(DESTDIR)$(swigincludedir)" +am__swiginclude_HEADERS_DIST = io.i gr_file_sink.i gr_file_sink_base.i \ + gr_file_source.i gr_file_descriptor_sink.i \ + gr_file_descriptor_source.i gr_histo_sink.i gr_message_sink.i \ + gr_message_source.i gr_oscope_sink.i \ + microtune_xxxx_eval_board.i microtune_4702_eval_board.i \ + microtune_4937_eval_board.i ppio.i sdr_1000.i gr_udp_sink.i \ + gr_udp_source.i gr_wavfile_source.i gr_wavfile_sink.i HEADERS = $(grinclude_HEADERS) $(swiginclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -238,6 +244,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@ @@ -245,6 +252,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@ @@ -263,6 +274,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -272,20 +284,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@ @@ -308,6 +323,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@ @@ -369,6 +386,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@ @@ -381,17 +399,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@ @@ -407,7 +425,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@ @@ -459,6 +476,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@ @@ -489,6 +511,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@ @@ -510,6 +537,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@ @@ -592,26 +629,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@ @@ -642,7 +664,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@ @@ -652,23 +673,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 @@ -680,7 +704,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, @@ -688,10 +712,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@ @@ -707,18 +727,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@ @@ -733,15 +741,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 = @@ -760,7 +770,6 @@ libio_la_SOURCES = \ gr_oscope_guts.cc \ gr_oscope_sink_f.cc \ gr_oscope_sink_x.cc \ - gri_logger.cc \ i2c.cc \ i2c_bitbang.cc \ i2c_bbio.cc \ @@ -793,7 +802,6 @@ grinclude_HEADERS = \ gr_oscope_sink_f.h \ gr_oscope_sink_x.h \ gr_trigger_mode.h \ - gri_logger.h \ i2c.h \ i2c_bitbang.h \ i2c_bbio.h \ @@ -814,26 +822,26 @@ grinclude_HEADERS = \ gr_wavfile_sink.h \ gri_wavfile.h -swiginclude_HEADERS = \ - io.i \ - gr_file_sink.i \ - gr_file_sink_base.i \ - gr_file_source.i \ - gr_file_descriptor_sink.i \ - gr_file_descriptor_source.i \ - gr_histo_sink.i \ - gr_message_sink.i \ - gr_message_source.i \ - gr_oscope_sink.i \ - microtune_xxxx_eval_board.i \ - microtune_4702_eval_board.i \ - microtune_4937_eval_board.i \ - ppio.i \ - sdr_1000.i \ - gr_udp_sink.i \ - gr_udp_source.i \ - gr_wavfile_source.i \ - gr_wavfile_sink.i +@PYTHON_TRUE@swiginclude_HEADERS = \ +@PYTHON_TRUE@ io.i \ +@PYTHON_TRUE@ gr_file_sink.i \ +@PYTHON_TRUE@ gr_file_sink_base.i \ +@PYTHON_TRUE@ gr_file_source.i \ +@PYTHON_TRUE@ gr_file_descriptor_sink.i \ +@PYTHON_TRUE@ gr_file_descriptor_source.i \ +@PYTHON_TRUE@ gr_histo_sink.i \ +@PYTHON_TRUE@ gr_message_sink.i \ +@PYTHON_TRUE@ gr_message_source.i \ +@PYTHON_TRUE@ gr_oscope_sink.i \ +@PYTHON_TRUE@ microtune_xxxx_eval_board.i \ +@PYTHON_TRUE@ microtune_4702_eval_board.i \ +@PYTHON_TRUE@ microtune_4937_eval_board.i \ +@PYTHON_TRUE@ ppio.i \ +@PYTHON_TRUE@ sdr_1000.i \ +@PYTHON_TRUE@ gr_udp_sink.i \ +@PYTHON_TRUE@ gr_udp_source.i \ +@PYTHON_TRUE@ gr_wavfile_source.i \ +@PYTHON_TRUE@ gr_wavfile_sink.i all: all-am @@ -902,7 +910,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_udp_source.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_wavfile_sink.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_wavfile_source.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gri_logger.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gri_wavfile.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i2c.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i2c_bbio.Plo@am__quote@ diff --git a/gnuradio-core/src/lib/missing/Makefile.in b/gnuradio-core/src/lib/missing/Makefile.in index be9ef9e7..a9d21549 100644 --- a/gnuradio-core/src/lib/missing/Makefile.in +++ b/gnuradio-core/src/lib/missing/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2003,2004,2008 Free Software Foundation, Inc. +# Copyright 2003,2004,2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -163,7 +163,13 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libmissing_la_LIBADD = -am_libmissing_la_OBJECTS = bug_work_around_8.lo posix_memalign.lo +am__libmissing_la_SOURCES_DIST = bug_work_around_8.cc \ + posix_memalign.cc +am__objects_1 = bug_work_around_8.lo +am__objects_2 = posix_memalign.lo +@MD_CPU_powerpc_FALSE@am_libmissing_la_OBJECTS = $(am__objects_1) +@MD_CPU_powerpc_TRUE@am_libmissing_la_OBJECTS = $(am__objects_1) \ +@MD_CPU_powerpc_TRUE@ $(am__objects_2) libmissing_la_OBJECTS = $(am_libmissing_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -179,7 +185,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libmissing_la_SOURCES) -DIST_SOURCES = $(libmissing_la_SOURCES) +DIST_SOURCES = $(am__libmissing_la_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -202,6 +208,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@ @@ -209,6 +216,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@ @@ -227,6 +238,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -236,20 +248,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@ @@ -272,6 +287,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@ @@ -333,6 +350,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@ @@ -345,17 +363,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@ @@ -371,7 +389,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@ @@ -423,6 +440,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@ @@ -453,6 +475,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@ @@ -474,6 +501,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@ @@ -556,26 +593,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@ @@ -606,7 +628,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@ @@ -616,23 +637,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 @@ -644,7 +668,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, @@ -652,10 +676,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@ @@ -671,18 +691,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@ @@ -697,15 +705,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 = @@ -720,10 +730,14 @@ EXTRA_DIST = \ usleep.c noinst_LTLIBRARIES = libmissing.la -libmissing_la_SOURCES = \ - bug_work_around_8.cc \ +libmissing_la_common_SOURCES = \ + bug_work_around_8.cc + +powerpc_CODE = \ posix_memalign.cc +@MD_CPU_powerpc_FALSE@libmissing_la_SOURCES = $(libmissing_la_common_SOURCES) +@MD_CPU_powerpc_TRUE@libmissing_la_SOURCES = $(libmissing_la_common_SOURCES) $(powerpc_CODE) all: all-am .SUFFIXES: diff --git a/gnuradio-core/src/lib/reed-solomon/Makefile.in b/gnuradio-core/src/lib/reed-solomon/Makefile.in index 1abe33fd..628d8774 100644 --- a/gnuradio-core/src/lib/reed-solomon/Makefile.in +++ b/gnuradio-core/src/lib/reed-solomon/Makefile.in @@ -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 # @@ -98,36 +98,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 \ @@ -141,9 +144,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 \ @@ -236,6 +236,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@ @@ -243,6 +244,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@ @@ -261,6 +266,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -270,20 +276,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@ @@ -306,6 +315,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@ @@ -367,6 +378,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@ @@ -379,17 +391,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@ @@ -405,7 +417,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@ @@ -457,6 +468,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@ @@ -487,6 +503,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@ @@ -508,6 +529,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@ @@ -590,26 +621,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@ @@ -640,7 +656,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@ @@ -650,23 +665,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 @@ -678,7 +696,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, @@ -686,10 +704,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@ @@ -705,18 +719,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@ @@ -731,15 +733,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 = diff --git a/gnuradio-core/src/lib/runtime/Makefile.in b/gnuradio-core/src/lib/runtime/Makefile.in index 7d0b44ef..b9b3ebb9 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.in +++ b/gnuradio-core/src/lib/runtime/Makefile.in @@ -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 = $(grinclude_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(swiginclude_HEADERS) $(top_srcdir)/Makefile.common +DIST_COMMON = $(am__swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ + $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.common subdir = gnuradio-core/src/lib/runtime ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -177,16 +177,16 @@ am_libruntime_la_OBJECTS = gr_basic_block.lo gr_flowgraph.lo \ gr_block_executor.lo gr_hier_block2.lo \ gr_hier_block2_detail.lo gr_buffer.lo gr_dispatcher.lo \ gr_error_handler.lo gr_io_signature.lo gr_local_sighandler.lo \ - gr_message.lo gr_msg_handler.lo gr_msg_queue.lo gr_pagesize.lo \ - gr_preferences.lo gr_realtime.lo gr_scheduler.lo \ - gr_scheduler_sts.lo gr_scheduler_tpb.lo \ - gr_single_threaded_scheduler.lo gr_sptr_magic.lo \ - gr_sync_block.lo gr_sync_decimator.lo gr_sync_interpolator.lo \ - gr_tmp_path.lo gr_top_block.lo gr_top_block_impl.lo \ - gr_tpb_detail.lo gr_tpb_thread_body.lo gr_vmcircbuf.lo \ - gr_vmcircbuf_mmap_shm_open.lo gr_vmcircbuf_mmap_tmpfile.lo \ - gr_vmcircbuf_createfilemapping.lo gr_vmcircbuf_sysv_shm.lo \ - gr_select_handler.lo + gr_message.lo gr_msg_accepter.lo gr_msg_handler.lo \ + gr_msg_queue.lo gr_pagesize.lo gr_preferences.lo \ + gr_realtime.lo gr_scheduler.lo gr_scheduler_sts.lo \ + gr_scheduler_tpb.lo gr_single_threaded_scheduler.lo \ + gr_sptr_magic.lo gr_sync_block.lo gr_sync_decimator.lo \ + gr_sync_interpolator.lo gr_tmp_path.lo gr_top_block.lo \ + gr_top_block_impl.lo gr_tpb_detail.lo gr_tpb_thread_body.lo \ + gr_vmcircbuf.lo gr_vmcircbuf_mmap_shm_open.lo \ + gr_vmcircbuf_mmap_tmpfile.lo gr_vmcircbuf_createfilemapping.lo \ + gr_vmcircbuf_sysv_shm.lo gr_select_handler.lo libruntime_la_OBJECTS = $(am_libruntime_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -226,6 +226,13 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(grincludedir)" \ "$(DESTDIR)$(swigincludedir)" +am__swiginclude_HEADERS_DIST = gr_basic_block.i gr_block.i \ + gr_block_detail.i gr_hier_block2.i gr_buffer.i gr_dispatcher.i \ + gr_error_handler.i gr_io_signature.i gr_message.i \ + gr_msg_handler.i gr_msg_queue.i gr_realtime.i \ + gr_single_threaded_scheduler.i gr_sync_block.i \ + gr_sync_decimator.i gr_sync_interpolator.i gr_top_block.i \ + runtime.i HEADERS = $(grinclude_HEADERS) $(noinst_HEADERS) \ $(swiginclude_HEADERS) ETAGS = etags @@ -250,6 +257,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@ @@ -257,6 +265,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@ @@ -275,6 +287,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -284,20 +297,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@ @@ -320,6 +336,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@ @@ -381,6 +399,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@ @@ -393,17 +412,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@ @@ -419,7 +438,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@ @@ -471,6 +489,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@ @@ -501,6 +524,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@ @@ -522,6 +550,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@ @@ -604,26 +642,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@ @@ -654,7 +677,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@ @@ -664,23 +686,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 @@ -692,7 +717,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, @@ -700,10 +725,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@ @@ -719,18 +740,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@ @@ -745,15 +754,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 = @@ -778,6 +789,7 @@ libruntime_la_SOURCES = \ gr_io_signature.cc \ gr_local_sighandler.cc \ gr_message.cc \ + gr_msg_accepter.cc \ gr_msg_handler.cc \ gr_msg_queue.cc \ gr_pagesize.cc \ @@ -830,6 +842,7 @@ grinclude_HEADERS = \ gr_io_signature.h \ gr_local_sighandler.h \ gr_message.h \ + gr_msg_accepter.h \ gr_msg_handler.h \ gr_msg_queue.h \ gr_pagesize.h \ @@ -869,25 +882,25 @@ noinst_HEADERS = \ qa_gr_vmcircbuf.h \ qa_runtime.h -swiginclude_HEADERS = \ - gr_basic_block.i \ - gr_block.i \ - gr_block_detail.i \ - gr_hier_block2.i \ - gr_buffer.i \ - gr_dispatcher.i \ - gr_error_handler.i \ - gr_io_signature.i \ - gr_message.i \ - gr_msg_handler.i \ - gr_msg_queue.i \ - gr_realtime.i \ - gr_single_threaded_scheduler.i \ - gr_sync_block.i \ - gr_sync_decimator.i \ - gr_sync_interpolator.i \ - gr_top_block.i \ - runtime.i +@PYTHON_TRUE@swiginclude_HEADERS = \ +@PYTHON_TRUE@ gr_basic_block.i \ +@PYTHON_TRUE@ gr_block.i \ +@PYTHON_TRUE@ gr_block_detail.i \ +@PYTHON_TRUE@ gr_hier_block2.i \ +@PYTHON_TRUE@ gr_buffer.i \ +@PYTHON_TRUE@ gr_dispatcher.i \ +@PYTHON_TRUE@ gr_error_handler.i \ +@PYTHON_TRUE@ gr_io_signature.i \ +@PYTHON_TRUE@ gr_message.i \ +@PYTHON_TRUE@ gr_msg_handler.i \ +@PYTHON_TRUE@ gr_msg_queue.i \ +@PYTHON_TRUE@ gr_realtime.i \ +@PYTHON_TRUE@ gr_single_threaded_scheduler.i \ +@PYTHON_TRUE@ gr_sync_block.i \ +@PYTHON_TRUE@ gr_sync_decimator.i \ +@PYTHON_TRUE@ gr_sync_interpolator.i \ +@PYTHON_TRUE@ gr_top_block.i \ +@PYTHON_TRUE@ runtime.i all: all-am @@ -957,6 +970,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_io_signature.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_local_sighandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_message.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_msg_accepter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_msg_handler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_msg_queue.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gr_pagesize.Plo@am__quote@ diff --git a/gnuradio-core/src/lib/swig/Makefile.in b/gnuradio-core/src/lib/swig/Makefile.in index 3b3197c4..fce007ef 100644 --- a/gnuradio-core/src/lib/swig/Makefile.in +++ b/gnuradio-core/src/lib/swig/Makefile.in @@ -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 # @@ -125,22 +125,32 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(gnuradio_swig_py_filter_python_PYTHON) \ - $(gnuradio_swig_py_filter_swiginclude_HEADERS) \ - $(gnuradio_swig_py_general_python_PYTHON) \ - $(gnuradio_swig_py_general_swiginclude_HEADERS) \ - $(gnuradio_swig_py_gengen_python_PYTHON) \ - $(gnuradio_swig_py_gengen_swiginclude_HEADERS) \ - $(gnuradio_swig_py_hier_python_PYTHON) \ - $(gnuradio_swig_py_hier_swiginclude_HEADERS) \ - $(gnuradio_swig_py_io_python_PYTHON) \ - $(gnuradio_swig_py_io_swiginclude_HEADERS) \ - $(gnuradio_swig_py_runtime_python_PYTHON) \ - $(gnuradio_swig_py_runtime_swiginclude_HEADERS) \ - $(grinclude_HEADERS) $(ourpython_PYTHON) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__gnuradio_swig_py_filter_python_PYTHON_DIST) \ + $(am__gnuradio_swig_py_filter_swiginclude_HEADERS_DIST) \ + $(am__gnuradio_swig_py_general_python_PYTHON_DIST) \ + $(am__gnuradio_swig_py_general_swiginclude_HEADERS_DIST) \ + $(am__gnuradio_swig_py_gengen_python_PYTHON_DIST) \ + $(am__gnuradio_swig_py_gengen_swiginclude_HEADERS_DIST) \ + $(am__gnuradio_swig_py_hier_python_PYTHON_DIST) \ + $(am__gnuradio_swig_py_hier_swiginclude_HEADERS_DIST) \ + $(am__gnuradio_swig_py_io_python_PYTHON_DIST) \ + $(am__gnuradio_swig_py_io_swiginclude_HEADERS_DIST) \ + $(am__gnuradio_swig_py_runtime_python_PYTHON_DIST) \ + $(am__gnuradio_swig_py_runtime_swiginclude_HEADERS_DIST) \ + $(am__grinclude_HEADERS_DIST) $(am__ourpython_PYTHON_DIST) \ + $(am__swiginclude_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ - $(swiginclude_HEADERS) $(top_srcdir)/Makefile.common \ - $(top_srcdir)/Makefile.swig + $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = \ +@PYTHON_TRUE@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-* \ +@PYTHON_TRUE@ $(DEPDIR)/gnuradio_swig_py_general-generate-* \ +@PYTHON_TRUE@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-* \ +@PYTHON_TRUE@ $(DEPDIR)/gnuradio_swig_py_filter-generate-* \ +@PYTHON_TRUE@ $(DEPDIR)/gnuradio_swig_py_io-generate-* \ +@PYTHON_TRUE@ $(DEPDIR)/gnuradio_swig_py_hier-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* $(DEPDIR)/*.S* \ +@PYTHON_TRUE@ $(DEPDIR)/*.S* $(DEPDIR)/*.S* $(DEPDIR)/*.S* \ +@PYTHON_TRUE@ $(DEPDIR)/*.S* subdir = gnuradio-core/src/lib/swig ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -154,36 +164,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 \ @@ -197,9 +210,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 \ @@ -270,67 +280,84 @@ LTLIBRARIES = $(gnuradio_swig_py_filter_pylib_LTLIBRARIES) \ $(gnuradio_swig_py_io_pylib_LTLIBRARIES) \ $(gnuradio_swig_py_runtime_pylib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -_gnuradio_swig_py_filter_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__gnuradio_swig_py_filter_la_OBJECTS = \ - _gnuradio_swig_py_filter_la-gnuradio_swig_py_filter.lo +@PYTHON_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +@PYTHON_TRUE@_gnuradio_swig_py_filter_la_DEPENDENCIES = \ +@PYTHON_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am___gnuradio_swig_py_filter_la_SOURCES_DIST = \ + gnuradio_swig_py_filter.cc +@PYTHON_TRUE@am__gnuradio_swig_py_filter_la_OBJECTS = _gnuradio_swig_py_filter_la-gnuradio_swig_py_filter.lo _gnuradio_swig_py_filter_la_OBJECTS = \ $(am__gnuradio_swig_py_filter_la_OBJECTS) _gnuradio_swig_py_filter_la_LINK = $(LIBTOOL) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_gnuradio_swig_py_filter_la_CXXFLAGS) $(CXXFLAGS) \ $(_gnuradio_swig_py_filter_la_LDFLAGS) $(LDFLAGS) -o $@ -_gnuradio_swig_py_general_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__gnuradio_swig_py_general_la_OBJECTS = \ - _gnuradio_swig_py_general_la-gnuradio_swig_py_general.lo +@PYTHON_TRUE@am__gnuradio_swig_py_filter_la_rpath = -rpath \ +@PYTHON_TRUE@ $(gnuradio_swig_py_filter_pylibdir) +@PYTHON_TRUE@_gnuradio_swig_py_general_la_DEPENDENCIES = \ +@PYTHON_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am___gnuradio_swig_py_general_la_SOURCES_DIST = \ + gnuradio_swig_py_general.cc +@PYTHON_TRUE@am__gnuradio_swig_py_general_la_OBJECTS = _gnuradio_swig_py_general_la-gnuradio_swig_py_general.lo _gnuradio_swig_py_general_la_OBJECTS = \ $(am__gnuradio_swig_py_general_la_OBJECTS) _gnuradio_swig_py_general_la_LINK = $(LIBTOOL) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_gnuradio_swig_py_general_la_CXXFLAGS) $(CXXFLAGS) \ $(_gnuradio_swig_py_general_la_LDFLAGS) $(LDFLAGS) -o $@ -_gnuradio_swig_py_gengen_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__gnuradio_swig_py_gengen_la_OBJECTS = \ - _gnuradio_swig_py_gengen_la-gnuradio_swig_py_gengen.lo +@PYTHON_TRUE@am__gnuradio_swig_py_general_la_rpath = -rpath \ +@PYTHON_TRUE@ $(gnuradio_swig_py_general_pylibdir) +@PYTHON_TRUE@_gnuradio_swig_py_gengen_la_DEPENDENCIES = \ +@PYTHON_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am___gnuradio_swig_py_gengen_la_SOURCES_DIST = \ + gnuradio_swig_py_gengen.cc +@PYTHON_TRUE@am__gnuradio_swig_py_gengen_la_OBJECTS = _gnuradio_swig_py_gengen_la-gnuradio_swig_py_gengen.lo _gnuradio_swig_py_gengen_la_OBJECTS = \ $(am__gnuradio_swig_py_gengen_la_OBJECTS) _gnuradio_swig_py_gengen_la_LINK = $(LIBTOOL) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_gnuradio_swig_py_gengen_la_CXXFLAGS) $(CXXFLAGS) \ $(_gnuradio_swig_py_gengen_la_LDFLAGS) $(LDFLAGS) -o $@ -_gnuradio_swig_py_hier_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__gnuradio_swig_py_hier_la_OBJECTS = \ - _gnuradio_swig_py_hier_la-gnuradio_swig_py_hier.lo +@PYTHON_TRUE@am__gnuradio_swig_py_gengen_la_rpath = -rpath \ +@PYTHON_TRUE@ $(gnuradio_swig_py_gengen_pylibdir) +@PYTHON_TRUE@_gnuradio_swig_py_hier_la_DEPENDENCIES = \ +@PYTHON_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am___gnuradio_swig_py_hier_la_SOURCES_DIST = gnuradio_swig_py_hier.cc +@PYTHON_TRUE@am__gnuradio_swig_py_hier_la_OBJECTS = _gnuradio_swig_py_hier_la-gnuradio_swig_py_hier.lo _gnuradio_swig_py_hier_la_OBJECTS = \ $(am__gnuradio_swig_py_hier_la_OBJECTS) _gnuradio_swig_py_hier_la_LINK = $(LIBTOOL) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_gnuradio_swig_py_hier_la_CXXFLAGS) $(CXXFLAGS) \ $(_gnuradio_swig_py_hier_la_LDFLAGS) $(LDFLAGS) -o $@ -_gnuradio_swig_py_io_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__gnuradio_swig_py_io_la_OBJECTS = \ - _gnuradio_swig_py_io_la-gnuradio_swig_py_io.lo +@PYTHON_TRUE@am__gnuradio_swig_py_hier_la_rpath = -rpath \ +@PYTHON_TRUE@ $(gnuradio_swig_py_hier_pylibdir) +@PYTHON_TRUE@_gnuradio_swig_py_io_la_DEPENDENCIES = \ +@PYTHON_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am___gnuradio_swig_py_io_la_SOURCES_DIST = gnuradio_swig_py_io.cc +@PYTHON_TRUE@am__gnuradio_swig_py_io_la_OBJECTS = \ +@PYTHON_TRUE@ _gnuradio_swig_py_io_la-gnuradio_swig_py_io.lo _gnuradio_swig_py_io_la_OBJECTS = \ $(am__gnuradio_swig_py_io_la_OBJECTS) _gnuradio_swig_py_io_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_gnuradio_swig_py_io_la_CXXFLAGS) $(CXXFLAGS) \ $(_gnuradio_swig_py_io_la_LDFLAGS) $(LDFLAGS) -o $@ -_gnuradio_swig_py_runtime_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__gnuradio_swig_py_runtime_la_OBJECTS = \ - _gnuradio_swig_py_runtime_la-gnuradio_swig_py_runtime.lo +@PYTHON_TRUE@am__gnuradio_swig_py_io_la_rpath = -rpath \ +@PYTHON_TRUE@ $(gnuradio_swig_py_io_pylibdir) +@PYTHON_TRUE@_gnuradio_swig_py_runtime_la_DEPENDENCIES = \ +@PYTHON_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am___gnuradio_swig_py_runtime_la_SOURCES_DIST = \ + gnuradio_swig_py_runtime.cc +@PYTHON_TRUE@am__gnuradio_swig_py_runtime_la_OBJECTS = _gnuradio_swig_py_runtime_la-gnuradio_swig_py_runtime.lo _gnuradio_swig_py_runtime_la_OBJECTS = \ $(am__gnuradio_swig_py_runtime_la_OBJECTS) _gnuradio_swig_py_runtime_la_LINK = $(LIBTOOL) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_gnuradio_swig_py_runtime_la_CXXFLAGS) $(CXXFLAGS) \ $(_gnuradio_swig_py_runtime_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__gnuradio_swig_py_runtime_la_rpath = -rpath \ +@PYTHON_TRUE@ $(gnuradio_swig_py_runtime_pylibdir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -350,13 +377,40 @@ SOURCES = $(_gnuradio_swig_py_filter_la_SOURCES) \ $(_gnuradio_swig_py_hier_la_SOURCES) \ $(_gnuradio_swig_py_io_la_SOURCES) \ $(_gnuradio_swig_py_runtime_la_SOURCES) -DIST_SOURCES = $(_gnuradio_swig_py_filter_la_SOURCES) \ - $(_gnuradio_swig_py_general_la_SOURCES) \ - $(_gnuradio_swig_py_gengen_la_SOURCES) \ - $(_gnuradio_swig_py_hier_la_SOURCES) \ - $(_gnuradio_swig_py_io_la_SOURCES) \ - $(_gnuradio_swig_py_runtime_la_SOURCES) +DIST_SOURCES = $(am___gnuradio_swig_py_filter_la_SOURCES_DIST) \ + $(am___gnuradio_swig_py_general_la_SOURCES_DIST) \ + $(am___gnuradio_swig_py_gengen_la_SOURCES_DIST) \ + $(am___gnuradio_swig_py_hier_la_SOURCES_DIST) \ + $(am___gnuradio_swig_py_io_la_SOURCES_DIST) \ + $(am___gnuradio_swig_py_runtime_la_SOURCES_DIST) +am__gnuradio_swig_py_filter_python_PYTHON_DIST = \ + gnuradio_swig_py_filter.py +am__gnuradio_swig_py_general_python_PYTHON_DIST = \ + gnuradio_swig_py_general.py +am__gnuradio_swig_py_gengen_python_PYTHON_DIST = \ + gnuradio_swig_py_gengen.py +am__gnuradio_swig_py_hier_python_PYTHON_DIST = \ + gnuradio_swig_py_hier.py +am__gnuradio_swig_py_io_python_PYTHON_DIST = gnuradio_swig_py_io.py +am__gnuradio_swig_py_runtime_python_PYTHON_DIST = \ + gnuradio_swig_py_runtime.py +am__ourpython_PYTHON_DIST = gnuradio_swig_python.py py_compile = $(top_srcdir)/py-compile +am__gnuradio_swig_py_filter_swiginclude_HEADERS_DIST = \ + gnuradio_swig_py_filter.i +am__gnuradio_swig_py_general_swiginclude_HEADERS_DIST = \ + gnuradio_swig_py_general.i +am__gnuradio_swig_py_gengen_swiginclude_HEADERS_DIST = \ + gnuradio_swig_py_gengen.i +am__gnuradio_swig_py_hier_swiginclude_HEADERS_DIST = \ + gnuradio_swig_py_hier.i +am__gnuradio_swig_py_io_swiginclude_HEADERS_DIST = \ + gnuradio_swig_py_io.i +am__gnuradio_swig_py_runtime_swiginclude_HEADERS_DIST = \ + gnuradio_swig_py_runtime.i +am__grinclude_HEADERS_DIST = gnuradio_swig_bug_workaround.h +am__swiginclude_HEADERS_DIST = gnuradio.i gr_swig_block_magic.i \ + gr_shared_ptr.i HEADERS = $(gnuradio_swig_py_filter_swiginclude_HEADERS) \ $(gnuradio_swig_py_general_swiginclude_HEADERS) \ $(gnuradio_swig_py_gengen_swiginclude_HEADERS) \ @@ -386,6 +440,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@ @@ -393,6 +448,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@ @@ -411,6 +470,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -420,20 +480,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@ @@ -456,6 +519,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@ @@ -517,6 +582,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@ @@ -529,17 +595,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@ @@ -555,7 +621,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@ @@ -607,6 +672,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@ @@ -637,6 +707,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@ @@ -658,6 +733,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@ @@ -740,26 +825,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@ @@ -790,7 +860,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@ @@ -800,23 +869,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 @@ -828,7 +900,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, @@ -836,10 +908,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@ @@ -855,18 +923,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@ @@ -881,46 +937,42 @@ 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 = $(DEPDIR)/gnuradio_swig_py_runtime-generate-* \ - $(DEPDIR)/gnuradio_swig_py_general-generate-* \ - $(DEPDIR)/gnuradio_swig_py_gengen-generate-* \ - $(DEPDIR)/gnuradio_swig_py_filter-generate-* \ - $(DEPDIR)/gnuradio_swig_py_io-generate-* \ - $(DEPDIR)/gnuradio_swig_py_hier-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* $(DEPDIR)/*.S* $(DEPDIR)/*.S* \ - $(DEPDIR)/*.S* $(DEPDIR)/*.S* $(DEPDIR)/*.S* -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \ - $(WITH_INCLUDES) + *.loT $(am__append_2) +@PYTHON_TRUE@AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) -EXTRA_DIST = gen-swig-bug-fix +@PYTHON_TRUE@EXTRA_DIST = gen-swig-bug-fix # SWIG headers get installed in ${prefix}/include/gnuradio/swig -swiginclude_HEADERS = \ - gnuradio.i \ - gr_swig_block_magic.i \ - gr_shared_ptr.i +@PYTHON_TRUE@swiginclude_HEADERS = \ +@PYTHON_TRUE@ gnuradio.i \ +@PYTHON_TRUE@ gr_swig_block_magic.i \ +@PYTHON_TRUE@ gr_shared_ptr.i # special install for this top-level Python script which includes all # of the split Python libraries. -ourpythondir = $(grpythondir)/gr -ourpython_PYTHON = gnuradio_swig_python.py +@PYTHON_TRUE@ourpythondir = $(grpythondir)/gr +@PYTHON_TRUE@ourpython_PYTHON = gnuradio_swig_python.py # C/C++ headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - gnuradio_swig_bug_workaround.h +@PYTHON_TRUE@grinclude_HEADERS = \ +@PYTHON_TRUE@ gnuradio_swig_bug_workaround.h # ---------------------------------------------------------------- @@ -929,263 +981,266 @@ grinclude_HEADERS = \ # smaller pieces for the compiler to digest. prior to this change, on # X86_64, g++'s resident set size was 650MB! # ---------------------------------------------------------------- -TOP_SWIG_IFILES = \ - gnuradio_swig_py_runtime.i \ - gnuradio_swig_py_general.i \ - gnuradio_swig_py_gengen.i \ - gnuradio_swig_py_filter.i \ - gnuradio_swig_py_io.i \ - gnuradio_swig_py_hier.i +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ gnuradio_swig_py_runtime.i \ +@PYTHON_TRUE@ gnuradio_swig_py_general.i \ +@PYTHON_TRUE@ gnuradio_swig_py_gengen.i \ +@PYTHON_TRUE@ gnuradio_swig_py_filter.i \ +@PYTHON_TRUE@ gnuradio_swig_py_io.i \ +@PYTHON_TRUE@ gnuradio_swig_py_hier.i # Install so that they end up available as: # import gnuradio.gr # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio/gr -gnuradio_swig_py_runtime_pythondir_category = gnuradio/gr -gnuradio_swig_py_general_pythondir_category = gnuradio/gr -gnuradio_swig_py_gengen_pythondir_category = gnuradio/gr -gnuradio_swig_py_filter_pythondir_category = gnuradio/gr -gnuradio_swig_py_io_pythondir_category = gnuradio/gr -gnuradio_swig_py_hier_pythondir_category = gnuradio/gr +@PYTHON_TRUE@gnuradio_swig_py_runtime_pythondir_category = gnuradio/gr +@PYTHON_TRUE@gnuradio_swig_py_general_pythondir_category = gnuradio/gr +@PYTHON_TRUE@gnuradio_swig_py_gengen_pythondir_category = gnuradio/gr +@PYTHON_TRUE@gnuradio_swig_py_filter_pythondir_category = gnuradio/gr +@PYTHON_TRUE@gnuradio_swig_py_io_pythondir_category = gnuradio/gr +@PYTHON_TRUE@gnuradio_swig_py_hier_pythondir_category = gnuradio/gr # additional libraries for linking with each SWIG-generated library -gnuradio_swig_py_runtime_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_general_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_gengen_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_filter_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_io_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_hier_la_swig_libadd = $(GNURADIO_CORE_LA) -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = gnuradio_swig_py_runtime.py \ - gnuradio_swig_py_runtime.cc gnuradio_swig_py_general.py \ - gnuradio_swig_py_general.cc gnuradio_swig_py_gengen.py \ - gnuradio_swig_py_gengen.cc gnuradio_swig_py_filter.py \ - gnuradio_swig_py_filter.cc gnuradio_swig_py_io.py \ - gnuradio_swig_py_io.cc gnuradio_swig_py_hier.py \ - gnuradio_swig_py_hier.cc -gnuradio_swig_py_runtime_pythondir = $(pythondir)/$(gnuradio_swig_py_runtime_pythondir_category) -gnuradio_swig_py_runtime_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_runtime_pylibdir_category) -gnuradio_swig_py_runtime_swigincludedir = $(swigincludedir) -gnuradio_swig_py_runtime_swiginclude_HEADERS = \ - gnuradio_swig_py_runtime.i \ - $(gnuradio_swig_py_runtime_swiginclude_headers) - -gnuradio_swig_py_runtime_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_runtime.la - -_gnuradio_swig_py_runtime_la_SOURCES = \ - gnuradio_swig_py_runtime.cc \ - $(gnuradio_swig_py_runtime_la_swig_sources) - -_gnuradio_swig_py_runtime_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_runtime_la_swig_libadd) - -_gnuradio_swig_py_runtime_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_runtime_la_swig_ldflags) - -_gnuradio_swig_py_runtime_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(gnuradio_swig_py_runtime_la_swig_cxxflags) - -gnuradio_swig_py_runtime_python_PYTHON = \ - gnuradio_swig_py_runtime.py \ - $(gnuradio_swig_py_runtime_python) - -gnuradio_swig_py_general_pythondir = $(pythondir)/$(gnuradio_swig_py_general_pythondir_category) -gnuradio_swig_py_general_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_general_pylibdir_category) -gnuradio_swig_py_general_swigincludedir = $(swigincludedir) -gnuradio_swig_py_general_swiginclude_HEADERS = \ - gnuradio_swig_py_general.i \ - $(gnuradio_swig_py_general_swiginclude_headers) - -gnuradio_swig_py_general_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_general.la - -_gnuradio_swig_py_general_la_SOURCES = \ - gnuradio_swig_py_general.cc \ - $(gnuradio_swig_py_general_la_swig_sources) - -_gnuradio_swig_py_general_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_general_la_swig_libadd) - -_gnuradio_swig_py_general_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_general_la_swig_ldflags) - -_gnuradio_swig_py_general_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(gnuradio_swig_py_general_la_swig_cxxflags) - -gnuradio_swig_py_general_python_PYTHON = \ - gnuradio_swig_py_general.py \ - $(gnuradio_swig_py_general_python) - -gnuradio_swig_py_gengen_pythondir = $(pythondir)/$(gnuradio_swig_py_gengen_pythondir_category) -gnuradio_swig_py_gengen_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_gengen_pylibdir_category) -gnuradio_swig_py_gengen_swigincludedir = $(swigincludedir) -gnuradio_swig_py_gengen_swiginclude_HEADERS = \ - gnuradio_swig_py_gengen.i \ - $(gnuradio_swig_py_gengen_swiginclude_headers) - -gnuradio_swig_py_gengen_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_gengen.la - -_gnuradio_swig_py_gengen_la_SOURCES = \ - gnuradio_swig_py_gengen.cc \ - $(gnuradio_swig_py_gengen_la_swig_sources) - -_gnuradio_swig_py_gengen_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_gengen_la_swig_libadd) - -_gnuradio_swig_py_gengen_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_gengen_la_swig_ldflags) - -_gnuradio_swig_py_gengen_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(gnuradio_swig_py_gengen_la_swig_cxxflags) - -gnuradio_swig_py_gengen_python_PYTHON = \ - gnuradio_swig_py_gengen.py \ - $(gnuradio_swig_py_gengen_python) - -gnuradio_swig_py_filter_pythondir = $(pythondir)/$(gnuradio_swig_py_filter_pythondir_category) -gnuradio_swig_py_filter_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_filter_pylibdir_category) -gnuradio_swig_py_filter_swigincludedir = $(swigincludedir) -gnuradio_swig_py_filter_swiginclude_HEADERS = \ - gnuradio_swig_py_filter.i \ - $(gnuradio_swig_py_filter_swiginclude_headers) - -gnuradio_swig_py_filter_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_filter.la - -_gnuradio_swig_py_filter_la_SOURCES = \ - gnuradio_swig_py_filter.cc \ - $(gnuradio_swig_py_filter_la_swig_sources) - -_gnuradio_swig_py_filter_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_filter_la_swig_libadd) - -_gnuradio_swig_py_filter_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_filter_la_swig_ldflags) - -_gnuradio_swig_py_filter_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(gnuradio_swig_py_filter_la_swig_cxxflags) - -gnuradio_swig_py_filter_python_PYTHON = \ - gnuradio_swig_py_filter.py \ - $(gnuradio_swig_py_filter_python) - -gnuradio_swig_py_io_pythondir = $(pythondir)/$(gnuradio_swig_py_io_pythondir_category) -gnuradio_swig_py_io_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_io_pylibdir_category) -gnuradio_swig_py_io_swigincludedir = $(swigincludedir) -gnuradio_swig_py_io_swiginclude_HEADERS = \ - gnuradio_swig_py_io.i \ - $(gnuradio_swig_py_io_swiginclude_headers) - -gnuradio_swig_py_io_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_io.la - -_gnuradio_swig_py_io_la_SOURCES = \ - gnuradio_swig_py_io.cc \ - $(gnuradio_swig_py_io_la_swig_sources) - -_gnuradio_swig_py_io_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_io_la_swig_libadd) - -_gnuradio_swig_py_io_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_io_la_swig_ldflags) - -_gnuradio_swig_py_io_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(gnuradio_swig_py_io_la_swig_cxxflags) - -gnuradio_swig_py_io_python_PYTHON = \ - gnuradio_swig_py_io.py \ - $(gnuradio_swig_py_io_python) - -gnuradio_swig_py_hier_pythondir = $(pythondir)/$(gnuradio_swig_py_hier_pythondir_category) -gnuradio_swig_py_hier_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_hier_pylibdir_category) -gnuradio_swig_py_hier_swigincludedir = $(swigincludedir) -gnuradio_swig_py_hier_swiginclude_HEADERS = \ - gnuradio_swig_py_hier.i \ - $(gnuradio_swig_py_hier_swiginclude_headers) - -gnuradio_swig_py_hier_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_hier.la +@PYTHON_TRUE@gnuradio_swig_py_runtime_la_swig_libadd = $(GNURADIO_CORE_LA) +@PYTHON_TRUE@gnuradio_swig_py_general_la_swig_libadd = $(GNURADIO_CORE_LA) +@PYTHON_TRUE@gnuradio_swig_py_gengen_la_swig_libadd = $(GNURADIO_CORE_LA) +@PYTHON_TRUE@gnuradio_swig_py_filter_la_swig_libadd = $(GNURADIO_CORE_LA) +@PYTHON_TRUE@gnuradio_swig_py_io_la_swig_libadd = $(GNURADIO_CORE_LA) +@PYTHON_TRUE@gnuradio_swig_py_hier_la_swig_libadd = $(GNURADIO_CORE_LA) +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = gnuradio_swig_py_runtime.py \ +@PYTHON_TRUE@ gnuradio_swig_py_runtime.cc \ +@PYTHON_TRUE@ gnuradio_swig_py_general.py \ +@PYTHON_TRUE@ gnuradio_swig_py_general.cc \ +@PYTHON_TRUE@ gnuradio_swig_py_gengen.py \ +@PYTHON_TRUE@ gnuradio_swig_py_gengen.cc \ +@PYTHON_TRUE@ gnuradio_swig_py_filter.py \ +@PYTHON_TRUE@ gnuradio_swig_py_filter.cc gnuradio_swig_py_io.py \ +@PYTHON_TRUE@ gnuradio_swig_py_io.cc gnuradio_swig_py_hier.py \ +@PYTHON_TRUE@ gnuradio_swig_py_hier.cc +@PYTHON_TRUE@gnuradio_swig_py_runtime_pythondir = $(pythondir)/$(gnuradio_swig_py_runtime_pythondir_category) +@PYTHON_TRUE@gnuradio_swig_py_runtime_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_runtime_pylibdir_category) +@PYTHON_TRUE@gnuradio_swig_py_runtime_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@gnuradio_swig_py_runtime_swiginclude_HEADERS = \ +@PYTHON_TRUE@ gnuradio_swig_py_runtime.i \ +@PYTHON_TRUE@ $(gnuradio_swig_py_runtime_swiginclude_headers) + +@PYTHON_TRUE@gnuradio_swig_py_runtime_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _gnuradio_swig_py_runtime.la + +@PYTHON_TRUE@_gnuradio_swig_py_runtime_la_SOURCES = \ +@PYTHON_TRUE@ gnuradio_swig_py_runtime.cc \ +@PYTHON_TRUE@ $(gnuradio_swig_py_runtime_la_swig_sources) + +@PYTHON_TRUE@_gnuradio_swig_py_runtime_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_runtime_la_swig_libadd) + +@PYTHON_TRUE@_gnuradio_swig_py_runtime_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_runtime_la_swig_ldflags) + +@PYTHON_TRUE@_gnuradio_swig_py_runtime_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_runtime_la_swig_cxxflags) + +@PYTHON_TRUE@gnuradio_swig_py_runtime_python_PYTHON = \ +@PYTHON_TRUE@ gnuradio_swig_py_runtime.py \ +@PYTHON_TRUE@ $(gnuradio_swig_py_runtime_python) + +@PYTHON_TRUE@gnuradio_swig_py_general_pythondir = $(pythondir)/$(gnuradio_swig_py_general_pythondir_category) +@PYTHON_TRUE@gnuradio_swig_py_general_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_general_pylibdir_category) +@PYTHON_TRUE@gnuradio_swig_py_general_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@gnuradio_swig_py_general_swiginclude_HEADERS = \ +@PYTHON_TRUE@ gnuradio_swig_py_general.i \ +@PYTHON_TRUE@ $(gnuradio_swig_py_general_swiginclude_headers) + +@PYTHON_TRUE@gnuradio_swig_py_general_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _gnuradio_swig_py_general.la + +@PYTHON_TRUE@_gnuradio_swig_py_general_la_SOURCES = \ +@PYTHON_TRUE@ gnuradio_swig_py_general.cc \ +@PYTHON_TRUE@ $(gnuradio_swig_py_general_la_swig_sources) + +@PYTHON_TRUE@_gnuradio_swig_py_general_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_general_la_swig_libadd) + +@PYTHON_TRUE@_gnuradio_swig_py_general_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_general_la_swig_ldflags) + +@PYTHON_TRUE@_gnuradio_swig_py_general_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_general_la_swig_cxxflags) + +@PYTHON_TRUE@gnuradio_swig_py_general_python_PYTHON = \ +@PYTHON_TRUE@ gnuradio_swig_py_general.py \ +@PYTHON_TRUE@ $(gnuradio_swig_py_general_python) + +@PYTHON_TRUE@gnuradio_swig_py_gengen_pythondir = $(pythondir)/$(gnuradio_swig_py_gengen_pythondir_category) +@PYTHON_TRUE@gnuradio_swig_py_gengen_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_gengen_pylibdir_category) +@PYTHON_TRUE@gnuradio_swig_py_gengen_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@gnuradio_swig_py_gengen_swiginclude_HEADERS = \ +@PYTHON_TRUE@ gnuradio_swig_py_gengen.i \ +@PYTHON_TRUE@ $(gnuradio_swig_py_gengen_swiginclude_headers) + +@PYTHON_TRUE@gnuradio_swig_py_gengen_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _gnuradio_swig_py_gengen.la + +@PYTHON_TRUE@_gnuradio_swig_py_gengen_la_SOURCES = \ +@PYTHON_TRUE@ gnuradio_swig_py_gengen.cc \ +@PYTHON_TRUE@ $(gnuradio_swig_py_gengen_la_swig_sources) + +@PYTHON_TRUE@_gnuradio_swig_py_gengen_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_gengen_la_swig_libadd) + +@PYTHON_TRUE@_gnuradio_swig_py_gengen_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_gengen_la_swig_ldflags) + +@PYTHON_TRUE@_gnuradio_swig_py_gengen_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_gengen_la_swig_cxxflags) + +@PYTHON_TRUE@gnuradio_swig_py_gengen_python_PYTHON = \ +@PYTHON_TRUE@ gnuradio_swig_py_gengen.py \ +@PYTHON_TRUE@ $(gnuradio_swig_py_gengen_python) + +@PYTHON_TRUE@gnuradio_swig_py_filter_pythondir = $(pythondir)/$(gnuradio_swig_py_filter_pythondir_category) +@PYTHON_TRUE@gnuradio_swig_py_filter_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_filter_pylibdir_category) +@PYTHON_TRUE@gnuradio_swig_py_filter_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@gnuradio_swig_py_filter_swiginclude_HEADERS = \ +@PYTHON_TRUE@ gnuradio_swig_py_filter.i \ +@PYTHON_TRUE@ $(gnuradio_swig_py_filter_swiginclude_headers) + +@PYTHON_TRUE@gnuradio_swig_py_filter_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _gnuradio_swig_py_filter.la + +@PYTHON_TRUE@_gnuradio_swig_py_filter_la_SOURCES = \ +@PYTHON_TRUE@ gnuradio_swig_py_filter.cc \ +@PYTHON_TRUE@ $(gnuradio_swig_py_filter_la_swig_sources) + +@PYTHON_TRUE@_gnuradio_swig_py_filter_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_filter_la_swig_libadd) + +@PYTHON_TRUE@_gnuradio_swig_py_filter_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_filter_la_swig_ldflags) + +@PYTHON_TRUE@_gnuradio_swig_py_filter_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_filter_la_swig_cxxflags) + +@PYTHON_TRUE@gnuradio_swig_py_filter_python_PYTHON = \ +@PYTHON_TRUE@ gnuradio_swig_py_filter.py \ +@PYTHON_TRUE@ $(gnuradio_swig_py_filter_python) + +@PYTHON_TRUE@gnuradio_swig_py_io_pythondir = $(pythondir)/$(gnuradio_swig_py_io_pythondir_category) +@PYTHON_TRUE@gnuradio_swig_py_io_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_io_pylibdir_category) +@PYTHON_TRUE@gnuradio_swig_py_io_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@gnuradio_swig_py_io_swiginclude_HEADERS = \ +@PYTHON_TRUE@ gnuradio_swig_py_io.i \ +@PYTHON_TRUE@ $(gnuradio_swig_py_io_swiginclude_headers) + +@PYTHON_TRUE@gnuradio_swig_py_io_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _gnuradio_swig_py_io.la + +@PYTHON_TRUE@_gnuradio_swig_py_io_la_SOURCES = \ +@PYTHON_TRUE@ gnuradio_swig_py_io.cc \ +@PYTHON_TRUE@ $(gnuradio_swig_py_io_la_swig_sources) + +@PYTHON_TRUE@_gnuradio_swig_py_io_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_io_la_swig_libadd) + +@PYTHON_TRUE@_gnuradio_swig_py_io_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_io_la_swig_ldflags) + +@PYTHON_TRUE@_gnuradio_swig_py_io_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_io_la_swig_cxxflags) + +@PYTHON_TRUE@gnuradio_swig_py_io_python_PYTHON = \ +@PYTHON_TRUE@ gnuradio_swig_py_io.py \ +@PYTHON_TRUE@ $(gnuradio_swig_py_io_python) + +@PYTHON_TRUE@gnuradio_swig_py_hier_pythondir = $(pythondir)/$(gnuradio_swig_py_hier_pythondir_category) +@PYTHON_TRUE@gnuradio_swig_py_hier_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_hier_pylibdir_category) +@PYTHON_TRUE@gnuradio_swig_py_hier_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@gnuradio_swig_py_hier_swiginclude_HEADERS = \ +@PYTHON_TRUE@ gnuradio_swig_py_hier.i \ +@PYTHON_TRUE@ $(gnuradio_swig_py_hier_swiginclude_headers) + +@PYTHON_TRUE@gnuradio_swig_py_hier_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _gnuradio_swig_py_hier.la -_gnuradio_swig_py_hier_la_SOURCES = \ - gnuradio_swig_py_hier.cc \ - $(gnuradio_swig_py_hier_la_swig_sources) +@PYTHON_TRUE@_gnuradio_swig_py_hier_la_SOURCES = \ +@PYTHON_TRUE@ gnuradio_swig_py_hier.cc \ +@PYTHON_TRUE@ $(gnuradio_swig_py_hier_la_swig_sources) -_gnuradio_swig_py_hier_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_hier_la_swig_libadd) +@PYTHON_TRUE@_gnuradio_swig_py_hier_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_hier_la_swig_libadd) -_gnuradio_swig_py_hier_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_hier_la_swig_ldflags) +@PYTHON_TRUE@_gnuradio_swig_py_hier_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_hier_la_swig_ldflags) -_gnuradio_swig_py_hier_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(gnuradio_swig_py_hier_la_swig_cxxflags) +@PYTHON_TRUE@_gnuradio_swig_py_hier_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(gnuradio_swig_py_hier_la_swig_cxxflags) -gnuradio_swig_py_hier_python_PYTHON = \ - gnuradio_swig_py_hier.py \ - $(gnuradio_swig_py_hier_python) +@PYTHON_TRUE@gnuradio_swig_py_hier_python_PYTHON = \ +@PYTHON_TRUE@ gnuradio_swig_py_hier.py \ +@PYTHON_TRUE@ $(gnuradio_swig_py_hier_python) # add some of the variables generated inside the Makefile.swig # include the SWIG-generated .h files in the BUILT SOURCES, since they # aren't by default when using Makefile.swig; order doesn't matter. -BUILT_SOURCES = \ - gnuradio_swig_py_runtime.h \ - gnuradio_swig_py_general.h \ - gnuradio_swig_py_gengen.h \ - gnuradio_swig_py_filter.h \ - gnuradio_swig_py_io.h \ - gnuradio_swig_py_hier.h \ - $(grinclude_HEADERS) \ - $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = \ +@PYTHON_TRUE@ gnuradio_swig_py_runtime.h \ +@PYTHON_TRUE@ gnuradio_swig_py_general.h \ +@PYTHON_TRUE@ gnuradio_swig_py_gengen.h \ +@PYTHON_TRUE@ gnuradio_swig_py_filter.h \ +@PYTHON_TRUE@ gnuradio_swig_py_io.h \ +@PYTHON_TRUE@ gnuradio_swig_py_hier.h \ +@PYTHON_TRUE@ $(grinclude_HEADERS) \ +@PYTHON_TRUE@ $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1408,17 +1463,17 @@ clean-gnuradio_swig_py_runtime_pylibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done _gnuradio_swig_py_filter.la: $(_gnuradio_swig_py_filter_la_OBJECTS) $(_gnuradio_swig_py_filter_la_DEPENDENCIES) - $(_gnuradio_swig_py_filter_la_LINK) -rpath $(gnuradio_swig_py_filter_pylibdir) $(_gnuradio_swig_py_filter_la_OBJECTS) $(_gnuradio_swig_py_filter_la_LIBADD) $(LIBS) + $(_gnuradio_swig_py_filter_la_LINK) $(am__gnuradio_swig_py_filter_la_rpath) $(_gnuradio_swig_py_filter_la_OBJECTS) $(_gnuradio_swig_py_filter_la_LIBADD) $(LIBS) _gnuradio_swig_py_general.la: $(_gnuradio_swig_py_general_la_OBJECTS) $(_gnuradio_swig_py_general_la_DEPENDENCIES) - $(_gnuradio_swig_py_general_la_LINK) -rpath $(gnuradio_swig_py_general_pylibdir) $(_gnuradio_swig_py_general_la_OBJECTS) $(_gnuradio_swig_py_general_la_LIBADD) $(LIBS) + $(_gnuradio_swig_py_general_la_LINK) $(am__gnuradio_swig_py_general_la_rpath) $(_gnuradio_swig_py_general_la_OBJECTS) $(_gnuradio_swig_py_general_la_LIBADD) $(LIBS) _gnuradio_swig_py_gengen.la: $(_gnuradio_swig_py_gengen_la_OBJECTS) $(_gnuradio_swig_py_gengen_la_DEPENDENCIES) - $(_gnuradio_swig_py_gengen_la_LINK) -rpath $(gnuradio_swig_py_gengen_pylibdir) $(_gnuradio_swig_py_gengen_la_OBJECTS) $(_gnuradio_swig_py_gengen_la_LIBADD) $(LIBS) + $(_gnuradio_swig_py_gengen_la_LINK) $(am__gnuradio_swig_py_gengen_la_rpath) $(_gnuradio_swig_py_gengen_la_OBJECTS) $(_gnuradio_swig_py_gengen_la_LIBADD) $(LIBS) _gnuradio_swig_py_hier.la: $(_gnuradio_swig_py_hier_la_OBJECTS) $(_gnuradio_swig_py_hier_la_DEPENDENCIES) - $(_gnuradio_swig_py_hier_la_LINK) -rpath $(gnuradio_swig_py_hier_pylibdir) $(_gnuradio_swig_py_hier_la_OBJECTS) $(_gnuradio_swig_py_hier_la_LIBADD) $(LIBS) + $(_gnuradio_swig_py_hier_la_LINK) $(am__gnuradio_swig_py_hier_la_rpath) $(_gnuradio_swig_py_hier_la_OBJECTS) $(_gnuradio_swig_py_hier_la_LIBADD) $(LIBS) _gnuradio_swig_py_io.la: $(_gnuradio_swig_py_io_la_OBJECTS) $(_gnuradio_swig_py_io_la_DEPENDENCIES) - $(_gnuradio_swig_py_io_la_LINK) -rpath $(gnuradio_swig_py_io_pylibdir) $(_gnuradio_swig_py_io_la_OBJECTS) $(_gnuradio_swig_py_io_la_LIBADD) $(LIBS) + $(_gnuradio_swig_py_io_la_LINK) $(am__gnuradio_swig_py_io_la_rpath) $(_gnuradio_swig_py_io_la_OBJECTS) $(_gnuradio_swig_py_io_la_LIBADD) $(LIBS) _gnuradio_swig_py_runtime.la: $(_gnuradio_swig_py_runtime_la_OBJECTS) $(_gnuradio_swig_py_runtime_la_DEPENDENCIES) - $(_gnuradio_swig_py_runtime_la_LINK) -rpath $(gnuradio_swig_py_runtime_pylibdir) $(_gnuradio_swig_py_runtime_la_OBJECTS) $(_gnuradio_swig_py_runtime_la_LIBADD) $(LIBS) + $(_gnuradio_swig_py_runtime_la_LINK) $(am__gnuradio_swig_py_runtime_la_rpath) $(_gnuradio_swig_py_runtime_la_OBJECTS) $(_gnuradio_swig_py_runtime_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -2238,78 +2293,78 @@ dist-hook: # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... -gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.cc $(srcdir)/gen-swig-bug-fix - $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@ - -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -gnuradio_swig_py_runtime_pythondir_category ?= gnuradio/gnuradio_swig_py_runtime -gnuradio_swig_py_runtime_pylibdir_category ?= $(gnuradio_swig_py_runtime_pythondir_category) - -gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.cc: gnuradio_swig_py_runtime.i - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_runtime-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \ - -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \ - > $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_runtime.Sd $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.d - cp $(DEPDIR)/gnuradio_swig_py_runtime.Std $(DEPDIR)/gnuradio_swig_py_runtime.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime.d - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Std - touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp +@PYTHON_TRUE@gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.cc $(srcdir)/gen-swig-bug-fix +@PYTHON_TRUE@ $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@ + +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@gnuradio_swig_py_runtime_pythondir_category ?= gnuradio/gnuradio_swig_py_runtime +@PYTHON_TRUE@gnuradio_swig_py_runtime_pylibdir_category ?= $(gnuradio_swig_py_runtime_pythondir_category) + +@PYTHON_TRUE@gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.cc: gnuradio_swig_py_runtime.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_runtime-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \ +@PYTHON_TRUE@ -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/gnuradio_swig_py_runtime.Sd $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.d +@PYTHON_TRUE@ cp $(DEPDIR)/gnuradio_swig_py_runtime.Std $(DEPDIR)/gnuradio_swig_py_runtime.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Std +@PYTHON_TRUE@ touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime.d@am__quote@ # -*- Makefile -*- # @@ -2335,50 +2390,50 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp: # Makefile.swig.gen for gnuradio_swig_py_general.i -gnuradio_swig_py_general_pythondir_category ?= gnuradio/gnuradio_swig_py_general -gnuradio_swig_py_general_pylibdir_category ?= $(gnuradio_swig_py_general_pythondir_category) - -gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general.cc: gnuradio_swig_py_general.i - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_general-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_general-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_general-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/gnuradio_swig_py_general-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_general_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \ - -module gnuradio_swig_py_general -o gnuradio_swig_py_general.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \ - > $(DEPDIR)/gnuradio_swig_py_general.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_general.Sd $(DEPDIR)/gnuradio_swig_py_general.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/gnuradio_swig_py_general.d - cp $(DEPDIR)/gnuradio_swig_py_general.Std $(DEPDIR)/gnuradio_swig_py_general.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_general.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general.d - $(RM) $(DEPDIR)/gnuradio_swig_py_general.Std - touch $(DEPDIR)/gnuradio_swig_py_general-generate-stamp +@PYTHON_TRUE@gnuradio_swig_py_general_pythondir_category ?= gnuradio/gnuradio_swig_py_general +@PYTHON_TRUE@gnuradio_swig_py_general_pylibdir_category ?= $(gnuradio_swig_py_general_pythondir_category) + +@PYTHON_TRUE@gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general.cc: gnuradio_swig_py_general.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_general-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/gnuradio_swig_py_general-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/gnuradio_swig_py_general-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/gnuradio_swig_py_general-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_general_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \ +@PYTHON_TRUE@ -module gnuradio_swig_py_general -o gnuradio_swig_py_general.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/gnuradio_swig_py_general.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_general.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/gnuradio_swig_py_general.Sd $(DEPDIR)/gnuradio_swig_py_general.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_general.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_general.d +@PYTHON_TRUE@ cp $(DEPDIR)/gnuradio_swig_py_general.Std $(DEPDIR)/gnuradio_swig_py_general.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/gnuradio_swig_py_general.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_general.Std +@PYTHON_TRUE@ touch $(DEPDIR)/gnuradio_swig_py_general-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general.d@am__quote@ # -*- Makefile -*- # @@ -2404,50 +2459,50 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-stamp: # Makefile.swig.gen for gnuradio_swig_py_gengen.i -gnuradio_swig_py_gengen_pythondir_category ?= gnuradio/gnuradio_swig_py_gengen -gnuradio_swig_py_gengen_pylibdir_category ?= $(gnuradio_swig_py_gengen_pythondir_category) - -gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc: gnuradio_swig_py_gengen.i - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_gengen-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \ - -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \ - > $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_gengen.Sd $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.d - cp $(DEPDIR)/gnuradio_swig_py_gengen.Std $(DEPDIR)/gnuradio_swig_py_gengen.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen.d - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Std - touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp +@PYTHON_TRUE@gnuradio_swig_py_gengen_pythondir_category ?= gnuradio/gnuradio_swig_py_gengen +@PYTHON_TRUE@gnuradio_swig_py_gengen_pylibdir_category ?= $(gnuradio_swig_py_gengen_pythondir_category) + +@PYTHON_TRUE@gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc: gnuradio_swig_py_gengen.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_gengen-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \ +@PYTHON_TRUE@ -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/gnuradio_swig_py_gengen.Sd $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.d +@PYTHON_TRUE@ cp $(DEPDIR)/gnuradio_swig_py_gengen.Std $(DEPDIR)/gnuradio_swig_py_gengen.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Std +@PYTHON_TRUE@ touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen.d@am__quote@ # -*- Makefile -*- # @@ -2473,50 +2528,50 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp: # Makefile.swig.gen for gnuradio_swig_py_filter.i -gnuradio_swig_py_filter_pythondir_category ?= gnuradio/gnuradio_swig_py_filter -gnuradio_swig_py_filter_pylibdir_category ?= $(gnuradio_swig_py_filter_pythondir_category) - -gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc: gnuradio_swig_py_filter.i - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_filter-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/gnuradio_swig_py_filter-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_filter_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \ - -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \ - > $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_filter.Sd $(DEPDIR)/gnuradio_swig_py_filter.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.d - cp $(DEPDIR)/gnuradio_swig_py_filter.Std $(DEPDIR)/gnuradio_swig_py_filter.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_filter.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter.d - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Std - touch $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp +@PYTHON_TRUE@gnuradio_swig_py_filter_pythondir_category ?= gnuradio/gnuradio_swig_py_filter +@PYTHON_TRUE@gnuradio_swig_py_filter_pylibdir_category ?= $(gnuradio_swig_py_filter_pythondir_category) + +@PYTHON_TRUE@gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc: gnuradio_swig_py_filter.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_filter-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/gnuradio_swig_py_filter-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_filter_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \ +@PYTHON_TRUE@ -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/gnuradio_swig_py_filter.Sd $(DEPDIR)/gnuradio_swig_py_filter.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_filter.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_filter.d +@PYTHON_TRUE@ cp $(DEPDIR)/gnuradio_swig_py_filter.Std $(DEPDIR)/gnuradio_swig_py_filter.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/gnuradio_swig_py_filter.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Std +@PYTHON_TRUE@ touch $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter.d@am__quote@ # -*- Makefile -*- # @@ -2542,50 +2597,50 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp: # Makefile.swig.gen for gnuradio_swig_py_io.i -gnuradio_swig_py_io_pythondir_category ?= gnuradio/gnuradio_swig_py_io -gnuradio_swig_py_io_pylibdir_category ?= $(gnuradio_swig_py_io_pythondir_category) - -gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_swig_py_io.i - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_io-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_io-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_io-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/gnuradio_swig_py_io-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_io_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \ - -module gnuradio_swig_py_io -o gnuradio_swig_py_io.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \ - > $(DEPDIR)/gnuradio_swig_py_io.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_io.Sd $(DEPDIR)/gnuradio_swig_py_io.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/gnuradio_swig_py_io.d - cp $(DEPDIR)/gnuradio_swig_py_io.Std $(DEPDIR)/gnuradio_swig_py_io.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_io.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io.d - $(RM) $(DEPDIR)/gnuradio_swig_py_io.Std - touch $(DEPDIR)/gnuradio_swig_py_io-generate-stamp +@PYTHON_TRUE@gnuradio_swig_py_io_pythondir_category ?= gnuradio/gnuradio_swig_py_io +@PYTHON_TRUE@gnuradio_swig_py_io_pylibdir_category ?= $(gnuradio_swig_py_io_pythondir_category) + +@PYTHON_TRUE@gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_swig_py_io.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_io-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/gnuradio_swig_py_io-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/gnuradio_swig_py_io-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/gnuradio_swig_py_io-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_io_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \ +@PYTHON_TRUE@ -module gnuradio_swig_py_io -o gnuradio_swig_py_io.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/gnuradio_swig_py_io.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_io.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/gnuradio_swig_py_io.Sd $(DEPDIR)/gnuradio_swig_py_io.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_io.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_io.d +@PYTHON_TRUE@ cp $(DEPDIR)/gnuradio_swig_py_io.Std $(DEPDIR)/gnuradio_swig_py_io.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/gnuradio_swig_py_io.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_io.Std +@PYTHON_TRUE@ touch $(DEPDIR)/gnuradio_swig_py_io-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io.d@am__quote@ # -*- Makefile -*- # @@ -2611,50 +2666,50 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-stamp: # Makefile.swig.gen for gnuradio_swig_py_hier.i -gnuradio_swig_py_hier_pythondir_category ?= gnuradio/gnuradio_swig_py_hier -gnuradio_swig_py_hier_pylibdir_category ?= $(gnuradio_swig_py_hier_pythondir_category) - -gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnuradio_swig_py_hier.i - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_hier-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/gnuradio_swig_py_hier-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_hier_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \ - -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \ - > $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_hier.Sd $(DEPDIR)/gnuradio_swig_py_hier.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.d - cp $(DEPDIR)/gnuradio_swig_py_hier.Std $(DEPDIR)/gnuradio_swig_py_hier.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_hier.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier.d - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std - touch $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp +@PYTHON_TRUE@gnuradio_swig_py_hier_pythondir_category ?= gnuradio/gnuradio_swig_py_hier +@PYTHON_TRUE@gnuradio_swig_py_hier_pylibdir_category ?= $(gnuradio_swig_py_hier_pythondir_category) + +@PYTHON_TRUE@gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnuradio_swig_py_hier.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_hier-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/gnuradio_swig_py_hier-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_hier_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \ +@PYTHON_TRUE@ -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/gnuradio_swig_py_hier.Sd $(DEPDIR)/gnuradio_swig_py_hier.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.d +@PYTHON_TRUE@ cp $(DEPDIR)/gnuradio_swig_py_hier.Std $(DEPDIR)/gnuradio_swig_py_hier.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/gnuradio_swig_py_hier.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std +@PYTHON_TRUE@ touch $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h b/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h deleted file mode 100644 index 8f7eea0b..00000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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_GNURADIO_SWIG_BUG_WORKAROUND_H -#define INCLUDED_GNURADIO_SWIG_BUG_WORKAROUND_H - -/* - * This include files works around a bug in SWIG 1.3.21 and 22 - * where it fails to emit these declarations when doing - * %import "gnuradio.i" - */ - -class gr_base_error_handler; -class gr_basic_block; -class gr_block; -class gr_error_handler; -class gr_file_error_handler; -class gr_hier_block2; -class gr_msg_handler; -class gr_msg_queue; -class gr_sync_block; -class gr_sync_decimator; -class gr_sync_interpolator; -class gr_top_block; - -#endif /* INCLUDED_GNURADIO_SWIG_BUG_WORKAROUND_H */ diff --git a/gnuradio-core/src/lib/viterbi/Makefile.in b/gnuradio-core/src/lib/viterbi/Makefile.in index 749360cb..577d5579 100644 --- a/gnuradio-core/src/lib/viterbi/Makefile.in +++ b/gnuradio-core/src/lib/viterbi/Makefile.in @@ -36,7 +36,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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -221,6 +221,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@ @@ -228,6 +229,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@ @@ -246,6 +251,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +261,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@ @@ -291,6 +300,8 @@ LIBGNURADIO_CORE_EXTRA_LDFLAGS = @LIBGNURADIO_CORE_EXTRA_LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = -lm LIBTOOL = @LIBTOOL@ +LIBUSB_PKG_CONFIG_NAME = @LIBUSB_PKG_CONFIG_NAME@ +LIBVER = @LIBVER@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -352,6 +363,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@ @@ -364,17 +376,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@ @@ -390,7 +402,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@ @@ -442,6 +453,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@ @@ -472,6 +488,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@ @@ -493,6 +514,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@ @@ -575,26 +606,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@ @@ -625,7 +641,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@ @@ -635,23 +650,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 @@ -663,7 +681,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, @@ -671,10 +689,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@ @@ -690,18 +704,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@ @@ -716,15 +718,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 = diff --git a/gnuradio-core/src/python/Makefile.in b/gnuradio-core/src/python/Makefile.in index af03d85e..c383b702 100644 --- a/gnuradio-core/src/python/Makefile.in +++ b/gnuradio-core/src/python/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -223,6 +223,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@ @@ -230,6 +231,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@ @@ -248,6 +253,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -257,20 +263,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@ @@ -293,6 +302,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@ @@ -354,6 +365,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@ @@ -366,17 +378,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@ @@ -392,7 +404,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@ @@ -444,6 +455,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@ @@ -474,6 +490,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@ @@ -495,6 +516,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@ @@ -577,26 +608,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@ @@ -627,7 +643,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@ @@ -637,23 +652,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 @@ -665,7 +683,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, @@ -673,10 +691,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@ @@ -692,18 +706,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@ @@ -718,15 +720,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 = diff --git a/gnuradio-core/src/python/bin/Makefile.in b/gnuradio-core/src/python/bin/Makefile.in index a3b6ceee..f8137ced 100644 --- a/gnuradio-core/src/python/bin/Makefile.in +++ b/gnuradio-core/src/python/bin/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -184,6 +184,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@ @@ -191,6 +192,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@ @@ -209,6 +214,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -218,20 +224,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@ @@ -254,6 +263,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@ @@ -315,6 +326,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@ @@ -327,17 +339,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@ @@ -353,7 +365,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@ @@ -405,6 +416,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@ @@ -435,6 +451,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@ @@ -456,6 +477,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@ @@ -538,26 +569,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@ @@ -588,7 +604,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@ @@ -598,23 +613,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 @@ -626,7 +644,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, @@ -634,10 +652,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@ @@ -653,18 +667,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@ @@ -679,15 +681,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 = diff --git a/gnuradio-core/src/python/gnuradio/Makefile.in b/gnuradio-core/src/python/gnuradio/Makefile.in index 47aa45d5..468319c7 100644 --- a/gnuradio-core/src/python/gnuradio/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/Makefile.in @@ -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 # @@ -77,7 +77,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grpython_PYTHON) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__grpython_PYTHON_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common subdir = gnuradio-core/src/python/gnuradio ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -169,6 +169,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__grpython_PYTHON_DIST = __init__.py audio.py eng_notation.py \ + eng_option.py modulation_utils.py modulation_utils2.py \ + ofdm_packet_utils.py packet_utils.py gr_unittest.py optfir.py \ + usrp_options.py window.py am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -199,7 +203,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -245,6 +249,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@ @@ -252,6 +257,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@ @@ -270,6 +279,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -279,20 +289,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@ @@ -315,6 +328,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@ @@ -376,6 +391,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@ @@ -388,17 +404,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@ @@ -414,7 +430,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@ @@ -466,6 +481,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@ @@ -496,6 +516,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@ @@ -517,6 +542,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@ @@ -599,26 +634,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@ @@ -649,7 +669,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@ @@ -659,23 +678,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 @@ -687,7 +709,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, @@ -695,10 +717,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@ @@ -714,18 +732,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@ @@ -740,31 +746,35 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder -grpython_PYTHON = \ - __init__.py \ - audio.py \ - eng_notation.py \ - eng_option.py \ - modulation_utils.py \ - ofdm_packet_utils.py \ - packet_utils.py \ - gr_unittest.py \ - optfir.py \ - window.py +@PYTHON_TRUE@SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder +@PYTHON_TRUE@grpython_PYTHON = \ +@PYTHON_TRUE@ __init__.py \ +@PYTHON_TRUE@ audio.py \ +@PYTHON_TRUE@ eng_notation.py \ +@PYTHON_TRUE@ eng_option.py \ +@PYTHON_TRUE@ modulation_utils.py \ +@PYTHON_TRUE@ modulation_utils2.py \ +@PYTHON_TRUE@ ofdm_packet_utils.py \ +@PYTHON_TRUE@ packet_utils.py \ +@PYTHON_TRUE@ gr_unittest.py \ +@PYTHON_TRUE@ optfir.py \ +@PYTHON_TRUE@ usrp_options.py \ +@PYTHON_TRUE@ window.py all: all-recursive diff --git a/gnuradio-core/src/python/gnuradio/blks2/Makefile.in b/gnuradio-core/src/python/gnuradio/blks2/Makefile.in index ead11672..be6e07af 100644 --- a/gnuradio-core/src/python/gnuradio/blks2/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/blks2/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -205,6 +205,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@ @@ -212,6 +213,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@ @@ -230,6 +235,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -239,20 +245,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@ @@ -275,6 +284,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@ @@ -336,6 +347,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@ @@ -348,17 +360,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@ @@ -374,7 +386,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@ @@ -426,6 +437,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@ @@ -456,6 +472,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@ @@ -477,6 +498,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@ @@ -559,26 +590,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@ @@ -609,7 +625,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@ @@ -619,23 +634,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 @@ -647,7 +665,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, @@ -655,10 +673,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@ @@ -674,18 +688,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@ @@ -700,15 +702,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 = diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.in b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.in index 658b3764..ccb02b9a 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2005,2007,2009 Free Software Foundation, Inc. +# Copyright 2005,2007,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -205,6 +205,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@ @@ -212,6 +213,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@ @@ -230,6 +235,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -239,20 +245,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@ @@ -275,6 +284,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@ @@ -336,6 +347,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@ @@ -348,17 +360,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@ @@ -374,7 +386,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@ @@ -426,6 +437,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@ @@ -456,6 +472,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@ @@ -477,6 +498,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@ @@ -559,26 +590,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@ @@ -609,7 +625,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@ @@ -619,23 +634,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 @@ -647,7 +665,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, @@ -655,10 +673,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@ @@ -674,18 +688,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@ @@ -700,15 +702,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 = @@ -722,11 +726,14 @@ grblkspython_PYTHON = \ am_demod.py \ channel_model.py \ dbpsk.py \ + dbpsk2.py \ dqpsk.py \ + dqpsk2.py \ d8psk.py \ filterbank.py \ fm_demod.py \ fm_emph.py \ + generic_usrp.py \ gmsk.py \ cpm.py \ logpwrfft.py \ @@ -738,6 +745,10 @@ grblkspython_PYTHON = \ 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 \ diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.in b/gnuradio-core/src/python/gnuradio/gr/Makefile.in index f5460bed..1c04c70f 100644 --- a/gnuradio-core/src/python/gnuradio/gr/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -208,6 +208,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@ @@ -215,6 +216,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@ @@ -233,6 +238,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -242,20 +248,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@ @@ -278,6 +287,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@ @@ -339,6 +350,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@ @@ -351,17 +363,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@ @@ -377,7 +389,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@ @@ -429,6 +440,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@ @@ -459,6 +475,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@ @@ -480,6 +501,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@ @@ -562,26 +593,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@ @@ -612,7 +628,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@ @@ -622,23 +637,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 @@ -650,7 +668,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, @@ -658,10 +676,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@ @@ -677,18 +691,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@ @@ -703,15 +705,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 = @@ -747,6 +751,7 @@ noinst_PYTHON = \ qa_cma_equalizer.py \ qa_complex_to_xxx.py \ qa_constellation_decoder_cb.py \ + qa_copy.py \ qa_correlate_access_code.py \ qa_delay.py \ qa_diff_encoder.py \ @@ -789,6 +794,7 @@ noinst_PYTHON = \ qa_unpack_k_bits.py \ qa_repeat.py \ qa_scrambler.py \ + qa_udp_sink_source.py \ qa_vector_sink_source.py all: all-am diff --git a/gnuradio-core/src/python/gnuradio/gru/Makefile.in b/gnuradio-core/src/python/gnuradio/gru/Makefile.in index 229c77df..86c842cf 100644 --- a/gnuradio-core/src/python/gnuradio/gru/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/gru/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -205,6 +205,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@ @@ -212,6 +213,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@ @@ -230,6 +235,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -239,20 +245,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@ @@ -275,6 +284,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@ @@ -336,6 +347,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@ @@ -348,17 +360,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@ @@ -374,7 +386,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@ @@ -426,6 +437,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@ @@ -456,6 +472,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@ @@ -477,6 +498,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@ @@ -559,26 +590,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@ @@ -609,7 +625,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@ @@ -619,23 +634,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 @@ -647,7 +665,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, @@ -655,10 +673,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@ @@ -674,18 +688,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@ @@ -700,15 +702,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 = diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in index 210c6e29..ea4eb4ee 100644 --- a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -205,6 +205,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@ @@ -212,6 +213,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@ @@ -230,6 +235,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -239,20 +245,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@ @@ -275,6 +284,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@ @@ -336,6 +347,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@ @@ -348,17 +360,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@ @@ -374,7 +386,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@ @@ -426,6 +437,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@ @@ -456,6 +472,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@ @@ -477,6 +498,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@ @@ -559,26 +590,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@ @@ -609,7 +625,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@ @@ -619,23 +634,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 @@ -647,7 +665,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, @@ -655,10 +673,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@ @@ -674,18 +688,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@ @@ -700,15 +702,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 = diff --git a/gnuradio-core/src/python/gnuradio/vocoder/Makefile.in b/gnuradio-core/src/python/gnuradio/vocoder/Makefile.in index 4c74b58d..a1d1eb9d 100644 --- a/gnuradio-core/src/python/gnuradio/vocoder/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/vocoder/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -205,6 +205,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@ @@ -212,6 +213,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@ @@ -230,6 +235,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -239,20 +245,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@ @@ -275,6 +284,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@ @@ -336,6 +347,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@ @@ -348,17 +360,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@ @@ -374,7 +386,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@ @@ -426,6 +437,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@ @@ -456,6 +472,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@ @@ -477,6 +498,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@ @@ -559,26 +590,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@ @@ -609,7 +625,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@ @@ -619,23 +634,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 @@ -647,7 +665,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, @@ -655,10 +673,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@ @@ -674,18 +688,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@ @@ -700,15 +702,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 = diff --git a/gnuradio-core/src/tests/Makefile.in b/gnuradio-core/src/tests/Makefile.in index e7a09fe5..b4498c95 100644 --- a/gnuradio-core/src/tests/Makefile.in +++ b/gnuradio-core/src/tests/Makefile.in @@ -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 # @@ -102,36 +102,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 \ @@ -145,9 +148,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 \ @@ -271,6 +271,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@ @@ -278,6 +279,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@ @@ -296,6 +301,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -305,20 +311,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@ @@ -341,6 +350,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@ @@ -402,6 +413,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@ @@ -414,17 +426,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@ @@ -440,7 +452,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@ @@ -492,6 +503,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@ @@ -522,6 +538,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@ @@ -543,6 +564,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@ @@ -625,26 +656,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@ @@ -675,7 +691,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@ @@ -685,23 +700,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 @@ -713,7 +731,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, @@ -721,10 +739,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@ @@ -740,18 +754,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@ @@ -766,15 +768,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 = diff --git a/gnuradio-core/src/utils/Makefile.in b/gnuradio-core/src/utils/Makefile.in index 5f650405..e2591b70 100644 --- a/gnuradio-core/src/utils/Makefile.in +++ b/gnuradio-core/src/utils/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gnuradio-examples/Makefile.in b/gnuradio-examples/Makefile.in index a325e729..767237f9 100644 --- a/gnuradio-examples/Makefile.in +++ b/gnuradio-examples/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2004,2007 Free Software Foundation, Inc. +# Copyright 2004,2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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,6 +79,7 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.common +@PYTHON_TRUE@am__append_1 = python grc subdir = gnuradio-examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -92,36 +93,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 \ @@ -135,9 +139,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 \ @@ -176,7 +177,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = c++ python grc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -222,6 +223,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@ @@ -229,6 +231,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@ @@ -247,6 +253,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +263,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@ @@ -292,6 +302,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@ @@ -353,6 +365,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@ @@ -365,17 +378,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@ @@ -391,7 +404,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@ @@ -443,6 +455,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@ @@ -473,6 +490,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@ @@ -494,6 +516,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@ @@ -576,26 +608,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@ @@ -626,7 +643,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@ @@ -636,23 +652,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 @@ -664,7 +683,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, @@ -672,10 +691,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@ @@ -691,18 +706,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@ @@ -717,20 +720,22 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -SUBDIRS = python c++ +SUBDIRS = c++ $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gnuradio-examples/c++/Makefile.in b/gnuradio-examples/c++/Makefile.in index b615532e..d8aa577b 100644 --- a/gnuradio-examples/c++/Makefile.in +++ b/gnuradio-examples/c++/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gnuradio-examples/python/Makefile.in b/gnuradio-examples/python/Makefile.in index 2415a855..323bcccc 100644 --- a/gnuradio-examples/python/Makefile.in +++ b/gnuradio-examples/python/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = @@ -741,6 +745,7 @@ SUBDIRS = \ multi_usrp \ network \ ofdm \ + pfb \ usrp \ usrp2 diff --git a/gnuradio-examples/python/apps/Makefile.in b/gnuradio-examples/python/apps/Makefile.in index 6e19f28f..fcf59d56 100644 --- a/gnuradio-examples/python/apps/Makefile.in +++ b/gnuradio-examples/python/apps/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -199,6 +199,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@ @@ -206,6 +207,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@ @@ -224,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +239,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@ @@ -269,6 +278,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@ @@ -330,6 +341,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@ @@ -342,17 +354,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@ @@ -368,7 +380,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@ @@ -420,6 +431,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@ @@ -450,6 +466,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@ @@ -471,6 +492,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@ @@ -553,26 +584,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@ @@ -603,7 +619,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@ diff --git a/gnuradio-examples/python/apps/hf_explorer/Makefile.in b/gnuradio-examples/python/apps/hf_explorer/Makefile.in index 9f458d74..24dbd7cf 100644 --- a/gnuradio-examples/python/apps/hf_explorer/Makefile.in +++ b/gnuradio-examples/python/apps/hf_explorer/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/gnuradio-examples/python/apps/hf_radio/Makefile.in b/gnuradio-examples/python/apps/hf_radio/Makefile.in index 9badeac9..1be88143 100644 --- a/gnuradio-examples/python/apps/hf_radio/Makefile.in +++ b/gnuradio-examples/python/apps/hf_radio/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/gnuradio-examples/python/audio/Makefile.in b/gnuradio-examples/python/audio/Makefile.in index 462f4a28..08bbe028 100644 --- a/gnuradio-examples/python/audio/Makefile.in +++ b/gnuradio-examples/python/audio/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/gnuradio-examples/python/digital-bert/Makefile.in b/gnuradio-examples/python/digital-bert/Makefile.in index 1116f11f..075c0658 100644 --- a/gnuradio-examples/python/digital-bert/Makefile.in +++ b/gnuradio-examples/python/digital-bert/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/gnuradio-examples/python/digital/Makefile.in b/gnuradio-examples/python/digital/Makefile.in index 03d256eb..d30bea7a 100644 --- a/gnuradio-examples/python/digital/Makefile.in +++ b/gnuradio-examples/python/digital/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = @@ -720,7 +724,6 @@ MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT ourdatadir = $(exampledir)/digital dist_ourdata_DATA = \ README \ - generic_usrp.py \ pick_bitrate.py \ qt_digital_window.ui \ qt_digital_window.py \ @@ -728,7 +731,6 @@ dist_ourdata_DATA = \ qt_rx_window.py \ receive_path.py \ transmit_path.py \ - usrp_options.py \ usrp_receive_path.py \ usrp_transmit_path.py diff --git a/gnuradio-examples/python/digital_voice/Makefile.in b/gnuradio-examples/python/digital_voice/Makefile.in index 944e4f0d..2faba1fd 100644 --- a/gnuradio-examples/python/digital_voice/Makefile.in +++ b/gnuradio-examples/python/digital_voice/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/gnuradio-examples/python/mp-sched/Makefile.in b/gnuradio-examples/python/mp-sched/Makefile.in index e1971d7a..bdde14db 100644 --- a/gnuradio-examples/python/mp-sched/Makefile.in +++ b/gnuradio-examples/python/mp-sched/Makefile.in @@ -37,7 +37,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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -208,6 +208,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@ @@ -215,6 +216,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@ @@ -233,6 +238,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -242,20 +248,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@ @@ -278,6 +287,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@ @@ -339,6 +350,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@ @@ -351,17 +363,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@ @@ -377,7 +389,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@ @@ -429,6 +440,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@ @@ -459,6 +475,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@ @@ -480,6 +501,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@ @@ -562,26 +593,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@ @@ -612,7 +628,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@ @@ -622,23 +637,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 @@ -650,7 +668,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, @@ -658,10 +676,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@ @@ -677,18 +691,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@ @@ -703,15 +705,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 = diff --git a/gnuradio-examples/python/multi-antenna/Makefile.in b/gnuradio-examples/python/multi-antenna/Makefile.in index e7a9cb0c..9bbe33bd 100644 --- a/gnuradio-examples/python/multi-antenna/Makefile.in +++ b/gnuradio-examples/python/multi-antenna/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/gnuradio-examples/python/multi_usrp/Makefile.in b/gnuradio-examples/python/multi_usrp/Makefile.in index 568db641..8a060ee8 100644 --- a/gnuradio-examples/python/multi_usrp/Makefile.in +++ b/gnuradio-examples/python/multi_usrp/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/gnuradio-examples/python/network/Makefile.in b/gnuradio-examples/python/network/Makefile.in index 0a5ba963..92319c80 100644 --- a/gnuradio-examples/python/network/Makefile.in +++ b/gnuradio-examples/python/network/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/gnuradio-examples/python/ofdm/Makefile.in b/gnuradio-examples/python/ofdm/Makefile.in index 1df9ba49..0f072b8e 100644 --- a/gnuradio-examples/python/ofdm/Makefile.in +++ b/gnuradio-examples/python/ofdm/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/gnuradio-examples/python/usrp/Makefile.in b/gnuradio-examples/python/usrp/Makefile.in index 19756359..2f956210 100644 --- a/gnuradio-examples/python/usrp/Makefile.in +++ b/gnuradio-examples/python/usrp/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/gnuradio-examples/python/usrp2/Makefile.in b/gnuradio-examples/python/usrp2/Makefile.in index 98a50798..d1bde4a2 100644 --- a/gnuradio-examples/python/usrp2/Makefile.in +++ b/gnuradio-examples/python/usrp2/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/gr-audio-alsa/Makefile.in b/gr-audio-alsa/Makefile.in index 1273cbd1..902ff1b0 100644 --- a/gr-audio-alsa/Makefile.in +++ b/gr-audio-alsa/Makefile.in @@ -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 # @@ -78,8 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(dist_etc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/gr-audio-alsa.pc.in \ +DIST_COMMON = $(dist_etc_DATA) $(dist_pkgconfig_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/gnuradio-audio-alsa.pc.in \ $(top_srcdir)/Makefile.common subdir = gr-audio-alsa ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -94,36 +95,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 \ @@ -137,9 +141,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 \ @@ -160,7 +161,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-audio-alsa.pc +CONFIG_CLEAN_FILES = gnuradio-audio-alsa.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -193,7 +194,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(etcdir)" "$(DESTDIR)$(pkgconfigdir)" -DATA = $(dist_etc_DATA) $(pkgconfig_DATA) +DATA = $(dist_etc_DATA) $(dist_pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -247,6 +248,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@ @@ -254,6 +256,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@ @@ -272,6 +278,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -281,20 +288,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@ @@ -317,6 +327,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@ @@ -378,6 +390,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@ @@ -390,17 +403,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@ @@ -416,7 +429,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@ @@ -468,6 +480,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@ @@ -498,6 +515,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@ @@ -519,6 +541,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@ @@ -601,26 +633,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@ @@ -651,7 +668,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@ @@ -661,23 +677,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 @@ -689,7 +708,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, @@ -697,10 +716,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@ @@ -716,18 +731,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@ @@ -742,26 +745,25 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -EXTRA_DIST = \ - gr-audio-alsa.pc.in - SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gr-audio-alsa.pc -etcdir = $(gr_sysconfdir) +dist_pkgconfig_DATA = gnuradio-audio-alsa.pc +etcdir = $(gr_prefsdir) dist_etc_DATA = gr-audio-alsa.conf all: all-recursive @@ -796,7 +798,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-audio-alsa.pc: $(top_builddir)/config.status $(srcdir)/gr-audio-alsa.pc.in +gnuradio-audio-alsa.pc: $(top_builddir)/config.status $(srcdir)/gnuradio-audio-alsa.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: @@ -824,10 +826,10 @@ uninstall-dist_etcDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(etcdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(etcdir)" && rm -f $$files -install-pkgconfigDATA: $(pkgconfig_DATA) +install-dist_pkgconfigDATA: $(dist_pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -837,9 +839,9 @@ install-pkgconfigDATA: $(pkgconfig_DATA) $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ done -uninstall-pkgconfigDATA: +uninstall-dist_pkgconfigDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ @@ -1095,7 +1097,7 @@ info: info-recursive info-am: -install-data-am: install-dist_etcDATA install-pkgconfigDATA +install-data-am: install-dist_etcDATA install-dist_pkgconfigDATA install-dvi: install-dvi-recursive @@ -1139,7 +1141,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_etcDATA uninstall-pkgconfigDATA +uninstall-am: uninstall-dist_etcDATA uninstall-dist_pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1149,16 +1151,16 @@ uninstall-am: uninstall-dist_etcDATA uninstall-pkgconfigDATA ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dist_etcDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-dist_etcDATA \ - uninstall-pkgconfigDATA + install-data-am install-dist_etcDATA \ + install-dist_pkgconfigDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-dist_etcDATA uninstall-dist_pkgconfigDATA # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gr-audio-alsa/src/Makefile.in b/gr-audio-alsa/src/Makefile.in index 654695b1..6e0f9ec8 100644 --- a/gr-audio-alsa/src/Makefile.in +++ b/gr-audio-alsa/src/Makefile.in @@ -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 # @@ -125,12 +125,14 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(audio_alsa_python_PYTHON) \ - $(audio_alsa_swiginclude_HEADERS) $(grinclude_HEADERS) \ - $(noinst_HEADERS) $(noinst_PYTHON) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ - $(srcdir)/run_tests.in $(top_srcdir)/Makefile.common \ - $(top_srcdir)/Makefile.swig +DIST_COMMON = $(am__audio_alsa_python_PYTHON_DIST) \ + $(am__audio_alsa_swiginclude_HEADERS_DIST) \ + $(grinclude_HEADERS) $(noinst_HEADERS) $(noinst_PYTHON) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \ + $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/audio_alsa-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-audio-alsa/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -144,36 +146,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 \ @@ -187,9 +192,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 \ @@ -239,14 +241,16 @@ am__installdirs = "$(DESTDIR)$(audio_alsa_pylibdir)" \ "$(DESTDIR)$(grincludedir)" LTLIBRARIES = $(audio_alsa_pylib_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -_audio_alsa_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(audio_alsa_la_swig_libadd) -am__audio_alsa_la_OBJECTS = _audio_alsa_la-audio_alsa.lo +@PYTHON_TRUE@_audio_alsa_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(audio_alsa_la_swig_libadd) +am___audio_alsa_la_SOURCES_DIST = audio_alsa.cc +@PYTHON_TRUE@am__audio_alsa_la_OBJECTS = _audio_alsa_la-audio_alsa.lo _audio_alsa_la_OBJECTS = $(am__audio_alsa_la_OBJECTS) _audio_alsa_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_audio_alsa_la_CXXFLAGS) $(CXXFLAGS) \ $(_audio_alsa_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__audio_alsa_la_rpath = -rpath $(audio_alsa_pylibdir) libgnuradio_audio_alsa_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libgnuradio_audio_alsa_la_OBJECTS = audio_alsa_sink.lo \ @@ -272,9 +276,11 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(_audio_alsa_la_SOURCES) \ $(libgnuradio_audio_alsa_la_SOURCES) -DIST_SOURCES = $(_audio_alsa_la_SOURCES) \ +DIST_SOURCES = $(am___audio_alsa_la_SOURCES_DIST) \ $(libgnuradio_audio_alsa_la_SOURCES) +am__audio_alsa_python_PYTHON_DIST = audio_alsa.py py_compile = $(top_srcdir)/py-compile +am__audio_alsa_swiginclude_HEADERS_DIST = audio_alsa.i HEADERS = $(audio_alsa_swiginclude_HEADERS) $(grinclude_HEADERS) \ $(noinst_HEADERS) ETAGS = etags @@ -301,6 +307,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@ @@ -308,6 +315,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@ @@ -326,6 +337,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -335,20 +347,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@ @@ -371,6 +386,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@ @@ -432,6 +449,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@ @@ -444,17 +462,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@ @@ -470,7 +488,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@ @@ -522,6 +539,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@ @@ -552,6 +574,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@ @@ -573,6 +600,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@ @@ -655,26 +692,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@ @@ -705,7 +727,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@ @@ -715,23 +736,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 @@ -743,7 +767,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, @@ -751,10 +775,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@ @@ -770,18 +790,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@ @@ -796,23 +804,23 @@ 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 = $(DEPDIR)/audio_alsa-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) EXTRA_DIST = run_tests.in -TESTS = run_tests -DISTCLEANFILES = run_tests # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -839,90 +847,90 @@ libgnuradio_audio_alsa_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(ALSA_LIBS) -libgnuradio_audio_alsa_la_LDFLAGS = \ - $(NO_UNDEFINED) - +libgnuradio_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) ################################### # SWIG Python interface and library -TOP_SWIG_IFILES = \ - audio_alsa.i +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@DISTCLEANFILES = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ audio_alsa.i # Install so that they end up available as: # import gnuradio.audio_alsa # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -audio_alsa_pythondir_category = \ - gnuradio +@PYTHON_TRUE@audio_alsa_pythondir_category = \ +@PYTHON_TRUE@ gnuradio # additional libraries for linking with the SWIG-generated library -audio_alsa_la_swig_libadd = \ - libgnuradio-audio-alsa.la - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = audio_alsa.py audio_alsa.cc -audio_alsa_pythondir = $(pythondir)/$(audio_alsa_pythondir_category) -audio_alsa_pylibdir = $(pyexecdir)/$(audio_alsa_pylibdir_category) -audio_alsa_swigincludedir = $(swigincludedir) -audio_alsa_swiginclude_HEADERS = \ - audio_alsa.i \ - $(audio_alsa_swiginclude_headers) - -audio_alsa_pylib_LTLIBRARIES = \ - _audio_alsa.la - -_audio_alsa_la_SOURCES = \ - audio_alsa.cc \ - $(audio_alsa_la_swig_sources) - -_audio_alsa_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(audio_alsa_la_swig_libadd) - -_audio_alsa_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(audio_alsa_la_swig_ldflags) - -_audio_alsa_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(audio_alsa_la_swig_cxxflags) - -audio_alsa_python_PYTHON = \ - audio_alsa.py \ - $(audio_alsa_python) +@PYTHON_TRUE@audio_alsa_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-audio-alsa.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = audio_alsa.py audio_alsa.cc +@PYTHON_TRUE@audio_alsa_pythondir = $(pythondir)/$(audio_alsa_pythondir_category) +@PYTHON_TRUE@audio_alsa_pylibdir = $(pyexecdir)/$(audio_alsa_pylibdir_category) +@PYTHON_TRUE@audio_alsa_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@audio_alsa_swiginclude_HEADERS = \ +@PYTHON_TRUE@ audio_alsa.i \ +@PYTHON_TRUE@ $(audio_alsa_swiginclude_headers) + +@PYTHON_TRUE@audio_alsa_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _audio_alsa.la + +@PYTHON_TRUE@_audio_alsa_la_SOURCES = \ +@PYTHON_TRUE@ audio_alsa.cc \ +@PYTHON_TRUE@ $(audio_alsa_la_swig_sources) + +@PYTHON_TRUE@_audio_alsa_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(audio_alsa_la_swig_libadd) + +@PYTHON_TRUE@_audio_alsa_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(audio_alsa_la_swig_ldflags) + +@PYTHON_TRUE@_audio_alsa_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(audio_alsa_la_swig_cxxflags) + +@PYTHON_TRUE@audio_alsa_python_PYTHON = \ +@PYTHON_TRUE@ audio_alsa.py \ +@PYTHON_TRUE@ $(audio_alsa_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1023,7 +1031,7 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done _audio_alsa.la: $(_audio_alsa_la_OBJECTS) $(_audio_alsa_la_DEPENDENCIES) - $(_audio_alsa_la_LINK) -rpath $(audio_alsa_pylibdir) $(_audio_alsa_la_OBJECTS) $(_audio_alsa_la_LIBADD) $(LIBS) + $(_audio_alsa_la_LINK) $(am__audio_alsa_la_rpath) $(_audio_alsa_la_OBJECTS) $(_audio_alsa_la_LIBADD) $(LIBS) libgnuradio-audio-alsa.la: $(libgnuradio_audio_alsa_la_OBJECTS) $(libgnuradio_audio_alsa_la_DEPENDENCIES) $(libgnuradio_audio_alsa_la_LINK) -rpath $(libdir) $(libgnuradio_audio_alsa_la_OBJECTS) $(libgnuradio_audio_alsa_la_LIBADD) $(LIBS) @@ -1476,75 +1484,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -audio_alsa_pythondir_category ?= gnuradio/audio_alsa -audio_alsa_pylibdir_category ?= $(audio_alsa_pythondir_category) - -audio_alsa.h audio_alsa.py audio_alsa.cc: audio_alsa.i - trap 'rm -rf $(DEPDIR)/audio_alsa-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/audio_alsa-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/audio_alsa-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_alsa-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/audio_alsa-generate-lock; \ - else \ - while test -d $(DEPDIR)/audio_alsa-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/audio_alsa-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/audio_alsa-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_alsa_swig_args) \ - -MD -MF $(DEPDIR)/audio_alsa.Std \ - -module audio_alsa -o audio_alsa.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_alsa.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa.Std \ - > $(DEPDIR)/audio_alsa.Sd; \ - $(RM) $(DEPDIR)/audio_alsa.Std; \ - $(MV) $(DEPDIR)/audio_alsa.Sd $(DEPDIR)/audio_alsa.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/audio_alsa.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/audio_alsa.d - cp $(DEPDIR)/audio_alsa.Std $(DEPDIR)/audio_alsa.d - echo "" >> $(DEPDIR)/audio_alsa.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_alsa.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_alsa.d - $(RM) $(DEPDIR)/audio_alsa.Std - touch $(DEPDIR)/audio_alsa-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@audio_alsa_pythondir_category ?= gnuradio/audio_alsa +@PYTHON_TRUE@audio_alsa_pylibdir_category ?= $(audio_alsa_pythondir_category) + +@PYTHON_TRUE@audio_alsa.h audio_alsa.py audio_alsa.cc: audio_alsa.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/audio_alsa-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/audio_alsa-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/audio_alsa-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_alsa-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/audio_alsa-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/audio_alsa-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/audio_alsa-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/audio_alsa-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_alsa_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/audio_alsa.Std \ +@PYTHON_TRUE@ -module audio_alsa -o audio_alsa.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_alsa.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/audio_alsa.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_alsa.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/audio_alsa.Sd $(DEPDIR)/audio_alsa.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_alsa.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_alsa.d +@PYTHON_TRUE@ cp $(DEPDIR)/audio_alsa.Std $(DEPDIR)/audio_alsa.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/audio_alsa.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_alsa.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_alsa.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_alsa.Std +@PYTHON_TRUE@ touch $(DEPDIR)/audio_alsa-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/audio_alsa.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_alsa.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-audio-jack/Makefile.in b/gr-audio-jack/Makefile.in index 220d6071..78df75ce 100644 --- a/gr-audio-jack/Makefile.in +++ b/gr-audio-jack/Makefile.in @@ -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 # @@ -78,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(dist_etc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common +DIST_COMMON = $(dist_etc_DATA) $(dist_pkgconfig_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/gnuradio-audio-jack.pc.in \ + $(top_srcdir)/Makefile.common subdir = gr-audio-jack ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -93,36 +95,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 \ @@ -136,9 +141,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 \ @@ -159,7 +161,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 = +CONFIG_CLEAN_FILES = gnuradio-audio-jack.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -191,8 +193,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(etcdir)" -DATA = $(dist_etc_DATA) +am__installdirs = "$(DESTDIR)$(etcdir)" "$(DESTDIR)$(pkgconfigdir)" +DATA = $(dist_etc_DATA) $(dist_pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -246,6 +248,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@ @@ -253,6 +256,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@ @@ -271,6 +278,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -280,20 +288,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@ @@ -316,6 +327,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@ @@ -377,6 +390,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@ @@ -389,17 +403,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@ @@ -415,7 +429,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@ @@ -467,6 +480,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@ @@ -497,6 +515,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@ @@ -518,6 +541,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@ @@ -600,26 +633,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@ @@ -650,7 +668,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@ @@ -660,23 +677,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 @@ -688,7 +708,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, @@ -696,10 +716,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@ @@ -715,18 +731,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@ @@ -741,21 +745,25 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT SUBDIRS = src -etcdir = $(gr_sysconfdir) +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-audio-jack.pc +etcdir = $(gr_prefsdir) dist_etc_DATA = gr-audio-jack.conf all: all-recursive @@ -790,6 +798,8 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +gnuradio-audio-jack.pc: $(top_builddir)/config.status $(srcdir)/gnuradio-audio-jack.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -816,6 +826,26 @@ uninstall-dist_etcDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(etcdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(etcdir)" && rm -f $$files +install-dist_pkgconfigDATA: $(dist_pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-dist_pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -1018,7 +1048,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(etcdir)"; do \ + for dir in "$(DESTDIR)$(etcdir)" "$(DESTDIR)$(pkgconfigdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1067,7 +1097,7 @@ info: info-recursive info-am: -install-data-am: install-dist_etcDATA +install-data-am: install-dist_etcDATA install-dist_pkgconfigDATA install-dvi: install-dvi-recursive @@ -1111,7 +1141,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_etcDATA +uninstall-am: uninstall-dist_etcDATA uninstall-dist_pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1121,15 +1151,16 @@ uninstall-am: uninstall-dist_etcDATA ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dist_etcDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_etcDATA + install-data-am install-dist_etcDATA \ + install-dist_pkgconfigDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-dist_etcDATA uninstall-dist_pkgconfigDATA # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gr-audio-jack/src/Makefile.in b/gr-audio-jack/src/Makefile.in index 4bfc9d80..c5ffa36b 100644 --- a/gr-audio-jack/src/Makefile.in +++ b/gr-audio-jack/src/Makefile.in @@ -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 # @@ -125,12 +125,14 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(audio_jack_python_PYTHON) \ - $(audio_jack_swiginclude_HEADERS) $(grinclude_HEADERS) \ - $(noinst_HEADERS) $(noinst_PYTHON) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ - $(srcdir)/run_tests.in $(top_srcdir)/Makefile.common \ - $(top_srcdir)/Makefile.swig +DIST_COMMON = $(am__audio_jack_python_PYTHON_DIST) \ + $(am__audio_jack_swiginclude_HEADERS_DIST) \ + $(grinclude_HEADERS) $(noinst_HEADERS) $(noinst_PYTHON) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \ + $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/audio_jack-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-audio-jack/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -144,36 +146,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 \ @@ -187,9 +192,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 \ @@ -234,23 +236,31 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(audio_jack_pylibdir)" \ - "$(DESTDIR)$(audio_jack_pythondir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_jack_pythondir)" \ "$(DESTDIR)$(audio_jack_swigincludedir)" \ "$(DESTDIR)$(grincludedir)" -LTLIBRARIES = $(audio_jack_pylib_LTLIBRARIES) +LTLIBRARIES = $(audio_jack_pylib_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -_audio_jack_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__objects_1 = _audio_jack_la-audio_jack_sink.lo \ - _audio_jack_la-audio_jack_source.lo _audio_jack_la-gri_jack.lo -am__audio_jack_la_OBJECTS = _audio_jack_la-audio_jack.lo \ - $(am__objects_1) +@PYTHON_TRUE@_audio_jack_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(audio_jack_la_swig_libadd) +am___audio_jack_la_SOURCES_DIST = audio_jack.cc +@PYTHON_TRUE@am__audio_jack_la_OBJECTS = _audio_jack_la-audio_jack.lo _audio_jack_la_OBJECTS = $(am__audio_jack_la_OBJECTS) _audio_jack_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_audio_jack_la_CXXFLAGS) $(CXXFLAGS) \ $(_audio_jack_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__audio_jack_la_rpath = -rpath $(audio_jack_pylibdir) +libgnuradio_audio_jack_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_libgnuradio_audio_jack_la_OBJECTS = audio_jack_sink.lo \ + audio_jack_source.lo gri_jack.lo +libgnuradio_audio_jack_la_OBJECTS = \ + $(am_libgnuradio_audio_jack_la_OBJECTS) +libgnuradio_audio_jack_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(libgnuradio_audio_jack_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -264,9 +274,13 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_audio_jack_la_SOURCES) -DIST_SOURCES = $(_audio_jack_la_SOURCES) +SOURCES = $(_audio_jack_la_SOURCES) \ + $(libgnuradio_audio_jack_la_SOURCES) +DIST_SOURCES = $(am___audio_jack_la_SOURCES_DIST) \ + $(libgnuradio_audio_jack_la_SOURCES) +am__audio_jack_python_PYTHON_DIST = audio_jack.py py_compile = $(top_srcdir)/py-compile +am__audio_jack_swiginclude_HEADERS_DIST = audio_jack.i HEADERS = $(audio_jack_swiginclude_HEADERS) $(grinclude_HEADERS) \ $(noinst_HEADERS) ETAGS = etags @@ -293,6 +307,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@ @@ -300,6 +315,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@ @@ -318,6 +337,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -327,20 +347,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@ @@ -363,6 +386,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@ @@ -424,6 +449,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@ @@ -436,17 +462,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@ @@ -462,7 +488,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@ @@ -514,6 +539,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@ @@ -544,6 +574,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@ @@ -565,6 +600,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@ @@ -647,26 +692,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@ @@ -697,7 +727,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@ @@ -707,23 +736,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 @@ -735,7 +767,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, @@ -743,10 +775,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@ @@ -762,18 +790,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@ @@ -788,23 +804,23 @@ 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 = $(DEPDIR)/audio_jack-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) EXTRA_DIST = run_tests.in -TESTS = run_tests -DISTCLEANFILES = run_tests # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -814,6 +830,17 @@ grinclude_HEADERS = \ noinst_HEADERS = \ gri_jack.h +lib_LTLIBRARIES = libgnuradio-audio-jack.la +libgnuradio_audio_jack_la_SOURCES = \ + audio_jack_sink.cc \ + audio_jack_source.cc \ + gri_jack.cc + +libgnuradio_audio_jack_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + $(JACK_LIBS) + +libgnuradio_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) noinst_PYTHON = \ qa_jack.py @@ -821,92 +848,86 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) ################################### # SWIG Python interface and library -TOP_SWIG_IFILES = \ - audio_jack.i +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@DISTCLEANFILES = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ audio_jack.i # Install so that they end up available as: # import gnuradio.audio_jack # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -audio_jack_pythondir_category = \ - gnuradio - - -# additional sources for the SWIG-generated library -audio_jack_la_swig_sources = \ - audio_jack_sink.cc \ - audio_jack_source.cc \ - gri_jack.cc +@PYTHON_TRUE@audio_jack_pythondir_category = \ +@PYTHON_TRUE@ gnuradio # additional libraries for linking with the SWIG-generated library -audio_jack_la_swig_libadd = \ - $(GNURADIO_CORE_LA) \ - $(JACK_LIBS) - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = audio_jack.py audio_jack.cc -audio_jack_pythondir = $(pythondir)/$(audio_jack_pythondir_category) -audio_jack_pylibdir = $(pyexecdir)/$(audio_jack_pylibdir_category) -audio_jack_swigincludedir = $(swigincludedir) -audio_jack_swiginclude_HEADERS = \ - audio_jack.i \ - $(audio_jack_swiginclude_headers) - -audio_jack_pylib_LTLIBRARIES = \ - _audio_jack.la - -_audio_jack_la_SOURCES = \ - audio_jack.cc \ - $(audio_jack_la_swig_sources) - -_audio_jack_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(audio_jack_la_swig_libadd) - -_audio_jack_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(audio_jack_la_swig_ldflags) - -_audio_jack_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(audio_jack_la_swig_cxxflags) - -audio_jack_python_PYTHON = \ - audio_jack.py \ - $(audio_jack_python) +@PYTHON_TRUE@audio_jack_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-audio-jack.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = audio_jack.py audio_jack.cc +@PYTHON_TRUE@audio_jack_pythondir = $(pythondir)/$(audio_jack_pythondir_category) +@PYTHON_TRUE@audio_jack_pylibdir = $(pyexecdir)/$(audio_jack_pylibdir_category) +@PYTHON_TRUE@audio_jack_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@audio_jack_swiginclude_HEADERS = \ +@PYTHON_TRUE@ audio_jack.i \ +@PYTHON_TRUE@ $(audio_jack_swiginclude_headers) + +@PYTHON_TRUE@audio_jack_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _audio_jack.la + +@PYTHON_TRUE@_audio_jack_la_SOURCES = \ +@PYTHON_TRUE@ audio_jack.cc \ +@PYTHON_TRUE@ $(audio_jack_la_swig_sources) + +@PYTHON_TRUE@_audio_jack_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(audio_jack_la_swig_libadd) + +@PYTHON_TRUE@_audio_jack_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(audio_jack_la_swig_ldflags) + +@PYTHON_TRUE@_audio_jack_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(audio_jack_la_swig_cxxflags) + +@PYTHON_TRUE@audio_jack_python_PYTHON = \ +@PYTHON_TRUE@ audio_jack.py \ +@PYTHON_TRUE@ $(audio_jack_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -975,8 +996,41 @@ clean-audio_jack_pylibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done _audio_jack.la: $(_audio_jack_la_OBJECTS) $(_audio_jack_la_DEPENDENCIES) - $(_audio_jack_la_LINK) -rpath $(audio_jack_pylibdir) $(_audio_jack_la_OBJECTS) $(_audio_jack_la_LIBADD) $(LIBS) + $(_audio_jack_la_LINK) $(am__audio_jack_la_rpath) $(_audio_jack_la_OBJECTS) $(_audio_jack_la_LIBADD) $(LIBS) +libgnuradio-audio-jack.la: $(libgnuradio_audio_jack_la_OBJECTS) $(libgnuradio_audio_jack_la_DEPENDENCIES) + $(libgnuradio_audio_jack_la_LINK) -rpath $(libdir) $(libgnuradio_audio_jack_la_OBJECTS) $(libgnuradio_audio_jack_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -985,9 +1039,9 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_jack_la-audio_jack.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_jack_la-audio_jack_sink.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_jack_la-audio_jack_source.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_jack_la-gri_jack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_jack_sink.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_jack_source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gri_jack.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1017,27 +1071,6 @@ _audio_jack_la-audio_jack.lo: audio_jack.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_jack_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_jack_la-audio_jack.lo `test -f 'audio_jack.cc' || echo '$(srcdir)/'`audio_jack.cc -_audio_jack_la-audio_jack_sink.lo: audio_jack_sink.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_jack_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_jack_la-audio_jack_sink.lo -MD -MP -MF $(DEPDIR)/_audio_jack_la-audio_jack_sink.Tpo -c -o _audio_jack_la-audio_jack_sink.lo `test -f 'audio_jack_sink.cc' || echo '$(srcdir)/'`audio_jack_sink.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_jack_la-audio_jack_sink.Tpo $(DEPDIR)/_audio_jack_la-audio_jack_sink.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_jack_sink.cc' object='_audio_jack_la-audio_jack_sink.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_jack_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_jack_la-audio_jack_sink.lo `test -f 'audio_jack_sink.cc' || echo '$(srcdir)/'`audio_jack_sink.cc - -_audio_jack_la-audio_jack_source.lo: audio_jack_source.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_jack_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_jack_la-audio_jack_source.lo -MD -MP -MF $(DEPDIR)/_audio_jack_la-audio_jack_source.Tpo -c -o _audio_jack_la-audio_jack_source.lo `test -f 'audio_jack_source.cc' || echo '$(srcdir)/'`audio_jack_source.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_jack_la-audio_jack_source.Tpo $(DEPDIR)/_audio_jack_la-audio_jack_source.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_jack_source.cc' object='_audio_jack_la-audio_jack_source.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_jack_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_jack_la-audio_jack_source.lo `test -f 'audio_jack_source.cc' || echo '$(srcdir)/'`audio_jack_source.cc - -_audio_jack_la-gri_jack.lo: gri_jack.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_jack_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_jack_la-gri_jack.lo -MD -MP -MF $(DEPDIR)/_audio_jack_la-gri_jack.Tpo -c -o _audio_jack_la-gri_jack.lo `test -f 'gri_jack.cc' || echo '$(srcdir)/'`gri_jack.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_jack_la-gri_jack.Tpo $(DEPDIR)/_audio_jack_la-gri_jack.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='gri_jack.cc' object='_audio_jack_la-gri_jack.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_jack_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_jack_la-gri_jack.lo `test -f 'gri_jack.cc' || echo '$(srcdir)/'`gri_jack.cc - mostlyclean-libtool: -rm -f *.lo @@ -1305,7 +1338,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(audio_jack_pylibdir)" "$(DESTDIR)$(audio_jack_pythondir)" "$(DESTDIR)$(audio_jack_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ + for dir in "$(DESTDIR)$(audio_jack_pylibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_jack_pythondir)" "$(DESTDIR)$(audio_jack_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1340,7 +1373,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-audio_jack_pylibLTLIBRARIES clean-generic \ - clean-libtool mostlyclean-am + clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1368,7 +1401,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-am @@ -1411,30 +1444,31 @@ ps-am: uninstall-am: uninstall-audio_jack_pylibLTLIBRARIES \ uninstall-audio_jack_pythonPYTHON \ uninstall-audio_jack_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES .MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-audio_jack_pylibLTLIBRARIES clean-generic clean-libtool \ - ctags dist-hook distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ - install-audio_jack_pylibLTLIBRARIES \ + clean-audio_jack_pylibLTLIBRARIES clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-audio_jack_pylibLTLIBRARIES \ install-audio_jack_pythonPYTHON \ install-audio_jack_swigincludeHEADERS install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-grincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am \ uninstall-audio_jack_pylibLTLIBRARIES \ uninstall-audio_jack_pythonPYTHON \ uninstall-audio_jack_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1447,75 +1481,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -audio_jack_pythondir_category ?= gnuradio/audio_jack -audio_jack_pylibdir_category ?= $(audio_jack_pythondir_category) - -audio_jack.h audio_jack.py audio_jack.cc: audio_jack.i - trap 'rm -rf $(DEPDIR)/audio_jack-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/audio_jack-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/audio_jack-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_jack-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/audio_jack-generate-lock; \ - else \ - while test -d $(DEPDIR)/audio_jack-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/audio_jack-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/audio_jack-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_jack_swig_args) \ - -MD -MF $(DEPDIR)/audio_jack.Std \ - -module audio_jack -o audio_jack.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_jack.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_jack.Std \ - > $(DEPDIR)/audio_jack.Sd; \ - $(RM) $(DEPDIR)/audio_jack.Std; \ - $(MV) $(DEPDIR)/audio_jack.Sd $(DEPDIR)/audio_jack.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/audio_jack.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/audio_jack.d - cp $(DEPDIR)/audio_jack.Std $(DEPDIR)/audio_jack.d - echo "" >> $(DEPDIR)/audio_jack.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_jack.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_jack.d - $(RM) $(DEPDIR)/audio_jack.Std - touch $(DEPDIR)/audio_jack-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@audio_jack_pythondir_category ?= gnuradio/audio_jack +@PYTHON_TRUE@audio_jack_pylibdir_category ?= $(audio_jack_pythondir_category) + +@PYTHON_TRUE@audio_jack.h audio_jack.py audio_jack.cc: audio_jack.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/audio_jack-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/audio_jack-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/audio_jack-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_jack-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/audio_jack-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/audio_jack-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/audio_jack-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/audio_jack-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_jack_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/audio_jack.Std \ +@PYTHON_TRUE@ -module audio_jack -o audio_jack.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_jack.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_jack.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/audio_jack.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_jack.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/audio_jack.Sd $(DEPDIR)/audio_jack.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_jack.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_jack.d +@PYTHON_TRUE@ cp $(DEPDIR)/audio_jack.Std $(DEPDIR)/audio_jack.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/audio_jack.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_jack.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_jack.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_jack.Std +@PYTHON_TRUE@ touch $(DEPDIR)/audio_jack-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/audio_jack.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_jack.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-audio-oss/Makefile.in b/gr-audio-oss/Makefile.in index baca32e0..c52480c5 100644 --- a/gr-audio-oss/Makefile.in +++ b/gr-audio-oss/Makefile.in @@ -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 # @@ -78,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(dist_etc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common +DIST_COMMON = $(dist_etc_DATA) $(dist_pkgconfig_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/gnuradio-audio-oss.pc.in \ + $(top_srcdir)/Makefile.common subdir = gr-audio-oss ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -93,36 +95,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 \ @@ -136,9 +141,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 \ @@ -159,7 +161,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 = +CONFIG_CLEAN_FILES = gnuradio-audio-oss.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -191,8 +193,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(etcdir)" -DATA = $(dist_etc_DATA) +am__installdirs = "$(DESTDIR)$(etcdir)" "$(DESTDIR)$(pkgconfigdir)" +DATA = $(dist_etc_DATA) $(dist_pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -246,6 +248,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@ @@ -253,6 +256,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@ @@ -271,6 +278,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -280,20 +288,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@ @@ -316,6 +327,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@ @@ -377,6 +390,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@ @@ -389,17 +403,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@ @@ -415,7 +429,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@ @@ -467,6 +480,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@ @@ -497,6 +515,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@ @@ -518,6 +541,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@ @@ -600,26 +633,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@ @@ -650,7 +668,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@ @@ -660,23 +677,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 @@ -688,7 +708,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, @@ -696,10 +716,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@ @@ -715,18 +731,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@ @@ -741,21 +745,25 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT SUBDIRS = src -etcdir = $(gr_sysconfdir) +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-audio-oss.pc +etcdir = $(gr_prefsdir) dist_etc_DATA = gr-audio-oss.conf all: all-recursive @@ -790,6 +798,8 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +gnuradio-audio-oss.pc: $(top_builddir)/config.status $(srcdir)/gnuradio-audio-oss.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -816,6 +826,26 @@ uninstall-dist_etcDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(etcdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(etcdir)" && rm -f $$files +install-dist_pkgconfigDATA: $(dist_pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-dist_pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -1018,7 +1048,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(etcdir)"; do \ + for dir in "$(DESTDIR)$(etcdir)" "$(DESTDIR)$(pkgconfigdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1067,7 +1097,7 @@ info: info-recursive info-am: -install-data-am: install-dist_etcDATA +install-data-am: install-dist_etcDATA install-dist_pkgconfigDATA install-dvi: install-dvi-recursive @@ -1111,7 +1141,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_etcDATA +uninstall-am: uninstall-dist_etcDATA uninstall-dist_pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1121,15 +1151,16 @@ uninstall-am: uninstall-dist_etcDATA ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dist_etcDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_etcDATA + install-data-am install-dist_etcDATA \ + install-dist_pkgconfigDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-dist_etcDATA uninstall-dist_pkgconfigDATA # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gr-audio-oss/src/Makefile.in b/gr-audio-oss/src/Makefile.in index e8358bf3..9b572174 100644 --- a/gr-audio-oss/src/Makefile.in +++ b/gr-audio-oss/src/Makefile.in @@ -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 # @@ -125,11 +125,13 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(audio_oss_python_PYTHON) \ - $(audio_oss_swiginclude_HEADERS) $(grinclude_HEADERS) \ +DIST_COMMON = $(am__audio_oss_python_PYTHON_DIST) \ + $(am__audio_oss_swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ $(noinst_PYTHON) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \ $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/audio_oss-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-audio-oss/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -143,36 +145,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 \ @@ -186,9 +191,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 \ @@ -233,21 +235,30 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(audio_oss_pylibdir)" \ - "$(DESTDIR)$(audio_oss_pythondir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_oss_pythondir)" \ "$(DESTDIR)$(audio_oss_swigincludedir)" \ "$(DESTDIR)$(grincludedir)" -LTLIBRARIES = $(audio_oss_pylib_LTLIBRARIES) +LTLIBRARIES = $(audio_oss_pylib_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -_audio_oss_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__objects_1 = _audio_oss_la-audio_oss_sink.lo \ - _audio_oss_la-audio_oss_source.lo -am__audio_oss_la_OBJECTS = _audio_oss_la-audio_oss.lo $(am__objects_1) +@PYTHON_TRUE@_audio_oss_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(audio_oss_la_swig_libadd) +am___audio_oss_la_SOURCES_DIST = audio_oss.cc +@PYTHON_TRUE@am__audio_oss_la_OBJECTS = _audio_oss_la-audio_oss.lo _audio_oss_la_OBJECTS = $(am__audio_oss_la_OBJECTS) _audio_oss_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(_audio_oss_la_CXXFLAGS) \ $(CXXFLAGS) $(_audio_oss_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__audio_oss_la_rpath = -rpath $(audio_oss_pylibdir) +libgnuradio_audio_oss_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_libgnuradio_audio_oss_la_OBJECTS = audio_oss_sink.lo \ + audio_oss_source.lo +libgnuradio_audio_oss_la_OBJECTS = \ + $(am_libgnuradio_audio_oss_la_OBJECTS) +libgnuradio_audio_oss_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libgnuradio_audio_oss_la_LDFLAGS) \ + $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -261,9 +272,12 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_audio_oss_la_SOURCES) -DIST_SOURCES = $(_audio_oss_la_SOURCES) +SOURCES = $(_audio_oss_la_SOURCES) $(libgnuradio_audio_oss_la_SOURCES) +DIST_SOURCES = $(am___audio_oss_la_SOURCES_DIST) \ + $(libgnuradio_audio_oss_la_SOURCES) +am__audio_oss_python_PYTHON_DIST = audio_oss.py py_compile = $(top_srcdir)/py-compile +am__audio_oss_swiginclude_HEADERS_DIST = audio_oss.i HEADERS = $(audio_oss_swiginclude_HEADERS) $(grinclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -289,6 +303,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@ @@ -296,6 +311,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@ @@ -314,6 +333,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -323,20 +343,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@ @@ -359,6 +382,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@ @@ -420,6 +445,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@ @@ -432,17 +458,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@ @@ -458,7 +484,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@ @@ -510,6 +535,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@ @@ -540,6 +570,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@ @@ -561,6 +596,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@ @@ -643,26 +688,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@ @@ -693,7 +723,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@ @@ -703,23 +732,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 @@ -731,7 +763,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, @@ -739,10 +771,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@ @@ -758,18 +786,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@ @@ -784,23 +800,24 @@ 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 = $(DEPDIR)/audio_oss-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) EXTRA_DIST = run_tests.in -TESTS = run_tests -DISTCLEANFILES = run_tests # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -808,95 +825,99 @@ grinclude_HEADERS = \ audio_oss_source.h noinst_PYTHON = qa_oss.py -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +lib_LTLIBRARIES = libgnuradio-audio-oss.la +libgnuradio_audio_oss_la_SOURCES = \ + audio_oss_sink.cc \ + audio_oss_source.cc + +libgnuradio_audio_oss_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + $(OSS_LIBS) + +libgnuradio_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) ################################### # SWIG Python interface and library -TOP_SWIG_IFILES = \ - audio_oss.i +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@DISTCLEANFILES = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ audio_oss.i # Install so that they end up available as: # import gnuradio.audio_oss # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -audio_oss_pythondir_category = \ - gnuradio - - -# additional sources for the SWIG-generated library -audio_oss_la_swig_sources = \ - audio_oss_sink.cc \ - audio_oss_source.cc +@PYTHON_TRUE@audio_oss_pythondir_category = \ +@PYTHON_TRUE@ gnuradio # additional libraries for linking with the SWIG-generated library -audio_oss_la_swig_libadd = \ - $(GNURADIO_CORE_LA) \ - $(OSS_LIBS) - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = audio_oss.py audio_oss.cc -audio_oss_pythondir = $(pythondir)/$(audio_oss_pythondir_category) -audio_oss_pylibdir = $(pyexecdir)/$(audio_oss_pylibdir_category) -audio_oss_swigincludedir = $(swigincludedir) -audio_oss_swiginclude_HEADERS = \ - audio_oss.i \ - $(audio_oss_swiginclude_headers) - -audio_oss_pylib_LTLIBRARIES = \ - _audio_oss.la - -_audio_oss_la_SOURCES = \ - audio_oss.cc \ - $(audio_oss_la_swig_sources) - -_audio_oss_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(audio_oss_la_swig_libadd) - -_audio_oss_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(audio_oss_la_swig_ldflags) - -_audio_oss_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(audio_oss_la_swig_cxxflags) - -audio_oss_python_PYTHON = \ - audio_oss.py \ - $(audio_oss_python) +@PYTHON_TRUE@audio_oss_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-audio-oss.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = audio_oss.py audio_oss.cc +@PYTHON_TRUE@audio_oss_pythondir = $(pythondir)/$(audio_oss_pythondir_category) +@PYTHON_TRUE@audio_oss_pylibdir = $(pyexecdir)/$(audio_oss_pylibdir_category) +@PYTHON_TRUE@audio_oss_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@audio_oss_swiginclude_HEADERS = \ +@PYTHON_TRUE@ audio_oss.i \ +@PYTHON_TRUE@ $(audio_oss_swiginclude_headers) + +@PYTHON_TRUE@audio_oss_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _audio_oss.la + +@PYTHON_TRUE@_audio_oss_la_SOURCES = \ +@PYTHON_TRUE@ audio_oss.cc \ +@PYTHON_TRUE@ $(audio_oss_la_swig_sources) + +@PYTHON_TRUE@_audio_oss_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(audio_oss_la_swig_libadd) + +@PYTHON_TRUE@_audio_oss_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(audio_oss_la_swig_ldflags) + +@PYTHON_TRUE@_audio_oss_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(audio_oss_la_swig_cxxflags) + +@PYTHON_TRUE@audio_oss_python_PYTHON = \ +@PYTHON_TRUE@ audio_oss.py \ +@PYTHON_TRUE@ $(audio_oss_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -965,8 +986,41 @@ clean-audio_oss_pylibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done _audio_oss.la: $(_audio_oss_la_OBJECTS) $(_audio_oss_la_DEPENDENCIES) - $(_audio_oss_la_LINK) -rpath $(audio_oss_pylibdir) $(_audio_oss_la_OBJECTS) $(_audio_oss_la_LIBADD) $(LIBS) + $(_audio_oss_la_LINK) $(am__audio_oss_la_rpath) $(_audio_oss_la_OBJECTS) $(_audio_oss_la_LIBADD) $(LIBS) +libgnuradio-audio-oss.la: $(libgnuradio_audio_oss_la_OBJECTS) $(libgnuradio_audio_oss_la_DEPENDENCIES) + $(libgnuradio_audio_oss_la_LINK) -rpath $(libdir) $(libgnuradio_audio_oss_la_OBJECTS) $(libgnuradio_audio_oss_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -975,8 +1029,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_oss_la-audio_oss.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_oss_la-audio_oss_sink.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_oss_la-audio_oss_source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_oss_sink.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_oss_source.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1006,20 +1060,6 @@ _audio_oss_la-audio_oss.lo: audio_oss.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_oss_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_oss_la-audio_oss.lo `test -f 'audio_oss.cc' || echo '$(srcdir)/'`audio_oss.cc -_audio_oss_la-audio_oss_sink.lo: audio_oss_sink.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_oss_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_oss_la-audio_oss_sink.lo -MD -MP -MF $(DEPDIR)/_audio_oss_la-audio_oss_sink.Tpo -c -o _audio_oss_la-audio_oss_sink.lo `test -f 'audio_oss_sink.cc' || echo '$(srcdir)/'`audio_oss_sink.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_oss_la-audio_oss_sink.Tpo $(DEPDIR)/_audio_oss_la-audio_oss_sink.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_oss_sink.cc' object='_audio_oss_la-audio_oss_sink.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_oss_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_oss_la-audio_oss_sink.lo `test -f 'audio_oss_sink.cc' || echo '$(srcdir)/'`audio_oss_sink.cc - -_audio_oss_la-audio_oss_source.lo: audio_oss_source.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_oss_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_oss_la-audio_oss_source.lo -MD -MP -MF $(DEPDIR)/_audio_oss_la-audio_oss_source.Tpo -c -o _audio_oss_la-audio_oss_source.lo `test -f 'audio_oss_source.cc' || echo '$(srcdir)/'`audio_oss_source.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_oss_la-audio_oss_source.Tpo $(DEPDIR)/_audio_oss_la-audio_oss_source.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_oss_source.cc' object='_audio_oss_la-audio_oss_source.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_oss_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_oss_la-audio_oss_source.lo `test -f 'audio_oss_source.cc' || echo '$(srcdir)/'`audio_oss_source.cc - mostlyclean-libtool: -rm -f *.lo @@ -1287,7 +1327,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(audio_oss_pylibdir)" "$(DESTDIR)$(audio_oss_pythondir)" "$(DESTDIR)$(audio_oss_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ + for dir in "$(DESTDIR)$(audio_oss_pylibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_oss_pythondir)" "$(DESTDIR)$(audio_oss_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1321,8 +1361,8 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-audio_oss_pylibLTLIBRARIES clean-generic clean-libtool \ - mostlyclean-am +clean-am: clean-audio_oss_pylibLTLIBRARIES clean-generic \ + clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1350,7 +1390,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-am @@ -1393,30 +1433,31 @@ ps-am: uninstall-am: uninstall-audio_oss_pylibLTLIBRARIES \ uninstall-audio_oss_pythonPYTHON \ uninstall-audio_oss_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES .MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-audio_oss_pylibLTLIBRARIES clean-generic clean-libtool \ - ctags dist-hook distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ - install-audio_oss_pylibLTLIBRARIES \ + clean-audio_oss_pylibLTLIBRARIES clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-audio_oss_pylibLTLIBRARIES \ install-audio_oss_pythonPYTHON \ install-audio_oss_swigincludeHEADERS install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-grincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am \ uninstall-audio_oss_pylibLTLIBRARIES \ uninstall-audio_oss_pythonPYTHON \ uninstall-audio_oss_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1429,75 +1470,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -audio_oss_pythondir_category ?= gnuradio/audio_oss -audio_oss_pylibdir_category ?= $(audio_oss_pythondir_category) - -audio_oss.h audio_oss.py audio_oss.cc: audio_oss.i - trap 'rm -rf $(DEPDIR)/audio_oss-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/audio_oss-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/audio_oss-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_oss-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/audio_oss-generate-lock; \ - else \ - while test -d $(DEPDIR)/audio_oss-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/audio_oss-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/audio_oss-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_oss_swig_args) \ - -MD -MF $(DEPDIR)/audio_oss.Std \ - -module audio_oss -o audio_oss.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_oss.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss.Std \ - > $(DEPDIR)/audio_oss.Sd; \ - $(RM) $(DEPDIR)/audio_oss.Std; \ - $(MV) $(DEPDIR)/audio_oss.Sd $(DEPDIR)/audio_oss.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/audio_oss.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/audio_oss.d - cp $(DEPDIR)/audio_oss.Std $(DEPDIR)/audio_oss.d - echo "" >> $(DEPDIR)/audio_oss.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_oss.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_oss.d - $(RM) $(DEPDIR)/audio_oss.Std - touch $(DEPDIR)/audio_oss-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@audio_oss_pythondir_category ?= gnuradio/audio_oss +@PYTHON_TRUE@audio_oss_pylibdir_category ?= $(audio_oss_pythondir_category) + +@PYTHON_TRUE@audio_oss.h audio_oss.py audio_oss.cc: audio_oss.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/audio_oss-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/audio_oss-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/audio_oss-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_oss-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/audio_oss-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/audio_oss-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/audio_oss-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/audio_oss-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_oss_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/audio_oss.Std \ +@PYTHON_TRUE@ -module audio_oss -o audio_oss.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_oss.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/audio_oss.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_oss.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/audio_oss.Sd $(DEPDIR)/audio_oss.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_oss.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_oss.d +@PYTHON_TRUE@ cp $(DEPDIR)/audio_oss.Std $(DEPDIR)/audio_oss.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/audio_oss.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_oss.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_oss.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_oss.Std +@PYTHON_TRUE@ touch $(DEPDIR)/audio_oss-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/audio_oss.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_oss.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-audio-osx/Makefile.in b/gr-audio-osx/Makefile.in index aa9881ad..8aa53063 100644 --- a/gr-audio-osx/Makefile.in +++ b/gr-audio-osx/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = diff --git a/gr-audio-osx/src/Makefile.in b/gr-audio-osx/src/Makefile.in index 8796eb42..d498eee5 100644 --- a/gr-audio-osx/src/Makefile.in +++ b/gr-audio-osx/src/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2006,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio. # @@ -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 # @@ -125,12 +125,14 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(audio_osx_python_PYTHON) \ - $(audio_osx_swiginclude_HEADERS) $(grinclude_HEADERS) \ +DIST_COMMON = $(am__audio_osx_python_PYTHON_DIST) \ + $(am__audio_osx_swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ $(noinst_HEADERS) $(noinst_PYTHON) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ $(srcdir)/run_tests.in $(top_srcdir)/Makefile.common \ $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/audio_osx-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-audio-osx/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -144,36 +146,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 \ @@ -187,9 +192,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 \ @@ -234,21 +236,29 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(audio_osx_pylibdir)" \ - "$(DESTDIR)$(audio_osx_pythondir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_osx_pythondir)" \ "$(DESTDIR)$(audio_osx_swigincludedir)" \ "$(DESTDIR)$(grincludedir)" -LTLIBRARIES = $(audio_osx_pylib_LTLIBRARIES) +LTLIBRARIES = $(audio_osx_pylib_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -_audio_osx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__objects_1 = _audio_osx_la-audio_osx_sink.lo \ - _audio_osx_la-audio_osx_source.lo -am__audio_osx_la_OBJECTS = _audio_osx_la-audio_osx.lo $(am__objects_1) +@PYTHON_TRUE@_audio_osx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(audio_osx_la_swig_libadd) +am___audio_osx_la_SOURCES_DIST = audio_osx.cc +@PYTHON_TRUE@am__audio_osx_la_OBJECTS = _audio_osx_la-audio_osx.lo _audio_osx_la_OBJECTS = $(am__audio_osx_la_OBJECTS) _audio_osx_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(_audio_osx_la_CXXFLAGS) \ $(CXXFLAGS) $(_audio_osx_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__audio_osx_la_rpath = -rpath $(audio_osx_pylibdir) +libgnuradio_audio_osx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_libgnuradio_audio_osx_la_OBJECTS = audio_osx_sink.lo \ + audio_osx_source.lo +libgnuradio_audio_osx_la_OBJECTS = \ + $(am_libgnuradio_audio_osx_la_OBJECTS) +libgnuradio_audio_osx_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libgnuradio_audio_osx_la_LDFLAGS) \ + $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -262,9 +272,12 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_audio_osx_la_SOURCES) -DIST_SOURCES = $(_audio_osx_la_SOURCES) +SOURCES = $(_audio_osx_la_SOURCES) $(libgnuradio_audio_osx_la_SOURCES) +DIST_SOURCES = $(am___audio_osx_la_SOURCES_DIST) \ + $(libgnuradio_audio_osx_la_SOURCES) +am__audio_osx_python_PYTHON_DIST = audio_osx.py py_compile = $(top_srcdir)/py-compile +am__audio_osx_swiginclude_HEADERS_DIST = audio_osx.i HEADERS = $(audio_osx_swiginclude_HEADERS) $(grinclude_HEADERS) \ $(noinst_HEADERS) ETAGS = etags @@ -291,6 +304,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@ @@ -298,6 +312,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@ @@ -316,6 +334,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -325,20 +344,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@ @@ -361,6 +383,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@ @@ -422,6 +446,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@ @@ -434,17 +459,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@ @@ -460,7 +485,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@ @@ -512,6 +536,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@ @@ -542,6 +571,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@ @@ -563,6 +597,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@ @@ -645,26 +689,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@ @@ -695,7 +724,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@ @@ -705,23 +733,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 @@ -733,7 +764,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, @@ -741,10 +772,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@ @@ -760,18 +787,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@ @@ -786,23 +801,23 @@ 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 = $(DEPDIR)/audio_osx-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) EXTRA_DIST = run_tests.in -TESTS = run_tests -DISTCLEANFILES = run_tests AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) # C/C++ headers get installed in ${prefix}/include/gnuradio @@ -812,107 +827,110 @@ grinclude_HEADERS = \ noinst_HEADERS = \ audio_osx.h \ - circular_buffer.h \ - mld_threads.h + circular_buffer.h noinst_PYTHON = \ qa_osx.py \ test_audio_loop.py +lib_LTLIBRARIES = libgnuradio-audio-osx.la +libgnuradio_audio_osx_la_SOURCES = \ + audio_osx_sink.cc \ + audio_osx_source.cc + +libgnuradio_audio_osx_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_audio_osx_la_LDFLAGS = \ + -framework AudioUnit \ + -framework CoreAudio \ + -framework AudioToolbox \ + $(NO_UNDEFINED) \ + $(LTVERSIONFLAGS) + ################################### # SWIG Python interface and library -TOP_SWIG_IFILES = \ - audio_osx.i +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@DISTCLEANFILES = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ audio_osx.i # Install so that they end up available as: # import gnuradio.audio_osx # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -audio_osx_pythondir_category = \ - gnuradio - - -# additional sources for the SWIG-generated library -audio_osx_la_swig_sources = \ - audio_osx_sink.cc \ - audio_osx_source.cc +@PYTHON_TRUE@audio_osx_pythondir_category = \ +@PYTHON_TRUE@ gnuradio # additional libraries for linking with the SWIG-generated library -audio_osx_la_swig_libadd = \ - $(GNURADIO_CORE_LA) - - -# additional LD flags for linking the SWIG-generated library -audio_osx_la_swig_ldflags = \ - -framework AudioUnit \ - -framework CoreAudio \ - -framework AudioToolbox - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = audio_osx.py audio_osx.cc -audio_osx_pythondir = $(pythondir)/$(audio_osx_pythondir_category) -audio_osx_pylibdir = $(pyexecdir)/$(audio_osx_pylibdir_category) -audio_osx_swigincludedir = $(swigincludedir) -audio_osx_swiginclude_HEADERS = \ - audio_osx.i \ - $(audio_osx_swiginclude_headers) - -audio_osx_pylib_LTLIBRARIES = \ - _audio_osx.la - -_audio_osx_la_SOURCES = \ - audio_osx.cc \ - $(audio_osx_la_swig_sources) - -_audio_osx_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(audio_osx_la_swig_libadd) - -_audio_osx_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(audio_osx_la_swig_ldflags) - -_audio_osx_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(audio_osx_la_swig_cxxflags) - -audio_osx_python_PYTHON = \ - audio_osx.py \ - $(audio_osx_python) +@PYTHON_TRUE@audio_osx_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-audio-osx.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = audio_osx.py audio_osx.cc +@PYTHON_TRUE@audio_osx_pythondir = $(pythondir)/$(audio_osx_pythondir_category) +@PYTHON_TRUE@audio_osx_pylibdir = $(pyexecdir)/$(audio_osx_pylibdir_category) +@PYTHON_TRUE@audio_osx_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@audio_osx_swiginclude_HEADERS = \ +@PYTHON_TRUE@ audio_osx.i \ +@PYTHON_TRUE@ $(audio_osx_swiginclude_headers) + +@PYTHON_TRUE@audio_osx_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _audio_osx.la + +@PYTHON_TRUE@_audio_osx_la_SOURCES = \ +@PYTHON_TRUE@ audio_osx.cc \ +@PYTHON_TRUE@ $(audio_osx_la_swig_sources) + +@PYTHON_TRUE@_audio_osx_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(audio_osx_la_swig_libadd) + +@PYTHON_TRUE@_audio_osx_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(audio_osx_la_swig_ldflags) + +@PYTHON_TRUE@_audio_osx_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(audio_osx_la_swig_cxxflags) + +@PYTHON_TRUE@audio_osx_python_PYTHON = \ +@PYTHON_TRUE@ audio_osx.py \ +@PYTHON_TRUE@ $(audio_osx_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -981,8 +999,41 @@ clean-audio_osx_pylibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done _audio_osx.la: $(_audio_osx_la_OBJECTS) $(_audio_osx_la_DEPENDENCIES) - $(_audio_osx_la_LINK) -rpath $(audio_osx_pylibdir) $(_audio_osx_la_OBJECTS) $(_audio_osx_la_LIBADD) $(LIBS) + $(_audio_osx_la_LINK) $(am__audio_osx_la_rpath) $(_audio_osx_la_OBJECTS) $(_audio_osx_la_LIBADD) $(LIBS) +libgnuradio-audio-osx.la: $(libgnuradio_audio_osx_la_OBJECTS) $(libgnuradio_audio_osx_la_DEPENDENCIES) + $(libgnuradio_audio_osx_la_LINK) -rpath $(libdir) $(libgnuradio_audio_osx_la_OBJECTS) $(libgnuradio_audio_osx_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -991,8 +1042,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_osx_la-audio_osx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_osx_la-audio_osx_sink.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_osx_la-audio_osx_source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_osx_sink.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_osx_source.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1022,20 +1073,6 @@ _audio_osx_la-audio_osx.lo: audio_osx.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_osx_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_osx_la-audio_osx.lo `test -f 'audio_osx.cc' || echo '$(srcdir)/'`audio_osx.cc -_audio_osx_la-audio_osx_sink.lo: audio_osx_sink.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_osx_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_osx_la-audio_osx_sink.lo -MD -MP -MF $(DEPDIR)/_audio_osx_la-audio_osx_sink.Tpo -c -o _audio_osx_la-audio_osx_sink.lo `test -f 'audio_osx_sink.cc' || echo '$(srcdir)/'`audio_osx_sink.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_osx_la-audio_osx_sink.Tpo $(DEPDIR)/_audio_osx_la-audio_osx_sink.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_osx_sink.cc' object='_audio_osx_la-audio_osx_sink.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_osx_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_osx_la-audio_osx_sink.lo `test -f 'audio_osx_sink.cc' || echo '$(srcdir)/'`audio_osx_sink.cc - -_audio_osx_la-audio_osx_source.lo: audio_osx_source.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_osx_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_osx_la-audio_osx_source.lo -MD -MP -MF $(DEPDIR)/_audio_osx_la-audio_osx_source.Tpo -c -o _audio_osx_la-audio_osx_source.lo `test -f 'audio_osx_source.cc' || echo '$(srcdir)/'`audio_osx_source.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_osx_la-audio_osx_source.Tpo $(DEPDIR)/_audio_osx_la-audio_osx_source.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_osx_source.cc' object='_audio_osx_la-audio_osx_source.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_osx_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_osx_la-audio_osx_source.lo `test -f 'audio_osx_source.cc' || echo '$(srcdir)/'`audio_osx_source.cc - mostlyclean-libtool: -rm -f *.lo @@ -1303,7 +1340,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(audio_osx_pylibdir)" "$(DESTDIR)$(audio_osx_pythondir)" "$(DESTDIR)$(audio_osx_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ + for dir in "$(DESTDIR)$(audio_osx_pylibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_osx_pythondir)" "$(DESTDIR)$(audio_osx_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1337,8 +1374,8 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-audio_osx_pylibLTLIBRARIES clean-generic clean-libtool \ - mostlyclean-am +clean-am: clean-audio_osx_pylibLTLIBRARIES clean-generic \ + clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1366,7 +1403,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-am @@ -1409,30 +1446,31 @@ ps-am: uninstall-am: uninstall-audio_osx_pylibLTLIBRARIES \ uninstall-audio_osx_pythonPYTHON \ uninstall-audio_osx_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES .MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-audio_osx_pylibLTLIBRARIES clean-generic clean-libtool \ - ctags dist-hook distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ - install-audio_osx_pylibLTLIBRARIES \ + clean-audio_osx_pylibLTLIBRARIES clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-audio_osx_pylibLTLIBRARIES \ install-audio_osx_pythonPYTHON \ install-audio_osx_swigincludeHEADERS install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-grincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am \ uninstall-audio_osx_pylibLTLIBRARIES \ uninstall-audio_osx_pythonPYTHON \ uninstall-audio_osx_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1445,75 +1483,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -audio_osx_pythondir_category ?= gnuradio/audio_osx -audio_osx_pylibdir_category ?= $(audio_osx_pythondir_category) - -audio_osx.h audio_osx.py audio_osx.cc: audio_osx.i - trap 'rm -rf $(DEPDIR)/audio_osx-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/audio_osx-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/audio_osx-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_osx-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/audio_osx-generate-lock; \ - else \ - while test -d $(DEPDIR)/audio_osx-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/audio_osx-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/audio_osx-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_osx_swig_args) \ - -MD -MF $(DEPDIR)/audio_osx.Std \ - -module audio_osx -o audio_osx.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_osx.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_osx.Std \ - > $(DEPDIR)/audio_osx.Sd; \ - $(RM) $(DEPDIR)/audio_osx.Std; \ - $(MV) $(DEPDIR)/audio_osx.Sd $(DEPDIR)/audio_osx.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/audio_osx.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/audio_osx.d - cp $(DEPDIR)/audio_osx.Std $(DEPDIR)/audio_osx.d - echo "" >> $(DEPDIR)/audio_osx.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_osx.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_osx.d - $(RM) $(DEPDIR)/audio_osx.Std - touch $(DEPDIR)/audio_osx-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@audio_osx_pythondir_category ?= gnuradio/audio_osx +@PYTHON_TRUE@audio_osx_pylibdir_category ?= $(audio_osx_pythondir_category) + +@PYTHON_TRUE@audio_osx.h audio_osx.py audio_osx.cc: audio_osx.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/audio_osx-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/audio_osx-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/audio_osx-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_osx-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/audio_osx-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/audio_osx-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/audio_osx-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/audio_osx-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_osx_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/audio_osx.Std \ +@PYTHON_TRUE@ -module audio_osx -o audio_osx.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_osx.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_osx.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/audio_osx.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_osx.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/audio_osx.Sd $(DEPDIR)/audio_osx.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_osx.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_osx.d +@PYTHON_TRUE@ cp $(DEPDIR)/audio_osx.Std $(DEPDIR)/audio_osx.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/audio_osx.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_osx.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_osx.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_osx.Std +@PYTHON_TRUE@ touch $(DEPDIR)/audio_osx-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/audio_osx.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_osx.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-audio-portaudio/Makefile.in b/gr-audio-portaudio/Makefile.in index dd752593..560b26a9 100644 --- a/gr-audio-portaudio/Makefile.in +++ b/gr-audio-portaudio/Makefile.in @@ -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 # @@ -78,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = README $(dist_etc_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common +DIST_COMMON = README $(dist_etc_DATA) $(dist_pkgconfig_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/gnuradio-audio-portaudio.pc.in \ + $(top_srcdir)/Makefile.common subdir = gr-audio-portaudio ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -93,36 +95,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 \ @@ -136,9 +141,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 \ @@ -159,7 +161,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 = +CONFIG_CLEAN_FILES = gnuradio-audio-portaudio.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -191,8 +193,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(etcdir)" -DATA = $(dist_etc_DATA) +am__installdirs = "$(DESTDIR)$(etcdir)" "$(DESTDIR)$(pkgconfigdir)" +DATA = $(dist_etc_DATA) $(dist_pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -246,6 +248,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@ @@ -253,6 +256,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@ @@ -271,6 +278,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -280,20 +288,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@ @@ -316,6 +327,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@ @@ -377,6 +390,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@ @@ -389,17 +403,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@ @@ -415,7 +429,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@ @@ -467,6 +480,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@ @@ -497,6 +515,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@ @@ -518,6 +541,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@ @@ -600,26 +633,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@ @@ -650,7 +668,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@ @@ -660,23 +677,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 @@ -688,7 +708,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, @@ -696,10 +716,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@ @@ -715,18 +731,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@ @@ -741,21 +745,25 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT SUBDIRS = src -etcdir = $(gr_sysconfdir) +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-audio-portaudio.pc +etcdir = $(gr_prefsdir) dist_etc_DATA = gr-audio-portaudio.conf all: all-recursive @@ -790,6 +798,8 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +gnuradio-audio-portaudio.pc: $(top_builddir)/config.status $(srcdir)/gnuradio-audio-portaudio.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -816,6 +826,26 @@ uninstall-dist_etcDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(etcdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(etcdir)" && rm -f $$files +install-dist_pkgconfigDATA: $(dist_pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-dist_pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -1018,7 +1048,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(etcdir)"; do \ + for dir in "$(DESTDIR)$(etcdir)" "$(DESTDIR)$(pkgconfigdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1067,7 +1097,7 @@ info: info-recursive info-am: -install-data-am: install-dist_etcDATA +install-data-am: install-dist_etcDATA install-dist_pkgconfigDATA install-dvi: install-dvi-recursive @@ -1111,7 +1141,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_etcDATA +uninstall-am: uninstall-dist_etcDATA uninstall-dist_pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1121,15 +1151,16 @@ uninstall-am: uninstall-dist_etcDATA ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dist_etcDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_etcDATA + install-data-am install-dist_etcDATA \ + install-dist_pkgconfigDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-dist_etcDATA uninstall-dist_pkgconfigDATA # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gr-audio-portaudio/src/Makefile.in b/gr-audio-portaudio/src/Makefile.in index e44e5619..e0438475 100644 --- a/gr-audio-portaudio/src/Makefile.in +++ b/gr-audio-portaudio/src/Makefile.in @@ -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 # @@ -125,12 +125,14 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(audio_portaudio_python_PYTHON) \ - $(audio_portaudio_swiginclude_HEADERS) $(grinclude_HEADERS) \ - $(noinst_HEADERS) $(noinst_PYTHON) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ - $(srcdir)/run_tests.in $(top_srcdir)/Makefile.common \ - $(top_srcdir)/Makefile.swig +DIST_COMMON = $(am__audio_portaudio_python_PYTHON_DIST) \ + $(am__audio_portaudio_swiginclude_HEADERS_DIST) \ + $(grinclude_HEADERS) $(noinst_HEADERS) $(noinst_PYTHON) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \ + $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/audio_portaudio-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-audio-portaudio/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -144,36 +146,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 \ @@ -187,9 +192,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 \ @@ -234,24 +236,33 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(audio_portaudio_pylibdir)" \ - "$(DESTDIR)$(audio_portaudio_pythondir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_portaudio_pythondir)" \ "$(DESTDIR)$(audio_portaudio_swigincludedir)" \ "$(DESTDIR)$(grincludedir)" -LTLIBRARIES = $(audio_portaudio_pylib_LTLIBRARIES) +LTLIBRARIES = $(audio_portaudio_pylib_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -_audio_portaudio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__objects_1 = _audio_portaudio_la-audio_portaudio_sink.lo \ - _audio_portaudio_la-audio_portaudio_source.lo \ - _audio_portaudio_la-gri_portaudio.lo -am__audio_portaudio_la_OBJECTS = \ - _audio_portaudio_la-audio_portaudio.lo $(am__objects_1) +@PYTHON_TRUE@_audio_portaudio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(audio_portaudio_la_swig_libadd) +am___audio_portaudio_la_SOURCES_DIST = audio_portaudio.cc +@PYTHON_TRUE@am__audio_portaudio_la_OBJECTS = \ +@PYTHON_TRUE@ _audio_portaudio_la-audio_portaudio.lo _audio_portaudio_la_OBJECTS = $(am__audio_portaudio_la_OBJECTS) _audio_portaudio_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_audio_portaudio_la_CXXFLAGS) $(CXXFLAGS) \ $(_audio_portaudio_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__audio_portaudio_la_rpath = -rpath \ +@PYTHON_TRUE@ $(audio_portaudio_pylibdir) +libgnuradio_audio_portaudio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_libgnuradio_audio_portaudio_la_OBJECTS = audio_portaudio_sink.lo \ + audio_portaudio_source.lo gri_portaudio.lo +libgnuradio_audio_portaudio_la_OBJECTS = \ + $(am_libgnuradio_audio_portaudio_la_OBJECTS) +libgnuradio_audio_portaudio_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(libgnuradio_audio_portaudio_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -265,9 +276,13 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_audio_portaudio_la_SOURCES) -DIST_SOURCES = $(_audio_portaudio_la_SOURCES) +SOURCES = $(_audio_portaudio_la_SOURCES) \ + $(libgnuradio_audio_portaudio_la_SOURCES) +DIST_SOURCES = $(am___audio_portaudio_la_SOURCES_DIST) \ + $(libgnuradio_audio_portaudio_la_SOURCES) +am__audio_portaudio_python_PYTHON_DIST = audio_portaudio.py py_compile = $(top_srcdir)/py-compile +am__audio_portaudio_swiginclude_HEADERS_DIST = audio_portaudio.i HEADERS = $(audio_portaudio_swiginclude_HEADERS) $(grinclude_HEADERS) \ $(noinst_HEADERS) ETAGS = etags @@ -294,6 +309,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@ @@ -301,6 +317,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@ @@ -319,6 +339,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -328,20 +349,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@ @@ -364,6 +388,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@ @@ -425,6 +451,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@ @@ -437,17 +464,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@ @@ -463,7 +490,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@ @@ -515,6 +541,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@ @@ -545,6 +576,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@ @@ -566,6 +602,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@ @@ -648,26 +694,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@ @@ -698,7 +729,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@ @@ -708,23 +738,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 @@ -736,7 +769,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, @@ -744,10 +777,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@ @@ -763,18 +792,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@ @@ -789,23 +806,23 @@ 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 = $(DEPDIR)/audio_portaudio-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) EXTRA_DIST = run_tests.in -TESTS = run_tests -DISTCLEANFILES = run_tests AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES) @@ -821,95 +838,101 @@ noinst_HEADERS = \ noinst_PYTHON = \ qa_portaudio.py +lib_LTLIBRARIES = libgnuradio-audio-portaudio.la +libgnuradio_audio_portaudio_la_SOURCES = \ + audio_portaudio_sink.cc \ + audio_portaudio_source.cc \ + gri_portaudio.cc + +libgnuradio_audio_portaudio_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + $(PORTAUDIO_LIBS) + +libgnuradio_audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) ################################### # SWIG Python interface and library -TOP_SWIG_IFILES = \ - audio_portaudio.i +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@DISTCLEANFILES = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ audio_portaudio.i # Install so that they end up available as: # import gnuradio.audio_portaudio # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -audio_portaudio_pythondir_category = \ - gnuradio - - -# additional sources for the SWIG-generated library -audio_portaudio_la_swig_sources = \ - audio_portaudio_sink.cc \ - audio_portaudio_source.cc \ - gri_portaudio.cc +@PYTHON_TRUE@audio_portaudio_pythondir_category = \ +@PYTHON_TRUE@ gnuradio # additional libraries for linking with the SWIG-generated library -audio_portaudio_la_swig_libadd = \ - $(GNURADIO_CORE_LA) \ - $(PORTAUDIO_LIBS) - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = audio_portaudio.py audio_portaudio.cc -audio_portaudio_pythondir = $(pythondir)/$(audio_portaudio_pythondir_category) -audio_portaudio_pylibdir = $(pyexecdir)/$(audio_portaudio_pylibdir_category) -audio_portaudio_swigincludedir = $(swigincludedir) -audio_portaudio_swiginclude_HEADERS = \ - audio_portaudio.i \ - $(audio_portaudio_swiginclude_headers) - -audio_portaudio_pylib_LTLIBRARIES = \ - _audio_portaudio.la - -_audio_portaudio_la_SOURCES = \ - audio_portaudio.cc \ - $(audio_portaudio_la_swig_sources) - -_audio_portaudio_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(audio_portaudio_la_swig_libadd) - -_audio_portaudio_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(audio_portaudio_la_swig_ldflags) - -_audio_portaudio_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(audio_portaudio_la_swig_cxxflags) - -audio_portaudio_python_PYTHON = \ - audio_portaudio.py \ - $(audio_portaudio_python) +@PYTHON_TRUE@audio_portaudio_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-audio-portaudio.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = audio_portaudio.py \ +@PYTHON_TRUE@ audio_portaudio.cc +@PYTHON_TRUE@audio_portaudio_pythondir = $(pythondir)/$(audio_portaudio_pythondir_category) +@PYTHON_TRUE@audio_portaudio_pylibdir = $(pyexecdir)/$(audio_portaudio_pylibdir_category) +@PYTHON_TRUE@audio_portaudio_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@audio_portaudio_swiginclude_HEADERS = \ +@PYTHON_TRUE@ audio_portaudio.i \ +@PYTHON_TRUE@ $(audio_portaudio_swiginclude_headers) + +@PYTHON_TRUE@audio_portaudio_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _audio_portaudio.la + +@PYTHON_TRUE@_audio_portaudio_la_SOURCES = \ +@PYTHON_TRUE@ audio_portaudio.cc \ +@PYTHON_TRUE@ $(audio_portaudio_la_swig_sources) + +@PYTHON_TRUE@_audio_portaudio_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(audio_portaudio_la_swig_libadd) + +@PYTHON_TRUE@_audio_portaudio_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(audio_portaudio_la_swig_ldflags) + +@PYTHON_TRUE@_audio_portaudio_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(audio_portaudio_la_swig_cxxflags) + +@PYTHON_TRUE@audio_portaudio_python_PYTHON = \ +@PYTHON_TRUE@ audio_portaudio.py \ +@PYTHON_TRUE@ $(audio_portaudio_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -978,8 +1001,41 @@ clean-audio_portaudio_pylibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done _audio_portaudio.la: $(_audio_portaudio_la_OBJECTS) $(_audio_portaudio_la_DEPENDENCIES) - $(_audio_portaudio_la_LINK) -rpath $(audio_portaudio_pylibdir) $(_audio_portaudio_la_OBJECTS) $(_audio_portaudio_la_LIBADD) $(LIBS) + $(_audio_portaudio_la_LINK) $(am__audio_portaudio_la_rpath) $(_audio_portaudio_la_OBJECTS) $(_audio_portaudio_la_LIBADD) $(LIBS) +libgnuradio-audio-portaudio.la: $(libgnuradio_audio_portaudio_la_OBJECTS) $(libgnuradio_audio_portaudio_la_DEPENDENCIES) + $(libgnuradio_audio_portaudio_la_LINK) -rpath $(libdir) $(libgnuradio_audio_portaudio_la_OBJECTS) $(libgnuradio_audio_portaudio_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -988,9 +1044,9 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_portaudio_la-audio_portaudio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_portaudio_la-audio_portaudio_sink.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_portaudio_la-audio_portaudio_source.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_portaudio_la-gri_portaudio.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_portaudio_sink.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_portaudio_source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gri_portaudio.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1020,27 +1076,6 @@ _audio_portaudio_la-audio_portaudio.lo: audio_portaudio.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_portaudio_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_portaudio_la-audio_portaudio.lo `test -f 'audio_portaudio.cc' || echo '$(srcdir)/'`audio_portaudio.cc -_audio_portaudio_la-audio_portaudio_sink.lo: audio_portaudio_sink.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_portaudio_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_portaudio_la-audio_portaudio_sink.lo -MD -MP -MF $(DEPDIR)/_audio_portaudio_la-audio_portaudio_sink.Tpo -c -o _audio_portaudio_la-audio_portaudio_sink.lo `test -f 'audio_portaudio_sink.cc' || echo '$(srcdir)/'`audio_portaudio_sink.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_portaudio_la-audio_portaudio_sink.Tpo $(DEPDIR)/_audio_portaudio_la-audio_portaudio_sink.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_portaudio_sink.cc' object='_audio_portaudio_la-audio_portaudio_sink.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_portaudio_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_portaudio_la-audio_portaudio_sink.lo `test -f 'audio_portaudio_sink.cc' || echo '$(srcdir)/'`audio_portaudio_sink.cc - -_audio_portaudio_la-audio_portaudio_source.lo: audio_portaudio_source.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_portaudio_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_portaudio_la-audio_portaudio_source.lo -MD -MP -MF $(DEPDIR)/_audio_portaudio_la-audio_portaudio_source.Tpo -c -o _audio_portaudio_la-audio_portaudio_source.lo `test -f 'audio_portaudio_source.cc' || echo '$(srcdir)/'`audio_portaudio_source.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_portaudio_la-audio_portaudio_source.Tpo $(DEPDIR)/_audio_portaudio_la-audio_portaudio_source.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_portaudio_source.cc' object='_audio_portaudio_la-audio_portaudio_source.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_portaudio_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_portaudio_la-audio_portaudio_source.lo `test -f 'audio_portaudio_source.cc' || echo '$(srcdir)/'`audio_portaudio_source.cc - -_audio_portaudio_la-gri_portaudio.lo: gri_portaudio.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_portaudio_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_portaudio_la-gri_portaudio.lo -MD -MP -MF $(DEPDIR)/_audio_portaudio_la-gri_portaudio.Tpo -c -o _audio_portaudio_la-gri_portaudio.lo `test -f 'gri_portaudio.cc' || echo '$(srcdir)/'`gri_portaudio.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_portaudio_la-gri_portaudio.Tpo $(DEPDIR)/_audio_portaudio_la-gri_portaudio.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='gri_portaudio.cc' object='_audio_portaudio_la-gri_portaudio.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_portaudio_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_portaudio_la-gri_portaudio.lo `test -f 'gri_portaudio.cc' || echo '$(srcdir)/'`gri_portaudio.cc - mostlyclean-libtool: -rm -f *.lo @@ -1308,7 +1343,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(audio_portaudio_pylibdir)" "$(DESTDIR)$(audio_portaudio_pythondir)" "$(DESTDIR)$(audio_portaudio_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ + for dir in "$(DESTDIR)$(audio_portaudio_pylibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_portaudio_pythondir)" "$(DESTDIR)$(audio_portaudio_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1343,7 +1378,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-audio_portaudio_pylibLTLIBRARIES clean-generic \ - clean-libtool mostlyclean-am + clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1372,7 +1407,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-am @@ -1415,30 +1450,31 @@ ps-am: uninstall-am: uninstall-audio_portaudio_pylibLTLIBRARIES \ uninstall-audio_portaudio_pythonPYTHON \ uninstall-audio_portaudio_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES .MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ clean-audio_portaudio_pylibLTLIBRARIES clean-generic \ - clean-libtool ctags dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-audio_portaudio_pylibLTLIBRARIES \ + clean-libLTLIBRARIES clean-libtool ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-audio_portaudio_pylibLTLIBRARIES \ install-audio_portaudio_pythonPYTHON \ install-audio_portaudio_swigincludeHEADERS install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-grincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am \ uninstall-audio_portaudio_pylibLTLIBRARIES \ uninstall-audio_portaudio_pythonPYTHON \ uninstall-audio_portaudio_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1451,75 +1487,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -audio_portaudio_pythondir_category ?= gnuradio/audio_portaudio -audio_portaudio_pylibdir_category ?= $(audio_portaudio_pythondir_category) - -audio_portaudio.h audio_portaudio.py audio_portaudio.cc: audio_portaudio.i - trap 'rm -rf $(DEPDIR)/audio_portaudio-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/audio_portaudio-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/audio_portaudio-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_portaudio-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/audio_portaudio-generate-lock; \ - else \ - while test -d $(DEPDIR)/audio_portaudio-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/audio_portaudio-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/audio_portaudio-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_portaudio_swig_args) \ - -MD -MF $(DEPDIR)/audio_portaudio.Std \ - -module audio_portaudio -o audio_portaudio.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_portaudio.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_portaudio.Std \ - > $(DEPDIR)/audio_portaudio.Sd; \ - $(RM) $(DEPDIR)/audio_portaudio.Std; \ - $(MV) $(DEPDIR)/audio_portaudio.Sd $(DEPDIR)/audio_portaudio.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/audio_portaudio.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/audio_portaudio.d - cp $(DEPDIR)/audio_portaudio.Std $(DEPDIR)/audio_portaudio.d - echo "" >> $(DEPDIR)/audio_portaudio.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_portaudio.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_portaudio.d - $(RM) $(DEPDIR)/audio_portaudio.Std - touch $(DEPDIR)/audio_portaudio-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@audio_portaudio_pythondir_category ?= gnuradio/audio_portaudio +@PYTHON_TRUE@audio_portaudio_pylibdir_category ?= $(audio_portaudio_pythondir_category) + +@PYTHON_TRUE@audio_portaudio.h audio_portaudio.py audio_portaudio.cc: audio_portaudio.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/audio_portaudio-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/audio_portaudio-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/audio_portaudio-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_portaudio-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/audio_portaudio-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/audio_portaudio-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/audio_portaudio-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/audio_portaudio-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_portaudio_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/audio_portaudio.Std \ +@PYTHON_TRUE@ -module audio_portaudio -o audio_portaudio.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_portaudio.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_portaudio.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/audio_portaudio.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_portaudio.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/audio_portaudio.Sd $(DEPDIR)/audio_portaudio.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_portaudio.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_portaudio.d +@PYTHON_TRUE@ cp $(DEPDIR)/audio_portaudio.Std $(DEPDIR)/audio_portaudio.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/audio_portaudio.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_portaudio.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_portaudio.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_portaudio.Std +@PYTHON_TRUE@ touch $(DEPDIR)/audio_portaudio-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/audio_portaudio.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_portaudio.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-audio-windows/Makefile.in b/gr-audio-windows/Makefile.in index cf973823..ba294002 100644 --- a/gr-audio-windows/Makefile.in +++ b/gr-audio-windows/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = diff --git a/gr-audio-windows/src/Makefile.in b/gr-audio-windows/src/Makefile.in index 0dcd3130..20f8cad8 100644 --- a/gr-audio-windows/src/Makefile.in +++ b/gr-audio-windows/src/Makefile.in @@ -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 # @@ -125,11 +125,14 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(audio_windows_python_PYTHON) \ - $(audio_windows_swiginclude_HEADERS) $(grinclude_HEADERS) \ - $(noinst_PYTHON) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \ - $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +DIST_COMMON = $(am__audio_windows_python_PYTHON_DIST) \ + $(am__audio_windows_swiginclude_HEADERS_DIST) \ + $(grinclude_HEADERS) $(noinst_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ + $(srcdir)/run_tests.in $(top_srcdir)/Makefile.common \ + $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/audio_windows-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-audio-windows/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -143,36 +146,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 \ @@ -186,9 +192,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 \ @@ -233,23 +236,33 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(audio_windows_pylibdir)" \ - "$(DESTDIR)$(audio_windows_pythondir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_windows_pythondir)" \ "$(DESTDIR)$(audio_windows_swigincludedir)" \ "$(DESTDIR)$(grincludedir)" -LTLIBRARIES = $(audio_windows_pylib_LTLIBRARIES) +LTLIBRARIES = $(audio_windows_pylib_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -_audio_windows_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__objects_1 = _audio_windows_la-audio_windows_sink.lo \ - _audio_windows_la-audio_windows_source.lo -am__audio_windows_la_OBJECTS = _audio_windows_la-audio_windows.lo \ - $(am__objects_1) +@PYTHON_TRUE@_audio_windows_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(audio_windows_la_swig_libadd) +am___audio_windows_la_SOURCES_DIST = audio_windows.cc +@PYTHON_TRUE@am__audio_windows_la_OBJECTS = \ +@PYTHON_TRUE@ _audio_windows_la-audio_windows.lo _audio_windows_la_OBJECTS = $(am__audio_windows_la_OBJECTS) _audio_windows_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_audio_windows_la_CXXFLAGS) $(CXXFLAGS) \ $(_audio_windows_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__audio_windows_la_rpath = -rpath \ +@PYTHON_TRUE@ $(audio_windows_pylibdir) +libgnuradio_audio_windows_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_libgnuradio_audio_windows_la_OBJECTS = audio_windows_sink.lo \ + audio_windows_source.lo +libgnuradio_audio_windows_la_OBJECTS = \ + $(am_libgnuradio_audio_windows_la_OBJECTS) +libgnuradio_audio_windows_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(libgnuradio_audio_windows_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -263,9 +276,13 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_audio_windows_la_SOURCES) -DIST_SOURCES = $(_audio_windows_la_SOURCES) +SOURCES = $(_audio_windows_la_SOURCES) \ + $(libgnuradio_audio_windows_la_SOURCES) +DIST_SOURCES = $(am___audio_windows_la_SOURCES_DIST) \ + $(libgnuradio_audio_windows_la_SOURCES) +am__audio_windows_python_PYTHON_DIST = audio_windows.py py_compile = $(top_srcdir)/py-compile +am__audio_windows_swiginclude_HEADERS_DIST = audio_windows.i HEADERS = $(audio_windows_swiginclude_HEADERS) $(grinclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -291,6 +308,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@ @@ -298,6 +316,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@ @@ -316,6 +338,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -325,20 +348,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@ @@ -361,6 +387,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@ @@ -422,6 +450,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@ @@ -434,17 +463,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@ @@ -460,7 +489,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@ @@ -512,6 +540,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@ @@ -542,6 +575,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@ @@ -563,6 +601,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@ @@ -645,26 +693,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@ @@ -695,7 +728,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@ @@ -705,23 +737,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 @@ -733,7 +768,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, @@ -741,10 +776,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@ @@ -760,18 +791,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@ @@ -786,124 +805,128 @@ 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 = $(DEPDIR)/audio_windows-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) EXTRA_DIST = run_tests.in -TESTS = run_tests -DISTCLEANFILES = run_tests -noinst_PYTHON = qa_audio_windows.py AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +noinst_PYTHON = qa_audio_windows.py # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ audio_windows_sink.h \ audio_windows_source.h - -################################### -# SWIG Python interface and library -TOP_SWIG_IFILES = \ - audio_windows.i - - -# Install so that they end up available as: -# import gnuradio.audio_windows -# This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio -audio_windows_pythondir_category = \ - gnuradio - - -# additional sources for the SWIG-generated library -audio_windows_la_swig_sources = \ +lib_LTLIBRARIES = libgnuradio-audio-windows.la +libgnuradio_audio_windows_la_SOURCES = \ audio_windows_sink.cc \ audio_windows_source.cc - -# additional libraries for linking with the SWIG-generated library -audio_windows_la_swig_libadd = \ +libgnuradio_audio_windows_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(WINAUDIO_LIBS) +libgnuradio_audio_windows_la_LDFLAGS = \ + $(LIBGNURADIO_CORE_EXTRA_LDFLAGS) \ + $(NO_UNDEFINED) \ + $(LTVERSIONFLAGS) -# additional LD flags for linking the SWIG-generated library -audio_windows_la_swig_ldflags = \ - $(LIBGNURADIO_CORE_EXTRA_LDFLAGS) - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = audio_windows.py audio_windows.cc -audio_windows_pythondir = $(pythondir)/$(audio_windows_pythondir_category) -audio_windows_pylibdir = $(pyexecdir)/$(audio_windows_pylibdir_category) -audio_windows_swigincludedir = $(swigincludedir) -audio_windows_swiginclude_HEADERS = \ - audio_windows.i \ - $(audio_windows_swiginclude_headers) - -audio_windows_pylib_LTLIBRARIES = \ - _audio_windows.la - -_audio_windows_la_SOURCES = \ - audio_windows.cc \ - $(audio_windows_la_swig_sources) +################################### +# SWIG Python interface and library +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@DISTCLEANFILES = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ audio_windows.i -_audio_windows_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(audio_windows_la_swig_libadd) -_audio_windows_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(audio_windows_la_swig_ldflags) +# Install so that they end up available as: +# import gnuradio.audio_windows +# This ends up at: +# ${prefix}/lib/python${python_version}/site-packages/gnuradio +@PYTHON_TRUE@audio_windows_pythondir_category = \ +@PYTHON_TRUE@ gnuradio -_audio_windows_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(audio_windows_la_swig_cxxflags) -audio_windows_python_PYTHON = \ - audio_windows.py \ - $(audio_windows_python) +# additional libraries for linking with the SWIG-generated library +@PYTHON_TRUE@audio_windows_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-audio-windows.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = audio_windows.py audio_windows.cc +@PYTHON_TRUE@audio_windows_pythondir = $(pythondir)/$(audio_windows_pythondir_category) +@PYTHON_TRUE@audio_windows_pylibdir = $(pyexecdir)/$(audio_windows_pylibdir_category) +@PYTHON_TRUE@audio_windows_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@audio_windows_swiginclude_HEADERS = \ +@PYTHON_TRUE@ audio_windows.i \ +@PYTHON_TRUE@ $(audio_windows_swiginclude_headers) + +@PYTHON_TRUE@audio_windows_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _audio_windows.la + +@PYTHON_TRUE@_audio_windows_la_SOURCES = \ +@PYTHON_TRUE@ audio_windows.cc \ +@PYTHON_TRUE@ $(audio_windows_la_swig_sources) + +@PYTHON_TRUE@_audio_windows_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(audio_windows_la_swig_libadd) + +@PYTHON_TRUE@_audio_windows_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(audio_windows_la_swig_ldflags) + +@PYTHON_TRUE@_audio_windows_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(audio_windows_la_swig_cxxflags) + +@PYTHON_TRUE@audio_windows_python_PYTHON = \ +@PYTHON_TRUE@ audio_windows.py \ +@PYTHON_TRUE@ $(audio_windows_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -972,8 +995,41 @@ clean-audio_windows_pylibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done _audio_windows.la: $(_audio_windows_la_OBJECTS) $(_audio_windows_la_DEPENDENCIES) - $(_audio_windows_la_LINK) -rpath $(audio_windows_pylibdir) $(_audio_windows_la_OBJECTS) $(_audio_windows_la_LIBADD) $(LIBS) + $(_audio_windows_la_LINK) $(am__audio_windows_la_rpath) $(_audio_windows_la_OBJECTS) $(_audio_windows_la_LIBADD) $(LIBS) +libgnuradio-audio-windows.la: $(libgnuradio_audio_windows_la_OBJECTS) $(libgnuradio_audio_windows_la_DEPENDENCIES) + $(libgnuradio_audio_windows_la_LINK) -rpath $(libdir) $(libgnuradio_audio_windows_la_OBJECTS) $(libgnuradio_audio_windows_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -982,8 +1038,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_windows_la-audio_windows.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_windows_la-audio_windows_sink.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_audio_windows_la-audio_windows_source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_windows_sink.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_windows_source.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1013,20 +1069,6 @@ _audio_windows_la-audio_windows.lo: audio_windows.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_windows_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_windows_la-audio_windows.lo `test -f 'audio_windows.cc' || echo '$(srcdir)/'`audio_windows.cc -_audio_windows_la-audio_windows_sink.lo: audio_windows_sink.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_windows_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_windows_la-audio_windows_sink.lo -MD -MP -MF $(DEPDIR)/_audio_windows_la-audio_windows_sink.Tpo -c -o _audio_windows_la-audio_windows_sink.lo `test -f 'audio_windows_sink.cc' || echo '$(srcdir)/'`audio_windows_sink.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_windows_la-audio_windows_sink.Tpo $(DEPDIR)/_audio_windows_la-audio_windows_sink.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_windows_sink.cc' object='_audio_windows_la-audio_windows_sink.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_windows_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_windows_la-audio_windows_sink.lo `test -f 'audio_windows_sink.cc' || echo '$(srcdir)/'`audio_windows_sink.cc - -_audio_windows_la-audio_windows_source.lo: audio_windows_source.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_windows_la_CXXFLAGS) $(CXXFLAGS) -MT _audio_windows_la-audio_windows_source.lo -MD -MP -MF $(DEPDIR)/_audio_windows_la-audio_windows_source.Tpo -c -o _audio_windows_la-audio_windows_source.lo `test -f 'audio_windows_source.cc' || echo '$(srcdir)/'`audio_windows_source.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_audio_windows_la-audio_windows_source.Tpo $(DEPDIR)/_audio_windows_la-audio_windows_source.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='audio_windows_source.cc' object='_audio_windows_la-audio_windows_source.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_audio_windows_la_CXXFLAGS) $(CXXFLAGS) -c -o _audio_windows_la-audio_windows_source.lo `test -f 'audio_windows_source.cc' || echo '$(srcdir)/'`audio_windows_source.cc - mostlyclean-libtool: -rm -f *.lo @@ -1294,7 +1336,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(audio_windows_pylibdir)" "$(DESTDIR)$(audio_windows_pythondir)" "$(DESTDIR)$(audio_windows_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ + for dir in "$(DESTDIR)$(audio_windows_pylibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(audio_windows_pythondir)" "$(DESTDIR)$(audio_windows_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1329,7 +1371,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-audio_windows_pylibLTLIBRARIES clean-generic \ - clean-libtool mostlyclean-am + clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1358,7 +1400,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-am @@ -1401,30 +1443,31 @@ ps-am: uninstall-am: uninstall-audio_windows_pylibLTLIBRARIES \ uninstall-audio_windows_pythonPYTHON \ uninstall-audio_windows_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES .MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ clean-audio_windows_pylibLTLIBRARIES clean-generic \ - clean-libtool ctags dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-audio_windows_pylibLTLIBRARIES \ + clean-libLTLIBRARIES clean-libtool ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-audio_windows_pylibLTLIBRARIES \ install-audio_windows_pythonPYTHON \ install-audio_windows_swigincludeHEADERS install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-grincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am \ uninstall-audio_windows_pylibLTLIBRARIES \ uninstall-audio_windows_pythonPYTHON \ uninstall-audio_windows_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1437,75 +1480,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -audio_windows_pythondir_category ?= gnuradio/audio_windows -audio_windows_pylibdir_category ?= $(audio_windows_pythondir_category) - -audio_windows.h audio_windows.py audio_windows.cc: audio_windows.i - trap 'rm -rf $(DEPDIR)/audio_windows-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/audio_windows-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/audio_windows-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_windows-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/audio_windows-generate-lock; \ - else \ - while test -d $(DEPDIR)/audio_windows-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/audio_windows-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/audio_windows-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_windows_swig_args) \ - -MD -MF $(DEPDIR)/audio_windows.Std \ - -module audio_windows -o audio_windows.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/audio_windows.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_windows.Std \ - > $(DEPDIR)/audio_windows.Sd; \ - $(RM) $(DEPDIR)/audio_windows.Std; \ - $(MV) $(DEPDIR)/audio_windows.Sd $(DEPDIR)/audio_windows.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/audio_windows.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/audio_windows.d - cp $(DEPDIR)/audio_windows.Std $(DEPDIR)/audio_windows.d - echo "" >> $(DEPDIR)/audio_windows.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_windows.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_windows.d - $(RM) $(DEPDIR)/audio_windows.Std - touch $(DEPDIR)/audio_windows-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@audio_windows_pythondir_category ?= gnuradio/audio_windows +@PYTHON_TRUE@audio_windows_pylibdir_category ?= $(audio_windows_pythondir_category) + +@PYTHON_TRUE@audio_windows.h audio_windows.py audio_windows.cc: audio_windows.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/audio_windows-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/audio_windows-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/audio_windows-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_windows-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/audio_windows-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/audio_windows-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/audio_windows-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/audio_windows-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_windows_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/audio_windows.Std \ +@PYTHON_TRUE@ -module audio_windows -o audio_windows.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_windows.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_windows.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/audio_windows.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_windows.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/audio_windows.Sd $(DEPDIR)/audio_windows.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_windows.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_windows.d +@PYTHON_TRUE@ cp $(DEPDIR)/audio_windows.Std $(DEPDIR)/audio_windows.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/audio_windows.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/audio_windows.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_windows.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/audio_windows.Std +@PYTHON_TRUE@ touch $(DEPDIR)/audio_windows-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/audio_windows.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_windows.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-cvsd-vocoder/Makefile.in b/gr-cvsd-vocoder/Makefile.in index bffe8deb..ac69d13c 100644 --- a/gr-cvsd-vocoder/Makefile.in +++ b/gr-cvsd-vocoder/Makefile.in @@ -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 # @@ -57,6 +57,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. # + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -77,7 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(dist_pkgconfig_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gnuradio-cvsd-vocoder.pc.in \ $(top_srcdir)/Makefile.common subdir = gr-cvsd-vocoder ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -92,36 +94,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 \ @@ -135,9 +140,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 \ @@ -158,7 +160,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 = +CONFIG_CLEAN_FILES = gnuradio-cvsd-vocoder.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -169,6 +171,29 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +DATA = $(dist_pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -176,6 +201,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -221,6 +247,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@ @@ -228,6 +255,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@ @@ -246,6 +277,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +287,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@ @@ -291,6 +326,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@ @@ -352,6 +389,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@ @@ -364,17 +402,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@ @@ -390,7 +428,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@ @@ -442,6 +479,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@ @@ -472,6 +514,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@ @@ -493,6 +540,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@ @@ -575,26 +632,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@ @@ -625,7 +667,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@ @@ -635,23 +676,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 @@ -663,7 +707,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, @@ -671,10 +715,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@ @@ -690,18 +730,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@ @@ -716,21 +744,24 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT SUBDIRS = src -DIST_SUBDIRS = src +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-cvsd-vocoder.pc all: all-recursive .SUFFIXES: @@ -764,12 +795,34 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +gnuradio-cvsd-vocoder.pc: $(top_builddir)/config.status $(srcdir)/gnuradio-cvsd-vocoder.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs +install-dist_pkgconfigDATA: $(dist_pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-dist_pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -969,9 +1022,12 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -1018,7 +1074,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-dist_pkgconfigDATA install-dvi: install-dvi-recursive @@ -1062,7 +1118,7 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-dist_pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1072,14 +1128,15 @@ uninstall-am: ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + install-data-am install-dist_pkgconfigDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-dist_pkgconfigDATA # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gr-cvsd-vocoder/src/Makefile.in b/gr-cvsd-vocoder/src/Makefile.in index 696c31ed..e1dd891c 100644 --- a/gr-cvsd-vocoder/src/Makefile.in +++ b/gr-cvsd-vocoder/src/Makefile.in @@ -55,6 +55,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@PYTHON_TRUE@am__append_1 = python subdir = gr-cvsd-vocoder/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -69,36 +70,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 \ @@ -112,9 +116,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 \ @@ -153,7 +154,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib python DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -199,6 +200,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@ @@ -206,6 +208,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@ @@ -224,6 +230,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +240,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@ @@ -269,6 +279,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@ @@ -330,6 +342,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@ @@ -342,17 +355,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@ @@ -368,7 +381,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@ @@ -420,6 +432,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@ @@ -450,6 +467,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@ @@ -471,6 +493,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@ @@ -553,26 +585,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@ @@ -603,14 +620,13 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -SUBDIRS = lib python +SUBDIRS = lib $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gr-cvsd-vocoder/src/lib/Makefile.in b/gr-cvsd-vocoder/src/lib/Makefile.in index 332c30a5..00ef9092 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.in +++ b/gr-cvsd-vocoder/src/lib/Makefile.in @@ -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 # @@ -125,11 +125,13 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(cvsd_vocoder_python_PYTHON) \ - $(cvsd_vocoder_swiginclude_HEADERS) $(grinclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.swig.gen $(top_srcdir)/Makefile.common \ - $(top_srcdir)/Makefile.swig +DIST_COMMON = $(am__cvsd_vocoder_python_PYTHON_DIST) \ + $(am__cvsd_vocoder_swiginclude_HEADERS_DIST) \ + $(grinclude_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ + $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/cvsd_vocoder-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-cvsd-vocoder/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -143,36 +145,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 \ @@ -186,9 +191,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 \ @@ -233,23 +235,32 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(cvsd_vocoder_pylibdir)" \ - "$(DESTDIR)$(cvsd_vocoder_pythondir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cvsd_vocoder_pythondir)" \ "$(DESTDIR)$(cvsd_vocoder_swigincludedir)" \ "$(DESTDIR)$(grincludedir)" -LTLIBRARIES = $(cvsd_vocoder_pylib_LTLIBRARIES) +LTLIBRARIES = $(cvsd_vocoder_pylib_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -_cvsd_vocoder_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__objects_1 = _cvsd_vocoder_la-cvsd_decode_bs.lo \ - _cvsd_vocoder_la-cvsd_encode_sb.lo -am__cvsd_vocoder_la_OBJECTS = _cvsd_vocoder_la-cvsd_vocoder.lo \ - $(am__objects_1) +@PYTHON_TRUE@_cvsd_vocoder_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(cvsd_vocoder_la_swig_libadd) +am___cvsd_vocoder_la_SOURCES_DIST = cvsd_vocoder.cc +@PYTHON_TRUE@am__cvsd_vocoder_la_OBJECTS = \ +@PYTHON_TRUE@ _cvsd_vocoder_la-cvsd_vocoder.lo _cvsd_vocoder_la_OBJECTS = $(am__cvsd_vocoder_la_OBJECTS) _cvsd_vocoder_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_cvsd_vocoder_la_CXXFLAGS) $(CXXFLAGS) \ $(_cvsd_vocoder_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__cvsd_vocoder_la_rpath = -rpath \ +@PYTHON_TRUE@ $(cvsd_vocoder_pylibdir) +libgnuradio_cvsd_vocoder_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_libgnuradio_cvsd_vocoder_la_OBJECTS = cvsd_decode_bs.lo \ + cvsd_encode_sb.lo +libgnuradio_cvsd_vocoder_la_OBJECTS = \ + $(am_libgnuradio_cvsd_vocoder_la_OBJECTS) +libgnuradio_cvsd_vocoder_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(libgnuradio_cvsd_vocoder_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -263,9 +274,13 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_cvsd_vocoder_la_SOURCES) -DIST_SOURCES = $(_cvsd_vocoder_la_SOURCES) +SOURCES = $(_cvsd_vocoder_la_SOURCES) \ + $(libgnuradio_cvsd_vocoder_la_SOURCES) +DIST_SOURCES = $(am___cvsd_vocoder_la_SOURCES_DIST) \ + $(libgnuradio_cvsd_vocoder_la_SOURCES) +am__cvsd_vocoder_python_PYTHON_DIST = cvsd_vocoder.py py_compile = $(top_srcdir)/py-compile +am__cvsd_vocoder_swiginclude_HEADERS_DIST = cvsd_vocoder.i HEADERS = $(cvsd_vocoder_swiginclude_HEADERS) $(grinclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -289,6 +304,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@ @@ -296,6 +312,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@ @@ -314,6 +334,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -323,20 +344,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@ @@ -359,6 +383,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@ @@ -420,6 +446,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@ @@ -432,17 +459,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@ @@ -458,7 +485,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@ @@ -510,6 +536,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@ @@ -540,6 +571,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@ @@ -561,6 +597,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@ @@ -643,26 +689,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@ @@ -693,7 +724,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@ @@ -703,23 +733,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 @@ -731,7 +764,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, @@ -739,10 +772,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@ @@ -758,18 +787,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@ @@ -784,20 +801,22 @@ 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 = $(DEPDIR)/cvsd_vocoder-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) # These headers get installed in ${prefix}/include/gnuradio @@ -805,93 +824,96 @@ grinclude_HEADERS = \ cvsd_decode_bs.h \ cvsd_encode_sb.h +lib_LTLIBRARIES = libgnuradio-cvsd-vocoder.la +libgnuradio_cvsd_vocoder_la_SOURCES = \ + cvsd_decode_bs.cc \ + cvsd_encode_sb.cc + +libgnuradio_cvsd_vocoder_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_cvsd_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) ################################### # SWIG Python interface and library -TOP_SWIG_IFILES = \ - cvsd_vocoder.i +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ cvsd_vocoder.i # Install so that they end up available as: # import gnuradio.vocoder.cvsd_vocoder # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder -cvsd_vocoder_pythondir_category = \ - gnuradio/vocoder - - -# additional sources for the SWIG-generated library -cvsd_vocoder_la_swig_sources = \ - cvsd_decode_bs.cc \ - cvsd_encode_sb.cc +@PYTHON_TRUE@cvsd_vocoder_pythondir_category = \ +@PYTHON_TRUE@ gnuradio/vocoder # additional libraries for linking with the SWIG-generated library -cvsd_vocoder_la_swig_libadd = \ - $(GNURADIO_CORE_LA) - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = cvsd_vocoder.py cvsd_vocoder.cc -cvsd_vocoder_pythondir = $(pythondir)/$(cvsd_vocoder_pythondir_category) -cvsd_vocoder_pylibdir = $(pyexecdir)/$(cvsd_vocoder_pylibdir_category) -cvsd_vocoder_swigincludedir = $(swigincludedir) -cvsd_vocoder_swiginclude_HEADERS = \ - cvsd_vocoder.i \ - $(cvsd_vocoder_swiginclude_headers) - -cvsd_vocoder_pylib_LTLIBRARIES = \ - _cvsd_vocoder.la - -_cvsd_vocoder_la_SOURCES = \ - cvsd_vocoder.cc \ - $(cvsd_vocoder_la_swig_sources) - -_cvsd_vocoder_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(cvsd_vocoder_la_swig_libadd) - -_cvsd_vocoder_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(cvsd_vocoder_la_swig_ldflags) - -_cvsd_vocoder_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(cvsd_vocoder_la_swig_cxxflags) - -cvsd_vocoder_python_PYTHON = \ - cvsd_vocoder.py \ - $(cvsd_vocoder_python) +@PYTHON_TRUE@cvsd_vocoder_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-cvsd-vocoder.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = cvsd_vocoder.py cvsd_vocoder.cc +@PYTHON_TRUE@cvsd_vocoder_pythondir = $(pythondir)/$(cvsd_vocoder_pythondir_category) +@PYTHON_TRUE@cvsd_vocoder_pylibdir = $(pyexecdir)/$(cvsd_vocoder_pylibdir_category) +@PYTHON_TRUE@cvsd_vocoder_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@cvsd_vocoder_swiginclude_HEADERS = \ +@PYTHON_TRUE@ cvsd_vocoder.i \ +@PYTHON_TRUE@ $(cvsd_vocoder_swiginclude_headers) + +@PYTHON_TRUE@cvsd_vocoder_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _cvsd_vocoder.la + +@PYTHON_TRUE@_cvsd_vocoder_la_SOURCES = \ +@PYTHON_TRUE@ cvsd_vocoder.cc \ +@PYTHON_TRUE@ $(cvsd_vocoder_la_swig_sources) + +@PYTHON_TRUE@_cvsd_vocoder_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(cvsd_vocoder_la_swig_libadd) + +@PYTHON_TRUE@_cvsd_vocoder_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(cvsd_vocoder_la_swig_ldflags) + +@PYTHON_TRUE@_cvsd_vocoder_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(cvsd_vocoder_la_swig_cxxflags) + +@PYTHON_TRUE@cvsd_vocoder_python_PYTHON = \ +@PYTHON_TRUE@ cvsd_vocoder.py \ +@PYTHON_TRUE@ $(cvsd_vocoder_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -958,8 +980,41 @@ clean-cvsd_vocoder_pylibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done _cvsd_vocoder.la: $(_cvsd_vocoder_la_OBJECTS) $(_cvsd_vocoder_la_DEPENDENCIES) - $(_cvsd_vocoder_la_LINK) -rpath $(cvsd_vocoder_pylibdir) $(_cvsd_vocoder_la_OBJECTS) $(_cvsd_vocoder_la_LIBADD) $(LIBS) + $(_cvsd_vocoder_la_LINK) $(am__cvsd_vocoder_la_rpath) $(_cvsd_vocoder_la_OBJECTS) $(_cvsd_vocoder_la_LIBADD) $(LIBS) +libgnuradio-cvsd-vocoder.la: $(libgnuradio_cvsd_vocoder_la_OBJECTS) $(libgnuradio_cvsd_vocoder_la_DEPENDENCIES) + $(libgnuradio_cvsd_vocoder_la_LINK) -rpath $(libdir) $(libgnuradio_cvsd_vocoder_la_OBJECTS) $(libgnuradio_cvsd_vocoder_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -967,9 +1022,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_cvsd_vocoder_la-cvsd_decode_bs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_cvsd_vocoder_la-cvsd_encode_sb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_cvsd_vocoder_la-cvsd_vocoder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvsd_decode_bs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvsd_encode_sb.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -999,20 +1054,6 @@ _cvsd_vocoder_la-cvsd_vocoder.lo: cvsd_vocoder.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_cvsd_vocoder_la_CXXFLAGS) $(CXXFLAGS) -c -o _cvsd_vocoder_la-cvsd_vocoder.lo `test -f 'cvsd_vocoder.cc' || echo '$(srcdir)/'`cvsd_vocoder.cc -_cvsd_vocoder_la-cvsd_decode_bs.lo: cvsd_decode_bs.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_cvsd_vocoder_la_CXXFLAGS) $(CXXFLAGS) -MT _cvsd_vocoder_la-cvsd_decode_bs.lo -MD -MP -MF $(DEPDIR)/_cvsd_vocoder_la-cvsd_decode_bs.Tpo -c -o _cvsd_vocoder_la-cvsd_decode_bs.lo `test -f 'cvsd_decode_bs.cc' || echo '$(srcdir)/'`cvsd_decode_bs.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_cvsd_vocoder_la-cvsd_decode_bs.Tpo $(DEPDIR)/_cvsd_vocoder_la-cvsd_decode_bs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cvsd_decode_bs.cc' object='_cvsd_vocoder_la-cvsd_decode_bs.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_cvsd_vocoder_la_CXXFLAGS) $(CXXFLAGS) -c -o _cvsd_vocoder_la-cvsd_decode_bs.lo `test -f 'cvsd_decode_bs.cc' || echo '$(srcdir)/'`cvsd_decode_bs.cc - -_cvsd_vocoder_la-cvsd_encode_sb.lo: cvsd_encode_sb.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_cvsd_vocoder_la_CXXFLAGS) $(CXXFLAGS) -MT _cvsd_vocoder_la-cvsd_encode_sb.lo -MD -MP -MF $(DEPDIR)/_cvsd_vocoder_la-cvsd_encode_sb.Tpo -c -o _cvsd_vocoder_la-cvsd_encode_sb.lo `test -f 'cvsd_encode_sb.cc' || echo '$(srcdir)/'`cvsd_encode_sb.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_cvsd_vocoder_la-cvsd_encode_sb.Tpo $(DEPDIR)/_cvsd_vocoder_la-cvsd_encode_sb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='cvsd_encode_sb.cc' object='_cvsd_vocoder_la-cvsd_encode_sb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_cvsd_vocoder_la_CXXFLAGS) $(CXXFLAGS) -c -o _cvsd_vocoder_la-cvsd_encode_sb.lo `test -f 'cvsd_encode_sb.cc' || echo '$(srcdir)/'`cvsd_encode_sb.cc - mostlyclean-libtool: -rm -f *.lo @@ -1187,7 +1228,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(cvsd_vocoder_pylibdir)" "$(DESTDIR)$(cvsd_vocoder_pythondir)" "$(DESTDIR)$(cvsd_vocoder_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ + for dir in "$(DESTDIR)$(cvsd_vocoder_pylibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cvsd_vocoder_pythondir)" "$(DESTDIR)$(cvsd_vocoder_swigincludedir)" "$(DESTDIR)$(grincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1221,7 +1262,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-cvsd_vocoder_pylibLTLIBRARIES clean-generic \ - clean-libtool mostlyclean-am + clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1250,7 +1291,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-am @@ -1293,30 +1334,31 @@ ps-am: uninstall-am: uninstall-cvsd_vocoder_pylibLTLIBRARIES \ uninstall-cvsd_vocoder_pythonPYTHON \ uninstall-cvsd_vocoder_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES .MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean \ clean-cvsd_vocoder_pylibLTLIBRARIES clean-generic \ - clean-libtool ctags dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-cvsd_vocoder_pylibLTLIBRARIES \ + clean-libLTLIBRARIES clean-libtool ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-cvsd_vocoder_pylibLTLIBRARIES \ install-cvsd_vocoder_pythonPYTHON \ install-cvsd_vocoder_swigincludeHEADERS install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-grincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am \ uninstall-cvsd_vocoder_pylibLTLIBRARIES \ uninstall-cvsd_vocoder_pythonPYTHON \ uninstall-cvsd_vocoder_swigincludeHEADERS \ - uninstall-grincludeHEADERS + uninstall-grincludeHEADERS uninstall-libLTLIBRARIES # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1329,75 +1371,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -cvsd_vocoder_pythondir_category ?= gnuradio/cvsd_vocoder -cvsd_vocoder_pylibdir_category ?= $(cvsd_vocoder_pythondir_category) - -cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder.cc: cvsd_vocoder.i - trap 'rm -rf $(DEPDIR)/cvsd_vocoder-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/cvsd_vocoder-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/cvsd_vocoder-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/cvsd_vocoder-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/cvsd_vocoder-generate-lock; \ - else \ - while test -d $(DEPDIR)/cvsd_vocoder-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/cvsd_vocoder-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/cvsd_vocoder-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(cvsd_vocoder_swig_args) \ - -MD -MF $(DEPDIR)/cvsd_vocoder.Std \ - -module cvsd_vocoder -o cvsd_vocoder.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/cvsd_vocoder.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder.Std \ - > $(DEPDIR)/cvsd_vocoder.Sd; \ - $(RM) $(DEPDIR)/cvsd_vocoder.Std; \ - $(MV) $(DEPDIR)/cvsd_vocoder.Sd $(DEPDIR)/cvsd_vocoder.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/cvsd_vocoder.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/cvsd_vocoder.d - cp $(DEPDIR)/cvsd_vocoder.Std $(DEPDIR)/cvsd_vocoder.d - echo "" >> $(DEPDIR)/cvsd_vocoder.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/cvsd_vocoder.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/cvsd_vocoder.d - $(RM) $(DEPDIR)/cvsd_vocoder.Std - touch $(DEPDIR)/cvsd_vocoder-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@cvsd_vocoder_pythondir_category ?= gnuradio/cvsd_vocoder +@PYTHON_TRUE@cvsd_vocoder_pylibdir_category ?= $(cvsd_vocoder_pythondir_category) + +@PYTHON_TRUE@cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder.cc: cvsd_vocoder.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/cvsd_vocoder-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/cvsd_vocoder-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/cvsd_vocoder-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/cvsd_vocoder-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/cvsd_vocoder-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/cvsd_vocoder-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/cvsd_vocoder-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/cvsd_vocoder-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(cvsd_vocoder_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/cvsd_vocoder.Std \ +@PYTHON_TRUE@ -module cvsd_vocoder -o cvsd_vocoder.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/cvsd_vocoder.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/cvsd_vocoder.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/cvsd_vocoder.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/cvsd_vocoder.Sd $(DEPDIR)/cvsd_vocoder.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/cvsd_vocoder.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/cvsd_vocoder.d +@PYTHON_TRUE@ cp $(DEPDIR)/cvsd_vocoder.Std $(DEPDIR)/cvsd_vocoder.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/cvsd_vocoder.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/cvsd_vocoder.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/cvsd_vocoder.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/cvsd_vocoder.Std +@PYTHON_TRUE@ touch $(DEPDIR)/cvsd_vocoder-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/cvsd_vocoder.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvsd_vocoder.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-cvsd-vocoder/src/python/Makefile.in b/gr-cvsd-vocoder/src/python/Makefile.in index 2df3fd20..62bcac8f 100644 --- a/gr-cvsd-vocoder/src/python/Makefile.in +++ b/gr-cvsd-vocoder/src/python/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -208,6 +208,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@ @@ -215,6 +216,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@ @@ -233,6 +238,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -242,20 +248,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@ @@ -278,6 +287,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@ @@ -339,6 +350,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@ @@ -351,17 +363,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@ @@ -377,7 +389,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@ @@ -429,6 +440,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@ @@ -459,6 +475,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@ @@ -480,6 +501,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@ @@ -562,26 +593,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@ @@ -612,7 +628,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@ @@ -622,23 +637,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 @@ -650,7 +668,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, @@ -658,10 +676,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@ @@ -677,18 +691,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@ @@ -703,15 +705,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 = diff --git a/gr-gcell/Makefile.in b/gr-gcell/Makefile.in index b9f46529..28786b63 100644 --- a/gr-gcell/Makefile.in +++ b/gr-gcell/Makefile.in @@ -37,7 +37,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 # @@ -91,36 +91,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 \ @@ -134,9 +137,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 \ @@ -221,6 +221,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@ @@ -228,6 +229,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@ @@ -246,6 +251,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +261,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@ @@ -291,6 +300,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@ @@ -352,6 +363,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@ @@ -364,17 +376,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@ @@ -390,7 +402,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@ @@ -442,6 +453,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@ @@ -472,6 +488,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@ @@ -493,6 +514,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@ @@ -575,26 +606,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@ @@ -625,7 +641,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@ @@ -635,23 +650,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 @@ -663,7 +681,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, @@ -671,10 +689,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@ @@ -690,18 +704,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@ @@ -716,15 +718,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 = diff --git a/gr-gcell/src/Makefile.in b/gr-gcell/src/Makefile.in index 2680c203..5994ac9a 100644 --- a/gr-gcell/src/Makefile.in +++ b/gr-gcell/src/Makefile.in @@ -37,7 +37,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 # @@ -124,11 +124,13 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(gcell_python_PYTHON) $(gcell_swiginclude_HEADERS) \ - $(grinclude_HEADERS) $(noinst_PYTHON) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ - $(srcdir)/run_tests.in $(top_srcdir)/Makefile.common \ - $(top_srcdir)/Makefile.swig +DIST_COMMON = $(am__gcell_python_PYTHON_DIST) \ + $(am__gcell_swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ + $(noinst_PYTHON) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \ + $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/gcell-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-gcell/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -142,36 +144,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 \ @@ -185,9 +190,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 \ @@ -237,19 +239,22 @@ am__installdirs = "$(DESTDIR)$(gcell_pylibdir)" "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(grincludedir)" LTLIBRARIES = $(gcell_pylib_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -_gcell_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(gcell_la_swig_libadd) -am__gcell_la_OBJECTS = _gcell_la-gcell.lo +@PYTHON_TRUE@_gcell_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(gcell_la_swig_libadd) +am___gcell_la_SOURCES_DIST = gcell.cc +@PYTHON_TRUE@am__gcell_la_OBJECTS = _gcell_la-gcell.lo _gcell_la_OBJECTS = $(am__gcell_la_OBJECTS) _gcell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(_gcell_la_CXXFLAGS) \ $(CXXFLAGS) $(_gcell_la_LDFLAGS) $(LDFLAGS) -o $@ -libgr_gcell_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@am__gcell_la_rpath = -rpath $(gcell_pylibdir) +libgnuradio_gcell_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_libgr_gcell_la_OBJECTS = gcell_fft_vcc.lo -libgr_gcell_la_OBJECTS = $(am_libgr_gcell_la_OBJECTS) -libgr_gcell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +am_libgnuradio_gcell_la_OBJECTS = gcell_fft_vcc.lo +libgnuradio_gcell_la_OBJECTS = $(am_libgnuradio_gcell_la_OBJECTS) +libgnuradio_gcell_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libgr_gcell_la_LDFLAGS) $(LDFLAGS) -o $@ + $(CXXFLAGS) $(libgnuradio_gcell_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -263,8 +268,9 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_gcell_la_SOURCES) $(libgr_gcell_la_SOURCES) -DIST_SOURCES = $(_gcell_la_SOURCES) $(libgr_gcell_la_SOURCES) +SOURCES = $(_gcell_la_SOURCES) $(libgnuradio_gcell_la_SOURCES) +DIST_SOURCES = $(am___gcell_la_SOURCES_DIST) \ + $(libgnuradio_gcell_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -272,7 +278,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__gcell_python_PYTHON_DIST = gcell.py py_compile = $(top_srcdir)/py-compile +am__gcell_swiginclude_HEADERS_DIST = gcell.i gc_job_manager.i \ + gcell_fft_vcc.i HEADERS = $(gcell_swiginclude_HEADERS) $(grinclude_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -329,6 +338,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@ @@ -336,6 +346,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@ @@ -354,6 +368,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -363,20 +378,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@ @@ -399,6 +417,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@ @@ -460,6 +480,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@ @@ -472,17 +493,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@ @@ -498,7 +519,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@ @@ -550,6 +570,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@ @@ -580,6 +605,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@ @@ -601,6 +631,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@ @@ -683,26 +723,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@ @@ -733,7 +758,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@ @@ -743,23 +767,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 @@ -771,7 +798,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, @@ -779,10 +806,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@ @@ -798,18 +821,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@ @@ -824,23 +835,23 @@ 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 = $(DEPDIR)/gcell-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) SUBDIRS = . examples -EXTRA_DIST = run_tests.in -TESTS = run_tests AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \ $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -859,8 +870,8 @@ DISTCLEANFILES = \ # ---------------------------------------------------------------- # the library for the C++ blocks -lib_LTLIBRARIES = libgr_gcell.la -libgr_gcell_la_SOURCES = \ +lib_LTLIBRARIES = libgnuradio_gcell.la +libgnuradio_gcell_la_SOURCES = \ gcell_fft_vcc.cc @@ -868,104 +879,106 @@ libgr_gcell_la_SOURCES = \ grinclude_HEADERS = \ gcell_fft_vcc.h -libgr_gcell_la_LIBADD = \ +libgnuradio_gcell_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(GCELL_LA) -libgr_gcell_la_LDFLAGS = $(NO_UNDEFINED) +libgnuradio_gcell_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) # ---------------------------------------------------------------- # SWIG stuff # ---------------------------------------------------------------- -TOP_SWIG_IFILES = \ - gcell.i +@PYTHON_TRUE@EXTRA_DIST = run_tests.in +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ gcell.i # Install so that they end up available as: # import gnuradio.gcell # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -gcell_pythondir_category = \ - gnuradio +@PYTHON_TRUE@gcell_pythondir_category = \ +@PYTHON_TRUE@ gnuradio # additional arguments to the SWIG command -gcell_swig_args = \ - $(GCELL_INCLUDES) +@PYTHON_TRUE@gcell_swig_args = \ +@PYTHON_TRUE@ $(GCELL_INCLUDES) # additional libraries for linking with the SWIG-generated library -gcell_la_swig_libadd = \ - libgr_gcell.la +@PYTHON_TRUE@gcell_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio_gcell.la # additional SWIG files to be installed -gcell_swiginclude_headers = \ - gc_job_manager.i \ - gcell_fft_vcc.i - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = gcell.py gcell.cc -gcell_pythondir = $(pythondir)/$(gcell_pythondir_category) -gcell_pylibdir = $(pyexecdir)/$(gcell_pylibdir_category) -gcell_swigincludedir = $(swigincludedir) -gcell_swiginclude_HEADERS = \ - gcell.i \ - $(gcell_swiginclude_headers) - -gcell_pylib_LTLIBRARIES = \ - _gcell.la - -_gcell_la_SOURCES = \ - gcell.cc \ - $(gcell_la_swig_sources) - -_gcell_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(gcell_la_swig_libadd) - -_gcell_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(gcell_la_swig_ldflags) - -_gcell_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(gcell_la_swig_cxxflags) - -gcell_python_PYTHON = \ - gcell.py \ - $(gcell_python) +@PYTHON_TRUE@gcell_swiginclude_headers = \ +@PYTHON_TRUE@ gc_job_manager.i \ +@PYTHON_TRUE@ gcell_fft_vcc.i + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = gcell.py gcell.cc +@PYTHON_TRUE@gcell_pythondir = $(pythondir)/$(gcell_pythondir_category) +@PYTHON_TRUE@gcell_pylibdir = $(pyexecdir)/$(gcell_pylibdir_category) +@PYTHON_TRUE@gcell_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@gcell_swiginclude_HEADERS = \ +@PYTHON_TRUE@ gcell.i \ +@PYTHON_TRUE@ $(gcell_swiginclude_headers) + +@PYTHON_TRUE@gcell_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _gcell.la + +@PYTHON_TRUE@_gcell_la_SOURCES = \ +@PYTHON_TRUE@ gcell.cc \ +@PYTHON_TRUE@ $(gcell_la_swig_sources) + +@PYTHON_TRUE@_gcell_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(gcell_la_swig_libadd) + +@PYTHON_TRUE@_gcell_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(gcell_la_swig_ldflags) + +@PYTHON_TRUE@_gcell_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(gcell_la_swig_cxxflags) + +@PYTHON_TRUE@gcell_python_PYTHON = \ +@PYTHON_TRUE@ gcell.py \ +@PYTHON_TRUE@ $(gcell_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1066,9 +1079,9 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done _gcell.la: $(_gcell_la_OBJECTS) $(_gcell_la_DEPENDENCIES) - $(_gcell_la_LINK) -rpath $(gcell_pylibdir) $(_gcell_la_OBJECTS) $(_gcell_la_LIBADD) $(LIBS) -libgr_gcell.la: $(libgr_gcell_la_OBJECTS) $(libgr_gcell_la_DEPENDENCIES) - $(libgr_gcell_la_LINK) -rpath $(libdir) $(libgr_gcell_la_OBJECTS) $(libgr_gcell_la_LIBADD) $(LIBS) + $(_gcell_la_LINK) $(am__gcell_la_rpath) $(_gcell_la_OBJECTS) $(_gcell_la_LIBADD) $(LIBS) +libgnuradio_gcell.la: $(libgnuradio_gcell_la_OBJECTS) $(libgnuradio_gcell_la_DEPENDENCIES) + $(libgnuradio_gcell_la_LINK) -rpath $(libdir) $(libgnuradio_gcell_la_OBJECTS) $(libgnuradio_gcell_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1631,75 +1644,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -gcell_pythondir_category ?= gnuradio/gcell -gcell_pylibdir_category ?= $(gcell_pythondir_category) - -gcell.h gcell.py gcell.cc: gcell.i - trap 'rm -rf $(DEPDIR)/gcell-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gcell-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gcell-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gcell-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gcell-generate-lock; \ - else \ - while test -d $(DEPDIR)/gcell-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gcell-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/gcell-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gcell_swig_args) \ - -MD -MF $(DEPDIR)/gcell.Std \ - -module gcell -o gcell.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gcell.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell.Std \ - > $(DEPDIR)/gcell.Sd; \ - $(RM) $(DEPDIR)/gcell.Std; \ - $(MV) $(DEPDIR)/gcell.Sd $(DEPDIR)/gcell.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gcell.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/gcell.d - cp $(DEPDIR)/gcell.Std $(DEPDIR)/gcell.d - echo "" >> $(DEPDIR)/gcell.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gcell.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gcell.d - $(RM) $(DEPDIR)/gcell.Std - touch $(DEPDIR)/gcell-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@gcell_pythondir_category ?= gnuradio/gcell +@PYTHON_TRUE@gcell_pylibdir_category ?= $(gcell_pythondir_category) + +@PYTHON_TRUE@gcell.h gcell.py gcell.cc: gcell.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/gcell-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/gcell-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/gcell-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gcell-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/gcell-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/gcell-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/gcell-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/gcell-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gcell_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/gcell.Std \ +@PYTHON_TRUE@ -module gcell -o gcell.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gcell.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/gcell.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gcell.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/gcell.Sd $(DEPDIR)/gcell.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gcell.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gcell.d +@PYTHON_TRUE@ cp $(DEPDIR)/gcell.Std $(DEPDIR)/gcell.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/gcell.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gcell.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gcell.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gcell.Std +@PYTHON_TRUE@ touch $(DEPDIR)/gcell-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/gcell.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcell.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-gcell/src/examples/Makefile.in b/gr-gcell/src/examples/Makefile.in index eacdc821..14c16a0b 100644 --- a/gr-gcell/src/examples/Makefile.in +++ b/gr-gcell/src/examples/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-gpio/Makefile.in b/gr-gpio/Makefile.in index 5f2135d2..24e2dbc9 100644 --- a/gr-gpio/Makefile.in +++ b/gr-gpio/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = diff --git a/gr-gpio/src/Makefile.in b/gr-gpio/src/Makefile.in index efda64f5..8d635e4f 100644 --- a/gr-gpio/src/Makefile.in +++ b/gr-gpio/src/Makefile.in @@ -55,6 +55,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@PYTHON_TRUE@am__append_1 = python subdir = gr-gpio/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -69,36 +70,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 \ @@ -112,9 +116,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 \ @@ -153,7 +154,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = fpga python DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -199,6 +200,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@ @@ -206,6 +208,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@ @@ -224,6 +230,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +240,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@ @@ -269,6 +279,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@ @@ -330,6 +342,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@ @@ -342,17 +355,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@ @@ -368,7 +381,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@ @@ -420,6 +432,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@ @@ -450,6 +467,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@ @@ -471,6 +493,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@ @@ -553,26 +585,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@ @@ -603,14 +620,13 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -SUBDIRS = python fpga +SUBDIRS = fpga $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gr-gpio/src/fpga/Makefile.in b/gr-gpio/src/fpga/Makefile.in index 32dca914..b93b96ed 100644 --- a/gr-gpio/src/fpga/Makefile.in +++ b/gr-gpio/src/fpga/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -199,6 +199,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@ @@ -206,6 +207,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@ @@ -224,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +239,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@ @@ -269,6 +278,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@ @@ -330,6 +341,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@ @@ -342,17 +354,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@ @@ -368,7 +380,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@ @@ -420,6 +431,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@ @@ -450,6 +466,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@ @@ -471,6 +492,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@ @@ -553,26 +584,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@ @@ -603,7 +619,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@ diff --git a/gr-gpio/src/fpga/include/Makefile.in b/gr-gpio/src/fpga/include/Makefile.in index 1c056b0c..f7ea9b01 100644 --- a/gr-gpio/src/fpga/include/Makefile.in +++ b/gr-gpio/src/fpga/include/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -159,6 +159,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@ @@ -166,6 +167,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@ @@ -184,6 +189,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -193,20 +199,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@ @@ -229,6 +238,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@ @@ -290,6 +301,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@ @@ -302,17 +314,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@ @@ -328,7 +340,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@ @@ -380,6 +391,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@ @@ -410,6 +426,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@ @@ -431,6 +452,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@ @@ -513,26 +544,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@ @@ -563,7 +579,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@ diff --git a/gr-gpio/src/fpga/lib/Makefile.in b/gr-gpio/src/fpga/lib/Makefile.in index 007180f7..3abf8bda 100644 --- a/gr-gpio/src/fpga/lib/Makefile.in +++ b/gr-gpio/src/fpga/lib/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -199,6 +199,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@ @@ -206,6 +207,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@ @@ -224,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +239,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@ @@ -269,6 +278,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@ @@ -330,6 +341,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@ @@ -342,17 +354,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@ @@ -368,7 +380,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@ @@ -420,6 +431,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@ @@ -450,6 +466,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@ @@ -471,6 +492,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@ @@ -553,26 +584,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@ @@ -603,7 +619,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@ diff --git a/gr-gpio/src/fpga/rbf/Makefile.in b/gr-gpio/src/fpga/rbf/Makefile.in index af3a0ddf..0fed522c 100644 --- a/gr-gpio/src/fpga/rbf/Makefile.in +++ b/gr-gpio/src/fpga/rbf/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -208,6 +208,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@ @@ -215,6 +216,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@ @@ -233,6 +238,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -242,20 +248,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@ @@ -278,6 +287,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@ @@ -339,6 +350,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@ @@ -351,17 +363,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@ @@ -377,7 +389,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@ @@ -429,6 +440,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@ @@ -459,6 +475,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@ @@ -480,6 +501,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@ @@ -562,26 +593,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@ @@ -612,7 +628,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@ @@ -622,23 +637,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 @@ -650,7 +668,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, @@ -658,10 +676,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@ @@ -677,18 +691,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@ @@ -703,15 +705,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 = diff --git a/gr-gpio/src/fpga/top/Makefile.in b/gr-gpio/src/fpga/top/Makefile.in index 327867a4..99a5b64a 100644 --- a/gr-gpio/src/fpga/top/Makefile.in +++ b/gr-gpio/src/fpga/top/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-gpio/src/python/Makefile.in b/gr-gpio/src/python/Makefile.in index c2e3e32f..1ecda1da 100644 --- a/gr-gpio/src/python/Makefile.in +++ b/gr-gpio/src/python/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -208,6 +208,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@ @@ -215,6 +216,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@ @@ -233,6 +238,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -242,20 +248,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@ @@ -278,6 +287,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@ @@ -339,6 +350,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@ @@ -351,17 +363,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@ @@ -377,7 +389,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@ @@ -429,6 +440,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@ @@ -459,6 +475,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@ @@ -480,6 +501,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@ @@ -562,26 +593,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@ @@ -612,7 +628,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@ @@ -622,23 +637,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 @@ -650,7 +668,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, @@ -658,10 +676,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@ @@ -677,18 +691,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@ @@ -703,15 +705,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 = diff --git a/gr-gsm-fr-vocoder/Makefile.in b/gr-gsm-fr-vocoder/Makefile.in index a93f583b..c52b6728 100644 --- a/gr-gsm-fr-vocoder/Makefile.in +++ b/gr-gsm-fr-vocoder/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2004 Free Software Foundation, Inc. +# Copyright 2004,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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 # @@ -57,6 +57,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. # + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -77,7 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(dist_pkgconfig_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gnuradio-gsm-fr-vocoder.pc.in \ $(top_srcdir)/Makefile.common subdir = gr-gsm-fr-vocoder ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -92,36 +94,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 \ @@ -135,9 +140,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 \ @@ -158,7 +160,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 = +CONFIG_CLEAN_FILES = gnuradio-gsm-fr-vocoder.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -169,6 +171,29 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +DATA = $(dist_pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -176,6 +201,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -221,6 +247,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@ @@ -228,6 +255,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@ @@ -246,6 +277,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +287,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@ @@ -291,6 +326,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@ @@ -352,6 +389,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@ @@ -364,17 +402,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@ @@ -390,7 +428,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@ @@ -442,6 +479,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@ @@ -472,6 +514,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@ @@ -493,6 +540,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@ @@ -575,26 +632,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@ @@ -625,7 +667,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@ @@ -635,23 +676,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 @@ -663,7 +707,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, @@ -671,10 +715,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@ @@ -690,18 +730,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@ @@ -716,21 +744,24 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT SUBDIRS = src -DIST_SUBDIRS = src +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-gsm-fr-vocoder.pc all: all-recursive .SUFFIXES: @@ -764,12 +795,34 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +gnuradio-gsm-fr-vocoder.pc: $(top_builddir)/config.status $(srcdir)/gnuradio-gsm-fr-vocoder.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs +install-dist_pkgconfigDATA: $(dist_pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-dist_pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -969,9 +1022,12 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -1018,7 +1074,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-dist_pkgconfigDATA install-dvi: install-dvi-recursive @@ -1062,7 +1118,7 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-dist_pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1072,14 +1128,15 @@ uninstall-am: ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + install-data-am install-dist_pkgconfigDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-dist_pkgconfigDATA # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gr-gsm-fr-vocoder/src/Makefile.in b/gr-gsm-fr-vocoder/src/Makefile.in index 6cbb71d2..b227e135 100644 --- a/gr-gsm-fr-vocoder/src/Makefile.in +++ b/gr-gsm-fr-vocoder/src/Makefile.in @@ -55,6 +55,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@PYTHON_TRUE@am__append_1 = python subdir = gr-gsm-fr-vocoder/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -69,36 +70,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 \ @@ -112,9 +116,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 \ @@ -153,7 +154,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib python DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -199,6 +200,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@ @@ -206,6 +208,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@ @@ -224,6 +230,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +240,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@ @@ -269,6 +279,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@ @@ -330,6 +342,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@ @@ -342,17 +355,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@ @@ -368,7 +381,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@ @@ -420,6 +432,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@ @@ -450,6 +467,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@ @@ -471,6 +493,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@ @@ -553,26 +585,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@ @@ -603,14 +620,13 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -SUBDIRS = lib python +SUBDIRS = lib $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.in b/gr-gsm-fr-vocoder/src/lib/Makefile.in index 6b1edef1..3f15400b 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.in +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.in @@ -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 # @@ -125,10 +125,13 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grinclude_HEADERS) $(gsm_full_rate_python_PYTHON) \ - $(gsm_full_rate_swiginclude_HEADERS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__gsm_full_rate_python_PYTHON_DIST) \ + $(am__gsm_full_rate_swiginclude_HEADERS_DIST) \ + $(grinclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/gsm_full_rate-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-gsm-fr-vocoder/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -142,36 +145,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 \ @@ -185,9 +191,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 \ @@ -232,23 +235,33 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(gsm_full_rate_pylibdir)" \ - "$(DESTDIR)$(gsm_full_rate_pythondir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gsm_full_rate_pythondir)" \ "$(DESTDIR)$(grincludedir)" \ "$(DESTDIR)$(gsm_full_rate_swigincludedir)" -LTLIBRARIES = $(gsm_full_rate_pylib_LTLIBRARIES) +LTLIBRARIES = $(gsm_full_rate_pylib_LTLIBRARIES) $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) gsm/libgsm.la -_gsm_full_rate_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__objects_1 = _gsm_full_rate_la-gsm_fr_decode_ps.lo \ - _gsm_full_rate_la-gsm_fr_encode_sp.lo -am__gsm_full_rate_la_OBJECTS = _gsm_full_rate_la-gsm_full_rate.lo \ - $(am__objects_1) +@PYTHON_TRUE@_gsm_full_rate_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(gsm_full_rate_la_swig_libadd) +am___gsm_full_rate_la_SOURCES_DIST = gsm_full_rate.cc +@PYTHON_TRUE@am__gsm_full_rate_la_OBJECTS = \ +@PYTHON_TRUE@ _gsm_full_rate_la-gsm_full_rate.lo _gsm_full_rate_la_OBJECTS = $(am__gsm_full_rate_la_OBJECTS) _gsm_full_rate_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(_gsm_full_rate_la_CXXFLAGS) $(CXXFLAGS) \ $(_gsm_full_rate_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__gsm_full_rate_la_rpath = -rpath \ +@PYTHON_TRUE@ $(gsm_full_rate_pylibdir) +libgnuradio_gsm_fr_vocoder_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + gsm/libgsm.la +am_libgnuradio_gsm_fr_vocoder_la_OBJECTS = gsm_fr_decode_ps.lo \ + gsm_fr_encode_sp.lo +libgnuradio_gsm_fr_vocoder_la_OBJECTS = \ + $(am_libgnuradio_gsm_fr_vocoder_la_OBJECTS) +libgnuradio_gsm_fr_vocoder_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(libgnuradio_gsm_fr_vocoder_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -262,8 +275,10 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_gsm_full_rate_la_SOURCES) -DIST_SOURCES = $(_gsm_full_rate_la_SOURCES) +SOURCES = $(_gsm_full_rate_la_SOURCES) \ + $(libgnuradio_gsm_fr_vocoder_la_SOURCES) +DIST_SOURCES = $(am___gsm_full_rate_la_SOURCES_DIST) \ + $(libgnuradio_gsm_fr_vocoder_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -271,7 +286,9 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__gsm_full_rate_python_PYTHON_DIST = gsm_full_rate.py py_compile = $(top_srcdir)/py-compile +am__gsm_full_rate_swiginclude_HEADERS_DIST = gsm_full_rate.i HEADERS = $(grinclude_HEADERS) $(gsm_full_rate_swiginclude_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -326,6 +343,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@ @@ -333,6 +351,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@ @@ -351,6 +373,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -360,20 +383,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@ @@ -396,6 +422,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@ @@ -457,6 +485,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@ @@ -469,17 +498,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@ @@ -495,7 +524,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@ @@ -547,6 +575,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@ @@ -577,6 +610,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@ @@ -598,6 +636,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@ @@ -680,26 +728,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@ @@ -730,7 +763,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@ @@ -740,23 +772,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 @@ -768,7 +803,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, @@ -776,10 +811,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@ @@ -795,18 +826,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@ @@ -821,20 +840,22 @@ 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 = $(DEPDIR)/gsm_full_rate-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) SUBDIRS = gsm . AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -843,93 +864,96 @@ grinclude_HEADERS = \ gsm_fr_decode_ps.h \ gsm_fr_encode_sp.h +lib_LTLIBRARIES = libgnuradio-gsm-fr-vocoder.la +libgnuradio_gsm_fr_vocoder_la_SOURCES = \ + gsm_fr_decode_ps.cc \ + gsm_fr_encode_sp.cc + +libgnuradio_gsm_fr_vocoder_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + gsm/libgsm.la + +libgnuradio_gsm_fr_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) # SWIG interface and library -TOP_SWIG_IFILES = \ - gsm_full_rate.i +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ gsm_full_rate.i # Install so that they end up available as: # import gnuradio.vocoder.gsm_full_rate # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder -gsm_full_rate_pythondir_category = \ - gnuradio/vocoder - - -# additional sources for the SWIG-generated library -gsm_full_rate_la_swig_sources = \ - gsm_fr_decode_ps.cc \ - gsm_fr_encode_sp.cc +@PYTHON_TRUE@gsm_full_rate_pythondir_category = \ +@PYTHON_TRUE@ gnuradio/vocoder # additional libraries for linking with the SWIG-generated library -gsm_full_rate_la_swig_libadd = \ - $(GNURADIO_CORE_LA) \ - gsm/libgsm.la - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = gsm_full_rate.py gsm_full_rate.cc -gsm_full_rate_pythondir = $(pythondir)/$(gsm_full_rate_pythondir_category) -gsm_full_rate_pylibdir = $(pyexecdir)/$(gsm_full_rate_pylibdir_category) -gsm_full_rate_swigincludedir = $(swigincludedir) -gsm_full_rate_swiginclude_HEADERS = \ - gsm_full_rate.i \ - $(gsm_full_rate_swiginclude_headers) - -gsm_full_rate_pylib_LTLIBRARIES = \ - _gsm_full_rate.la - -_gsm_full_rate_la_SOURCES = \ - gsm_full_rate.cc \ - $(gsm_full_rate_la_swig_sources) - -_gsm_full_rate_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(gsm_full_rate_la_swig_libadd) - -_gsm_full_rate_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(gsm_full_rate_la_swig_ldflags) - -_gsm_full_rate_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(gsm_full_rate_la_swig_cxxflags) - -gsm_full_rate_python_PYTHON = \ - gsm_full_rate.py \ - $(gsm_full_rate_python) +@PYTHON_TRUE@gsm_full_rate_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-gsm-fr-vocoder.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = gsm_full_rate.py gsm_full_rate.cc +@PYTHON_TRUE@gsm_full_rate_pythondir = $(pythondir)/$(gsm_full_rate_pythondir_category) +@PYTHON_TRUE@gsm_full_rate_pylibdir = $(pyexecdir)/$(gsm_full_rate_pylibdir_category) +@PYTHON_TRUE@gsm_full_rate_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@gsm_full_rate_swiginclude_HEADERS = \ +@PYTHON_TRUE@ gsm_full_rate.i \ +@PYTHON_TRUE@ $(gsm_full_rate_swiginclude_headers) + +@PYTHON_TRUE@gsm_full_rate_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _gsm_full_rate.la + +@PYTHON_TRUE@_gsm_full_rate_la_SOURCES = \ +@PYTHON_TRUE@ gsm_full_rate.cc \ +@PYTHON_TRUE@ $(gsm_full_rate_la_swig_sources) + +@PYTHON_TRUE@_gsm_full_rate_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(gsm_full_rate_la_swig_libadd) + +@PYTHON_TRUE@_gsm_full_rate_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(gsm_full_rate_la_swig_ldflags) + +@PYTHON_TRUE@_gsm_full_rate_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(gsm_full_rate_la_swig_cxxflags) + +@PYTHON_TRUE@gsm_full_rate_python_PYTHON = \ +@PYTHON_TRUE@ gsm_full_rate.py \ +@PYTHON_TRUE@ $(gsm_full_rate_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -996,8 +1020,41 @@ clean-gsm_full_rate_pylibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done _gsm_full_rate.la: $(_gsm_full_rate_la_OBJECTS) $(_gsm_full_rate_la_DEPENDENCIES) - $(_gsm_full_rate_la_LINK) -rpath $(gsm_full_rate_pylibdir) $(_gsm_full_rate_la_OBJECTS) $(_gsm_full_rate_la_LIBADD) $(LIBS) + $(_gsm_full_rate_la_LINK) $(am__gsm_full_rate_la_rpath) $(_gsm_full_rate_la_OBJECTS) $(_gsm_full_rate_la_LIBADD) $(LIBS) +libgnuradio-gsm-fr-vocoder.la: $(libgnuradio_gsm_fr_vocoder_la_OBJECTS) $(libgnuradio_gsm_fr_vocoder_la_DEPENDENCIES) + $(libgnuradio_gsm_fr_vocoder_la_LINK) -rpath $(libdir) $(libgnuradio_gsm_fr_vocoder_la_OBJECTS) $(libgnuradio_gsm_fr_vocoder_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1005,9 +1062,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gsm_full_rate_la-gsm_fr_decode_ps.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gsm_full_rate_la-gsm_fr_encode_sp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_gsm_full_rate_la-gsm_full_rate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_fr_decode_ps.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_fr_encode_sp.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1037,20 +1094,6 @@ _gsm_full_rate_la-gsm_full_rate.lo: gsm_full_rate.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gsm_full_rate_la_CXXFLAGS) $(CXXFLAGS) -c -o _gsm_full_rate_la-gsm_full_rate.lo `test -f 'gsm_full_rate.cc' || echo '$(srcdir)/'`gsm_full_rate.cc -_gsm_full_rate_la-gsm_fr_decode_ps.lo: gsm_fr_decode_ps.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gsm_full_rate_la_CXXFLAGS) $(CXXFLAGS) -MT _gsm_full_rate_la-gsm_fr_decode_ps.lo -MD -MP -MF $(DEPDIR)/_gsm_full_rate_la-gsm_fr_decode_ps.Tpo -c -o _gsm_full_rate_la-gsm_fr_decode_ps.lo `test -f 'gsm_fr_decode_ps.cc' || echo '$(srcdir)/'`gsm_fr_decode_ps.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_gsm_full_rate_la-gsm_fr_decode_ps.Tpo $(DEPDIR)/_gsm_full_rate_la-gsm_fr_decode_ps.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='gsm_fr_decode_ps.cc' object='_gsm_full_rate_la-gsm_fr_decode_ps.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gsm_full_rate_la_CXXFLAGS) $(CXXFLAGS) -c -o _gsm_full_rate_la-gsm_fr_decode_ps.lo `test -f 'gsm_fr_decode_ps.cc' || echo '$(srcdir)/'`gsm_fr_decode_ps.cc - -_gsm_full_rate_la-gsm_fr_encode_sp.lo: gsm_fr_encode_sp.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gsm_full_rate_la_CXXFLAGS) $(CXXFLAGS) -MT _gsm_full_rate_la-gsm_fr_encode_sp.lo -MD -MP -MF $(DEPDIR)/_gsm_full_rate_la-gsm_fr_encode_sp.Tpo -c -o _gsm_full_rate_la-gsm_fr_encode_sp.lo `test -f 'gsm_fr_encode_sp.cc' || echo '$(srcdir)/'`gsm_fr_encode_sp.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_gsm_full_rate_la-gsm_fr_encode_sp.Tpo $(DEPDIR)/_gsm_full_rate_la-gsm_fr_encode_sp.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='gsm_fr_encode_sp.cc' object='_gsm_full_rate_la-gsm_fr_encode_sp.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gsm_full_rate_la_CXXFLAGS) $(CXXFLAGS) -c -o _gsm_full_rate_la-gsm_fr_encode_sp.lo `test -f 'gsm_fr_encode_sp.cc' || echo '$(srcdir)/'`gsm_fr_encode_sp.cc - mostlyclean-libtool: -rm -f *.lo @@ -1337,7 +1380,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(gsm_full_rate_pylibdir)" "$(DESTDIR)$(gsm_full_rate_pythondir)" "$(DESTDIR)$(grincludedir)" "$(DESTDIR)$(gsm_full_rate_swigincludedir)"; do \ + for dir in "$(DESTDIR)$(gsm_full_rate_pylibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gsm_full_rate_pythondir)" "$(DESTDIR)$(grincludedir)" "$(DESTDIR)$(gsm_full_rate_swigincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1371,7 +1414,7 @@ maintainer-clean-generic: clean: clean-recursive clean-am: clean-generic clean-gsm_full_rate_pylibLTLIBRARIES \ - clean-libtool mostlyclean-am + clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-recursive -rm -rf ./$(DEPDIR) @@ -1400,7 +1443,7 @@ install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-recursive @@ -1443,7 +1486,8 @@ ps-am: uninstall-am: uninstall-grincludeHEADERS \ uninstall-gsm_full_rate_pylibLTLIBRARIES \ uninstall-gsm_full_rate_pythonPYTHON \ - uninstall-gsm_full_rate_swigincludeHEADERS + uninstall-gsm_full_rate_swigincludeHEADERS \ + uninstall-libLTLIBRARIES .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ ctags-recursive install install-am install-strip \ @@ -1451,25 +1495,28 @@ uninstall-am: uninstall-grincludeHEADERS \ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-gsm_full_rate_pylibLTLIBRARIES clean-libtool ctags \ - ctags-recursive dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-grincludeHEADERS \ + clean-gsm_full_rate_pylibLTLIBRARIES clean-libLTLIBRARIES \ + clean-libtool ctags ctags-recursive dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-grincludeHEADERS \ install-gsm_full_rate_pylibLTLIBRARIES \ install-gsm_full_rate_pythonPYTHON \ install-gsm_full_rate_swigincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-grincludeHEADERS \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-grincludeHEADERS \ uninstall-gsm_full_rate_pylibLTLIBRARIES \ uninstall-gsm_full_rate_pythonPYTHON \ - uninstall-gsm_full_rate_swigincludeHEADERS + uninstall-gsm_full_rate_swigincludeHEADERS \ + uninstall-libLTLIBRARIES # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1482,75 +1529,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -gsm_full_rate_pythondir_category ?= gnuradio/gsm_full_rate -gsm_full_rate_pylibdir_category ?= $(gsm_full_rate_pythondir_category) - -gsm_full_rate.h gsm_full_rate.py gsm_full_rate.cc: gsm_full_rate.i - trap 'rm -rf $(DEPDIR)/gsm_full_rate-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gsm_full_rate-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gsm_full_rate-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gsm_full_rate-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gsm_full_rate-generate-lock; \ - else \ - while test -d $(DEPDIR)/gsm_full_rate-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gsm_full_rate-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/gsm_full_rate-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gsm_full_rate_swig_args) \ - -MD -MF $(DEPDIR)/gsm_full_rate.Std \ - -module gsm_full_rate -o gsm_full_rate.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gsm_full_rate.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate.Std \ - > $(DEPDIR)/gsm_full_rate.Sd; \ - $(RM) $(DEPDIR)/gsm_full_rate.Std; \ - $(MV) $(DEPDIR)/gsm_full_rate.Sd $(DEPDIR)/gsm_full_rate.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gsm_full_rate.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/gsm_full_rate.d - cp $(DEPDIR)/gsm_full_rate.Std $(DEPDIR)/gsm_full_rate.d - echo "" >> $(DEPDIR)/gsm_full_rate.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gsm_full_rate.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gsm_full_rate.d - $(RM) $(DEPDIR)/gsm_full_rate.Std - touch $(DEPDIR)/gsm_full_rate-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@gsm_full_rate_pythondir_category ?= gnuradio/gsm_full_rate +@PYTHON_TRUE@gsm_full_rate_pylibdir_category ?= $(gsm_full_rate_pythondir_category) + +@PYTHON_TRUE@gsm_full_rate.h gsm_full_rate.py gsm_full_rate.cc: gsm_full_rate.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/gsm_full_rate-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/gsm_full_rate-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/gsm_full_rate-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gsm_full_rate-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/gsm_full_rate-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/gsm_full_rate-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/gsm_full_rate-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/gsm_full_rate-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gsm_full_rate_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/gsm_full_rate.Std \ +@PYTHON_TRUE@ -module gsm_full_rate -o gsm_full_rate.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gsm_full_rate.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/gsm_full_rate.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gsm_full_rate.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/gsm_full_rate.Sd $(DEPDIR)/gsm_full_rate.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gsm_full_rate.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gsm_full_rate.d +@PYTHON_TRUE@ cp $(DEPDIR)/gsm_full_rate.Std $(DEPDIR)/gsm_full_rate.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/gsm_full_rate.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gsm_full_rate.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gsm_full_rate.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/gsm_full_rate.Std +@PYTHON_TRUE@ touch $(DEPDIR)/gsm_full_rate-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/gsm_full_rate.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm_full_rate.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in index de54af1d..6192683c 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in +++ b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -207,6 +207,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@ @@ -214,6 +215,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@ @@ -232,6 +237,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -241,20 +247,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@ @@ -277,6 +286,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@ @@ -338,6 +349,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@ @@ -350,17 +362,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@ @@ -376,7 +388,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@ @@ -428,6 +439,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@ @@ -458,6 +474,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@ @@ -479,6 +500,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@ @@ -561,26 +592,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@ @@ -611,7 +627,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@ @@ -621,23 +636,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 @@ -649,7 +667,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, @@ -657,10 +675,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@ @@ -676,18 +690,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@ @@ -702,15 +704,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 = diff --git a/gr-gsm-fr-vocoder/src/python/Makefile.in b/gr-gsm-fr-vocoder/src/python/Makefile.in index 4c508a26..a55af299 100644 --- a/gr-gsm-fr-vocoder/src/python/Makefile.in +++ b/gr-gsm-fr-vocoder/src/python/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -186,6 +186,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@ @@ -193,6 +194,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@ @@ -211,6 +216,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -220,20 +226,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@ @@ -256,6 +265,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@ @@ -317,6 +328,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@ @@ -329,17 +341,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@ @@ -355,7 +367,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@ @@ -407,6 +418,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@ @@ -437,6 +453,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@ @@ -458,6 +479,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@ @@ -540,26 +571,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@ @@ -590,7 +606,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@ @@ -600,23 +615,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 @@ -628,7 +646,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, @@ -636,10 +654,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@ @@ -655,18 +669,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@ @@ -681,15 +683,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 = diff --git a/gr-pager/Makefile.in b/gr-pager/Makefile.in index 32851517..039e1ce0 100644 --- a/gr-pager/Makefile.in +++ b/gr-pager/Makefile.in @@ -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 # @@ -57,6 +57,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. # + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -77,8 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = README $(dist_pkgconfig_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gnuradio-pager.pc.in \ $(top_srcdir)/Makefile.common +@PYTHON_TRUE@am__append_1 = swig python apps grc subdir = gr-pager ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -92,36 +95,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 \ @@ -135,9 +141,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 \ @@ -158,7 +161,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 = +CONFIG_CLEAN_FILES = gnuradio-pager.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -169,6 +172,29 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +DATA = $(dist_pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -176,7 +202,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib swig python apps grc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -222,6 +248,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@ @@ -229,6 +256,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@ @@ -247,6 +278,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +288,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@ @@ -292,6 +327,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@ @@ -353,6 +390,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@ @@ -365,17 +403,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@ @@ -391,7 +429,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@ @@ -443,6 +480,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@ @@ -473,6 +515,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@ @@ -494,6 +541,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@ @@ -576,26 +633,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@ @@ -626,7 +668,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@ @@ -636,23 +677,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 @@ -664,7 +708,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, @@ -672,10 +716,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@ @@ -691,18 +731,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@ @@ -717,20 +745,24 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -SUBDIRS = src +SUBDIRS = lib $(am__append_1) +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-pager.pc all: all-recursive .SUFFIXES: @@ -764,12 +796,34 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +gnuradio-pager.pc: $(top_builddir)/config.status $(srcdir)/gnuradio-pager.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs +install-dist_pkgconfigDATA: $(dist_pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-dist_pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -969,9 +1023,12 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -1018,7 +1075,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-dist_pkgconfigDATA install-dvi: install-dvi-recursive @@ -1062,7 +1119,7 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-dist_pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1072,14 +1129,15 @@ uninstall-am: ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + install-data-am install-dist_pkgconfigDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-dist_pkgconfigDATA # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gr-qtgui/Makefile.in b/gr-qtgui/Makefile.in index ff2c5970..2ec1fec2 100644 --- a/gr-qtgui/Makefile.in +++ b/gr-qtgui/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -221,6 +221,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@ @@ -228,6 +229,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@ @@ -246,6 +251,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +261,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@ @@ -291,6 +300,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@ @@ -352,6 +363,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@ @@ -364,17 +376,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@ @@ -390,7 +402,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@ @@ -442,6 +453,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@ @@ -472,6 +488,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@ @@ -493,6 +514,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@ @@ -575,26 +606,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@ @@ -625,7 +641,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@ @@ -635,23 +650,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 @@ -663,7 +681,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, @@ -671,10 +689,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@ @@ -690,18 +704,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@ @@ -716,15 +718,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 = diff --git a/gr-qtgui/src/Makefile.in b/gr-qtgui/src/Makefile.in index 4bfe84cb..6588109f 100644 --- a/gr-qtgui/src/Makefile.in +++ b/gr-qtgui/src/Makefile.in @@ -55,6 +55,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@PYTHON_TRUE@am__append_1 = python subdir = gr-qtgui/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -69,36 +70,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 \ @@ -112,9 +116,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 \ @@ -153,7 +154,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib python DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -199,6 +200,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@ @@ -206,6 +208,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@ @@ -224,6 +230,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +240,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@ @@ -269,6 +279,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@ @@ -330,6 +342,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@ @@ -342,17 +355,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@ @@ -368,7 +381,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@ @@ -420,6 +432,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@ @@ -450,6 +467,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@ @@ -471,6 +493,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@ @@ -553,26 +585,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@ @@ -603,14 +620,13 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -SUBDIRS = lib python +SUBDIRS = lib $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gr-qtgui/src/lib/Makefile.in b/gr-qtgui/src/lib/Makefile.in index 990e6cc8..e49661c4 100644 --- a/gr-qtgui/src/lib/Makefile.in +++ b/gr-qtgui/src/lib/Makefile.in @@ -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 # @@ -125,10 +125,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grinclude_HEADERS) $(qtgui_python_PYTHON) \ - $(qtgui_swiginclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ - $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +DIST_COMMON = $(am__qtgui_python_PYTHON_DIST) \ + $(am__qtgui_swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.swig.gen $(top_srcdir)/Makefile.common \ + $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/qtgui-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* + +# add some of the variables generated inside the Makefile.swig.gen +@PYTHON_TRUE@am__append_3 = \ +@PYTHON_TRUE@ $(swig_built_sources) + subdir = gr-qtgui/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -142,36 +150,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 \ @@ -185,9 +196,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 \ @@ -236,29 +244,20 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qtgui_pylibdir)" \ "$(DESTDIR)$(qtgui_swigincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(qtgui_pylib_LTLIBRARIES) am__DEPENDENCIES_1 = -_qtgui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(qtgui_la_swig_libadd) -am__qtgui_la_OBJECTS = _qtgui_la-qtgui.lo +@PYTHON_TRUE@_qtgui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(qtgui_la_swig_libadd) +am___qtgui_la_SOURCES_DIST = qtgui.cc +@PYTHON_TRUE@am__qtgui_la_OBJECTS = _qtgui_la-qtgui.lo _qtgui_la_OBJECTS = $(am__qtgui_la_OBJECTS) _qtgui_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(_qtgui_la_CXXFLAGS) \ $(CXXFLAGS) $(_qtgui_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__qtgui_la_rpath = -rpath $(qtgui_pylibdir) libgnuradio_qtgui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__libgnuradio_qtgui_la_SOURCES_DIST = FrequencyDisplayPlot.cc \ - TimeDomainDisplayPlot.cc WaterfallDisplayPlot.cc \ - Waterfall3DDisplayPlot.cc waterfallGlobalData.cc \ - ConstellationDisplayPlot.cc spectrumdisplayform.cc \ - SpectrumGUIClass.cc spectrumUpdateEvents.cc plot_waterfall.cc \ - spectrumdisplayform_moc.cc FrequencyDisplayPlot_moc.cc \ - TimeDomainDisplayPlot_moc.cc WaterfallDisplayPlot_moc.cc \ - Waterfall3DDisplayPlot_moc.cc ConstellationDisplayPlot_moc.cc \ - spectrumdisplayform_ui.h qtgui_sink_c.cc qtgui_sink_f.cc -@BUILD_QT_TRUE@am__objects_1 = spectrumdisplayform_moc.lo \ -@BUILD_QT_TRUE@ FrequencyDisplayPlot_moc.lo \ -@BUILD_QT_TRUE@ TimeDomainDisplayPlot_moc.lo \ -@BUILD_QT_TRUE@ WaterfallDisplayPlot_moc.lo \ -@BUILD_QT_TRUE@ Waterfall3DDisplayPlot_moc.lo \ -@BUILD_QT_TRUE@ ConstellationDisplayPlot_moc.lo +am__objects_1 = spectrumdisplayform_moc.lo FrequencyDisplayPlot_moc.lo \ + TimeDomainDisplayPlot_moc.lo WaterfallDisplayPlot_moc.lo \ + Waterfall3DDisplayPlot_moc.lo ConstellationDisplayPlot_moc.lo am_libgnuradio_qtgui_la_OBJECTS = FrequencyDisplayPlot.lo \ TimeDomainDisplayPlot.lo WaterfallDisplayPlot.lo \ Waterfall3DDisplayPlot.lo waterfallGlobalData.lo \ @@ -292,9 +291,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(_qtgui_la_SOURCES) $(libgnuradio_qtgui_la_SOURCES) -DIST_SOURCES = $(_qtgui_la_SOURCES) \ - $(am__libgnuradio_qtgui_la_SOURCES_DIST) +DIST_SOURCES = $(am___qtgui_la_SOURCES_DIST) \ + $(libgnuradio_qtgui_la_SOURCES) +am__qtgui_python_PYTHON_DIST = qtgui.py py_compile = $(top_srcdir)/py-compile +am__qtgui_swiginclude_HEADERS_DIST = qtgui.i HEADERS = $(grinclude_HEADERS) $(qtgui_swiginclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -318,6 +319,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@ @@ -325,6 +327,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@ @@ -343,6 +349,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -352,20 +359,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@ @@ -388,6 +398,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@ @@ -449,6 +461,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@ @@ -461,17 +474,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@ @@ -487,7 +500,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@ @@ -539,6 +551,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@ @@ -569,6 +586,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@ @@ -590,6 +612,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@ @@ -672,26 +704,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@ @@ -722,7 +739,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@ @@ -732,23 +748,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 @@ -760,7 +779,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, @@ -768,10 +787,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@ @@ -787,18 +802,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@ @@ -813,36 +816,39 @@ 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 = $(DEPDIR)/qtgui-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(QT_INCLUDES) -I. $(WITH_INCLUDES) # Only include these files in the build if qtgui passes configure checks # This is mostly to help make distcheck pass -@BUILD_QT_TRUE@QMAKE_SOURCES = \ -@BUILD_QT_TRUE@ spectrumdisplayform_moc.cc \ -@BUILD_QT_TRUE@ FrequencyDisplayPlot_moc.cc \ -@BUILD_QT_TRUE@ TimeDomainDisplayPlot_moc.cc \ -@BUILD_QT_TRUE@ WaterfallDisplayPlot_moc.cc \ -@BUILD_QT_TRUE@ Waterfall3DDisplayPlot_moc.cc \ -@BUILD_QT_TRUE@ ConstellationDisplayPlot_moc.cc \ -@BUILD_QT_TRUE@ spectrumdisplayform_ui.h +QMAKE_SOURCES = \ + spectrumdisplayform_moc.cc \ + FrequencyDisplayPlot_moc.cc \ + TimeDomainDisplayPlot_moc.cc \ + WaterfallDisplayPlot_moc.cc \ + Waterfall3DDisplayPlot_moc.cc \ + ConstellationDisplayPlot_moc.cc \ + spectrumdisplayform_ui.h EXTRA_DIST = spectrumdisplayform.ui +BUILT_SOURCES = $(QMAKE_SOURCES) $(am__append_3) # Build the normal library for C++ apps to link against lib_LTLIBRARIES = libgnuradio-qtgui.la @@ -883,7 +889,7 @@ grinclude_HEADERS = \ # magic flags -libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) libgnuradio_qtgui_la_LIBADD = \ $(GNURADIO_CORE_LA) \ -lstdc++ \ @@ -892,87 +898,82 @@ libgnuradio_qtgui_la_LIBADD = \ ############################## # SWIG interface and library -TOP_SWIG_IFILES = \ - qtgui.i +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ qtgui.i # Install so that they end up available as: # import gnuradio.qtgui # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -qtgui_pythondir_category = \ - gnuradio/qtgui +@PYTHON_TRUE@qtgui_pythondir_category = \ +@PYTHON_TRUE@ gnuradio/qtgui # additional libraries for linking with the SWIG-generated library -qtgui_la_swig_libadd = \ - libgnuradio-qtgui.la - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = qtgui.py qtgui.cc -qtgui_pythondir = $(pythondir)/$(qtgui_pythondir_category) -qtgui_pylibdir = $(pyexecdir)/$(qtgui_pylibdir_category) -qtgui_swigincludedir = $(swigincludedir) -qtgui_swiginclude_HEADERS = \ - qtgui.i \ - $(qtgui_swiginclude_headers) - -qtgui_pylib_LTLIBRARIES = \ - _qtgui.la - -_qtgui_la_SOURCES = \ - qtgui.cc \ - $(qtgui_la_swig_sources) - -_qtgui_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(qtgui_la_swig_libadd) - -_qtgui_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(qtgui_la_swig_ldflags) - -_qtgui_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(qtgui_la_swig_cxxflags) - -qtgui_python_PYTHON = \ - qtgui.py \ - $(qtgui_python) - - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = \ - $(QMAKE_SOURCES) \ - $(swig_built_sources) - - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@qtgui_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-qtgui.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = qtgui.py qtgui.cc +@PYTHON_TRUE@qtgui_pythondir = $(pythondir)/$(qtgui_pythondir_category) +@PYTHON_TRUE@qtgui_pylibdir = $(pyexecdir)/$(qtgui_pylibdir_category) +@PYTHON_TRUE@qtgui_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@qtgui_swiginclude_HEADERS = \ +@PYTHON_TRUE@ qtgui.i \ +@PYTHON_TRUE@ $(qtgui_swiginclude_headers) + +@PYTHON_TRUE@qtgui_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _qtgui.la + +@PYTHON_TRUE@_qtgui_la_SOURCES = \ +@PYTHON_TRUE@ qtgui.cc \ +@PYTHON_TRUE@ $(qtgui_la_swig_sources) + +@PYTHON_TRUE@_qtgui_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(qtgui_la_swig_libadd) + +@PYTHON_TRUE@_qtgui_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(qtgui_la_swig_ldflags) + +@PYTHON_TRUE@_qtgui_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(qtgui_la_swig_cxxflags) + +@PYTHON_TRUE@qtgui_python_PYTHON = \ +@PYTHON_TRUE@ qtgui.py \ +@PYTHON_TRUE@ $(qtgui_python) + + +# Do not distribute built sources, they may contain generated paths +# which are invalid on other systems +no_dist_files = $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1071,7 +1072,7 @@ clean-qtgui_pylibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done _qtgui.la: $(_qtgui_la_OBJECTS) $(_qtgui_la_DEPENDENCIES) - $(_qtgui_la_LINK) -rpath $(qtgui_pylibdir) $(_qtgui_la_OBJECTS) $(_qtgui_la_LIBADD) $(LIBS) + $(_qtgui_la_LINK) $(am__qtgui_la_rpath) $(_qtgui_la_OBJECTS) $(_qtgui_la_LIBADD) $(LIBS) libgnuradio-qtgui.la: $(libgnuradio_qtgui_la_OBJECTS) $(libgnuradio_qtgui_la_DEPENDENCIES) $(libgnuradio_qtgui_la_LINK) -rpath $(libdir) $(libgnuradio_qtgui_la_OBJECTS) $(libgnuradio_qtgui_la_LIBADD) $(LIBS) @@ -1442,86 +1443,81 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -@BUILD_QT_TRUE@%_moc.cc : %.h -@BUILD_QT_TRUE@ $(QT_MOC_EXEC) -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB $< -o $@ - -@BUILD_QT_TRUE@%_ui.h : %.ui -@BUILD_QT_TRUE@ $(QT_UIC_EXEC) $< -o $@ -@BUILD_QT_FALSE@%_moc.cc : %.h -@BUILD_QT_FALSE@ touch $@ - -@BUILD_QT_FALSE@%_ui.h : %.ui -@BUILD_QT_FALSE@ touch $@ - -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -qtgui_pythondir_category ?= gnuradio/qtgui -qtgui_pylibdir_category ?= $(qtgui_pythondir_category) - -qtgui.h qtgui.py qtgui.cc: qtgui.i - trap 'rm -rf $(DEPDIR)/qtgui-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/qtgui-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/qtgui-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/qtgui-generate-lock; \ - else \ - while test -d $(DEPDIR)/qtgui-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/qtgui-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/qtgui-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \ - -MD -MF $(DEPDIR)/qtgui.Std \ - -module qtgui -o qtgui.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/qtgui.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \ - > $(DEPDIR)/qtgui.Sd; \ - $(RM) $(DEPDIR)/qtgui.Std; \ - $(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/qtgui.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/qtgui.d - cp $(DEPDIR)/qtgui.Std $(DEPDIR)/qtgui.d - echo "" >> $(DEPDIR)/qtgui.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui.d - $(RM) $(DEPDIR)/qtgui.Std - touch $(DEPDIR)/qtgui-generate-stamp +%_moc.cc : %.h + $(QT_MOC_EXEC) -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -p $(srcdir) $< -o $@ + +%_ui.h : %.ui + $(QT_UIC_EXEC) $< -o $@ + +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@qtgui_pythondir_category ?= gnuradio/qtgui +@PYTHON_TRUE@qtgui_pylibdir_category ?= $(qtgui_pythondir_category) + +@PYTHON_TRUE@qtgui.h qtgui.py qtgui.cc: qtgui.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/qtgui-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/qtgui-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/qtgui-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/qtgui-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/qtgui-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/qtgui-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/qtgui-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/qtgui.Std \ +@PYTHON_TRUE@ -module qtgui -o qtgui.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/qtgui.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/qtgui.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/qtgui.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/qtgui.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/qtgui.d +@PYTHON_TRUE@ cp $(DEPDIR)/qtgui.Std $(DEPDIR)/qtgui.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/qtgui.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/qtgui.Std +@PYTHON_TRUE@ touch $(DEPDIR)/qtgui-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/qtgui.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qtgui.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-qtgui/src/lib/spectrumdisplayform_ui.h b/gr-qtgui/src/lib/spectrumdisplayform_ui.h deleted file mode 100644 index 0d5b112e..00000000 --- a/gr-qtgui/src/lib/spectrumdisplayform_ui.h +++ /dev/null @@ -1,363 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'spectrumdisplayform.ui' -** -** Created: Tue Jul 14 15:57:22 2009 -** by: Qt User Interface Compiler version 4.5.0 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef SPECTRUMDISPLAYFORM_UI_H -#define SPECTRUMDISPLAYFORM_UI_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "qwt_wheel.h" - -QT_BEGIN_NAMESPACE - -class Ui_SpectrumDisplayForm -{ -public: - QCheckBox *UseRFFrequenciesCheckBox; - QComboBox *WindowComboBox; - QLabel *WindowLbl; - QLabel *FFTSizeLabel; - QComboBox *FFTSizeComboBox; - QTabWidget *SpectrumTypeTab; - QWidget *FrequencyPage; - QLineEdit *PowerLineEdit; - QCheckBox *MinHoldCheckBox; - QLabel *AvgLabel; - QPushButton *MinHoldResetBtn; - QLineEdit *AvgLineEdit; - QLabel *PowerLabel; - QPushButton *MaxHoldResetBtn; - QCheckBox *MaxHoldCheckBox; - QFrame *FrequencyPlotDisplayFrame; - QWidget *WaterfallPage; - QLabel *textLabel1; - QComboBox *WaterfallIntensityComboBox; - QwtWheel *WaterfallMaximumIntensityWheel; - QLabel *WaterfallMaximumIntensityLabel; - QFrame *WaterfallPlotDisplayFrame; - QwtWheel *WaterfallMinimumIntensityWheel; - QLabel *WaterfallMinimumIntensityLabel; - QPushButton *WaterfallAutoScaleBtn; - QWidget *Waterfall3DPage; - QLabel *textLabel1_2; - QLabel *Waterfall3DMaximumIntensityLabel; - QPushButton *Waterfall3DAutoScaleBtn; - QwtWheel *Waterfall3DMinimumIntensityWheel; - QLabel *Waterfall3DMinimumIntensityLabel; - QFrame *Waterfall3DPlotDisplayFrame; - QComboBox *Waterfall3DIntensityComboBox; - QwtWheel *Waterfall3DMaximumIntensityWheel; - QWidget *TimeDomainPage; - QFrame *TimeDomainDisplayFrame; - QWidget *ConstellationPage; - QFrame *ConstellationDisplayFrame; - - void setupUi(QWidget *SpectrumDisplayForm) - { - if (SpectrumDisplayForm->objectName().isEmpty()) - SpectrumDisplayForm->setObjectName(QString::fromUtf8("SpectrumDisplayForm")); - SpectrumDisplayForm->resize(633, 436); - UseRFFrequenciesCheckBox = new QCheckBox(SpectrumDisplayForm); - UseRFFrequenciesCheckBox->setObjectName(QString::fromUtf8("UseRFFrequenciesCheckBox")); - UseRFFrequenciesCheckBox->setGeometry(QRect(10, 385, 180, 20)); - WindowComboBox = new QComboBox(SpectrumDisplayForm); - WindowComboBox->setObjectName(QString::fromUtf8("WindowComboBox")); - WindowComboBox->setGeometry(QRect(105, 410, 170, 20)); - QFont font; - font.setPointSize(9); - WindowComboBox->setFont(font); - WindowLbl = new QLabel(SpectrumDisplayForm); - WindowLbl->setObjectName(QString::fromUtf8("WindowLbl")); - WindowLbl->setGeometry(QRect(10, 410, 90, 17)); - WindowLbl->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - WindowLbl->setWordWrap(false); - FFTSizeLabel = new QLabel(SpectrumDisplayForm); - FFTSizeLabel->setObjectName(QString::fromUtf8("FFTSizeLabel")); - FFTSizeLabel->setGeometry(QRect(405, 385, 116, 20)); - FFTSizeLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); - FFTSizeLabel->setWordWrap(false); - FFTSizeComboBox = new QComboBox(SpectrumDisplayForm); - FFTSizeComboBox->setObjectName(QString::fromUtf8("FFTSizeComboBox")); - FFTSizeComboBox->setGeometry(QRect(525, 385, 100, 20)); - SpectrumTypeTab = new QTabWidget(SpectrumDisplayForm); - SpectrumTypeTab->setObjectName(QString::fromUtf8("SpectrumTypeTab")); - SpectrumTypeTab->setGeometry(QRect(0, 0, 630, 380)); - FrequencyPage = new QWidget(); - FrequencyPage->setObjectName(QString::fromUtf8("FrequencyPage")); - PowerLineEdit = new QLineEdit(FrequencyPage); - PowerLineEdit->setObjectName(QString::fromUtf8("PowerLineEdit")); - PowerLineEdit->setGeometry(QRect(480, 320, 60, 20)); - MinHoldCheckBox = new QCheckBox(FrequencyPage); - MinHoldCheckBox->setObjectName(QString::fromUtf8("MinHoldCheckBox")); - MinHoldCheckBox->setGeometry(QRect(10, 325, 95, 20)); - MinHoldCheckBox->setChecked(false); - AvgLabel = new QLabel(FrequencyPage); - AvgLabel->setObjectName(QString::fromUtf8("AvgLabel")); - AvgLabel->setGeometry(QRect(545, 300, 72, 20)); - AvgLabel->setAlignment(Qt::AlignCenter); - AvgLabel->setWordWrap(false); - MinHoldResetBtn = new QPushButton(FrequencyPage); - MinHoldResetBtn->setObjectName(QString::fromUtf8("MinHoldResetBtn")); - MinHoldResetBtn->setGeometry(QRect(105, 325, 61, 20)); - AvgLineEdit = new QLineEdit(FrequencyPage); - AvgLineEdit->setObjectName(QString::fromUtf8("AvgLineEdit")); - AvgLineEdit->setGeometry(QRect(550, 320, 60, 20)); - PowerLabel = new QLabel(FrequencyPage); - PowerLabel->setObjectName(QString::fromUtf8("PowerLabel")); - PowerLabel->setGeometry(QRect(475, 300, 72, 20)); - PowerLabel->setAlignment(Qt::AlignCenter); - PowerLabel->setWordWrap(false); - MaxHoldResetBtn = new QPushButton(FrequencyPage); - MaxHoldResetBtn->setObjectName(QString::fromUtf8("MaxHoldResetBtn")); - MaxHoldResetBtn->setGeometry(QRect(105, 300, 61, 20)); - MaxHoldCheckBox = new QCheckBox(FrequencyPage); - MaxHoldCheckBox->setObjectName(QString::fromUtf8("MaxHoldCheckBox")); - MaxHoldCheckBox->setGeometry(QRect(10, 300, 95, 20)); - MaxHoldCheckBox->setChecked(false); - FrequencyPlotDisplayFrame = new QFrame(FrequencyPage); - FrequencyPlotDisplayFrame->setObjectName(QString::fromUtf8("FrequencyPlotDisplayFrame")); - FrequencyPlotDisplayFrame->setGeometry(QRect(5, 5, 620, 290)); - FrequencyPlotDisplayFrame->setFrameShape(QFrame::NoFrame); - FrequencyPlotDisplayFrame->setFrameShadow(QFrame::Plain); - SpectrumTypeTab->addTab(FrequencyPage, QString()); - WaterfallPage = new QWidget(); - WaterfallPage->setObjectName(QString::fromUtf8("WaterfallPage")); - textLabel1 = new QLabel(WaterfallPage); - textLabel1->setObjectName(QString::fromUtf8("textLabel1")); - textLabel1->setGeometry(QRect(5, 0, 85, 21)); - textLabel1->setWordWrap(false); - WaterfallIntensityComboBox = new QComboBox(WaterfallPage); - WaterfallIntensityComboBox->setObjectName(QString::fromUtf8("WaterfallIntensityComboBox")); - WaterfallIntensityComboBox->setGeometry(QRect(90, 0, 121, 25)); - WaterfallMaximumIntensityWheel = new QwtWheel(WaterfallPage); - WaterfallMaximumIntensityWheel->setObjectName(QString::fromUtf8("WaterfallMaximumIntensityWheel")); - WaterfallMaximumIntensityWheel->setGeometry(QRect(215, 0, 335, 24)); - WaterfallMaximumIntensityWheel->setMouseTracking(true); - WaterfallMaximumIntensityWheel->setFocusPolicy(Qt::WheelFocus); - WaterfallMaximumIntensityWheel->setValid(true); - WaterfallMaximumIntensityWheel->setTotalAngle(200); - WaterfallMaximumIntensityWheel->setViewAngle(20); - WaterfallMaximumIntensityWheel->setMass(0); - WaterfallMaximumIntensityLabel = new QLabel(WaterfallPage); - WaterfallMaximumIntensityLabel->setObjectName(QString::fromUtf8("WaterfallMaximumIntensityLabel")); - WaterfallMaximumIntensityLabel->setGeometry(QRect(563, 3, 55, 21)); - WaterfallMaximumIntensityLabel->setWordWrap(false); - WaterfallPlotDisplayFrame = new QFrame(WaterfallPage); - WaterfallPlotDisplayFrame->setObjectName(QString::fromUtf8("WaterfallPlotDisplayFrame")); - WaterfallPlotDisplayFrame->setGeometry(QRect(5, 30, 615, 295)); - WaterfallPlotDisplayFrame->setFrameShape(QFrame::NoFrame); - WaterfallPlotDisplayFrame->setFrameShadow(QFrame::Plain); - WaterfallMinimumIntensityWheel = new QwtWheel(WaterfallPage); - WaterfallMinimumIntensityWheel->setObjectName(QString::fromUtf8("WaterfallMinimumIntensityWheel")); - WaterfallMinimumIntensityWheel->setGeometry(QRect(215, 325, 335, 24)); - WaterfallMinimumIntensityWheel->setValid(true); - WaterfallMinimumIntensityWheel->setTotalAngle(200); - WaterfallMinimumIntensityWheel->setViewAngle(20); - WaterfallMinimumIntensityWheel->setMass(0); - WaterfallMinimumIntensityLabel = new QLabel(WaterfallPage); - WaterfallMinimumIntensityLabel->setObjectName(QString::fromUtf8("WaterfallMinimumIntensityLabel")); - WaterfallMinimumIntensityLabel->setGeometry(QRect(565, 325, 55, 20)); - WaterfallMinimumIntensityLabel->setWordWrap(false); - WaterfallAutoScaleBtn = new QPushButton(WaterfallPage); - WaterfallAutoScaleBtn->setObjectName(QString::fromUtf8("WaterfallAutoScaleBtn")); - WaterfallAutoScaleBtn->setGeometry(QRect(0, 325, 135, 21)); - SpectrumTypeTab->addTab(WaterfallPage, QString()); - Waterfall3DPage = new QWidget(); - Waterfall3DPage->setObjectName(QString::fromUtf8("Waterfall3DPage")); - textLabel1_2 = new QLabel(Waterfall3DPage); - textLabel1_2->setObjectName(QString::fromUtf8("textLabel1_2")); - textLabel1_2->setGeometry(QRect(5, 0, 85, 21)); - textLabel1_2->setWordWrap(false); - Waterfall3DMaximumIntensityLabel = new QLabel(Waterfall3DPage); - Waterfall3DMaximumIntensityLabel->setObjectName(QString::fromUtf8("Waterfall3DMaximumIntensityLabel")); - Waterfall3DMaximumIntensityLabel->setGeometry(QRect(563, 3, 55, 21)); - Waterfall3DMaximumIntensityLabel->setWordWrap(false); - Waterfall3DAutoScaleBtn = new QPushButton(Waterfall3DPage); - Waterfall3DAutoScaleBtn->setObjectName(QString::fromUtf8("Waterfall3DAutoScaleBtn")); - Waterfall3DAutoScaleBtn->setGeometry(QRect(0, 325, 135, 21)); - Waterfall3DMinimumIntensityWheel = new QwtWheel(Waterfall3DPage); - Waterfall3DMinimumIntensityWheel->setObjectName(QString::fromUtf8("Waterfall3DMinimumIntensityWheel")); - Waterfall3DMinimumIntensityWheel->setGeometry(QRect(215, 325, 335, 24)); - Waterfall3DMinimumIntensityWheel->setValid(true); - Waterfall3DMinimumIntensityWheel->setTotalAngle(200); - Waterfall3DMinimumIntensityWheel->setViewAngle(20); - Waterfall3DMinimumIntensityWheel->setMass(0); - Waterfall3DMinimumIntensityLabel = new QLabel(Waterfall3DPage); - Waterfall3DMinimumIntensityLabel->setObjectName(QString::fromUtf8("Waterfall3DMinimumIntensityLabel")); - Waterfall3DMinimumIntensityLabel->setGeometry(QRect(565, 325, 55, 20)); - Waterfall3DMinimumIntensityLabel->setWordWrap(false); - Waterfall3DPlotDisplayFrame = new QFrame(Waterfall3DPage); - Waterfall3DPlotDisplayFrame->setObjectName(QString::fromUtf8("Waterfall3DPlotDisplayFrame")); - Waterfall3DPlotDisplayFrame->setGeometry(QRect(5, 30, 615, 295)); - Waterfall3DPlotDisplayFrame->setFrameShape(QFrame::NoFrame); - Waterfall3DPlotDisplayFrame->setFrameShadow(QFrame::Plain); - Waterfall3DIntensityComboBox = new QComboBox(Waterfall3DPage); - Waterfall3DIntensityComboBox->setObjectName(QString::fromUtf8("Waterfall3DIntensityComboBox")); - Waterfall3DIntensityComboBox->setGeometry(QRect(90, 0, 121, 25)); - Waterfall3DMaximumIntensityWheel = new QwtWheel(Waterfall3DPage); - Waterfall3DMaximumIntensityWheel->setObjectName(QString::fromUtf8("Waterfall3DMaximumIntensityWheel")); - Waterfall3DMaximumIntensityWheel->setGeometry(QRect(215, 0, 335, 24)); - Waterfall3DMaximumIntensityWheel->setMouseTracking(true); - Waterfall3DMaximumIntensityWheel->setFocusPolicy(Qt::WheelFocus); - Waterfall3DMaximumIntensityWheel->setValid(true); - Waterfall3DMaximumIntensityWheel->setTotalAngle(200); - Waterfall3DMaximumIntensityWheel->setViewAngle(20); - Waterfall3DMaximumIntensityWheel->setMass(0); - SpectrumTypeTab->addTab(Waterfall3DPage, QString()); - TimeDomainPage = new QWidget(); - TimeDomainPage->setObjectName(QString::fromUtf8("TimeDomainPage")); - TimeDomainDisplayFrame = new QFrame(TimeDomainPage); - TimeDomainDisplayFrame->setObjectName(QString::fromUtf8("TimeDomainDisplayFrame")); - TimeDomainDisplayFrame->setGeometry(QRect(5, 5, 620, 340)); - TimeDomainDisplayFrame->setFrameShape(QFrame::NoFrame); - TimeDomainDisplayFrame->setFrameShadow(QFrame::Plain); - SpectrumTypeTab->addTab(TimeDomainPage, QString()); - ConstellationPage = new QWidget(); - ConstellationPage->setObjectName(QString::fromUtf8("ConstellationPage")); - ConstellationDisplayFrame = new QFrame(ConstellationPage); - ConstellationDisplayFrame->setObjectName(QString::fromUtf8("ConstellationDisplayFrame")); - ConstellationDisplayFrame->setGeometry(QRect(5, 5, 620, 340)); - ConstellationDisplayFrame->setFrameShape(QFrame::StyledPanel); - ConstellationDisplayFrame->setFrameShadow(QFrame::Raised); - SpectrumTypeTab->addTab(ConstellationPage, QString()); - QWidget::setTabOrder(SpectrumTypeTab, MaxHoldCheckBox); - QWidget::setTabOrder(MaxHoldCheckBox, MaxHoldResetBtn); - QWidget::setTabOrder(MaxHoldResetBtn, MinHoldCheckBox); - QWidget::setTabOrder(MinHoldCheckBox, MinHoldResetBtn); - QWidget::setTabOrder(MinHoldResetBtn, PowerLineEdit); - QWidget::setTabOrder(PowerLineEdit, AvgLineEdit); - QWidget::setTabOrder(AvgLineEdit, UseRFFrequenciesCheckBox); - QWidget::setTabOrder(UseRFFrequenciesCheckBox, WindowComboBox); - QWidget::setTabOrder(WindowComboBox, FFTSizeComboBox); - QWidget::setTabOrder(FFTSizeComboBox, WaterfallMaximumIntensityWheel); - QWidget::setTabOrder(WaterfallMaximumIntensityWheel, WaterfallMinimumIntensityWheel); - - retranslateUi(SpectrumDisplayForm); - QObject::connect(MaxHoldCheckBox, SIGNAL(toggled(bool)), SpectrumDisplayForm, SLOT(MaxHoldCheckBox_toggled(bool))); - QObject::connect(MaxHoldResetBtn, SIGNAL(clicked()), SpectrumDisplayForm, SLOT(MaxHoldResetBtn_clicked())); - QObject::connect(MinHoldCheckBox, SIGNAL(toggled(bool)), SpectrumDisplayForm, SLOT(MinHoldCheckBox_toggled(bool))); - QObject::connect(MinHoldResetBtn, SIGNAL(clicked()), SpectrumDisplayForm, SLOT(MinHoldResetBtn_clicked())); - QObject::connect(AvgLineEdit, SIGNAL(textChanged(QString)), SpectrumDisplayForm, SLOT(AvgLineEdit_textChanged(QString))); - QObject::connect(PowerLineEdit, SIGNAL(textChanged(QString)), SpectrumDisplayForm, SLOT(PowerLineEdit_textChanged(QString))); - QObject::connect(WindowComboBox, SIGNAL(activated(int)), SpectrumDisplayForm, SLOT(WindowTypeChanged(int))); - QObject::connect(UseRFFrequenciesCheckBox, SIGNAL(toggled(bool)), SpectrumDisplayForm, SLOT(UseRFFrequenciesCB(bool))); - QObject::connect(WaterfallMaximumIntensityWheel, SIGNAL(valueChanged(double)), SpectrumDisplayForm, SLOT(waterfallMaximumIntensityChangedCB(double))); - QObject::connect(WaterfallMinimumIntensityWheel, SIGNAL(valueChanged(double)), SpectrumDisplayForm, SLOT(waterfallMinimumIntensityChangedCB(double))); - QObject::connect(Waterfall3DMaximumIntensityWheel, SIGNAL(valueChanged(double)), SpectrumDisplayForm, SLOT(waterfall3DMaximumIntensityChangedCB(double))); - QObject::connect(Waterfall3DMinimumIntensityWheel, SIGNAL(valueChanged(double)), SpectrumDisplayForm, SLOT(waterfall3DMinimumIntensityChangedCB(double))); - QObject::connect(FFTSizeComboBox, SIGNAL(activated(QString)), SpectrumDisplayForm, SLOT(FFTComboBoxSelectedCB(QString))); - QObject::connect(WaterfallAutoScaleBtn, SIGNAL(clicked()), SpectrumDisplayForm, SLOT(WaterfallAutoScaleBtnCB())); - QObject::connect(Waterfall3DAutoScaleBtn, SIGNAL(clicked()), SpectrumDisplayForm, SLOT(Waterfall3DAutoScaleBtnCB())); - QObject::connect(WaterfallIntensityComboBox, SIGNAL(activated(int)), SpectrumDisplayForm, SLOT(WaterfallIntensityColorTypeChanged(int))); - QObject::connect(Waterfall3DIntensityComboBox, SIGNAL(activated(int)), SpectrumDisplayForm, SLOT(Waterfall3DIntensityColorTypeChanged(int))); - - SpectrumTypeTab->setCurrentIndex(0); - - - QMetaObject::connectSlotsByName(SpectrumDisplayForm); - } // setupUi - - void retranslateUi(QWidget *SpectrumDisplayForm) - { - SpectrumDisplayForm->setWindowTitle(QApplication::translate("SpectrumDisplayForm", "Spectrum Display", 0, QApplication::UnicodeUTF8)); - UseRFFrequenciesCheckBox->setText(QApplication::translate("SpectrumDisplayForm", "Display RF Frequencies", 0, QApplication::UnicodeUTF8)); - WindowComboBox->clear(); - WindowComboBox->insertItems(0, QStringList() - << QApplication::translate("SpectrumDisplayForm", "Hamming", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "Hann", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "Blackman", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "Rectangular", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "Kaiser", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "Blackman-harris", 0, QApplication::UnicodeUTF8) - ); - WindowLbl->setText(QApplication::translate("SpectrumDisplayForm", "Window:", 0, QApplication::UnicodeUTF8)); - FFTSizeLabel->setText(QApplication::translate("SpectrumDisplayForm", "FFT Size:", 0, QApplication::UnicodeUTF8)); - FFTSizeComboBox->clear(); - FFTSizeComboBox->insertItems(0, QStringList() - << QApplication::translate("SpectrumDisplayForm", "1024", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "2048", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "4096", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "8192", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "16384", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "32768", 0, QApplication::UnicodeUTF8) - ); - PowerLineEdit->setText(QApplication::translate("SpectrumDisplayForm", "1", 0, QApplication::UnicodeUTF8)); - MinHoldCheckBox->setText(QApplication::translate("SpectrumDisplayForm", "Min Hold", 0, QApplication::UnicodeUTF8)); - AvgLabel->setText(QApplication::translate("SpectrumDisplayForm", "Average", 0, QApplication::UnicodeUTF8)); - MinHoldResetBtn->setText(QApplication::translate("SpectrumDisplayForm", "Reset", 0, QApplication::UnicodeUTF8)); - AvgLineEdit->setText(QApplication::translate("SpectrumDisplayForm", "0", 0, QApplication::UnicodeUTF8)); - PowerLabel->setText(QApplication::translate("SpectrumDisplayForm", "Power", 0, QApplication::UnicodeUTF8)); - MaxHoldResetBtn->setText(QApplication::translate("SpectrumDisplayForm", "Reset", 0, QApplication::UnicodeUTF8)); - MaxHoldCheckBox->setText(QApplication::translate("SpectrumDisplayForm", "Max Hold", 0, QApplication::UnicodeUTF8)); - SpectrumTypeTab->setTabText(SpectrumTypeTab->indexOf(FrequencyPage), QApplication::translate("SpectrumDisplayForm", "Frequency Display", 0, QApplication::UnicodeUTF8)); - textLabel1->setText(QApplication::translate("SpectrumDisplayForm", "Intensity Display:", 0, QApplication::UnicodeUTF8)); - WaterfallIntensityComboBox->clear(); - WaterfallIntensityComboBox->insertItems(0, QStringList() - << QApplication::translate("SpectrumDisplayForm", "Color", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "White Hot", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "Black Hot", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "Incandescent", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "User Defined", 0, QApplication::UnicodeUTF8) - ); - WaterfallMaximumIntensityLabel->setText(QApplication::translate("SpectrumDisplayForm", "100 dB", 0, QApplication::UnicodeUTF8)); - WaterfallMinimumIntensityLabel->setText(QApplication::translate("SpectrumDisplayForm", "-100 dB", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - WaterfallAutoScaleBtn->setToolTip(QApplication::translate("SpectrumDisplayForm", "Scales the Intensity to the current data extremes.", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - WaterfallAutoScaleBtn->setText(QApplication::translate("SpectrumDisplayForm", "Auto Scale", 0, QApplication::UnicodeUTF8)); - SpectrumTypeTab->setTabText(SpectrumTypeTab->indexOf(WaterfallPage), QApplication::translate("SpectrumDisplayForm", "Waterfall Display", 0, QApplication::UnicodeUTF8)); - textLabel1_2->setText(QApplication::translate("SpectrumDisplayForm", "Intensity Display:", 0, QApplication::UnicodeUTF8)); - Waterfall3DMaximumIntensityLabel->setText(QApplication::translate("SpectrumDisplayForm", "100 dB", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - Waterfall3DAutoScaleBtn->setToolTip(QApplication::translate("SpectrumDisplayForm", "Scales the Intensity to the current data extremes.", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - Waterfall3DAutoScaleBtn->setText(QApplication::translate("SpectrumDisplayForm", "Auto Scale", 0, QApplication::UnicodeUTF8)); - Waterfall3DMinimumIntensityLabel->setText(QApplication::translate("SpectrumDisplayForm", "-100 dB", 0, QApplication::UnicodeUTF8)); - Waterfall3DIntensityComboBox->clear(); - Waterfall3DIntensityComboBox->insertItems(0, QStringList() - << QApplication::translate("SpectrumDisplayForm", "Color", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "White Hot", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "Black Hot", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "Incandescent", 0, QApplication::UnicodeUTF8) - << QApplication::translate("SpectrumDisplayForm", "User Defined", 0, QApplication::UnicodeUTF8) - ); - SpectrumTypeTab->setTabText(SpectrumTypeTab->indexOf(Waterfall3DPage), QApplication::translate("SpectrumDisplayForm", "3D Waterfall Display", 0, QApplication::UnicodeUTF8)); - SpectrumTypeTab->setTabText(SpectrumTypeTab->indexOf(TimeDomainPage), QApplication::translate("SpectrumDisplayForm", "Time Domain Display", 0, QApplication::UnicodeUTF8)); - SpectrumTypeTab->setTabText(SpectrumTypeTab->indexOf(ConstellationPage), QApplication::translate("SpectrumDisplayForm", "Constellation Display", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(SpectrumDisplayForm); - } // retranslateUi - -}; - -namespace Ui { - class SpectrumDisplayForm: public Ui_SpectrumDisplayForm {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // SPECTRUMDISPLAYFORM_UI_H diff --git a/gr-qtgui/src/python/Makefile.in b/gr-qtgui/src/python/Makefile.in index 9fc32a8e..a0ca3803 100644 --- a/gr-qtgui/src/python/Makefile.in +++ b/gr-qtgui/src/python/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/gr-radar-mono/Makefile.in b/gr-radar-mono/Makefile.in index 2367d90a..c4e36486 100644 --- a/gr-radar-mono/Makefile.in +++ b/gr-radar-mono/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = diff --git a/gr-radar-mono/doc/Makefile.in b/gr-radar-mono/doc/Makefile.in index 58cfb5e8..ee459355 100644 --- a/gr-radar-mono/doc/Makefile.in +++ b/gr-radar-mono/doc/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-radar-mono/src/Makefile.in b/gr-radar-mono/src/Makefile.in index 1380a244..739bf620 100644 --- a/gr-radar-mono/src/Makefile.in +++ b/gr-radar-mono/src/Makefile.in @@ -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,6 +79,7 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.common +@PYTHON_TRUE@am__append_1 = python subdir = gr-radar-mono/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -92,36 +93,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 \ @@ -135,9 +139,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 \ @@ -176,7 +177,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = fpga lib python DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -222,6 +223,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@ @@ -229,6 +231,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@ @@ -247,6 +253,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +263,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@ @@ -292,6 +302,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@ @@ -353,6 +365,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@ @@ -365,17 +378,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@ @@ -391,7 +404,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@ @@ -443,6 +455,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@ @@ -473,6 +490,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@ @@ -494,6 +516,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@ @@ -576,26 +608,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@ @@ -626,7 +643,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@ @@ -636,23 +652,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 @@ -664,7 +683,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, @@ -672,10 +691,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@ @@ -691,18 +706,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@ @@ -717,20 +720,22 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -SUBDIRS = fpga lib python +SUBDIRS = fpga lib $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gr-radar-mono/src/fpga/Makefile.in b/gr-radar-mono/src/fpga/Makefile.in index b6f2a6f8..49e161dc 100644 --- a/gr-radar-mono/src/fpga/Makefile.in +++ b/gr-radar-mono/src/fpga/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = diff --git a/gr-radar-mono/src/fpga/lib/Makefile.in b/gr-radar-mono/src/fpga/lib/Makefile.in index c315c79b..05ae5109 100644 --- a/gr-radar-mono/src/fpga/lib/Makefile.in +++ b/gr-radar-mono/src/fpga/lib/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-radar-mono/src/fpga/models/Makefile.in b/gr-radar-mono/src/fpga/models/Makefile.in index ce186a29..ccdfc708 100644 --- a/gr-radar-mono/src/fpga/models/Makefile.in +++ b/gr-radar-mono/src/fpga/models/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-radar-mono/src/fpga/tb/Makefile.in b/gr-radar-mono/src/fpga/tb/Makefile.in index 60c498ea..f9bf3b29 100644 --- a/gr-radar-mono/src/fpga/tb/Makefile.in +++ b/gr-radar-mono/src/fpga/tb/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-radar-mono/src/fpga/top/Makefile.in b/gr-radar-mono/src/fpga/top/Makefile.in index be2f21a3..fc17b965 100644 --- a/gr-radar-mono/src/fpga/top/Makefile.in +++ b/gr-radar-mono/src/fpga/top/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -208,6 +208,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@ @@ -215,6 +216,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@ @@ -233,6 +238,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -242,20 +248,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@ @@ -278,6 +287,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@ @@ -339,6 +350,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@ @@ -351,17 +363,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@ @@ -377,7 +389,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@ @@ -429,6 +440,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@ @@ -459,6 +475,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@ @@ -480,6 +501,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@ @@ -562,26 +593,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@ @@ -612,7 +628,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@ @@ -622,23 +637,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 @@ -650,7 +668,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, @@ -658,10 +676,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@ @@ -677,18 +691,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@ @@ -703,15 +705,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 = diff --git a/gr-radar-mono/src/lib/Makefile.in b/gr-radar-mono/src/lib/Makefile.in index 532d8b63..4be7a726 100644 --- a/gr-radar-mono/src/lib/Makefile.in +++ b/gr-radar-mono/src/lib/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-radar-mono/src/python/Makefile.in b/gr-radar-mono/src/python/Makefile.in index ea00bff9..a7367d57 100644 --- a/gr-radar-mono/src/python/Makefile.in +++ b/gr-radar-mono/src/python/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/gr-radio-astronomy/Makefile.in b/gr-radio-astronomy/Makefile.in index 471236fe..511030a6 100644 --- a/gr-radio-astronomy/Makefile.in +++ b/gr-radio-astronomy/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = diff --git a/gr-radio-astronomy/src/Makefile.in b/gr-radio-astronomy/src/Makefile.in index 3ccdaef8..e0a6fb89 100644 --- a/gr-radio-astronomy/src/Makefile.in +++ b/gr-radio-astronomy/src/Makefile.in @@ -55,6 +55,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@PYTHON_TRUE@am__append_1 = python subdir = gr-radio-astronomy/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -69,36 +70,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 \ @@ -112,9 +116,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 \ @@ -153,7 +154,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib python DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -199,6 +200,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@ @@ -206,6 +208,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@ @@ -224,6 +230,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +240,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@ @@ -269,6 +279,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@ @@ -330,6 +342,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@ @@ -342,17 +355,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@ @@ -368,7 +381,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@ @@ -420,6 +432,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@ @@ -450,6 +467,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@ @@ -471,6 +493,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@ @@ -553,26 +585,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@ @@ -603,14 +620,13 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -SUBDIRS = lib python +SUBDIRS = lib $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gr-radio-astronomy/src/lib/Makefile.in b/gr-radio-astronomy/src/lib/Makefile.in index c8f5f678..54d29a1b 100644 --- a/gr-radio-astronomy/src/lib/Makefile.in +++ b/gr-radio-astronomy/src/lib/Makefile.in @@ -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 # @@ -125,10 +125,12 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(ra_python_PYTHON) $(ra_swiginclude_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.swig.gen $(top_srcdir)/Makefile.common \ - $(top_srcdir)/Makefile.swig +DIST_COMMON = $(am__ra_python_PYTHON_DIST) \ + $(am__ra_swiginclude_HEADERS_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ + $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/ra-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-radio-astronomy/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -142,36 +144,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 \ @@ -185,9 +190,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 \ @@ -235,12 +237,14 @@ am__installdirs = "$(DESTDIR)$(ra_pylibdir)" \ "$(DESTDIR)$(ra_pythondir)" "$(DESTDIR)$(ra_swigincludedir)" LTLIBRARIES = $(ra_pylib_LTLIBRARIES) am__DEPENDENCIES_1 = -_ra_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__ra_la_OBJECTS = _ra_la-ra.lo +@PYTHON_TRUE@_ra_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am___ra_la_SOURCES_DIST = ra.cc +@PYTHON_TRUE@am__ra_la_OBJECTS = _ra_la-ra.lo _ra_la_OBJECTS = $(am__ra_la_OBJECTS) _ra_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(_ra_la_CXXFLAGS) $(CXXFLAGS) \ $(_ra_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__ra_la_rpath = -rpath $(ra_pylibdir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -255,8 +259,10 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(_ra_la_SOURCES) -DIST_SOURCES = $(_ra_la_SOURCES) +DIST_SOURCES = $(am___ra_la_SOURCES_DIST) +am__ra_python_PYTHON_DIST = ra.py py_compile = $(top_srcdir)/py-compile +am__ra_swiginclude_HEADERS_DIST = ra.i HEADERS = $(ra_swiginclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -280,6 +286,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@ @@ -287,6 +294,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@ @@ -305,6 +316,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -314,20 +326,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@ @@ -350,6 +365,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@ @@ -411,6 +428,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@ @@ -423,17 +441,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@ @@ -449,7 +467,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@ @@ -501,6 +518,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@ @@ -531,6 +553,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@ @@ -552,6 +579,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@ @@ -634,26 +671,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@ @@ -684,7 +706,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@ @@ -694,23 +715,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 @@ -722,7 +746,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, @@ -730,10 +754,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@ @@ -749,18 +769,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@ @@ -775,94 +783,96 @@ 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 = $(DEPDIR)/ra-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -TOP_SWIG_IFILES = \ - ra.i +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ ra.i # Install so that they end up available as: # import gnuradio.ra # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -ra_pythondir_category = \ - gnuradio - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = ra.py ra.cc -ra_pythondir = $(pythondir)/$(ra_pythondir_category) -ra_pylibdir = $(pyexecdir)/$(ra_pylibdir_category) -ra_swigincludedir = $(swigincludedir) -ra_swiginclude_HEADERS = \ - ra.i \ - $(ra_swiginclude_headers) - -ra_pylib_LTLIBRARIES = \ - _ra.la - -_ra_la_SOURCES = \ - ra.cc \ - $(ra_la_swig_sources) - -_ra_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(ra_la_swig_libadd) - -_ra_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(ra_la_swig_ldflags) - -_ra_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(ra_la_swig_cxxflags) - -ra_python_PYTHON = \ - ra.py \ - $(ra_python) +@PYTHON_TRUE@ra_pythondir_category = \ +@PYTHON_TRUE@ gnuradio + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = ra.py ra.cc +@PYTHON_TRUE@ra_pythondir = $(pythondir)/$(ra_pythondir_category) +@PYTHON_TRUE@ra_pylibdir = $(pyexecdir)/$(ra_pylibdir_category) +@PYTHON_TRUE@ra_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@ra_swiginclude_HEADERS = \ +@PYTHON_TRUE@ ra.i \ +@PYTHON_TRUE@ $(ra_swiginclude_headers) + +@PYTHON_TRUE@ra_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _ra.la + +@PYTHON_TRUE@_ra_la_SOURCES = \ +@PYTHON_TRUE@ ra.cc \ +@PYTHON_TRUE@ $(ra_la_swig_sources) + +@PYTHON_TRUE@_ra_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(ra_la_swig_libadd) + +@PYTHON_TRUE@_ra_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(ra_la_swig_ldflags) + +@PYTHON_TRUE@_ra_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(ra_la_swig_cxxflags) + +@PYTHON_TRUE@ra_python_PYTHON = \ +@PYTHON_TRUE@ ra.py \ +@PYTHON_TRUE@ $(ra_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -930,7 +940,7 @@ clean-ra_pylibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done _ra.la: $(_ra_la_OBJECTS) $(_ra_la_DEPENDENCIES) - $(_ra_la_LINK) -rpath $(ra_pylibdir) $(_ra_la_OBJECTS) $(_ra_la_LIBADD) $(LIBS) + $(_ra_la_LINK) $(am__ra_la_rpath) $(_ra_la_OBJECTS) $(_ra_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1256,75 +1266,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -ra_pythondir_category ?= gnuradio/ra -ra_pylibdir_category ?= $(ra_pythondir_category) - -ra.h ra.py ra.cc: ra.i - trap 'rm -rf $(DEPDIR)/ra-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/ra-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/ra-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/ra-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/ra-generate-lock; \ - else \ - while test -d $(DEPDIR)/ra-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/ra-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/ra-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(ra_swig_args) \ - -MD -MF $(DEPDIR)/ra.Std \ - -module ra -o ra.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/ra.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/ra.Std \ - > $(DEPDIR)/ra.Sd; \ - $(RM) $(DEPDIR)/ra.Std; \ - $(MV) $(DEPDIR)/ra.Sd $(DEPDIR)/ra.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/ra.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/ra.d - cp $(DEPDIR)/ra.Std $(DEPDIR)/ra.d - echo "" >> $(DEPDIR)/ra.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/ra.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/ra.d - $(RM) $(DEPDIR)/ra.Std - touch $(DEPDIR)/ra-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@ra_pythondir_category ?= gnuradio/ra +@PYTHON_TRUE@ra_pylibdir_category ?= $(ra_pythondir_category) + +@PYTHON_TRUE@ra.h ra.py ra.cc: ra.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/ra-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/ra-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/ra-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/ra-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/ra-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/ra-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/ra-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/ra-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(ra_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/ra.Std \ +@PYTHON_TRUE@ -module ra -o ra.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/ra.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/ra.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/ra.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/ra.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/ra.Sd $(DEPDIR)/ra.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/ra.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/ra.d +@PYTHON_TRUE@ cp $(DEPDIR)/ra.Std $(DEPDIR)/ra.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/ra.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/ra.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/ra.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/ra.Std +@PYTHON_TRUE@ touch $(DEPDIR)/ra-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/ra.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ra.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-radio-astronomy/src/python/Makefile.in b/gr-radio-astronomy/src/python/Makefile.in index e5b352a6..d888c8c2 100644 --- a/gr-radio-astronomy/src/python/Makefile.in +++ b/gr-radio-astronomy/src/python/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -212,6 +212,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@ @@ -219,6 +220,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@ @@ -237,6 +242,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -246,20 +252,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@ @@ -282,6 +291,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@ @@ -343,6 +354,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@ @@ -355,17 +367,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@ @@ -381,7 +393,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@ @@ -433,6 +444,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@ @@ -463,6 +479,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@ @@ -484,6 +505,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@ @@ -566,26 +597,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@ @@ -616,7 +632,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@ @@ -626,23 +641,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 @@ -654,7 +672,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, @@ -662,10 +680,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@ @@ -681,18 +695,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@ @@ -707,15 +709,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 = diff --git a/gr-sounder/Makefile.in b/gr-sounder/Makefile.in index 1455408f..c8ca3eb8 100644 --- a/gr-sounder/Makefile.in +++ b/gr-sounder/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = diff --git a/gr-sounder/doc/Makefile.in b/gr-sounder/doc/Makefile.in index 6f5a1834..05b95e9e 100644 --- a/gr-sounder/doc/Makefile.in +++ b/gr-sounder/doc/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-sounder/src/Makefile.in b/gr-sounder/src/Makefile.in index b824d6a2..07d18eb1 100644 --- a/gr-sounder/src/Makefile.in +++ b/gr-sounder/src/Makefile.in @@ -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,6 +79,7 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.common +@PYTHON_TRUE@am__append_1 = python subdir = gr-sounder/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -92,36 +93,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 \ @@ -135,9 +139,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 \ @@ -176,7 +177,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = fpga lib python DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -222,6 +223,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@ @@ -229,6 +231,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@ @@ -247,6 +253,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +263,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@ @@ -292,6 +302,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@ @@ -353,6 +365,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@ @@ -365,17 +378,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@ @@ -391,7 +404,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@ @@ -443,6 +455,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@ @@ -473,6 +490,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@ @@ -494,6 +516,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@ @@ -576,26 +608,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@ @@ -626,7 +643,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@ @@ -636,23 +652,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 @@ -664,7 +683,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, @@ -672,10 +691,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@ @@ -691,18 +706,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@ @@ -717,20 +720,22 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -SUBDIRS = fpga lib python +SUBDIRS = fpga lib $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gr-sounder/src/fpga/Makefile.in b/gr-sounder/src/fpga/Makefile.in index 9cb68697..f421fc38 100644 --- a/gr-sounder/src/fpga/Makefile.in +++ b/gr-sounder/src/fpga/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = diff --git a/gr-sounder/src/fpga/lib/Makefile.in b/gr-sounder/src/fpga/lib/Makefile.in index fdf7d44c..edd29d43 100644 --- a/gr-sounder/src/fpga/lib/Makefile.in +++ b/gr-sounder/src/fpga/lib/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-sounder/src/fpga/tb/Makefile.in b/gr-sounder/src/fpga/tb/Makefile.in index 1c183d5d..e2ace00e 100644 --- a/gr-sounder/src/fpga/tb/Makefile.in +++ b/gr-sounder/src/fpga/tb/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-sounder/src/fpga/top/Makefile.in b/gr-sounder/src/fpga/top/Makefile.in index cbe4710a..c5b3740a 100644 --- a/gr-sounder/src/fpga/top/Makefile.in +++ b/gr-sounder/src/fpga/top/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -208,6 +208,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@ @@ -215,6 +216,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@ @@ -233,6 +238,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -242,20 +248,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@ @@ -278,6 +287,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@ @@ -339,6 +350,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@ @@ -351,17 +363,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@ @@ -377,7 +389,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@ @@ -429,6 +440,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@ @@ -459,6 +475,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@ @@ -480,6 +501,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@ @@ -562,26 +593,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@ @@ -612,7 +628,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@ @@ -622,23 +637,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 @@ -650,7 +668,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, @@ -658,10 +676,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@ @@ -677,18 +691,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@ @@ -703,15 +705,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 = diff --git a/gr-sounder/src/lib/Makefile.in b/gr-sounder/src/lib/Makefile.in index 734db007..549062f2 100644 --- a/gr-sounder/src/lib/Makefile.in +++ b/gr-sounder/src/lib/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/gr-sounder/src/python/Makefile.in b/gr-sounder/src/python/Makefile.in index 3b665e92..884c8026 100644 --- a/gr-sounder/src/python/Makefile.in +++ b/gr-sounder/src/python/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/gr-trellis/Makefile.in b/gr-trellis/Makefile.in index 6d10158b..e8fe667b 100644 --- a/gr-trellis/Makefile.in +++ b/gr-trellis/Makefile.in @@ -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 # @@ -57,6 +57,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. # + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -77,7 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = README $(dist_pkgconfig_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gnuradio-trellis.pc.in \ $(top_srcdir)/Makefile.common subdir = gr-trellis ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -92,36 +94,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 \ @@ -135,9 +140,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 \ @@ -158,7 +160,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 = +CONFIG_CLEAN_FILES = gnuradio-trellis.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -169,6 +171,29 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +DATA = $(dist_pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -222,6 +247,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@ @@ -229,6 +255,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@ @@ -247,6 +277,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +287,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@ @@ -292,6 +326,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@ @@ -353,6 +389,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@ @@ -365,17 +402,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@ @@ -391,7 +428,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@ @@ -443,6 +479,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@ @@ -473,6 +514,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@ @@ -494,6 +540,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@ @@ -576,26 +632,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@ @@ -626,7 +667,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@ @@ -636,23 +676,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 @@ -664,7 +707,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, @@ -672,10 +715,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@ @@ -691,18 +730,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@ @@ -717,20 +744,24 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT SUBDIRS = src doc +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-trellis.pc all: all-recursive .SUFFIXES: @@ -764,12 +795,34 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +gnuradio-trellis.pc: $(top_builddir)/config.status $(srcdir)/gnuradio-trellis.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs +install-dist_pkgconfigDATA: $(dist_pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-dist_pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -969,9 +1022,12 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -1018,7 +1074,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-dist_pkgconfigDATA install-dvi: install-dvi-recursive @@ -1062,7 +1118,7 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-dist_pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1072,14 +1128,15 @@ uninstall-am: ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + install-data-am install-dist_pkgconfigDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-dist_pkgconfigDATA # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gr-trellis/doc/Makefile.in b/gr-trellis/doc/Makefile.in index 2e8adf51..e8e37874 100644 --- a/gr-trellis/doc/Makefile.in +++ b/gr-trellis/doc/Makefile.in @@ -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 # @@ -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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/gr-trellis/src/Makefile.in b/gr-trellis/src/Makefile.in index 02edb736..5a0b89ac 100644 --- a/gr-trellis/src/Makefile.in +++ b/gr-trellis/src/Makefile.in @@ -55,6 +55,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@PYTHON_TRUE@am__append_1 = python examples subdir = gr-trellis/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -69,36 +70,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 \ @@ -112,9 +116,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 \ @@ -153,7 +154,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib python examples DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -199,6 +200,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@ @@ -206,6 +208,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@ @@ -224,6 +230,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +240,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@ @@ -269,6 +279,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@ @@ -330,6 +342,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@ @@ -342,17 +355,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@ @@ -368,7 +381,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@ @@ -420,6 +432,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@ @@ -450,6 +467,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@ @@ -471,6 +493,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@ @@ -553,26 +585,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@ @@ -603,14 +620,13 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -SUBDIRS = lib python examples +SUBDIRS = lib $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gr-trellis/src/examples/Makefile.in b/gr-trellis/src/examples/Makefile.in index 7466f680..b3c2a213 100644 --- a/gr-trellis/src/examples/Makefile.in +++ b/gr-trellis/src/examples/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -249,6 +249,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@ @@ -256,6 +257,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@ @@ -274,6 +279,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -283,20 +289,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@ @@ -319,6 +328,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@ @@ -380,6 +391,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@ @@ -392,17 +404,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@ @@ -418,7 +430,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@ @@ -470,6 +481,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@ @@ -500,6 +516,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@ @@ -521,6 +542,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@ @@ -603,26 +634,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@ @@ -653,7 +669,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@ @@ -663,23 +678,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 @@ -691,7 +709,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, @@ -699,10 +717,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@ @@ -718,18 +732,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@ @@ -744,15 +746,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 = diff --git a/gr-trellis/src/examples/fsm_files/Makefile.in b/gr-trellis/src/examples/fsm_files/Makefile.in index ee95e530..14525c69 100644 --- a/gr-trellis/src/examples/fsm_files/Makefile.in +++ b/gr-trellis/src/examples/fsm_files/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/gr-trellis/src/lib/Makefile.in b/gr-trellis/src/lib/Makefile.in index 5a3e2370..26464d3c 100644 --- a/gr-trellis/src/lib/Makefile.in +++ b/gr-trellis/src/lib/Makefile.in @@ -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 # @@ -169,12 +169,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grinclude_HEADERS) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__grinclude_HEADERS_DIST) \ + $(am__trellis_python_PYTHON_DIST) \ + $(am__trellis_swiginclude_HEADERS_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.gen $(srcdir)/Makefile.in \ $(srcdir)/Makefile.swig.gen $(top_srcdir)/Makefile.common \ $(top_srcdir)/Makefile.gen.gen $(top_srcdir)/Makefile.par.gen \ - $(top_srcdir)/Makefile.swig $(trellis_python_PYTHON) \ - $(trellis_swiginclude_HEADERS) + $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = \ +@PYTHON_TRUE@ $(DEPDIR)/Makefile.gen-generate-generate-* \ +@PYTHON_TRUE@ $(DEPDIR)/stamp-sources-generate* \ +@PYTHON_TRUE@ $(DEPDIR)/trellis-generate-* +@PYTHON_TRUE@am__append_2 = stamp-sources-generate +@PYTHON_TRUE@am__append_3 = stamp-sources-generate $(DEPDIR)/*.S* subdir = gr-trellis/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -188,36 +195,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 \ @@ -231,9 +241,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 \ @@ -277,49 +284,64 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(trellis_pylibdir)" \ +am__installdirs = "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(trellis_pylibdir)" \ "$(DESTDIR)$(trellis_pythondir)" "$(DESTDIR)$(grincludedir)" \ "$(DESTDIR)$(trellis_swigincludedir)" -LTLIBRARIES = $(trellis_pylib_LTLIBRARIES) +LTLIBRARIES = $(lib_LTLIBRARIES) $(trellis_pylib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -_trellis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) -am__objects_1 = _trellis_la-trellis_encoder_bb.lo \ - _trellis_la-trellis_encoder_bi.lo \ - _trellis_la-trellis_encoder_bs.lo \ - _trellis_la-trellis_encoder_ii.lo \ - _trellis_la-trellis_encoder_si.lo \ - _trellis_la-trellis_encoder_ss.lo \ - _trellis_la-trellis_metrics_c.lo \ - _trellis_la-trellis_metrics_f.lo \ - _trellis_la-trellis_metrics_i.lo \ - _trellis_la-trellis_metrics_s.lo \ - _trellis_la-trellis_viterbi_b.lo \ - _trellis_la-trellis_viterbi_combined_cb.lo \ - _trellis_la-trellis_viterbi_combined_ci.lo \ - _trellis_la-trellis_viterbi_combined_cs.lo \ - _trellis_la-trellis_viterbi_combined_fb.lo \ - _trellis_la-trellis_viterbi_combined_fi.lo \ - _trellis_la-trellis_viterbi_combined_fs.lo \ - _trellis_la-trellis_viterbi_combined_ib.lo \ - _trellis_la-trellis_viterbi_combined_ii.lo \ - _trellis_la-trellis_viterbi_combined_is.lo \ - _trellis_la-trellis_viterbi_combined_sb.lo \ - _trellis_la-trellis_viterbi_combined_si.lo \ - _trellis_la-trellis_viterbi_combined_ss.lo \ - _trellis_la-trellis_viterbi_i.lo \ - _trellis_la-trellis_viterbi_s.lo -am__objects_2 = _trellis_la-fsm.lo _trellis_la-quicksort_index.lo \ - _trellis_la-base.lo _trellis_la-interleaver.lo \ - _trellis_la-trellis_calc_metric.lo \ - _trellis_la-trellis_permutation.lo \ - _trellis_la-trellis_siso_f.lo \ - _trellis_la-trellis_siso_combined_f.lo $(am__objects_1) -am__trellis_la_OBJECTS = _trellis_la-trellis.lo $(am__objects_2) +@PYTHON_TRUE@_trellis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(trellis_la_swig_libadd) +am___trellis_la_SOURCES_DIST = trellis.cc +@PYTHON_TRUE@am__trellis_la_OBJECTS = _trellis_la-trellis.lo _trellis_la_OBJECTS = $(am__trellis_la_OBJECTS) _trellis_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(_trellis_la_CXXFLAGS) \ $(CXXFLAGS) $(_trellis_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__trellis_la_rpath = -rpath $(trellis_pylibdir) +libgnuradio_trellis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__libgnuradio_trellis_la_SOURCES_DIST = fsm.cc quicksort_index.cc \ + base.cc interleaver.cc trellis_calc_metric.cc \ + trellis_permutation.cc trellis_siso_f.cc \ + trellis_siso_combined_f.cc trellis_encoder_bb.cc \ + trellis_encoder_bi.cc trellis_encoder_bs.cc \ + trellis_encoder_ii.cc trellis_encoder_si.cc \ + trellis_encoder_ss.cc trellis_metrics_c.cc \ + trellis_metrics_f.cc trellis_metrics_i.cc trellis_metrics_s.cc \ + trellis_viterbi_b.cc trellis_viterbi_combined_cb.cc \ + trellis_viterbi_combined_ci.cc trellis_viterbi_combined_cs.cc \ + trellis_viterbi_combined_fb.cc trellis_viterbi_combined_fi.cc \ + trellis_viterbi_combined_fs.cc trellis_viterbi_combined_ib.cc \ + trellis_viterbi_combined_ii.cc trellis_viterbi_combined_is.cc \ + trellis_viterbi_combined_sb.cc trellis_viterbi_combined_si.cc \ + trellis_viterbi_combined_ss.cc trellis_viterbi_i.cc \ + trellis_viterbi_s.cc +@PYTHON_TRUE@am__objects_1 = trellis_encoder_bb.lo \ +@PYTHON_TRUE@ trellis_encoder_bi.lo trellis_encoder_bs.lo \ +@PYTHON_TRUE@ trellis_encoder_ii.lo trellis_encoder_si.lo \ +@PYTHON_TRUE@ trellis_encoder_ss.lo trellis_metrics_c.lo \ +@PYTHON_TRUE@ trellis_metrics_f.lo trellis_metrics_i.lo \ +@PYTHON_TRUE@ trellis_metrics_s.lo trellis_viterbi_b.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_cb.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_ci.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_cs.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_fb.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_fi.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_fs.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_ib.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_ii.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_is.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_sb.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_si.lo \ +@PYTHON_TRUE@ trellis_viterbi_combined_ss.lo \ +@PYTHON_TRUE@ trellis_viterbi_i.lo trellis_viterbi_s.lo +am_libgnuradio_trellis_la_OBJECTS = fsm.lo quicksort_index.lo base.lo \ + interleaver.lo trellis_calc_metric.lo trellis_permutation.lo \ + trellis_siso_f.lo trellis_siso_combined_f.lo $(am__objects_1) +libgnuradio_trellis_la_OBJECTS = $(am_libgnuradio_trellis_la_OBJECTS) +libgnuradio_trellis_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libgnuradio_trellis_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -333,9 +355,39 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_trellis_la_SOURCES) -DIST_SOURCES = $(_trellis_la_SOURCES) +SOURCES = $(_trellis_la_SOURCES) $(libgnuradio_trellis_la_SOURCES) +DIST_SOURCES = $(am___trellis_la_SOURCES_DIST) \ + $(am__libgnuradio_trellis_la_SOURCES_DIST) +am__trellis_python_PYTHON_DIST = trellis.py py_compile = $(top_srcdir)/py-compile +am__grinclude_HEADERS_DIST = fsm.h quicksort_index.h base.h \ + interleaver.h trellis_metric_type.h trellis_calc_metric.h \ + trellis_permutation.h trellis_siso_type.h trellis_siso_f.h \ + trellis_siso_combined_f.h trellis_encoder_bb.h \ + trellis_encoder_bi.h trellis_encoder_bs.h trellis_encoder_ii.h \ + trellis_encoder_si.h trellis_encoder_ss.h trellis_metrics_c.h \ + trellis_metrics_f.h trellis_metrics_i.h trellis_metrics_s.h \ + trellis_viterbi_b.h trellis_viterbi_combined_cb.h \ + trellis_viterbi_combined_ci.h trellis_viterbi_combined_cs.h \ + trellis_viterbi_combined_fb.h trellis_viterbi_combined_fi.h \ + trellis_viterbi_combined_fs.h trellis_viterbi_combined_ib.h \ + trellis_viterbi_combined_ii.h trellis_viterbi_combined_is.h \ + trellis_viterbi_combined_sb.h trellis_viterbi_combined_si.h \ + trellis_viterbi_combined_ss.h trellis_viterbi_i.h \ + trellis_viterbi_s.h +am__trellis_swiginclude_HEADERS_DIST = trellis.i trellis_encoder_bb.i \ + trellis_encoder_bi.i trellis_encoder_bs.i trellis_encoder_ii.i \ + trellis_encoder_si.i trellis_encoder_ss.i trellis_metrics_c.i \ + trellis_metrics_f.i trellis_metrics_i.i trellis_metrics_s.i \ + trellis_viterbi_b.i trellis_viterbi_combined_cb.i \ + trellis_viterbi_combined_ci.i trellis_viterbi_combined_cs.i \ + trellis_viterbi_combined_fb.i trellis_viterbi_combined_fi.i \ + trellis_viterbi_combined_fs.i trellis_viterbi_combined_ib.i \ + trellis_viterbi_combined_ii.i trellis_viterbi_combined_is.i \ + trellis_viterbi_combined_sb.i trellis_viterbi_combined_si.i \ + trellis_viterbi_combined_ss.i trellis_viterbi_i.i \ + trellis_viterbi_s.i fsm.i interleaver.i trellis_permutation.i \ + trellis_siso_f.i trellis_siso_combined_f.i trellis_generated.i HEADERS = $(grinclude_HEADERS) $(trellis_swiginclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -359,6 +411,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@ @@ -366,6 +419,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@ @@ -384,6 +441,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -393,20 +451,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@ @@ -429,6 +490,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@ @@ -490,6 +553,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@ @@ -502,17 +566,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@ @@ -528,7 +592,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@ @@ -580,6 +643,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@ @@ -610,6 +678,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@ @@ -631,6 +704,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@ @@ -713,26 +796,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@ @@ -763,7 +831,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@ @@ -773,23 +840,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 @@ -801,7 +871,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, @@ -809,10 +879,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@ @@ -828,18 +894,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@ @@ -854,21 +908,22 @@ 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 = $(DEPDIR)/Makefile.gen-generate-generate-* \ - $(DEPDIR)/stamp-sources-generate* $(DEPDIR)/trellis-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT stamp-sources-generate $(DEPDIR)/*.S* + *.loT $(am__append_3) AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) # ---------------------------------------------------------------- @@ -897,7 +952,7 @@ python_built_sources = \ $(GENERATED_CC) \ trellis_generated.i -EXTRA_DIST = $(core_generator) stamp-sources-generate +EXTRA_DIST = $(core_generator) $(am__append_2) # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -913,23 +968,8 @@ grinclude_HEADERS = \ trellis_siso_combined_f.h \ $(GENERATED_H) - -################################# -# SWIG interface and library -TOP_SWIG_IFILES = \ - trellis.i - - -# Install so that they end up available as: -# import gnuradio.trellis -# This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio -trellis_pythondir_category = \ - gnuradio - - -# additional sources for the SWIG-generated library -trellis_la_swig_sources = \ +lib_LTLIBRARIES = libgnuradio-trellis.la +libgnuradio_trellis_la_SOURCES = \ fsm.cc \ quicksort_index.cc \ base.cc \ @@ -940,106 +980,124 @@ trellis_la_swig_sources = \ trellis_siso_combined_f.cc \ $(GENERATED_CC) +libgnuradio_trellis_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_trellis_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) + +################################# +# SWIG interface and library +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ trellis.i + + +# Install so that they end up available as: +# import gnuradio.trellis +# This ends up at: +# ${prefix}/lib/python${python_version}/site-packages/gnuradio +@PYTHON_TRUE@trellis_pythondir_category = \ +@PYTHON_TRUE@ gnuradio + # additional libraries for linking with the SWIG-generated library -trellis_la_swig_libadd = \ - $(GNURADIO_CORE_LA) +@PYTHON_TRUE@trellis_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-trellis.la # additional SWIG files to be installed -trellis_swiginclude_headers = \ - $(GENERATED_I) \ - fsm.i \ - interleaver.i \ - trellis_permutation.i \ - trellis_siso_f.i \ - trellis_siso_combined_f.i \ - trellis_generated.i +@PYTHON_TRUE@trellis_swiginclude_headers = \ +@PYTHON_TRUE@ $(GENERATED_I) \ +@PYTHON_TRUE@ fsm.i \ +@PYTHON_TRUE@ interleaver.i \ +@PYTHON_TRUE@ trellis_permutation.i \ +@PYTHON_TRUE@ trellis_siso_f.i \ +@PYTHON_TRUE@ trellis_siso_combined_f.i \ +@PYTHON_TRUE@ trellis_generated.i # # This file is machine generated. All edits will be overwritten # -GENERATED_H = \ - trellis_encoder_bb.h \ - trellis_encoder_bi.h \ - trellis_encoder_bs.h \ - trellis_encoder_ii.h \ - trellis_encoder_si.h \ - trellis_encoder_ss.h \ - trellis_metrics_c.h \ - trellis_metrics_f.h \ - trellis_metrics_i.h \ - trellis_metrics_s.h \ - trellis_viterbi_b.h \ - trellis_viterbi_combined_cb.h \ - trellis_viterbi_combined_ci.h \ - trellis_viterbi_combined_cs.h \ - trellis_viterbi_combined_fb.h \ - trellis_viterbi_combined_fi.h \ - trellis_viterbi_combined_fs.h \ - trellis_viterbi_combined_ib.h \ - trellis_viterbi_combined_ii.h \ - trellis_viterbi_combined_is.h \ - trellis_viterbi_combined_sb.h \ - trellis_viterbi_combined_si.h \ - trellis_viterbi_combined_ss.h \ - trellis_viterbi_i.h \ - trellis_viterbi_s.h - -GENERATED_I = \ - trellis_encoder_bb.i \ - trellis_encoder_bi.i \ - trellis_encoder_bs.i \ - trellis_encoder_ii.i \ - trellis_encoder_si.i \ - trellis_encoder_ss.i \ - trellis_metrics_c.i \ - trellis_metrics_f.i \ - trellis_metrics_i.i \ - trellis_metrics_s.i \ - trellis_viterbi_b.i \ - trellis_viterbi_combined_cb.i \ - trellis_viterbi_combined_ci.i \ - trellis_viterbi_combined_cs.i \ - trellis_viterbi_combined_fb.i \ - trellis_viterbi_combined_fi.i \ - trellis_viterbi_combined_fs.i \ - trellis_viterbi_combined_ib.i \ - trellis_viterbi_combined_ii.i \ - trellis_viterbi_combined_is.i \ - trellis_viterbi_combined_sb.i \ - trellis_viterbi_combined_si.i \ - trellis_viterbi_combined_ss.i \ - trellis_viterbi_i.i \ - trellis_viterbi_s.i - -GENERATED_CC = \ - trellis_encoder_bb.cc \ - trellis_encoder_bi.cc \ - trellis_encoder_bs.cc \ - trellis_encoder_ii.cc \ - trellis_encoder_si.cc \ - trellis_encoder_ss.cc \ - trellis_metrics_c.cc \ - trellis_metrics_f.cc \ - trellis_metrics_i.cc \ - trellis_metrics_s.cc \ - trellis_viterbi_b.cc \ - trellis_viterbi_combined_cb.cc \ - trellis_viterbi_combined_ci.cc \ - trellis_viterbi_combined_cs.cc \ - trellis_viterbi_combined_fb.cc \ - trellis_viterbi_combined_fi.cc \ - trellis_viterbi_combined_fs.cc \ - trellis_viterbi_combined_ib.cc \ - trellis_viterbi_combined_ii.cc \ - trellis_viterbi_combined_is.cc \ - trellis_viterbi_combined_sb.cc \ - trellis_viterbi_combined_si.cc \ - trellis_viterbi_combined_ss.cc \ - trellis_viterbi_i.cc \ - trellis_viterbi_s.cc +@PYTHON_TRUE@GENERATED_H = \ +@PYTHON_TRUE@ trellis_encoder_bb.h \ +@PYTHON_TRUE@ trellis_encoder_bi.h \ +@PYTHON_TRUE@ trellis_encoder_bs.h \ +@PYTHON_TRUE@ trellis_encoder_ii.h \ +@PYTHON_TRUE@ trellis_encoder_si.h \ +@PYTHON_TRUE@ trellis_encoder_ss.h \ +@PYTHON_TRUE@ trellis_metrics_c.h \ +@PYTHON_TRUE@ trellis_metrics_f.h \ +@PYTHON_TRUE@ trellis_metrics_i.h \ +@PYTHON_TRUE@ trellis_metrics_s.h \ +@PYTHON_TRUE@ trellis_viterbi_b.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_cb.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_ci.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_cs.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_fb.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_fi.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_fs.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_ib.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_ii.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_is.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_sb.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_si.h \ +@PYTHON_TRUE@ trellis_viterbi_combined_ss.h \ +@PYTHON_TRUE@ trellis_viterbi_i.h \ +@PYTHON_TRUE@ trellis_viterbi_s.h + +@PYTHON_TRUE@GENERATED_I = \ +@PYTHON_TRUE@ trellis_encoder_bb.i \ +@PYTHON_TRUE@ trellis_encoder_bi.i \ +@PYTHON_TRUE@ trellis_encoder_bs.i \ +@PYTHON_TRUE@ trellis_encoder_ii.i \ +@PYTHON_TRUE@ trellis_encoder_si.i \ +@PYTHON_TRUE@ trellis_encoder_ss.i \ +@PYTHON_TRUE@ trellis_metrics_c.i \ +@PYTHON_TRUE@ trellis_metrics_f.i \ +@PYTHON_TRUE@ trellis_metrics_i.i \ +@PYTHON_TRUE@ trellis_metrics_s.i \ +@PYTHON_TRUE@ trellis_viterbi_b.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_cb.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_ci.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_cs.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_fb.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_fi.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_fs.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_ib.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_ii.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_is.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_sb.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_si.i \ +@PYTHON_TRUE@ trellis_viterbi_combined_ss.i \ +@PYTHON_TRUE@ trellis_viterbi_i.i \ +@PYTHON_TRUE@ trellis_viterbi_s.i + +@PYTHON_TRUE@GENERATED_CC = \ +@PYTHON_TRUE@ trellis_encoder_bb.cc \ +@PYTHON_TRUE@ trellis_encoder_bi.cc \ +@PYTHON_TRUE@ trellis_encoder_bs.cc \ +@PYTHON_TRUE@ trellis_encoder_ii.cc \ +@PYTHON_TRUE@ trellis_encoder_si.cc \ +@PYTHON_TRUE@ trellis_encoder_ss.cc \ +@PYTHON_TRUE@ trellis_metrics_c.cc \ +@PYTHON_TRUE@ trellis_metrics_f.cc \ +@PYTHON_TRUE@ trellis_metrics_i.cc \ +@PYTHON_TRUE@ trellis_metrics_s.cc \ +@PYTHON_TRUE@ trellis_viterbi_b.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_cb.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_ci.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_cs.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_fb.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_fi.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_fs.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_ib.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_ii.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_is.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_sb.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_si.cc \ +@PYTHON_TRUE@ trellis_viterbi_combined_ss.cc \ +@PYTHON_TRUE@ trellis_viterbi_i.cc \ +@PYTHON_TRUE@ trellis_viterbi_s.cc # Do creation and inclusion of other Makefiles last @@ -1048,78 +1106,78 @@ GENERATED_CC = \ # dependency between $(srcdir)/Makefile.in and $(srcdir)/Makefile.gen. # common way for generating local Makefile.gen -makefile_gen_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) do_makefile=1 do_sources=0 $(PYTHON) $(srcdir)/generate_all.py +@PYTHON_TRUE@makefile_gen_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) do_makefile=1 do_sources=0 $(PYTHON) $(srcdir)/generate_all.py # common way for generating sources from templates when using # BUILT_SOURCES, using parallel build protection. -gen_sources = $(python_built_sources) -gen_sources_deps = $(core_generator) -par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = trellis.py trellis.cc -trellis_pythondir = $(pythondir)/$(trellis_pythondir_category) -trellis_pylibdir = $(pyexecdir)/$(trellis_pylibdir_category) -trellis_swigincludedir = $(swigincludedir) -trellis_swiginclude_HEADERS = \ - trellis.i \ - $(trellis_swiginclude_headers) - -trellis_pylib_LTLIBRARIES = \ - _trellis.la - -_trellis_la_SOURCES = \ - trellis.cc \ - $(trellis_la_swig_sources) - -_trellis_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(trellis_la_swig_libadd) - -_trellis_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(trellis_la_swig_ldflags) - -_trellis_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(trellis_la_swig_cxxflags) - -trellis_python_PYTHON = \ - trellis.py \ - $(trellis_python) +@PYTHON_TRUE@gen_sources = $(python_built_sources) +@PYTHON_TRUE@gen_sources_deps = $(core_generator) +@PYTHON_TRUE@par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = trellis.py trellis.cc +@PYTHON_TRUE@trellis_pythondir = $(pythondir)/$(trellis_pythondir_category) +@PYTHON_TRUE@trellis_pylibdir = $(pyexecdir)/$(trellis_pylibdir_category) +@PYTHON_TRUE@trellis_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@trellis_swiginclude_HEADERS = \ +@PYTHON_TRUE@ trellis.i \ +@PYTHON_TRUE@ $(trellis_swiginclude_headers) + +@PYTHON_TRUE@trellis_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _trellis.la + +@PYTHON_TRUE@_trellis_la_SOURCES = \ +@PYTHON_TRUE@ trellis.cc \ +@PYTHON_TRUE@ $(trellis_la_swig_sources) + +@PYTHON_TRUE@_trellis_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(trellis_la_swig_libadd) + +@PYTHON_TRUE@_trellis_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(trellis_la_swig_ldflags) + +@PYTHON_TRUE@_trellis_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(trellis_la_swig_cxxflags) + +@PYTHON_TRUE@trellis_python_PYTHON = \ +@PYTHON_TRUE@ trellis.py \ +@PYTHON_TRUE@ $(trellis_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = \ - $(python_built_sources) \ - $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = \ +@PYTHON_TRUE@ $(python_built_sources) \ +@PYTHON_TRUE@ $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1155,6 +1213,37 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done install-trellis_pylibLTLIBRARIES: $(trellis_pylib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(trellis_pylibdir)" || $(MKDIR_P) "$(DESTDIR)$(trellis_pylibdir)" @@ -1187,7 +1276,9 @@ clean-trellis_pylibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done _trellis.la: $(_trellis_la_OBJECTS) $(_trellis_la_DEPENDENCIES) - $(_trellis_la_LINK) -rpath $(trellis_pylibdir) $(_trellis_la_OBJECTS) $(_trellis_la_LIBADD) $(LIBS) + $(_trellis_la_LINK) $(am__trellis_la_rpath) $(_trellis_la_OBJECTS) $(_trellis_la_LIBADD) $(LIBS) +libgnuradio-trellis.la: $(libgnuradio_trellis_la_OBJECTS) $(libgnuradio_trellis_la_DEPENDENCIES) + $(libgnuradio_trellis_la_LINK) -rpath $(libdir) $(libgnuradio_trellis_la_OBJECTS) $(libgnuradio_trellis_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1195,40 +1286,40 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-base.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-fsm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-interleaver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-quicksort_index.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_calc_metric.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_encoder_bb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_encoder_bi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_encoder_bs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_encoder_ii.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_encoder_si.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_encoder_ss.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_metrics_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_metrics_f.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_metrics_i.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_metrics_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_permutation.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_siso_combined_f.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_siso_f.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_b.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_cb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_ci.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_cs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_fb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_fi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_fs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_ib.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_ii.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_is.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_sb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_si.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_combined_ss.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_i.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_trellis_la-trellis_viterbi_s.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interleaver.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quicksort_index.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_calc_metric.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_encoder_bb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_encoder_bi.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_encoder_bs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_encoder_ii.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_encoder_si.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_encoder_ss.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_metrics_c.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_metrics_f.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_metrics_i.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_metrics_s.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_permutation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_siso_combined_f.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_siso_f.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_b.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_cb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_ci.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_cs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_fb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_fi.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_fs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_ib.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_ii.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_is.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_sb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_si.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_combined_ss.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_i.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis_viterbi_s.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1258,237 +1349,6 @@ _trellis_la-trellis.lo: trellis.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis.lo `test -f 'trellis.cc' || echo '$(srcdir)/'`trellis.cc -_trellis_la-fsm.lo: fsm.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-fsm.lo -MD -MP -MF $(DEPDIR)/_trellis_la-fsm.Tpo -c -o _trellis_la-fsm.lo `test -f 'fsm.cc' || echo '$(srcdir)/'`fsm.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-fsm.Tpo $(DEPDIR)/_trellis_la-fsm.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fsm.cc' object='_trellis_la-fsm.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-fsm.lo `test -f 'fsm.cc' || echo '$(srcdir)/'`fsm.cc - -_trellis_la-quicksort_index.lo: quicksort_index.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-quicksort_index.lo -MD -MP -MF $(DEPDIR)/_trellis_la-quicksort_index.Tpo -c -o _trellis_la-quicksort_index.lo `test -f 'quicksort_index.cc' || echo '$(srcdir)/'`quicksort_index.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-quicksort_index.Tpo $(DEPDIR)/_trellis_la-quicksort_index.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='quicksort_index.cc' object='_trellis_la-quicksort_index.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-quicksort_index.lo `test -f 'quicksort_index.cc' || echo '$(srcdir)/'`quicksort_index.cc - -_trellis_la-base.lo: base.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-base.lo -MD -MP -MF $(DEPDIR)/_trellis_la-base.Tpo -c -o _trellis_la-base.lo `test -f 'base.cc' || echo '$(srcdir)/'`base.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-base.Tpo $(DEPDIR)/_trellis_la-base.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='base.cc' object='_trellis_la-base.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-base.lo `test -f 'base.cc' || echo '$(srcdir)/'`base.cc - -_trellis_la-interleaver.lo: interleaver.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-interleaver.lo -MD -MP -MF $(DEPDIR)/_trellis_la-interleaver.Tpo -c -o _trellis_la-interleaver.lo `test -f 'interleaver.cc' || echo '$(srcdir)/'`interleaver.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-interleaver.Tpo $(DEPDIR)/_trellis_la-interleaver.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='interleaver.cc' object='_trellis_la-interleaver.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-interleaver.lo `test -f 'interleaver.cc' || echo '$(srcdir)/'`interleaver.cc - -_trellis_la-trellis_calc_metric.lo: trellis_calc_metric.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_calc_metric.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_calc_metric.Tpo -c -o _trellis_la-trellis_calc_metric.lo `test -f 'trellis_calc_metric.cc' || echo '$(srcdir)/'`trellis_calc_metric.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_calc_metric.Tpo $(DEPDIR)/_trellis_la-trellis_calc_metric.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_calc_metric.cc' object='_trellis_la-trellis_calc_metric.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_calc_metric.lo `test -f 'trellis_calc_metric.cc' || echo '$(srcdir)/'`trellis_calc_metric.cc - -_trellis_la-trellis_permutation.lo: trellis_permutation.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_permutation.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_permutation.Tpo -c -o _trellis_la-trellis_permutation.lo `test -f 'trellis_permutation.cc' || echo '$(srcdir)/'`trellis_permutation.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_permutation.Tpo $(DEPDIR)/_trellis_la-trellis_permutation.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_permutation.cc' object='_trellis_la-trellis_permutation.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_permutation.lo `test -f 'trellis_permutation.cc' || echo '$(srcdir)/'`trellis_permutation.cc - -_trellis_la-trellis_siso_f.lo: trellis_siso_f.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_siso_f.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_siso_f.Tpo -c -o _trellis_la-trellis_siso_f.lo `test -f 'trellis_siso_f.cc' || echo '$(srcdir)/'`trellis_siso_f.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_siso_f.Tpo $(DEPDIR)/_trellis_la-trellis_siso_f.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_siso_f.cc' object='_trellis_la-trellis_siso_f.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_siso_f.lo `test -f 'trellis_siso_f.cc' || echo '$(srcdir)/'`trellis_siso_f.cc - -_trellis_la-trellis_siso_combined_f.lo: trellis_siso_combined_f.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_siso_combined_f.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_siso_combined_f.Tpo -c -o _trellis_la-trellis_siso_combined_f.lo `test -f 'trellis_siso_combined_f.cc' || echo '$(srcdir)/'`trellis_siso_combined_f.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_siso_combined_f.Tpo $(DEPDIR)/_trellis_la-trellis_siso_combined_f.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_siso_combined_f.cc' object='_trellis_la-trellis_siso_combined_f.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_siso_combined_f.lo `test -f 'trellis_siso_combined_f.cc' || echo '$(srcdir)/'`trellis_siso_combined_f.cc - -_trellis_la-trellis_encoder_bb.lo: trellis_encoder_bb.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_encoder_bb.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_encoder_bb.Tpo -c -o _trellis_la-trellis_encoder_bb.lo `test -f 'trellis_encoder_bb.cc' || echo '$(srcdir)/'`trellis_encoder_bb.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_encoder_bb.Tpo $(DEPDIR)/_trellis_la-trellis_encoder_bb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_encoder_bb.cc' object='_trellis_la-trellis_encoder_bb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_encoder_bb.lo `test -f 'trellis_encoder_bb.cc' || echo '$(srcdir)/'`trellis_encoder_bb.cc - -_trellis_la-trellis_encoder_bi.lo: trellis_encoder_bi.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_encoder_bi.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_encoder_bi.Tpo -c -o _trellis_la-trellis_encoder_bi.lo `test -f 'trellis_encoder_bi.cc' || echo '$(srcdir)/'`trellis_encoder_bi.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_encoder_bi.Tpo $(DEPDIR)/_trellis_la-trellis_encoder_bi.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_encoder_bi.cc' object='_trellis_la-trellis_encoder_bi.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_encoder_bi.lo `test -f 'trellis_encoder_bi.cc' || echo '$(srcdir)/'`trellis_encoder_bi.cc - -_trellis_la-trellis_encoder_bs.lo: trellis_encoder_bs.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_encoder_bs.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_encoder_bs.Tpo -c -o _trellis_la-trellis_encoder_bs.lo `test -f 'trellis_encoder_bs.cc' || echo '$(srcdir)/'`trellis_encoder_bs.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_encoder_bs.Tpo $(DEPDIR)/_trellis_la-trellis_encoder_bs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_encoder_bs.cc' object='_trellis_la-trellis_encoder_bs.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_encoder_bs.lo `test -f 'trellis_encoder_bs.cc' || echo '$(srcdir)/'`trellis_encoder_bs.cc - -_trellis_la-trellis_encoder_ii.lo: trellis_encoder_ii.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_encoder_ii.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_encoder_ii.Tpo -c -o _trellis_la-trellis_encoder_ii.lo `test -f 'trellis_encoder_ii.cc' || echo '$(srcdir)/'`trellis_encoder_ii.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_encoder_ii.Tpo $(DEPDIR)/_trellis_la-trellis_encoder_ii.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_encoder_ii.cc' object='_trellis_la-trellis_encoder_ii.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_encoder_ii.lo `test -f 'trellis_encoder_ii.cc' || echo '$(srcdir)/'`trellis_encoder_ii.cc - -_trellis_la-trellis_encoder_si.lo: trellis_encoder_si.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_encoder_si.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_encoder_si.Tpo -c -o _trellis_la-trellis_encoder_si.lo `test -f 'trellis_encoder_si.cc' || echo '$(srcdir)/'`trellis_encoder_si.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_encoder_si.Tpo $(DEPDIR)/_trellis_la-trellis_encoder_si.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_encoder_si.cc' object='_trellis_la-trellis_encoder_si.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_encoder_si.lo `test -f 'trellis_encoder_si.cc' || echo '$(srcdir)/'`trellis_encoder_si.cc - -_trellis_la-trellis_encoder_ss.lo: trellis_encoder_ss.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_encoder_ss.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_encoder_ss.Tpo -c -o _trellis_la-trellis_encoder_ss.lo `test -f 'trellis_encoder_ss.cc' || echo '$(srcdir)/'`trellis_encoder_ss.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_encoder_ss.Tpo $(DEPDIR)/_trellis_la-trellis_encoder_ss.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_encoder_ss.cc' object='_trellis_la-trellis_encoder_ss.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_encoder_ss.lo `test -f 'trellis_encoder_ss.cc' || echo '$(srcdir)/'`trellis_encoder_ss.cc - -_trellis_la-trellis_metrics_c.lo: trellis_metrics_c.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_metrics_c.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_metrics_c.Tpo -c -o _trellis_la-trellis_metrics_c.lo `test -f 'trellis_metrics_c.cc' || echo '$(srcdir)/'`trellis_metrics_c.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_metrics_c.Tpo $(DEPDIR)/_trellis_la-trellis_metrics_c.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_metrics_c.cc' object='_trellis_la-trellis_metrics_c.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_metrics_c.lo `test -f 'trellis_metrics_c.cc' || echo '$(srcdir)/'`trellis_metrics_c.cc - -_trellis_la-trellis_metrics_f.lo: trellis_metrics_f.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_metrics_f.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_metrics_f.Tpo -c -o _trellis_la-trellis_metrics_f.lo `test -f 'trellis_metrics_f.cc' || echo '$(srcdir)/'`trellis_metrics_f.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_metrics_f.Tpo $(DEPDIR)/_trellis_la-trellis_metrics_f.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_metrics_f.cc' object='_trellis_la-trellis_metrics_f.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_metrics_f.lo `test -f 'trellis_metrics_f.cc' || echo '$(srcdir)/'`trellis_metrics_f.cc - -_trellis_la-trellis_metrics_i.lo: trellis_metrics_i.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_metrics_i.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_metrics_i.Tpo -c -o _trellis_la-trellis_metrics_i.lo `test -f 'trellis_metrics_i.cc' || echo '$(srcdir)/'`trellis_metrics_i.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_metrics_i.Tpo $(DEPDIR)/_trellis_la-trellis_metrics_i.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_metrics_i.cc' object='_trellis_la-trellis_metrics_i.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_metrics_i.lo `test -f 'trellis_metrics_i.cc' || echo '$(srcdir)/'`trellis_metrics_i.cc - -_trellis_la-trellis_metrics_s.lo: trellis_metrics_s.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_metrics_s.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_metrics_s.Tpo -c -o _trellis_la-trellis_metrics_s.lo `test -f 'trellis_metrics_s.cc' || echo '$(srcdir)/'`trellis_metrics_s.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_metrics_s.Tpo $(DEPDIR)/_trellis_la-trellis_metrics_s.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_metrics_s.cc' object='_trellis_la-trellis_metrics_s.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_metrics_s.lo `test -f 'trellis_metrics_s.cc' || echo '$(srcdir)/'`trellis_metrics_s.cc - -_trellis_la-trellis_viterbi_b.lo: trellis_viterbi_b.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_b.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_b.Tpo -c -o _trellis_la-trellis_viterbi_b.lo `test -f 'trellis_viterbi_b.cc' || echo '$(srcdir)/'`trellis_viterbi_b.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_b.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_b.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_b.cc' object='_trellis_la-trellis_viterbi_b.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_b.lo `test -f 'trellis_viterbi_b.cc' || echo '$(srcdir)/'`trellis_viterbi_b.cc - -_trellis_la-trellis_viterbi_combined_cb.lo: trellis_viterbi_combined_cb.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_cb.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_cb.Tpo -c -o _trellis_la-trellis_viterbi_combined_cb.lo `test -f 'trellis_viterbi_combined_cb.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_cb.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_cb.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_cb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_cb.cc' object='_trellis_la-trellis_viterbi_combined_cb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_cb.lo `test -f 'trellis_viterbi_combined_cb.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_cb.cc - -_trellis_la-trellis_viterbi_combined_ci.lo: trellis_viterbi_combined_ci.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_ci.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ci.Tpo -c -o _trellis_la-trellis_viterbi_combined_ci.lo `test -f 'trellis_viterbi_combined_ci.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_ci.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ci.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ci.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_ci.cc' object='_trellis_la-trellis_viterbi_combined_ci.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_ci.lo `test -f 'trellis_viterbi_combined_ci.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_ci.cc - -_trellis_la-trellis_viterbi_combined_cs.lo: trellis_viterbi_combined_cs.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_cs.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_cs.Tpo -c -o _trellis_la-trellis_viterbi_combined_cs.lo `test -f 'trellis_viterbi_combined_cs.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_cs.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_cs.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_cs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_cs.cc' object='_trellis_la-trellis_viterbi_combined_cs.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_cs.lo `test -f 'trellis_viterbi_combined_cs.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_cs.cc - -_trellis_la-trellis_viterbi_combined_fb.lo: trellis_viterbi_combined_fb.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_fb.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_fb.Tpo -c -o _trellis_la-trellis_viterbi_combined_fb.lo `test -f 'trellis_viterbi_combined_fb.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_fb.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_fb.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_fb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_fb.cc' object='_trellis_la-trellis_viterbi_combined_fb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_fb.lo `test -f 'trellis_viterbi_combined_fb.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_fb.cc - -_trellis_la-trellis_viterbi_combined_fi.lo: trellis_viterbi_combined_fi.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_fi.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_fi.Tpo -c -o _trellis_la-trellis_viterbi_combined_fi.lo `test -f 'trellis_viterbi_combined_fi.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_fi.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_fi.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_fi.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_fi.cc' object='_trellis_la-trellis_viterbi_combined_fi.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_fi.lo `test -f 'trellis_viterbi_combined_fi.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_fi.cc - -_trellis_la-trellis_viterbi_combined_fs.lo: trellis_viterbi_combined_fs.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_fs.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_fs.Tpo -c -o _trellis_la-trellis_viterbi_combined_fs.lo `test -f 'trellis_viterbi_combined_fs.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_fs.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_fs.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_fs.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_fs.cc' object='_trellis_la-trellis_viterbi_combined_fs.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_fs.lo `test -f 'trellis_viterbi_combined_fs.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_fs.cc - -_trellis_la-trellis_viterbi_combined_ib.lo: trellis_viterbi_combined_ib.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_ib.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ib.Tpo -c -o _trellis_la-trellis_viterbi_combined_ib.lo `test -f 'trellis_viterbi_combined_ib.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_ib.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ib.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ib.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_ib.cc' object='_trellis_la-trellis_viterbi_combined_ib.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_ib.lo `test -f 'trellis_viterbi_combined_ib.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_ib.cc - -_trellis_la-trellis_viterbi_combined_ii.lo: trellis_viterbi_combined_ii.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_ii.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ii.Tpo -c -o _trellis_la-trellis_viterbi_combined_ii.lo `test -f 'trellis_viterbi_combined_ii.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_ii.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ii.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ii.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_ii.cc' object='_trellis_la-trellis_viterbi_combined_ii.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_ii.lo `test -f 'trellis_viterbi_combined_ii.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_ii.cc - -_trellis_la-trellis_viterbi_combined_is.lo: trellis_viterbi_combined_is.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_is.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_is.Tpo -c -o _trellis_la-trellis_viterbi_combined_is.lo `test -f 'trellis_viterbi_combined_is.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_is.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_is.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_is.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_is.cc' object='_trellis_la-trellis_viterbi_combined_is.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_is.lo `test -f 'trellis_viterbi_combined_is.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_is.cc - -_trellis_la-trellis_viterbi_combined_sb.lo: trellis_viterbi_combined_sb.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_sb.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_sb.Tpo -c -o _trellis_la-trellis_viterbi_combined_sb.lo `test -f 'trellis_viterbi_combined_sb.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_sb.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_sb.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_sb.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_sb.cc' object='_trellis_la-trellis_viterbi_combined_sb.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_sb.lo `test -f 'trellis_viterbi_combined_sb.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_sb.cc - -_trellis_la-trellis_viterbi_combined_si.lo: trellis_viterbi_combined_si.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_si.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_si.Tpo -c -o _trellis_la-trellis_viterbi_combined_si.lo `test -f 'trellis_viterbi_combined_si.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_si.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_si.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_si.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_si.cc' object='_trellis_la-trellis_viterbi_combined_si.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_si.lo `test -f 'trellis_viterbi_combined_si.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_si.cc - -_trellis_la-trellis_viterbi_combined_ss.lo: trellis_viterbi_combined_ss.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_combined_ss.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ss.Tpo -c -o _trellis_la-trellis_viterbi_combined_ss.lo `test -f 'trellis_viterbi_combined_ss.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_ss.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ss.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_combined_ss.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_combined_ss.cc' object='_trellis_la-trellis_viterbi_combined_ss.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_combined_ss.lo `test -f 'trellis_viterbi_combined_ss.cc' || echo '$(srcdir)/'`trellis_viterbi_combined_ss.cc - -_trellis_la-trellis_viterbi_i.lo: trellis_viterbi_i.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_i.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_i.Tpo -c -o _trellis_la-trellis_viterbi_i.lo `test -f 'trellis_viterbi_i.cc' || echo '$(srcdir)/'`trellis_viterbi_i.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_i.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_i.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_i.cc' object='_trellis_la-trellis_viterbi_i.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_i.lo `test -f 'trellis_viterbi_i.cc' || echo '$(srcdir)/'`trellis_viterbi_i.cc - -_trellis_la-trellis_viterbi_s.lo: trellis_viterbi_s.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -MT _trellis_la-trellis_viterbi_s.lo -MD -MP -MF $(DEPDIR)/_trellis_la-trellis_viterbi_s.Tpo -c -o _trellis_la-trellis_viterbi_s.lo `test -f 'trellis_viterbi_s.cc' || echo '$(srcdir)/'`trellis_viterbi_s.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_trellis_la-trellis_viterbi_s.Tpo $(DEPDIR)/_trellis_la-trellis_viterbi_s.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='trellis_viterbi_s.cc' object='_trellis_la-trellis_viterbi_s.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_trellis_la_CXXFLAGS) $(CXXFLAGS) -c -o _trellis_la-trellis_viterbi_s.lo `test -f 'trellis_viterbi_s.cc' || echo '$(srcdir)/'`trellis_viterbi_s.cc - mostlyclean-libtool: -rm -f *.lo @@ -1663,7 +1523,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(trellis_pylibdir)" "$(DESTDIR)$(trellis_pythondir)" "$(DESTDIR)$(grincludedir)" "$(DESTDIR)$(trellis_swigincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(trellis_pylibdir)" "$(DESTDIR)$(trellis_pythondir)" "$(DESTDIR)$(grincludedir)" "$(DESTDIR)$(trellis_swigincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1696,8 +1556,8 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-generic clean-libtool clean-trellis_pylibLTLIBRARIES \ - mostlyclean-am +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-trellis_pylibLTLIBRARIES mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1725,7 +1585,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-am @@ -1765,7 +1625,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-grincludeHEADERS \ +uninstall-am: uninstall-grincludeHEADERS uninstall-libLTLIBRARIES \ uninstall-trellis_pylibLTLIBRARIES \ uninstall-trellis_pythonPYTHON \ uninstall-trellis_swigincludeHEADERS @@ -1773,22 +1633,23 @@ uninstall-am: uninstall-grincludeHEADERS \ .MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-trellis_pylibLTLIBRARIES ctags dist-hook \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-grincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-trellis_pylibLTLIBRARIES \ + clean-libLTLIBRARIES clean-libtool \ + clean-trellis_pylibLTLIBRARIES ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-grincludeHEADERS install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip install-trellis_pylibLTLIBRARIES \ install-trellis_pythonPYTHON \ install-trellis_swigincludeHEADERS installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-grincludeHEADERS \ - uninstall-trellis_pylibLTLIBRARIES \ + uninstall-libLTLIBRARIES uninstall-trellis_pylibLTLIBRARIES \ uninstall-trellis_pythonPYTHON \ uninstall-trellis_swigincludeHEADERS @@ -1803,128 +1664,128 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile $(srcdir)/Makefile.gen: - @trap 'rm -rf $(DEPDIR)/Makefile.gen-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/Makefile.gen-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/Makefile.gen-generate-stamp; \ - rm -f $(DEPDIR)/Makefile.gen-generate-tmp; \ - touch $(DEPDIR)/Makefile.gen-generate-tmp; \ - do_recreate=0; \ - if test -f $(srcdir)/Makefile.gen; then \ - if $(RM) $(srcdir)/Makefile.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.gen"; \ - $(makefile_gen_gen_command); \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; \ - mv -f $(DEPDIR)/Makefile.gen-generate-tmp $(DEPDIR)/Makefile.gen-generate-stamp; \ - rmdir $(DEPDIR)/Makefile.gen-generate-lock; \ - else \ - while test -d $(DEPDIR)/Makefile.gen-generate-lock; do sleep 1; done; \ - test -f $(DEPDIR)/Makefile.gen-generate-stamp; exit $$?; \ - fi; - -STAMPS ?= -EXTRA_DIST ?= -MOSTLYCLEANFILES ?= - -stamp-sources-generate: $(gen_sources_deps) - @rm -f $(DEPDIR)/stamp-sources-generate-tmp - @touch $(DEPDIR)/stamp-sources-generate-tmp - $(par_gen_command) - @mv -f $(DEPDIR)/stamp-sources-generate-tmp $@ - -$(gen_sources): stamp-sources-generate - @if test -f $@; then :; else \ - trap 'rm -rf $(DEPDIR)/stamp-sources-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/stamp-sources-generate-lock 2>/dev/null; then \ - rm -f stamp-sources-generate; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-sources-generate; \ - rmdir $(DEPDIR)/stamp-sources-generate-lock; \ - else \ - while test -d $(DEPDIR)/stamp-sources-generate-lock; do sleep 1; done; \ - test -f stamp-sources-generate; exit $$?; \ - fi; \ - fi; - -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -trellis_pythondir_category ?= gnuradio/trellis -trellis_pylibdir_category ?= $(trellis_pythondir_category) - -trellis.h trellis.py trellis.cc: trellis.i - trap 'rm -rf $(DEPDIR)/trellis-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/trellis-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/trellis-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/trellis-generate-lock; \ - else \ - while test -d $(DEPDIR)/trellis-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/trellis-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/trellis-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(trellis_swig_args) \ - -MD -MF $(DEPDIR)/trellis.Std \ - -module trellis -o trellis.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/trellis.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \ - > $(DEPDIR)/trellis.Sd; \ - $(RM) $(DEPDIR)/trellis.Std; \ - $(MV) $(DEPDIR)/trellis.Sd $(DEPDIR)/trellis.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/trellis.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/trellis.d - cp $(DEPDIR)/trellis.Std $(DEPDIR)/trellis.d - echo "" >> $(DEPDIR)/trellis.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis.d - $(RM) $(DEPDIR)/trellis.Std - touch $(DEPDIR)/trellis-generate-stamp +@PYTHON_TRUE@generate-makefile $(srcdir)/Makefile.gen: +@PYTHON_TRUE@ @trap 'rm -rf $(DEPDIR)/Makefile.gen-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/Makefile.gen-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/Makefile.gen-generate-stamp; \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/Makefile.gen-generate-tmp; \ +@PYTHON_TRUE@ touch $(DEPDIR)/Makefile.gen-generate-tmp; \ +@PYTHON_TRUE@ do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.gen"; \ +@PYTHON_TRUE@ $(makefile_gen_gen_command); \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ mv -f $(DEPDIR)/Makefile.gen-generate-tmp $(DEPDIR)/Makefile.gen-generate-stamp; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/Makefile.gen-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/Makefile.gen-generate-lock; do sleep 1; done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/Makefile.gen-generate-stamp; exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@STAMPS ?= +@PYTHON_TRUE@EXTRA_DIST ?= +@PYTHON_TRUE@MOSTLYCLEANFILES ?= + +@PYTHON_TRUE@stamp-sources-generate: $(gen_sources_deps) +@PYTHON_TRUE@ @rm -f $(DEPDIR)/stamp-sources-generate-tmp +@PYTHON_TRUE@ @touch $(DEPDIR)/stamp-sources-generate-tmp +@PYTHON_TRUE@ $(par_gen_command) +@PYTHON_TRUE@ @mv -f $(DEPDIR)/stamp-sources-generate-tmp $@ + +@PYTHON_TRUE@$(gen_sources): stamp-sources-generate +@PYTHON_TRUE@ @if test -f $@; then :; else \ +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/stamp-sources-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/stamp-sources-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f stamp-sources-generate; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) stamp-sources-generate; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/stamp-sources-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/stamp-sources-generate-lock; do sleep 1; done; \ +@PYTHON_TRUE@ test -f stamp-sources-generate; exit $$?; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@trellis_pythondir_category ?= gnuradio/trellis +@PYTHON_TRUE@trellis_pylibdir_category ?= $(trellis_pythondir_category) + +@PYTHON_TRUE@trellis.h trellis.py trellis.cc: trellis.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/trellis-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/trellis-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/trellis-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/trellis-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/trellis-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/trellis-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/trellis-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(trellis_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/trellis.Std \ +@PYTHON_TRUE@ -module trellis -o trellis.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/trellis.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/trellis.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/trellis.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/trellis.Sd $(DEPDIR)/trellis.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/trellis.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/trellis.d +@PYTHON_TRUE@ cp $(DEPDIR)/trellis.Std $(DEPDIR)/trellis.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/trellis.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/trellis.Std +@PYTHON_TRUE@ touch $(DEPDIR)/trellis-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/trellis.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trellis.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-trellis/src/lib/stamp-sources-generate b/gr-trellis/src/lib/stamp-sources-generate deleted file mode 100644 index e69de29b..00000000 diff --git a/gr-trellis/src/lib/trellis_encoder_bb.cc b/gr-trellis/src/lib/trellis_encoder_bb.cc deleted file mode 100644 index 36e45b9f..00000000 --- a/gr-trellis/src/lib/trellis_encoder_bb.cc +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -trellis_encoder_bb_sptr -trellis_make_encoder_bb (const fsm &FSM, int ST) -{ - return trellis_encoder_bb_sptr (new trellis_encoder_bb (FSM,ST)); -} - -trellis_encoder_bb::trellis_encoder_bb (const fsm &FSM, int ST) - : gr_sync_block ("encoder_bb", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, -1, sizeof (unsigned char))), - d_FSM (FSM), - d_ST (ST) -{ -} - - - -int -trellis_encoder_bb::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int ST_tmp=0; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class trellis_encoder_bb; -typedef boost::shared_ptr trellis_encoder_bb_sptr; - -trellis_encoder_bb_sptr trellis_make_encoder_bb (const fsm &FSM, int ST); - -/*! - * \brief Convolutional encoder. - * \ingroup coding_blk - */ -class trellis_encoder_bb : public gr_sync_block -{ -private: - friend trellis_encoder_bb_sptr trellis_make_encoder_bb (const fsm &FSM, int ST); - fsm d_FSM; - int d_ST; - trellis_encoder_bb (const fsm &FSM, int ST); - -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_encoder_bb.i b/gr-trellis/src/lib/trellis_encoder_bb.i deleted file mode 100644 index 84aee74c..00000000 --- a/gr-trellis/src/lib/trellis_encoder_bb.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,encoder_bb); - -trellis_encoder_bb_sptr trellis_make_encoder_bb (const fsm &FSM, int ST); - -class trellis_encoder_bb : public gr_sync_block -{ -private: - trellis_encoder_bb (const fsm &FSM, int ST); -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } -}; diff --git a/gr-trellis/src/lib/trellis_encoder_bi.cc b/gr-trellis/src/lib/trellis_encoder_bi.cc deleted file mode 100644 index 6152d62d..00000000 --- a/gr-trellis/src/lib/trellis_encoder_bi.cc +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -trellis_encoder_bi_sptr -trellis_make_encoder_bi (const fsm &FSM, int ST) -{ - return trellis_encoder_bi_sptr (new trellis_encoder_bi (FSM,ST)); -} - -trellis_encoder_bi::trellis_encoder_bi (const fsm &FSM, int ST) - : gr_sync_block ("encoder_bi", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, -1, sizeof (int))), - d_FSM (FSM), - d_ST (ST) -{ -} - - - -int -trellis_encoder_bi::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int ST_tmp=0; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class trellis_encoder_bi; -typedef boost::shared_ptr trellis_encoder_bi_sptr; - -trellis_encoder_bi_sptr trellis_make_encoder_bi (const fsm &FSM, int ST); - -/*! - * \brief Convolutional encoder. - * \ingroup coding_blk - */ -class trellis_encoder_bi : public gr_sync_block -{ -private: - friend trellis_encoder_bi_sptr trellis_make_encoder_bi (const fsm &FSM, int ST); - fsm d_FSM; - int d_ST; - trellis_encoder_bi (const fsm &FSM, int ST); - -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_encoder_bi.i b/gr-trellis/src/lib/trellis_encoder_bi.i deleted file mode 100644 index a4dcba80..00000000 --- a/gr-trellis/src/lib/trellis_encoder_bi.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,encoder_bi); - -trellis_encoder_bi_sptr trellis_make_encoder_bi (const fsm &FSM, int ST); - -class trellis_encoder_bi : public gr_sync_block -{ -private: - trellis_encoder_bi (const fsm &FSM, int ST); -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } -}; diff --git a/gr-trellis/src/lib/trellis_encoder_bs.cc b/gr-trellis/src/lib/trellis_encoder_bs.cc deleted file mode 100644 index 1c6fcef2..00000000 --- a/gr-trellis/src/lib/trellis_encoder_bs.cc +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -trellis_encoder_bs_sptr -trellis_make_encoder_bs (const fsm &FSM, int ST) -{ - return trellis_encoder_bs_sptr (new trellis_encoder_bs (FSM,ST)); -} - -trellis_encoder_bs::trellis_encoder_bs (const fsm &FSM, int ST) - : gr_sync_block ("encoder_bs", - gr_make_io_signature (1, -1, sizeof (unsigned char)), - gr_make_io_signature (1, -1, sizeof (short))), - d_FSM (FSM), - d_ST (ST) -{ -} - - - -int -trellis_encoder_bs::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int ST_tmp=0; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class trellis_encoder_bs; -typedef boost::shared_ptr trellis_encoder_bs_sptr; - -trellis_encoder_bs_sptr trellis_make_encoder_bs (const fsm &FSM, int ST); - -/*! - * \brief Convolutional encoder. - * \ingroup coding_blk - */ -class trellis_encoder_bs : public gr_sync_block -{ -private: - friend trellis_encoder_bs_sptr trellis_make_encoder_bs (const fsm &FSM, int ST); - fsm d_FSM; - int d_ST; - trellis_encoder_bs (const fsm &FSM, int ST); - -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_encoder_bs.i b/gr-trellis/src/lib/trellis_encoder_bs.i deleted file mode 100644 index e4bf573c..00000000 --- a/gr-trellis/src/lib/trellis_encoder_bs.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,encoder_bs); - -trellis_encoder_bs_sptr trellis_make_encoder_bs (const fsm &FSM, int ST); - -class trellis_encoder_bs : public gr_sync_block -{ -private: - trellis_encoder_bs (const fsm &FSM, int ST); -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } -}; diff --git a/gr-trellis/src/lib/trellis_encoder_ii.cc b/gr-trellis/src/lib/trellis_encoder_ii.cc deleted file mode 100644 index 6b725868..00000000 --- a/gr-trellis/src/lib/trellis_encoder_ii.cc +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -trellis_encoder_ii_sptr -trellis_make_encoder_ii (const fsm &FSM, int ST) -{ - return trellis_encoder_ii_sptr (new trellis_encoder_ii (FSM,ST)); -} - -trellis_encoder_ii::trellis_encoder_ii (const fsm &FSM, int ST) - : gr_sync_block ("encoder_ii", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, -1, sizeof (int))), - d_FSM (FSM), - d_ST (ST) -{ -} - - - -int -trellis_encoder_ii::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int ST_tmp=0; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class trellis_encoder_ii; -typedef boost::shared_ptr trellis_encoder_ii_sptr; - -trellis_encoder_ii_sptr trellis_make_encoder_ii (const fsm &FSM, int ST); - -/*! - * \brief Convolutional encoder. - * \ingroup coding_blk - */ -class trellis_encoder_ii : public gr_sync_block -{ -private: - friend trellis_encoder_ii_sptr trellis_make_encoder_ii (const fsm &FSM, int ST); - fsm d_FSM; - int d_ST; - trellis_encoder_ii (const fsm &FSM, int ST); - -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_encoder_ii.i b/gr-trellis/src/lib/trellis_encoder_ii.i deleted file mode 100644 index bac3498b..00000000 --- a/gr-trellis/src/lib/trellis_encoder_ii.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,encoder_ii); - -trellis_encoder_ii_sptr trellis_make_encoder_ii (const fsm &FSM, int ST); - -class trellis_encoder_ii : public gr_sync_block -{ -private: - trellis_encoder_ii (const fsm &FSM, int ST); -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } -}; diff --git a/gr-trellis/src/lib/trellis_encoder_si.cc b/gr-trellis/src/lib/trellis_encoder_si.cc deleted file mode 100644 index 6ee93066..00000000 --- a/gr-trellis/src/lib/trellis_encoder_si.cc +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -trellis_encoder_si_sptr -trellis_make_encoder_si (const fsm &FSM, int ST) -{ - return trellis_encoder_si_sptr (new trellis_encoder_si (FSM,ST)); -} - -trellis_encoder_si::trellis_encoder_si (const fsm &FSM, int ST) - : gr_sync_block ("encoder_si", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (int))), - d_FSM (FSM), - d_ST (ST) -{ -} - - - -int -trellis_encoder_si::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int ST_tmp=0; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class trellis_encoder_si; -typedef boost::shared_ptr trellis_encoder_si_sptr; - -trellis_encoder_si_sptr trellis_make_encoder_si (const fsm &FSM, int ST); - -/*! - * \brief Convolutional encoder. - * \ingroup coding_blk - */ -class trellis_encoder_si : public gr_sync_block -{ -private: - friend trellis_encoder_si_sptr trellis_make_encoder_si (const fsm &FSM, int ST); - fsm d_FSM; - int d_ST; - trellis_encoder_si (const fsm &FSM, int ST); - -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_encoder_si.i b/gr-trellis/src/lib/trellis_encoder_si.i deleted file mode 100644 index 0355681c..00000000 --- a/gr-trellis/src/lib/trellis_encoder_si.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,encoder_si); - -trellis_encoder_si_sptr trellis_make_encoder_si (const fsm &FSM, int ST); - -class trellis_encoder_si : public gr_sync_block -{ -private: - trellis_encoder_si (const fsm &FSM, int ST); -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } -}; diff --git a/gr-trellis/src/lib/trellis_encoder_ss.cc b/gr-trellis/src/lib/trellis_encoder_ss.cc deleted file mode 100644 index cc6b0da1..00000000 --- a/gr-trellis/src/lib/trellis_encoder_ss.cc +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -trellis_encoder_ss_sptr -trellis_make_encoder_ss (const fsm &FSM, int ST) -{ - return trellis_encoder_ss_sptr (new trellis_encoder_ss (FSM,ST)); -} - -trellis_encoder_ss::trellis_encoder_ss (const fsm &FSM, int ST) - : gr_sync_block ("encoder_ss", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (short))), - d_FSM (FSM), - d_ST (ST) -{ -} - - - -int -trellis_encoder_ss::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - int ST_tmp=0; - - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - - for (int m=0;m - -class trellis_encoder_ss; -typedef boost::shared_ptr trellis_encoder_ss_sptr; - -trellis_encoder_ss_sptr trellis_make_encoder_ss (const fsm &FSM, int ST); - -/*! - * \brief Convolutional encoder. - * \ingroup coding_blk - */ -class trellis_encoder_ss : public gr_sync_block -{ -private: - friend trellis_encoder_ss_sptr trellis_make_encoder_ss (const fsm &FSM, int ST); - fsm d_FSM; - int d_ST; - trellis_encoder_ss (const fsm &FSM, int ST); - -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_encoder_ss.i b/gr-trellis/src/lib/trellis_encoder_ss.i deleted file mode 100644 index eda92b1a..00000000 --- a/gr-trellis/src/lib/trellis_encoder_ss.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,encoder_ss); - -trellis_encoder_ss_sptr trellis_make_encoder_ss (const fsm &FSM, int ST); - -class trellis_encoder_ss : public gr_sync_block -{ -private: - trellis_encoder_ss (const fsm &FSM, int ST); -public: - fsm FSM () const { return d_FSM; } - int ST () const { return d_ST; } -}; diff --git a/gr-trellis/src/lib/trellis_generated.i b/gr-trellis/src/lib/trellis_generated.i deleted file mode 100644 index 7a379bdc..00000000 --- a/gr-trellis/src/lib/trellis_generated.i +++ /dev/null @@ -1,56 +0,0 @@ -// -// This file is machine generated. All edits will be overwritten -// -%{ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -%} - -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include -%include diff --git a/gr-trellis/src/lib/trellis_metrics_c.cc b/gr-trellis/src/lib/trellis_metrics_c.cc deleted file mode 100644 index 4fac9f6d..00000000 --- a/gr-trellis/src/lib/trellis_metrics_c.cc +++ /dev/null @@ -1,97 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - - -trellis_metrics_c_sptr -trellis_make_metrics_c (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE) -{ - return trellis_metrics_c_sptr (new trellis_metrics_c (O,D,TABLE,TYPE)); -} - - - -trellis_metrics_c::trellis_metrics_c (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE) - : gr_block ("metrics_c", - gr_make_io_signature (1, -1, sizeof (gr_complex)), - gr_make_io_signature (1, -1, sizeof (float))), - d_O (O), - d_D (D), - d_TYPE (TYPE), - d_TABLE (TABLE) -{ - set_relative_rate (1.0 * d_O / ((double) d_D)); - set_output_multiple ((int)d_O); -} - -void trellis_metrics_c::set_TABLE (const std::vector &table) -{ - d_TABLE = table; -} - - -void -trellis_metrics_c::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_O == 0); - int input_required = d_D * noutput_items / d_O; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) - ninput_items_required[i] = input_required; -} - - - -int -trellis_metrics_c::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - - assert (noutput_items % d_O == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - -for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_metrics_c; -typedef boost::shared_ptr trellis_metrics_c_sptr; - -trellis_metrics_c_sptr trellis_make_metrics_c (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -/*! - * \brief Evaluate metrics for use by the Viterbi algorithm. - * \ingroup coding_blk - */ -class trellis_metrics_c : public gr_block -{ - int d_O; - int d_D; - trellis_metric_type_t d_TYPE; - std::vector d_TABLE; - - friend trellis_metrics_c_sptr trellis_make_metrics_c (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - trellis_metrics_c (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -public: - int O () const { return d_O; } - int D () const { return d_D; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - std::vector TABLE () const { return d_TABLE; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gr-trellis/src/lib/trellis_metrics_c.i b/gr-trellis/src/lib/trellis_metrics_c.i deleted file mode 100644 index 37b6ba98..00000000 --- a/gr-trellis/src/lib/trellis_metrics_c.i +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,metrics_c); - -trellis_metrics_c_sptr trellis_make_metrics_c (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -class trellis_metrics_c : public gr_block -{ -private: - trellis_metrics_c (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -public: - int O () const { return d_O; } - int D () const { return d_D; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - void set_TABLE (const std::vector &table); - std::vector TABLE () const { return d_TABLE; } -}; diff --git a/gr-trellis/src/lib/trellis_metrics_f.cc b/gr-trellis/src/lib/trellis_metrics_f.cc deleted file mode 100644 index 1fb06408..00000000 --- a/gr-trellis/src/lib/trellis_metrics_f.cc +++ /dev/null @@ -1,97 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - - -trellis_metrics_f_sptr -trellis_make_metrics_f (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE) -{ - return trellis_metrics_f_sptr (new trellis_metrics_f (O,D,TABLE,TYPE)); -} - - - -trellis_metrics_f::trellis_metrics_f (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE) - : gr_block ("metrics_f", - gr_make_io_signature (1, -1, sizeof (float)), - gr_make_io_signature (1, -1, sizeof (float))), - d_O (O), - d_D (D), - d_TYPE (TYPE), - d_TABLE (TABLE) -{ - set_relative_rate (1.0 * d_O / ((double) d_D)); - set_output_multiple ((int)d_O); -} - -void trellis_metrics_f::set_TABLE (const std::vector &table) -{ - d_TABLE = table; -} - - -void -trellis_metrics_f::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_O == 0); - int input_required = d_D * noutput_items / d_O; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) - ninput_items_required[i] = input_required; -} - - - -int -trellis_metrics_f::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - - assert (noutput_items % d_O == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - -for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_metrics_f; -typedef boost::shared_ptr trellis_metrics_f_sptr; - -trellis_metrics_f_sptr trellis_make_metrics_f (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -/*! - * \brief Evaluate metrics for use by the Viterbi algorithm. - * \ingroup coding_blk - */ -class trellis_metrics_f : public gr_block -{ - int d_O; - int d_D; - trellis_metric_type_t d_TYPE; - std::vector d_TABLE; - - friend trellis_metrics_f_sptr trellis_make_metrics_f (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - trellis_metrics_f (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -public: - int O () const { return d_O; } - int D () const { return d_D; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - std::vector TABLE () const { return d_TABLE; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gr-trellis/src/lib/trellis_metrics_f.i b/gr-trellis/src/lib/trellis_metrics_f.i deleted file mode 100644 index 34136299..00000000 --- a/gr-trellis/src/lib/trellis_metrics_f.i +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,metrics_f); - -trellis_metrics_f_sptr trellis_make_metrics_f (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -class trellis_metrics_f : public gr_block -{ -private: - trellis_metrics_f (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -public: - int O () const { return d_O; } - int D () const { return d_D; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - void set_TABLE (const std::vector &table); - std::vector TABLE () const { return d_TABLE; } -}; diff --git a/gr-trellis/src/lib/trellis_metrics_i.cc b/gr-trellis/src/lib/trellis_metrics_i.cc deleted file mode 100644 index 251f4594..00000000 --- a/gr-trellis/src/lib/trellis_metrics_i.cc +++ /dev/null @@ -1,97 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - - -trellis_metrics_i_sptr -trellis_make_metrics_i (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE) -{ - return trellis_metrics_i_sptr (new trellis_metrics_i (O,D,TABLE,TYPE)); -} - - - -trellis_metrics_i::trellis_metrics_i (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE) - : gr_block ("metrics_i", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, -1, sizeof (float))), - d_O (O), - d_D (D), - d_TYPE (TYPE), - d_TABLE (TABLE) -{ - set_relative_rate (1.0 * d_O / ((double) d_D)); - set_output_multiple ((int)d_O); -} - -void trellis_metrics_i::set_TABLE (const std::vector &table) -{ - d_TABLE = table; -} - - -void -trellis_metrics_i::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_O == 0); - int input_required = d_D * noutput_items / d_O; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) - ninput_items_required[i] = input_required; -} - - - -int -trellis_metrics_i::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - - assert (noutput_items % d_O == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - -for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_metrics_i; -typedef boost::shared_ptr trellis_metrics_i_sptr; - -trellis_metrics_i_sptr trellis_make_metrics_i (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -/*! - * \brief Evaluate metrics for use by the Viterbi algorithm. - * \ingroup coding_blk - */ -class trellis_metrics_i : public gr_block -{ - int d_O; - int d_D; - trellis_metric_type_t d_TYPE; - std::vector d_TABLE; - - friend trellis_metrics_i_sptr trellis_make_metrics_i (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - trellis_metrics_i (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -public: - int O () const { return d_O; } - int D () const { return d_D; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - std::vector TABLE () const { return d_TABLE; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gr-trellis/src/lib/trellis_metrics_i.i b/gr-trellis/src/lib/trellis_metrics_i.i deleted file mode 100644 index 67ed867f..00000000 --- a/gr-trellis/src/lib/trellis_metrics_i.i +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,metrics_i); - -trellis_metrics_i_sptr trellis_make_metrics_i (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -class trellis_metrics_i : public gr_block -{ -private: - trellis_metrics_i (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -public: - int O () const { return d_O; } - int D () const { return d_D; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - void set_TABLE (const std::vector &table); - std::vector TABLE () const { return d_TABLE; } -}; diff --git a/gr-trellis/src/lib/trellis_metrics_s.cc b/gr-trellis/src/lib/trellis_metrics_s.cc deleted file mode 100644 index db21fdbc..00000000 --- a/gr-trellis/src/lib/trellis_metrics_s.cc +++ /dev/null @@ -1,97 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifndef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include -#include - - -trellis_metrics_s_sptr -trellis_make_metrics_s (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE) -{ - return trellis_metrics_s_sptr (new trellis_metrics_s (O,D,TABLE,TYPE)); -} - - - -trellis_metrics_s::trellis_metrics_s (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE) - : gr_block ("metrics_s", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (float))), - d_O (O), - d_D (D), - d_TYPE (TYPE), - d_TABLE (TABLE) -{ - set_relative_rate (1.0 * d_O / ((double) d_D)); - set_output_multiple ((int)d_O); -} - -void trellis_metrics_s::set_TABLE (const std::vector &table) -{ - d_TABLE = table; -} - - -void -trellis_metrics_s::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_O == 0); - int input_required = d_D * noutput_items / d_O; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) - ninput_items_required[i] = input_required; -} - - - -int -trellis_metrics_s::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - - assert (noutput_items % d_O == 0); - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - -for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_metrics_s; -typedef boost::shared_ptr trellis_metrics_s_sptr; - -trellis_metrics_s_sptr trellis_make_metrics_s (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -/*! - * \brief Evaluate metrics for use by the Viterbi algorithm. - * \ingroup coding_blk - */ -class trellis_metrics_s : public gr_block -{ - int d_O; - int d_D; - trellis_metric_type_t d_TYPE; - std::vector d_TABLE; - - friend trellis_metrics_s_sptr trellis_make_metrics_s (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - trellis_metrics_s (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -public: - int O () const { return d_O; } - int D () const { return d_D; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - std::vector TABLE () const { return d_TABLE; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - - -#endif diff --git a/gr-trellis/src/lib/trellis_metrics_s.i b/gr-trellis/src/lib/trellis_metrics_s.i deleted file mode 100644 index 207c0a7e..00000000 --- a/gr-trellis/src/lib/trellis_metrics_s.i +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,metrics_s); - -trellis_metrics_s_sptr trellis_make_metrics_s (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -class trellis_metrics_s : public gr_block -{ -private: - trellis_metrics_s (int O, int D, const std::vector &TABLE, trellis_metric_type_t TYPE); - -public: - int O () const { return d_O; } - int D () const { return d_D; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - void set_TABLE (const std::vector &table); - std::vector TABLE () const { return d_TABLE; } -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_b.cc b/gr-trellis/src/lib/trellis_viterbi_b.cc deleted file mode 100644 index ead61b19..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_b.cc +++ /dev/null @@ -1,170 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_b_sptr -trellis_make_viterbi_b ( - const fsm &FSM, - int K, - int S0, - int SK) -{ - return trellis_viterbi_b_sptr (new trellis_viterbi_b (FSM,K,S0,SK)); -} - -trellis_viterbi_b::trellis_viterbi_b ( - const fsm &FSM, - int K, - int S0, - int SK) - : gr_block ("viterbi_b", - gr_make_io_signature (1, -1, sizeof (float)), - gr_make_io_signature (1, -1, sizeof (unsigned char))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_FSM.O())); - set_output_multiple (d_K); -} - - -void -trellis_viterbi_b::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_FSM.O() * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - const float *in, unsigned char *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - int alphai; - float norm,mm,minm; - int minmi; - int st; - - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (unsigned char) PI[st][i0]; - st=PS[st][i0]; - } - -} - - - - - - -int -trellis_viterbi_b::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m - -class trellis_viterbi_b; -typedef boost::shared_ptr trellis_viterbi_b_sptr; - -trellis_viterbi_b_sptr trellis_make_viterbi_b ( - const fsm &FSM, - int K, - int S0, - int SK); - - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_b : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - //std::vector d_trace; - - friend trellis_viterbi_b_sptr trellis_make_viterbi_b ( - const fsm &FSM, - int K, - int S0, - int SK); - - - trellis_viterbi_b ( - const fsm &FSM, - int K, - int S0, - int SK); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - //std::vector trace () const { return d_trace; } - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_b.i b/gr-trellis/src/lib/trellis_viterbi_b.i deleted file mode 100644 index a9da3fcb..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_b.i +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_b); - -trellis_viterbi_b_sptr trellis_make_viterbi_b ( - const fsm &FSM, - int K, - int S0, - int SK); - - -class trellis_viterbi_b : public gr_block -{ -private: - trellis_viterbi_b ( - const fsm &FSM, - int K, - int S0, - int SK); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - //std::vector trace () const { return d_trace; } -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_cb.cc b/gr-trellis/src/lib/trellis_viterbi_combined_cb.cc deleted file mode 100644 index 91341aa4..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_cb.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_cb_sptr -trellis_make_viterbi_combined_cb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_cb_sptr (new trellis_viterbi_combined_cb (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_cb::trellis_viterbi_combined_cb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_cb", - gr_make_io_signature (1, -1, sizeof (gr_complex)), - gr_make_io_signature (1, -1, sizeof (unsigned char))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_cb::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_cb::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const gr_complex *in, unsigned char *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (unsigned char) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_cb::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_cb; -typedef boost::shared_ptr trellis_viterbi_combined_cb_sptr; - -trellis_viterbi_combined_cb_sptr trellis_make_viterbi_combined_cb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_cb : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_cb_sptr trellis_make_viterbi_combined_cb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_cb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_cb.i b/gr-trellis/src/lib/trellis_viterbi_combined_cb.i deleted file mode 100644 index 34319585..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_cb.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_cb); - -trellis_viterbi_combined_cb_sptr trellis_make_viterbi_combined_cb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_cb : public gr_block -{ -private: - trellis_viterbi_combined_cb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_ci.cc b/gr-trellis/src/lib/trellis_viterbi_combined_ci.cc deleted file mode 100644 index 81583721..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_ci.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_ci_sptr -trellis_make_viterbi_combined_ci ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_ci_sptr (new trellis_viterbi_combined_ci (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_ci::trellis_viterbi_combined_ci ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_ci", - gr_make_io_signature (1, -1, sizeof (gr_complex)), - gr_make_io_signature (1, -1, sizeof (int))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_ci::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_ci::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const gr_complex *in, int *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (int) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_ci::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_ci; -typedef boost::shared_ptr trellis_viterbi_combined_ci_sptr; - -trellis_viterbi_combined_ci_sptr trellis_make_viterbi_combined_ci ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_ci : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_ci_sptr trellis_make_viterbi_combined_ci ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_ci ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_ci.i b/gr-trellis/src/lib/trellis_viterbi_combined_ci.i deleted file mode 100644 index cc91268b..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_ci.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_ci); - -trellis_viterbi_combined_ci_sptr trellis_make_viterbi_combined_ci ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_ci : public gr_block -{ -private: - trellis_viterbi_combined_ci ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_cs.cc b/gr-trellis/src/lib/trellis_viterbi_combined_cs.cc deleted file mode 100644 index f876bcc0..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_cs.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_cs_sptr -trellis_make_viterbi_combined_cs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_cs_sptr (new trellis_viterbi_combined_cs (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_cs::trellis_viterbi_combined_cs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_cs", - gr_make_io_signature (1, -1, sizeof (gr_complex)), - gr_make_io_signature (1, -1, sizeof (short))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_cs::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_cs::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const gr_complex *in, short *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (short) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_cs::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_cs; -typedef boost::shared_ptr trellis_viterbi_combined_cs_sptr; - -trellis_viterbi_combined_cs_sptr trellis_make_viterbi_combined_cs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_cs : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_cs_sptr trellis_make_viterbi_combined_cs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_cs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_cs.i b/gr-trellis/src/lib/trellis_viterbi_combined_cs.i deleted file mode 100644 index 15c8c56a..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_cs.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_cs); - -trellis_viterbi_combined_cs_sptr trellis_make_viterbi_combined_cs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_cs : public gr_block -{ -private: - trellis_viterbi_combined_cs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_fb.cc b/gr-trellis/src/lib/trellis_viterbi_combined_fb.cc deleted file mode 100644 index 97827c3b..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_fb.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_fb_sptr -trellis_make_viterbi_combined_fb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_fb_sptr (new trellis_viterbi_combined_fb (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_fb::trellis_viterbi_combined_fb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_fb", - gr_make_io_signature (1, -1, sizeof (float)), - gr_make_io_signature (1, -1, sizeof (unsigned char))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_fb::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_fb::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const float *in, unsigned char *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (unsigned char) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_fb::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_fb; -typedef boost::shared_ptr trellis_viterbi_combined_fb_sptr; - -trellis_viterbi_combined_fb_sptr trellis_make_viterbi_combined_fb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_fb : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_fb_sptr trellis_make_viterbi_combined_fb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_fb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_fb.i b/gr-trellis/src/lib/trellis_viterbi_combined_fb.i deleted file mode 100644 index 2a05761c..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_fb.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_fb); - -trellis_viterbi_combined_fb_sptr trellis_make_viterbi_combined_fb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_fb : public gr_block -{ -private: - trellis_viterbi_combined_fb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_fi.cc b/gr-trellis/src/lib/trellis_viterbi_combined_fi.cc deleted file mode 100644 index 0653fc2b..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_fi.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_fi_sptr -trellis_make_viterbi_combined_fi ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_fi_sptr (new trellis_viterbi_combined_fi (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_fi::trellis_viterbi_combined_fi ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_fi", - gr_make_io_signature (1, -1, sizeof (float)), - gr_make_io_signature (1, -1, sizeof (int))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_fi::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_fi::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const float *in, int *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (int) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_fi::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_fi; -typedef boost::shared_ptr trellis_viterbi_combined_fi_sptr; - -trellis_viterbi_combined_fi_sptr trellis_make_viterbi_combined_fi ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_fi : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_fi_sptr trellis_make_viterbi_combined_fi ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_fi ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_fi.i b/gr-trellis/src/lib/trellis_viterbi_combined_fi.i deleted file mode 100644 index f0576e75..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_fi.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_fi); - -trellis_viterbi_combined_fi_sptr trellis_make_viterbi_combined_fi ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_fi : public gr_block -{ -private: - trellis_viterbi_combined_fi ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_fs.cc b/gr-trellis/src/lib/trellis_viterbi_combined_fs.cc deleted file mode 100644 index 7f17bb97..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_fs.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_fs_sptr -trellis_make_viterbi_combined_fs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_fs_sptr (new trellis_viterbi_combined_fs (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_fs::trellis_viterbi_combined_fs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_fs", - gr_make_io_signature (1, -1, sizeof (float)), - gr_make_io_signature (1, -1, sizeof (short))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_fs::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_fs::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const float *in, short *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (short) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_fs::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_fs; -typedef boost::shared_ptr trellis_viterbi_combined_fs_sptr; - -trellis_viterbi_combined_fs_sptr trellis_make_viterbi_combined_fs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_fs : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_fs_sptr trellis_make_viterbi_combined_fs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_fs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_fs.i b/gr-trellis/src/lib/trellis_viterbi_combined_fs.i deleted file mode 100644 index 37452780..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_fs.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_fs); - -trellis_viterbi_combined_fs_sptr trellis_make_viterbi_combined_fs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_fs : public gr_block -{ -private: - trellis_viterbi_combined_fs ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_ib.cc b/gr-trellis/src/lib/trellis_viterbi_combined_ib.cc deleted file mode 100644 index 2e9e3475..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_ib.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_ib_sptr -trellis_make_viterbi_combined_ib ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_ib_sptr (new trellis_viterbi_combined_ib (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_ib::trellis_viterbi_combined_ib ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_ib", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, -1, sizeof (unsigned char))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_ib::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_ib::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const int *in, unsigned char *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (unsigned char) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_ib::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_ib; -typedef boost::shared_ptr trellis_viterbi_combined_ib_sptr; - -trellis_viterbi_combined_ib_sptr trellis_make_viterbi_combined_ib ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_ib : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_ib_sptr trellis_make_viterbi_combined_ib ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_ib ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_ib.i b/gr-trellis/src/lib/trellis_viterbi_combined_ib.i deleted file mode 100644 index 2e26f2fa..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_ib.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_ib); - -trellis_viterbi_combined_ib_sptr trellis_make_viterbi_combined_ib ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_ib : public gr_block -{ -private: - trellis_viterbi_combined_ib ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_ii.cc b/gr-trellis/src/lib/trellis_viterbi_combined_ii.cc deleted file mode 100644 index 0a18245e..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_ii.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_ii_sptr -trellis_make_viterbi_combined_ii ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_ii_sptr (new trellis_viterbi_combined_ii (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_ii::trellis_viterbi_combined_ii ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_ii", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, -1, sizeof (int))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_ii::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_ii::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const int *in, int *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (int) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_ii::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_ii; -typedef boost::shared_ptr trellis_viterbi_combined_ii_sptr; - -trellis_viterbi_combined_ii_sptr trellis_make_viterbi_combined_ii ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_ii : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_ii_sptr trellis_make_viterbi_combined_ii ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_ii ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_ii.i b/gr-trellis/src/lib/trellis_viterbi_combined_ii.i deleted file mode 100644 index 3a0f42b2..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_ii.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_ii); - -trellis_viterbi_combined_ii_sptr trellis_make_viterbi_combined_ii ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_ii : public gr_block -{ -private: - trellis_viterbi_combined_ii ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_is.cc b/gr-trellis/src/lib/trellis_viterbi_combined_is.cc deleted file mode 100644 index dd9775b5..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_is.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_is_sptr -trellis_make_viterbi_combined_is ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_is_sptr (new trellis_viterbi_combined_is (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_is::trellis_viterbi_combined_is ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_is", - gr_make_io_signature (1, -1, sizeof (int)), - gr_make_io_signature (1, -1, sizeof (short))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_is::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_is::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const int *in, short *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (short) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_is::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_is; -typedef boost::shared_ptr trellis_viterbi_combined_is_sptr; - -trellis_viterbi_combined_is_sptr trellis_make_viterbi_combined_is ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_is : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_is_sptr trellis_make_viterbi_combined_is ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_is ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_is.i b/gr-trellis/src/lib/trellis_viterbi_combined_is.i deleted file mode 100644 index 65dc7136..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_is.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_is); - -trellis_viterbi_combined_is_sptr trellis_make_viterbi_combined_is ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_is : public gr_block -{ -private: - trellis_viterbi_combined_is ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_sb.cc b/gr-trellis/src/lib/trellis_viterbi_combined_sb.cc deleted file mode 100644 index 103df314..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_sb.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_sb_sptr -trellis_make_viterbi_combined_sb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_sb_sptr (new trellis_viterbi_combined_sb (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_sb::trellis_viterbi_combined_sb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_sb", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (unsigned char))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_sb::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_sb::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const short *in, unsigned char *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (unsigned char) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_sb::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_sb; -typedef boost::shared_ptr trellis_viterbi_combined_sb_sptr; - -trellis_viterbi_combined_sb_sptr trellis_make_viterbi_combined_sb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_sb : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_sb_sptr trellis_make_viterbi_combined_sb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_sb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_sb.i b/gr-trellis/src/lib/trellis_viterbi_combined_sb.i deleted file mode 100644 index 55d3a86f..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_sb.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_sb); - -trellis_viterbi_combined_sb_sptr trellis_make_viterbi_combined_sb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_sb : public gr_block -{ -private: - trellis_viterbi_combined_sb ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_si.cc b/gr-trellis/src/lib/trellis_viterbi_combined_si.cc deleted file mode 100644 index 48b20836..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_si.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_si_sptr -trellis_make_viterbi_combined_si ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_si_sptr (new trellis_viterbi_combined_si (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_si::trellis_viterbi_combined_si ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_si", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (int))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_si::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_si::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const short *in, int *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (int) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_si::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_si; -typedef boost::shared_ptr trellis_viterbi_combined_si_sptr; - -trellis_viterbi_combined_si_sptr trellis_make_viterbi_combined_si ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_si : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_si_sptr trellis_make_viterbi_combined_si ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_si ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_si.i b/gr-trellis/src/lib/trellis_viterbi_combined_si.i deleted file mode 100644 index 94362d6f..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_si.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_si); - -trellis_viterbi_combined_si_sptr trellis_make_viterbi_combined_si ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_si : public gr_block -{ -private: - trellis_viterbi_combined_si ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_ss.cc b/gr-trellis/src/lib/trellis_viterbi_combined_ss.cc deleted file mode 100644 index 7e64c4fd..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_ss.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_combined_ss_sptr -trellis_make_viterbi_combined_ss ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) -{ - return trellis_viterbi_combined_ss_sptr (new trellis_viterbi_combined_ss (FSM,K,S0,SK,D,TABLE,TYPE)); -} - -trellis_viterbi_combined_ss::trellis_viterbi_combined_ss ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE) - : gr_block ("viterbi_combined_ss", - gr_make_io_signature (1, -1, sizeof (short)), - gr_make_io_signature (1, -1, sizeof (short))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK), - d_D (D), - d_TABLE (TABLE), - d_TYPE (TYPE)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_D)); - set_output_multiple (d_K); -} - - -void trellis_viterbi_combined_ss::set_TABLE(const std::vector &table) -{ - d_TABLE = table; -} - -void -trellis_viterbi_combined_ss::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_D * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm_combined(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE, - const short *in, short *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - float *metric = new float[O]; - int alphai; - float norm,mm,minm; - int minmi; - int st; - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (short) PI[st][i0]; - st=PS[st][i0]; - } - - delete [] metric; - -} - - - - - - -int -trellis_viterbi_combined_ss::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m -#include "trellis_calc_metric.h" - -class trellis_viterbi_combined_ss; -typedef boost::shared_ptr trellis_viterbi_combined_ss_sptr; - -trellis_viterbi_combined_ss_sptr trellis_make_viterbi_combined_ss ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_combined_ss : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - int d_D; - std::vector d_TABLE; - trellis_metric_type_t d_TYPE; - //std::vector d_trace; - - friend trellis_viterbi_combined_ss_sptr trellis_make_viterbi_combined_ss ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - - trellis_viterbi_combined_ss ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_ss.i b/gr-trellis/src/lib/trellis_viterbi_combined_ss.i deleted file mode 100644 index 035e7b32..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_combined_ss.i +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_ss); - -trellis_viterbi_combined_ss_sptr trellis_make_viterbi_combined_ss ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - - -class trellis_viterbi_combined_ss : public gr_block -{ -private: - trellis_viterbi_combined_ss ( - const fsm &FSM, - int K, - int S0, - int SK, - int D, - const std::vector &TABLE, - trellis_metric_type_t TYPE); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - int D () const { return d_D; } - std::vector TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } - //std::vector trace () const { return d_trace; } - void set_TABLE (const std::vector &table); -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_i.cc b/gr-trellis/src/lib/trellis_viterbi_i.cc deleted file mode 100644 index 487b6d54..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_i.cc +++ /dev/null @@ -1,170 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_i_sptr -trellis_make_viterbi_i ( - const fsm &FSM, - int K, - int S0, - int SK) -{ - return trellis_viterbi_i_sptr (new trellis_viterbi_i (FSM,K,S0,SK)); -} - -trellis_viterbi_i::trellis_viterbi_i ( - const fsm &FSM, - int K, - int S0, - int SK) - : gr_block ("viterbi_i", - gr_make_io_signature (1, -1, sizeof (float)), - gr_make_io_signature (1, -1, sizeof (int))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_FSM.O())); - set_output_multiple (d_K); -} - - -void -trellis_viterbi_i::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_FSM.O() * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - const float *in, int *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - int alphai; - float norm,mm,minm; - int minmi; - int st; - - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (int) PI[st][i0]; - st=PS[st][i0]; - } - -} - - - - - - -int -trellis_viterbi_i::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m - -class trellis_viterbi_i; -typedef boost::shared_ptr trellis_viterbi_i_sptr; - -trellis_viterbi_i_sptr trellis_make_viterbi_i ( - const fsm &FSM, - int K, - int S0, - int SK); - - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_i : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - //std::vector d_trace; - - friend trellis_viterbi_i_sptr trellis_make_viterbi_i ( - const fsm &FSM, - int K, - int S0, - int SK); - - - trellis_viterbi_i ( - const fsm &FSM, - int K, - int S0, - int SK); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - //std::vector trace () const { return d_trace; } - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_i.i b/gr-trellis/src/lib/trellis_viterbi_i.i deleted file mode 100644 index 2968884f..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_i.i +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_i); - -trellis_viterbi_i_sptr trellis_make_viterbi_i ( - const fsm &FSM, - int K, - int S0, - int SK); - - -class trellis_viterbi_i : public gr_block -{ -private: - trellis_viterbi_i ( - const fsm &FSM, - int K, - int S0, - int SK); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - //std::vector trace () const { return d_trace; } -}; diff --git a/gr-trellis/src/lib/trellis_viterbi_s.cc b/gr-trellis/src/lib/trellis_viterbi_s.cc deleted file mode 100644 index 94a9c0be..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_s.cc +++ /dev/null @@ -1,170 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#include - -static const float INF = 1.0e9; - -trellis_viterbi_s_sptr -trellis_make_viterbi_s ( - const fsm &FSM, - int K, - int S0, - int SK) -{ - return trellis_viterbi_s_sptr (new trellis_viterbi_s (FSM,K,S0,SK)); -} - -trellis_viterbi_s::trellis_viterbi_s ( - const fsm &FSM, - int K, - int S0, - int SK) - : gr_block ("viterbi_s", - gr_make_io_signature (1, -1, sizeof (float)), - gr_make_io_signature (1, -1, sizeof (short))), - d_FSM (FSM), - d_K (K), - d_S0 (S0), - d_SK (SK)//, - //d_trace(FSM.S()*K) -{ - set_relative_rate (1.0 / ((double) d_FSM.O())); - set_output_multiple (d_K); -} - - -void -trellis_viterbi_s::forecast (int noutput_items, gr_vector_int &ninput_items_required) -{ - assert (noutput_items % d_K == 0); - int input_required = d_FSM.O() * noutput_items ; - unsigned ninputs = ninput_items_required.size(); - for (unsigned int i = 0; i < ninputs; i++) { - ninput_items_required[i] = input_required; - } -} - - - - -void viterbi_algorithm(int I, int S, int O, - const std::vector &NS, - const std::vector &OS, - const std::vector< std::vector > &PS, - const std::vector< std::vector > &PI, - int K, - int S0,int SK, - const float *in, short *out)//, - //std::vector &trace) -{ - std::vector trace(S*K); - std::vector alpha(S*2); - int alphai; - float norm,mm,minm; - int minmi; - int st; - - - if(S0<0) { // initial state not specified - for(int i=0;i=0;k--) { // traceback - int i0=trace[k*S+st]; - out[k]= (short) PI[st][i0]; - st=PS[st][i0]; - } - -} - - - - - - -int -trellis_viterbi_s::general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - assert (input_items.size() == output_items.size()); - int nstreams = input_items.size(); - assert (noutput_items % d_K == 0); - int nblocks = noutput_items / d_K; - - for (int m=0;m - -class trellis_viterbi_s; -typedef boost::shared_ptr trellis_viterbi_s_sptr; - -trellis_viterbi_s_sptr trellis_make_viterbi_s ( - const fsm &FSM, - int K, - int S0, - int SK); - - - -/*! - * \ingroup coding_blk - */ -class trellis_viterbi_s : public gr_block -{ - fsm d_FSM; - int d_K; - int d_S0; - int d_SK; - //std::vector d_trace; - - friend trellis_viterbi_s_sptr trellis_make_viterbi_s ( - const fsm &FSM, - int K, - int S0, - int SK); - - - trellis_viterbi_s ( - const fsm &FSM, - int K, - int S0, - int SK); - - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - //std::vector trace () const { return d_trace; } - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gr-trellis/src/lib/trellis_viterbi_s.i b/gr-trellis/src/lib/trellis_viterbi_s.i deleted file mode 100644 index e417044a..00000000 --- a/gr-trellis/src/lib/trellis_viterbi_s.i +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// WARNING: this file is machine generated. Edits will be over written - -GR_SWIG_BLOCK_MAGIC(trellis,viterbi_s); - -trellis_viterbi_s_sptr trellis_make_viterbi_s ( - const fsm &FSM, - int K, - int S0, - int SK); - - -class trellis_viterbi_s : public gr_block -{ -private: - trellis_viterbi_s ( - const fsm &FSM, - int K, - int S0, - int SK); - -public: - fsm FSM () const { return d_FSM; } - int K () const { return d_K; } - int S0 () const { return d_S0; } - int SK () const { return d_SK; } - //std::vector trace () const { return d_trace; } -}; diff --git a/gr-trellis/src/python/Makefile.in b/gr-trellis/src/python/Makefile.in index e1d0b76a..477ce89f 100644 --- a/gr-trellis/src/python/Makefile.in +++ b/gr-trellis/src/python/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -186,6 +186,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@ @@ -193,6 +194,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@ @@ -211,6 +216,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -220,20 +226,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@ @@ -256,6 +265,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@ @@ -317,6 +328,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@ @@ -329,17 +341,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@ @@ -355,7 +367,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@ @@ -407,6 +418,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@ @@ -437,6 +453,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@ @@ -458,6 +479,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@ @@ -540,26 +571,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@ @@ -590,7 +606,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@ @@ -600,23 +615,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 @@ -628,7 +646,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, @@ -636,10 +654,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@ @@ -655,18 +669,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@ @@ -681,15 +683,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 = diff --git a/gr-usrp/Makefile.in b/gr-usrp/Makefile.in index 7ee9ee7e..08028712 100644 --- a/gr-usrp/Makefile.in +++ b/gr-usrp/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -246,6 +246,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@ @@ -253,6 +254,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@ @@ -271,6 +276,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -280,20 +286,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@ @@ -316,6 +325,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@ @@ -377,6 +388,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@ @@ -389,17 +401,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@ @@ -415,7 +427,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@ @@ -467,6 +478,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@ @@ -497,6 +513,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@ @@ -518,6 +539,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@ @@ -600,26 +631,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@ @@ -650,7 +666,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@ @@ -660,23 +675,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 @@ -688,7 +706,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, @@ -696,10 +714,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@ @@ -715,18 +729,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@ @@ -741,15 +743,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 = diff --git a/gr-usrp/apps/Makefile.in b/gr-usrp/apps/Makefile.in index ee8da81d..1ed38984 100644 --- a/gr-usrp/apps/Makefile.in +++ b/gr-usrp/apps/Makefile.in @@ -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 # @@ -95,36 +95,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 \ @@ -138,9 +141,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 \ @@ -213,6 +213,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@ @@ -220,6 +221,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@ @@ -238,6 +243,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -247,20 +253,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@ @@ -283,6 +292,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@ @@ -344,6 +355,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@ @@ -356,17 +368,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@ @@ -382,7 +394,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@ @@ -434,6 +445,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@ @@ -464,6 +480,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@ @@ -485,6 +506,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@ @@ -567,26 +598,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@ @@ -617,7 +633,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@ @@ -627,23 +642,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 @@ -655,7 +673,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, @@ -663,10 +681,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@ @@ -682,18 +696,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@ @@ -708,15 +710,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 = @@ -725,9 +729,7 @@ MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT # For compiling within the GNU Radio build tree AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \ -I$(top_srcdir)/gr-usrp/src \ - -I$(top_srcdir)/usrp/host/lib/legacy \ - -I\${abs_top_builddir}/usrp/host/lib/legacy \ - -I$(top_srcdir)/usrp/firmware/include \ + $(USRP_INCLUDES) \ $(WITH_INCLUDES) GR_USRP_LA = $(top_builddir)/gr-usrp/src/libgnuradio-usrp.la diff --git a/gr-usrp/src/Makefile.in b/gr-usrp/src/Makefile.in index a2c41dae..d11fb0e7 100644 --- a/gr-usrp/src/Makefile.in +++ b/gr-usrp/src/Makefile.in @@ -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 # @@ -125,11 +125,13 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grinclude_HEADERS) $(noinst_PYTHON) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(am__usrp_swig_python_PYTHON_DIST) \ + $(am__usrp_swig_swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ + $(noinst_PYTHON) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \ - $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig \ - $(usrp_swig_python_PYTHON) $(usrp_swig_swiginclude_HEADERS) + $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/usrp_swig-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-usrp/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -143,36 +145,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 \ @@ -186,9 +191,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 \ @@ -238,13 +240,15 @@ am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(usrp_swig_swigincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(usrp_swig_pylib_LTLIBRARIES) am__DEPENDENCIES_1 = -_usrp_swig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(usrp_swig_la_swig_libadd) -am__usrp_swig_la_OBJECTS = _usrp_swig_la-usrp_swig.lo +@PYTHON_TRUE@_usrp_swig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(usrp_swig_la_swig_libadd) +am___usrp_swig_la_SOURCES_DIST = usrp_swig.cc +@PYTHON_TRUE@am__usrp_swig_la_OBJECTS = _usrp_swig_la-usrp_swig.lo _usrp_swig_la_OBJECTS = $(am__usrp_swig_la_OBJECTS) _usrp_swig_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(_usrp_swig_la_CXXFLAGS) \ $(CXXFLAGS) $(_usrp_swig_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__usrp_swig_la_rpath = -rpath $(usrp_swig_pylibdir) libgnuradio_usrp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libgnuradio_usrp_la_OBJECTS = usrp_base.lo usrp_sink_base.lo \ @@ -268,8 +272,13 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(_usrp_swig_la_SOURCES) $(libgnuradio_usrp_la_SOURCES) -DIST_SOURCES = $(_usrp_swig_la_SOURCES) $(libgnuradio_usrp_la_SOURCES) +DIST_SOURCES = $(am___usrp_swig_la_SOURCES_DIST) \ + $(libgnuradio_usrp_la_SOURCES) +am__usrp_swig_python_PYTHON_DIST = usrp_swig.py __init__.py py_compile = $(top_srcdir)/py-compile +am__usrp_swig_swiginclude_HEADERS_DIST = usrp_swig.i usrp_base.i \ + usrp_source_base.i usrp_source_c.i usrp_source_s.i \ + usrp_sink_base.i usrp_sink_c.i usrp_sink_s.i usrp_standard.i HEADERS = $(grinclude_HEADERS) $(usrp_swig_swiginclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -295,6 +304,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@ @@ -302,6 +312,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@ @@ -320,6 +334,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -329,20 +344,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@ @@ -365,6 +383,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@ @@ -426,6 +446,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@ @@ -438,17 +459,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@ @@ -464,7 +485,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@ @@ -516,6 +536,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@ @@ -546,6 +571,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@ @@ -567,6 +597,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@ @@ -649,26 +689,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@ @@ -699,7 +724,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@ @@ -709,23 +733,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 @@ -737,7 +764,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, @@ -745,10 +772,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@ @@ -764,18 +787,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@ @@ -790,25 +801,26 @@ 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 = $(DEPDIR)/usrp_swig-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) # ---------------------------------------------------------------- # Misc. build/installation activities EXTRA_DIST = run_tests.in -TESTS = run_tests DISTCLEANFILES = run_tests noinst_PYTHON = qa_usrp.py @@ -818,6 +830,7 @@ AM_CPPFLAGS = \ $(STD_DEFINES_AND_INCLUDES) \ $(PYTHON_CPPFLAGS) \ $(USRP_INCLUDES) \ + $(USB_INCLUDES) \ $(WITH_INCLUDES) lib_LTLIBRARIES = \ @@ -836,7 +849,7 @@ libgnuradio_usrp_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(USRP_LA) -libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) grinclude_HEADERS = \ usrp_base.h \ usrp_sink_base.h \ @@ -849,106 +862,107 @@ grinclude_HEADERS = \ # ---------------------------------------------------------------- # The SWIG library -TOP_SWIG_IFILES = \ - usrp_swig.i +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ usrp_swig.i # Install so that they end up available as: # import gnuradio.usrp # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp -usrp_swig_pythondir_category = \ - gnuradio/usrp +@PYTHON_TRUE@usrp_swig_pythondir_category = \ +@PYTHON_TRUE@ gnuradio/usrp # additional arguments to the SWIG command -usrp_swig_swig_args = \ - $(USRP_INCLUDES) +@PYTHON_TRUE@usrp_swig_swig_args = \ +@PYTHON_TRUE@ $(USRP_INCLUDES) # additional libraries for linking with the SWIG-generated library -usrp_swig_la_swig_libadd = \ - libgnuradio-usrp.la +@PYTHON_TRUE@usrp_swig_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-usrp.la # additional Python files to be installed along with the SWIG-generated one -usrp_swig_python = \ - __init__.py +@PYTHON_TRUE@usrp_swig_python = \ +@PYTHON_TRUE@ __init__.py # additional SWIG files to be installed -usrp_swig_swiginclude_headers = \ - usrp_base.i \ - usrp_source_base.i \ - usrp_source_c.i \ - usrp_source_s.i \ - usrp_sink_base.i \ - usrp_sink_c.i \ - usrp_sink_s.i \ - usrp_standard.i - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = usrp_swig.py usrp_swig.cc -usrp_swig_pythondir = $(pythondir)/$(usrp_swig_pythondir_category) -usrp_swig_pylibdir = $(pyexecdir)/$(usrp_swig_pylibdir_category) -usrp_swig_swigincludedir = $(swigincludedir) -usrp_swig_swiginclude_HEADERS = \ - usrp_swig.i \ - $(usrp_swig_swiginclude_headers) - -usrp_swig_pylib_LTLIBRARIES = \ - _usrp_swig.la - -_usrp_swig_la_SOURCES = \ - usrp_swig.cc \ - $(usrp_swig_la_swig_sources) - -_usrp_swig_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(usrp_swig_la_swig_libadd) - -_usrp_swig_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(usrp_swig_la_swig_ldflags) - -_usrp_swig_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(usrp_swig_la_swig_cxxflags) - -usrp_swig_python_PYTHON = \ - usrp_swig.py \ - $(usrp_swig_python) +@PYTHON_TRUE@usrp_swig_swiginclude_headers = \ +@PYTHON_TRUE@ usrp_base.i \ +@PYTHON_TRUE@ usrp_source_base.i \ +@PYTHON_TRUE@ usrp_source_c.i \ +@PYTHON_TRUE@ usrp_source_s.i \ +@PYTHON_TRUE@ usrp_sink_base.i \ +@PYTHON_TRUE@ usrp_sink_c.i \ +@PYTHON_TRUE@ usrp_sink_s.i \ +@PYTHON_TRUE@ usrp_standard.i + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = usrp_swig.py usrp_swig.cc +@PYTHON_TRUE@usrp_swig_pythondir = $(pythondir)/$(usrp_swig_pythondir_category) +@PYTHON_TRUE@usrp_swig_pylibdir = $(pyexecdir)/$(usrp_swig_pylibdir_category) +@PYTHON_TRUE@usrp_swig_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@usrp_swig_swiginclude_HEADERS = \ +@PYTHON_TRUE@ usrp_swig.i \ +@PYTHON_TRUE@ $(usrp_swig_swiginclude_headers) + +@PYTHON_TRUE@usrp_swig_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _usrp_swig.la + +@PYTHON_TRUE@_usrp_swig_la_SOURCES = \ +@PYTHON_TRUE@ usrp_swig.cc \ +@PYTHON_TRUE@ $(usrp_swig_la_swig_sources) + +@PYTHON_TRUE@_usrp_swig_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(usrp_swig_la_swig_libadd) + +@PYTHON_TRUE@_usrp_swig_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(usrp_swig_la_swig_ldflags) + +@PYTHON_TRUE@_usrp_swig_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(usrp_swig_la_swig_cxxflags) + +@PYTHON_TRUE@usrp_swig_python_PYTHON = \ +@PYTHON_TRUE@ usrp_swig.py \ +@PYTHON_TRUE@ $(usrp_swig_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1049,7 +1063,7 @@ clean-usrp_swig_pylibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done _usrp_swig.la: $(_usrp_swig_la_OBJECTS) $(_usrp_swig_la_DEPENDENCIES) - $(_usrp_swig_la_LINK) -rpath $(usrp_swig_pylibdir) $(_usrp_swig_la_OBJECTS) $(_usrp_swig_la_LIBADD) $(LIBS) + $(_usrp_swig_la_LINK) $(am__usrp_swig_la_rpath) $(_usrp_swig_la_OBJECTS) $(_usrp_swig_la_LIBADD) $(LIBS) libgnuradio-usrp.la: $(libgnuradio_usrp_la_OBJECTS) $(libgnuradio_usrp_la_DEPENDENCIES) $(libgnuradio_usrp_la_LINK) -rpath $(libdir) $(libgnuradio_usrp_la_OBJECTS) $(libgnuradio_usrp_la_LIBADD) $(LIBS) @@ -1506,75 +1520,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -usrp_swig_pythondir_category ?= gnuradio/usrp_swig -usrp_swig_pylibdir_category ?= $(usrp_swig_pythondir_category) - -usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i - trap 'rm -rf $(DEPDIR)/usrp_swig-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/usrp_swig-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/usrp_swig-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/usrp_swig-generate-lock; \ - else \ - while test -d $(DEPDIR)/usrp_swig-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/usrp_swig-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/usrp_swig-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_swig_swig_args) \ - -MD -MF $(DEPDIR)/usrp_swig.Std \ - -module usrp_swig -o usrp_swig.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp_swig.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \ - > $(DEPDIR)/usrp_swig.Sd; \ - $(RM) $(DEPDIR)/usrp_swig.Std; \ - $(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/usrp_swig.d - cp $(DEPDIR)/usrp_swig.Std $(DEPDIR)/usrp_swig.d - echo "" >> $(DEPDIR)/usrp_swig.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig.d - $(RM) $(DEPDIR)/usrp_swig.Std - touch $(DEPDIR)/usrp_swig-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@usrp_swig_pythondir_category ?= gnuradio/usrp_swig +@PYTHON_TRUE@usrp_swig_pylibdir_category ?= $(usrp_swig_pythondir_category) + +@PYTHON_TRUE@usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/usrp_swig-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/usrp_swig-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/usrp_swig-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/usrp_swig-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/usrp_swig-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/usrp_swig-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/usrp_swig-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_swig_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/usrp_swig.Std \ +@PYTHON_TRUE@ -module usrp_swig -o usrp_swig.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp_swig.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/usrp_swig.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp_swig.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp_swig.d +@PYTHON_TRUE@ cp $(DEPDIR)/usrp_swig.Std $(DEPDIR)/usrp_swig.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/usrp_swig.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp_swig.Std +@PYTHON_TRUE@ touch $(DEPDIR)/usrp_swig-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/usrp_swig.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_swig.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-usrp2/Makefile.in b/gr-usrp2/Makefile.in index f60e81a7..c449f43d 100644 --- a/gr-usrp2/Makefile.in +++ b/gr-usrp2/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -246,6 +246,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@ @@ -253,6 +254,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@ @@ -271,6 +276,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -280,20 +286,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@ @@ -316,6 +325,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@ @@ -377,6 +388,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@ @@ -389,17 +401,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@ @@ -415,7 +427,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@ @@ -467,6 +478,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@ @@ -497,6 +513,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@ @@ -518,6 +539,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@ @@ -600,26 +631,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@ @@ -650,7 +666,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@ @@ -660,23 +675,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 @@ -688,7 +706,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, @@ -696,10 +714,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@ @@ -715,18 +729,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@ @@ -741,15 +743,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 = diff --git a/gr-usrp2/src/Makefile.in b/gr-usrp2/src/Makefile.in index a150ee11..93df239c 100644 --- a/gr-usrp2/src/Makefile.in +++ b/gr-usrp2/src/Makefile.in @@ -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 # @@ -125,11 +125,14 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grinclude_HEADERS) $(noinst_HEADERS) $(noinst_PYTHON) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \ - $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig \ - $(usrp2_python_PYTHON) $(usrp2_swiginclude_HEADERS) +DIST_COMMON = $(am__usrp2_python_PYTHON_DIST) \ + $(am__usrp2_swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ + $(noinst_HEADERS) $(noinst_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.swig.gen \ + $(srcdir)/run_tests.in $(top_srcdir)/Makefile.common \ + $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/usrp2-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-usrp2/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -143,36 +146,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 \ @@ -186,9 +192,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 \ @@ -237,12 +240,15 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(usrp2_pylibdir)" \ "$(DESTDIR)$(usrp2_swigincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(usrp2_pylib_LTLIBRARIES) am__DEPENDENCIES_1 = -_usrp2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(usrp2_la_swig_libadd) -am__usrp2_la_OBJECTS = _usrp2_la-usrp2.lo +@PYTHON_TRUE@_usrp2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(usrp2_la_swig_libadd) +am___usrp2_la_SOURCES_DIST = usrp2.cc +@PYTHON_TRUE@am__usrp2_la_OBJECTS = _usrp2_la-usrp2.lo _usrp2_la_OBJECTS = $(am__usrp2_la_OBJECTS) _usrp2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(_usrp2_la_CXXFLAGS) \ $(CXXFLAGS) $(_usrp2_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__usrp2_la_rpath = -rpath $(usrp2_pylibdir) libgnuradio_usrp2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libgnuradio_usrp2_la_OBJECTS = rx_16sc_handler.lo \ @@ -250,6 +256,9 @@ am_libgnuradio_usrp2_la_OBJECTS = rx_16sc_handler.lo \ usrp2_source_16sc.lo usrp2_source_32fc.lo usrp2_sink_base.lo \ usrp2_sink_16sc.lo usrp2_sink_32fc.lo libgnuradio_usrp2_la_OBJECTS = $(am_libgnuradio_usrp2_la_OBJECTS) +libgnuradio_usrp2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libgnuradio_usrp2_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -264,8 +273,11 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(_usrp2_la_SOURCES) $(libgnuradio_usrp2_la_SOURCES) -DIST_SOURCES = $(_usrp2_la_SOURCES) $(libgnuradio_usrp2_la_SOURCES) +DIST_SOURCES = $(am___usrp2_la_SOURCES_DIST) \ + $(libgnuradio_usrp2_la_SOURCES) +am__usrp2_python_PYTHON_DIST = usrp2.py py_compile = $(top_srcdir)/py-compile +am__usrp2_swiginclude_HEADERS_DIST = usrp2.i HEADERS = $(grinclude_HEADERS) $(noinst_HEADERS) \ $(usrp2_swiginclude_HEADERS) ETAGS = etags @@ -292,6 +304,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@ @@ -299,6 +312,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@ @@ -317,6 +334,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -326,20 +344,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@ @@ -362,6 +383,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@ @@ -423,6 +446,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@ @@ -435,17 +459,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@ @@ -461,7 +485,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@ @@ -513,6 +536,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@ @@ -543,6 +571,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@ @@ -564,6 +597,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@ @@ -646,26 +689,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@ @@ -696,7 +724,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@ @@ -706,23 +733,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 @@ -734,7 +764,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, @@ -742,10 +772,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@ @@ -761,18 +787,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@ @@ -787,20 +801,22 @@ 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 = $(DEPDIR)/usrp2-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) # ---------------------------------------------------------------------- # Local Python files, not installed @@ -813,7 +829,6 @@ noinst_PYTHON = qa_usrp2.py # Miscellaneous build operations # ---------------------------------------------------------------------- EXTRA_DIST = run_tests.in -TESTS = run_tests DISTCLEANFILES = run_tests # ---------------------------------------------------------------------- @@ -829,6 +844,7 @@ AM_CPPFLAGS = \ $(WITH_INCLUDES) lib_LTLIBRARIES = libgnuradio-usrp2.la +libgnuradio_usrp2_la_LDFLAGS = $(LTVERSIONFLAGS) libgnuradio_usrp2_la_SOURCES = \ rx_16sc_handler.cc \ rx_32fc_handler.cc \ @@ -864,89 +880,90 @@ noinst_HEADERS = \ # usrp2.py # _usrp2.so # ---------------------------------------------------------------------- -TOP_SWIG_IFILES = \ - usrp2.i +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ usrp2.i # Install so that they end up available as: # import gnuradio.usrp2 # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -usrp2_pythondir_category = \ - gnuradio +@PYTHON_TRUE@usrp2_pythondir_category = \ +@PYTHON_TRUE@ gnuradio # additional arguments to the SWIG command -usrp2_swig_args = \ - $(USRP2_INCLUDES) +@PYTHON_TRUE@usrp2_swig_args = \ +@PYTHON_TRUE@ $(USRP2_INCLUDES) # additional libraries for linking with the SWIG-generated library -usrp2_la_swig_libadd = \ - libgnuradio-usrp2.la - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = usrp2.py usrp2.cc -usrp2_pythondir = $(pythondir)/$(usrp2_pythondir_category) -usrp2_pylibdir = $(pyexecdir)/$(usrp2_pylibdir_category) -usrp2_swigincludedir = $(swigincludedir) -usrp2_swiginclude_HEADERS = \ - usrp2.i \ - $(usrp2_swiginclude_headers) - -usrp2_pylib_LTLIBRARIES = \ - _usrp2.la - -_usrp2_la_SOURCES = \ - usrp2.cc \ - $(usrp2_la_swig_sources) - -_usrp2_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(usrp2_la_swig_libadd) - -_usrp2_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(usrp2_la_swig_ldflags) - -_usrp2_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(usrp2_la_swig_cxxflags) - -usrp2_python_PYTHON = \ - usrp2.py \ - $(usrp2_python) +@PYTHON_TRUE@usrp2_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-usrp2.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = usrp2.py usrp2.cc +@PYTHON_TRUE@usrp2_pythondir = $(pythondir)/$(usrp2_pythondir_category) +@PYTHON_TRUE@usrp2_pylibdir = $(pyexecdir)/$(usrp2_pylibdir_category) +@PYTHON_TRUE@usrp2_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@usrp2_swiginclude_HEADERS = \ +@PYTHON_TRUE@ usrp2.i \ +@PYTHON_TRUE@ $(usrp2_swiginclude_headers) + +@PYTHON_TRUE@usrp2_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _usrp2.la + +@PYTHON_TRUE@_usrp2_la_SOURCES = \ +@PYTHON_TRUE@ usrp2.cc \ +@PYTHON_TRUE@ $(usrp2_la_swig_sources) + +@PYTHON_TRUE@_usrp2_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(usrp2_la_swig_libadd) + +@PYTHON_TRUE@_usrp2_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(usrp2_la_swig_ldflags) + +@PYTHON_TRUE@_usrp2_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(usrp2_la_swig_cxxflags) + +@PYTHON_TRUE@usrp2_python_PYTHON = \ +@PYTHON_TRUE@ usrp2.py \ +@PYTHON_TRUE@ $(usrp2_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1047,9 +1064,9 @@ clean-usrp2_pylibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done _usrp2.la: $(_usrp2_la_OBJECTS) $(_usrp2_la_DEPENDENCIES) - $(_usrp2_la_LINK) -rpath $(usrp2_pylibdir) $(_usrp2_la_OBJECTS) $(_usrp2_la_LIBADD) $(LIBS) + $(_usrp2_la_LINK) $(am__usrp2_la_rpath) $(_usrp2_la_OBJECTS) $(_usrp2_la_LIBADD) $(LIBS) libgnuradio-usrp2.la: $(libgnuradio_usrp2_la_OBJECTS) $(libgnuradio_usrp2_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libgnuradio_usrp2_la_OBJECTS) $(libgnuradio_usrp2_la_LIBADD) $(LIBS) + $(libgnuradio_usrp2_la_LINK) -rpath $(libdir) $(libgnuradio_usrp2_la_OBJECTS) $(libgnuradio_usrp2_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1503,75 +1520,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -usrp2_pythondir_category ?= gnuradio/usrp2 -usrp2_pylibdir_category ?= $(usrp2_pythondir_category) - -usrp2.h usrp2.py usrp2.cc: usrp2.i - trap 'rm -rf $(DEPDIR)/usrp2-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/usrp2-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/usrp2-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/usrp2-generate-lock; \ - else \ - while test -d $(DEPDIR)/usrp2-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/usrp2-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/usrp2-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \ - -MD -MF $(DEPDIR)/usrp2.Std \ - -module usrp2 -o usrp2.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp2.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ - > $(DEPDIR)/usrp2.Sd; \ - $(RM) $(DEPDIR)/usrp2.Std; \ - $(MV) $(DEPDIR)/usrp2.Sd $(DEPDIR)/usrp2.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/usrp2.d - cp $(DEPDIR)/usrp2.Std $(DEPDIR)/usrp2.d - echo "" >> $(DEPDIR)/usrp2.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2.d - $(RM) $(DEPDIR)/usrp2.Std - touch $(DEPDIR)/usrp2-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@usrp2_pythondir_category ?= gnuradio/usrp2 +@PYTHON_TRUE@usrp2_pylibdir_category ?= $(usrp2_pythondir_category) + +@PYTHON_TRUE@usrp2.h usrp2.py usrp2.cc: usrp2.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/usrp2-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/usrp2-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/usrp2-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/usrp2-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/usrp2-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/usrp2-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/usrp2-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/usrp2.Std \ +@PYTHON_TRUE@ -module usrp2 -o usrp2.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp2.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/usrp2.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp2.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/usrp2.Sd $(DEPDIR)/usrp2.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp2.d +@PYTHON_TRUE@ cp $(DEPDIR)/usrp2.Std $(DEPDIR)/usrp2.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/usrp2.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/usrp2.Std +@PYTHON_TRUE@ touch $(DEPDIR)/usrp2-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/usrp2.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp2.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-utils/Makefile.in b/gr-utils/Makefile.in index 2c11e128..2e7f560a 100644 --- a/gr-utils/Makefile.in +++ b/gr-utils/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -199,6 +199,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@ @@ -206,6 +207,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@ @@ -224,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +239,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@ @@ -269,6 +278,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@ @@ -330,6 +341,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@ @@ -342,17 +354,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@ @@ -368,7 +380,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@ @@ -420,6 +431,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@ @@ -450,6 +466,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@ @@ -471,6 +492,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@ @@ -553,26 +584,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@ @@ -603,7 +619,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@ diff --git a/gr-utils/src/Makefile.in b/gr-utils/src/Makefile.in index 3f343b4c..bcd5f629 100644 --- a/gr-utils/src/Makefile.in +++ b/gr-utils/src/Makefile.in @@ -55,6 +55,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@PYTHON_TRUE@am__append_1 = python subdir = gr-utils/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -69,36 +70,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 \ @@ -112,9 +116,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 \ @@ -153,7 +154,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = lib python DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -199,6 +200,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@ @@ -206,6 +208,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@ @@ -224,6 +230,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +240,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@ @@ -269,6 +279,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@ @@ -330,6 +342,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@ @@ -342,17 +355,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@ @@ -368,7 +381,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@ @@ -420,6 +432,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@ @@ -450,6 +467,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@ @@ -471,6 +493,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@ @@ -553,26 +585,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@ @@ -603,14 +620,13 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -SUBDIRS = lib python +SUBDIRS = lib $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/gr-utils/src/lib/Makefile.in b/gr-utils/src/lib/Makefile.in index d945730a..3129ec52 100644 --- a/gr-utils/src/lib/Makefile.in +++ b/gr-utils/src/lib/Makefile.in @@ -48,36 +48,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 \ @@ -91,9 +94,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 \ @@ -138,6 +138,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@ @@ -145,6 +146,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@ @@ -163,6 +168,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -172,20 +178,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@ @@ -208,6 +217,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@ @@ -269,6 +280,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@ @@ -281,17 +293,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@ @@ -307,7 +319,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@ @@ -359,6 +370,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@ @@ -389,6 +405,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@ @@ -410,6 +431,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@ @@ -492,26 +523,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@ @@ -542,7 +558,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@ diff --git a/gr-utils/src/python/Makefile.in b/gr-utils/src/python/Makefile.in index c472046a..d48382a9 100644 --- a/gr-utils/src/python/Makefile.in +++ b/gr-utils/src/python/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -207,6 +207,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@ @@ -214,6 +215,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@ @@ -232,6 +237,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -241,20 +247,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@ @@ -277,6 +286,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@ @@ -338,6 +349,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@ @@ -350,17 +362,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@ @@ -376,7 +388,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@ @@ -428,6 +439,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@ @@ -458,6 +474,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@ @@ -479,6 +500,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@ @@ -561,26 +592,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@ @@ -611,7 +627,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@ @@ -621,23 +636,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 @@ -649,7 +667,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, @@ -657,10 +675,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@ @@ -676,18 +690,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@ @@ -702,28 +704,35 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT EXTRA_DIST = \ $(bin_SCRIPTS) \ - README.plot + README.plot \ + pyqt_plot.ui \ + pyqt_filter.ui ourpythondir = $(grpythondir) ourpython_PYTHON = \ - plot_data.py + plot_data.py \ + pyqt_plot.py \ + pyqt_filter.py bin_SCRIPTS = \ + create-gnuradio-out-of-tree-project \ gr_plot_char.py \ gr_plot_const.py \ gr_plot_fft.py \ @@ -736,6 +745,8 @@ bin_SCRIPTS = \ gr_plot_int.py \ gr_plot_iq.py \ gr_plot_short.py \ + gr_plot_qt.py \ + gr_filter_design.py \ lsusrp \ usrp_fft.py \ usrp_oscope.py \ @@ -743,12 +754,11 @@ bin_SCRIPTS = \ usrp_rx_cfile.py \ usrp_rx_nogui.py \ usrp_siggen.py \ + usrp_siggen_gui.py \ usrp_test_counting.py \ usrp_test_loopback.py \ usrp2_fft.py \ - usrp2_rx_cfile.py \ - usrp2_siggen.py \ - usrp2_siggen_gui.py + usrp2_rx_cfile.py all: all-am diff --git a/gr-video-sdl/Makefile.in b/gr-video-sdl/Makefile.in index 0c8dc854..dc645555 100644 --- a/gr-video-sdl/Makefile.in +++ b/gr-video-sdl/Makefile.in @@ -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 # @@ -57,6 +57,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. # + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -77,7 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(dist_pkgconfig_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gnuradio-video-sdl.pc.in \ $(top_srcdir)/Makefile.common subdir = gr-video-sdl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -92,36 +94,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 \ @@ -135,9 +140,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 \ @@ -158,7 +160,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 = +CONFIG_CLEAN_FILES = gnuradio-video-sdl.pc CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -169,6 +171,29 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +DATA = $(dist_pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -222,6 +247,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@ @@ -229,6 +255,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@ @@ -247,6 +277,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +287,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@ @@ -292,6 +326,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@ @@ -353,6 +389,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@ @@ -365,17 +402,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@ @@ -391,7 +428,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@ @@ -443,6 +479,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@ @@ -473,6 +514,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@ @@ -494,6 +540,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@ @@ -576,26 +632,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@ @@ -626,7 +667,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@ @@ -636,23 +676,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 @@ -664,7 +707,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, @@ -672,10 +715,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@ @@ -691,18 +730,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@ @@ -717,20 +744,24 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT SUBDIRS = src +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-video-sdl.pc all: all-recursive .SUFFIXES: @@ -764,12 +795,34 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +gnuradio-video-sdl.pc: $(top_builddir)/config.status $(srcdir)/gnuradio-video-sdl.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs +install-dist_pkgconfigDATA: $(dist_pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-dist_pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -969,9 +1022,12 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -1018,7 +1074,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-dist_pkgconfigDATA install-dvi: install-dvi-recursive @@ -1062,7 +1118,7 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-dist_pkgconfigDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -1072,14 +1128,15 @@ uninstall-am: ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + install-data-am install-dist_pkgconfigDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-dist_pkgconfigDATA # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/gr-video-sdl/src/Makefile.in b/gr-video-sdl/src/Makefile.in index 759abf62..6e7eba97 100644 --- a/gr-video-sdl/src/Makefile.in +++ b/gr-video-sdl/src/Makefile.in @@ -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 # @@ -125,11 +125,13 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(grinclude_HEADERS) $(noinst_PYTHON) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(am__video_sdl_python_PYTHON_DIST) \ + $(am__video_sdl_swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \ + $(noinst_PYTHON) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \ - $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig \ - $(video_sdl_python_PYTHON) $(video_sdl_swiginclude_HEADERS) + $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig +@PYTHON_TRUE@am__append_1 = $(DEPDIR)/video_sdl-generate-* +@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S* subdir = gr-video-sdl/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -143,36 +145,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 \ @@ -186,9 +191,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 \ @@ -232,21 +234,31 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(video_sdl_pylibdir)" \ +am__installdirs = "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(video_sdl_pylibdir)" \ "$(DESTDIR)$(video_sdl_pythondir)" "$(DESTDIR)$(grincludedir)" \ "$(DESTDIR)$(video_sdl_swigincludedir)" -LTLIBRARIES = $(video_sdl_pylib_LTLIBRARIES) +LTLIBRARIES = $(lib_LTLIBRARIES) $(video_sdl_pylib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -_video_sdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am__objects_1 = _video_sdl_la-video_sdl_sink_uc.lo \ - _video_sdl_la-video_sdl_sink_s.lo -am__video_sdl_la_OBJECTS = _video_sdl_la-video_sdl.lo $(am__objects_1) +@PYTHON_TRUE@_video_sdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@PYTHON_TRUE@ $(video_sdl_la_swig_libadd) +am___video_sdl_la_SOURCES_DIST = video_sdl.cc +@PYTHON_TRUE@am__video_sdl_la_OBJECTS = _video_sdl_la-video_sdl.lo _video_sdl_la_OBJECTS = $(am__video_sdl_la_OBJECTS) _video_sdl_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(_video_sdl_la_CXXFLAGS) \ $(CXXFLAGS) $(_video_sdl_la_LDFLAGS) $(LDFLAGS) -o $@ +@PYTHON_TRUE@am__video_sdl_la_rpath = -rpath $(video_sdl_pylibdir) +libgnuradio_video_sdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_libgnuradio_video_sdl_la_OBJECTS = video_sdl_sink_uc.lo \ + video_sdl_sink_s.lo +libgnuradio_video_sdl_la_OBJECTS = \ + $(am_libgnuradio_video_sdl_la_OBJECTS) +libgnuradio_video_sdl_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libgnuradio_video_sdl_la_LDFLAGS) \ + $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -260,9 +272,12 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(_video_sdl_la_SOURCES) -DIST_SOURCES = $(_video_sdl_la_SOURCES) +SOURCES = $(_video_sdl_la_SOURCES) $(libgnuradio_video_sdl_la_SOURCES) +DIST_SOURCES = $(am___video_sdl_la_SOURCES_DIST) \ + $(libgnuradio_video_sdl_la_SOURCES) +am__video_sdl_python_PYTHON_DIST = video_sdl.py py_compile = $(top_srcdir)/py-compile +am__video_sdl_swiginclude_HEADERS_DIST = video_sdl.i HEADERS = $(grinclude_HEADERS) $(video_sdl_swiginclude_HEADERS) ETAGS = etags CTAGS = ctags @@ -288,6 +303,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@ @@ -295,6 +311,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@ @@ -313,6 +333,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -322,20 +343,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@ @@ -358,6 +382,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@ @@ -419,6 +445,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@ @@ -431,17 +458,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@ @@ -457,7 +484,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@ @@ -509,6 +535,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@ @@ -539,6 +570,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@ @@ -560,6 +596,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@ @@ -642,26 +688,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@ @@ -692,7 +723,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@ @@ -702,23 +732,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 @@ -730,7 +763,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, @@ -738,10 +771,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@ @@ -757,18 +786,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@ @@ -783,121 +800,126 @@ 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 = $(DEPDIR)/video_sdl-generate-* +STAMPS = $(am__append_1) MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ - *.loT $(DEPDIR)/*.S* + *.loT $(am__append_2) EXTRA_DIST = run_tests.in -TESTS = run_tests -DISTCLEANFILES = run_tests -noinst_PYTHON = \ - qa_video_sdl.py - AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \ $(WITH_INCLUDES) +noinst_PYTHON = \ + qa_video_sdl.py + grinclude_HEADERS = \ video_sdl_sink_uc.h \ video_sdl_sink_s.h +lib_LTLIBRARIES = libgnuradio-video-sdl.la +libgnuradio_video_sdl_la_SOURCES = \ + video_sdl_sink_uc.cc \ + video_sdl_sink_s.cc + +libgnuradio_video_sdl_la_LIBADD = \ + $(SDL_LIBS) \ + $(GNURADIO_CORE_LA) + +libgnuradio_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) ################################# # SWIG interface and library -TOP_SWIG_IFILES = \ - video_sdl.i +@PYTHON_TRUE@TESTS = run_tests +@PYTHON_TRUE@DISTCLEANFILES = run_tests +@PYTHON_TRUE@TOP_SWIG_IFILES = \ +@PYTHON_TRUE@ video_sdl.i # Install so that they end up available as: # import gnuradio.video_sdl # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -video_sdl_pythondir_category = \ - gnuradio - - -# additional sources for the SWIG-generated library -video_sdl_la_swig_sources = \ - video_sdl_sink_uc.cc \ - video_sdl_sink_s.cc +@PYTHON_TRUE@video_sdl_pythondir_category = \ +@PYTHON_TRUE@ gnuradio # additional libraries for linking with the SWIG-generated library -video_sdl_la_swig_libadd = \ - $(SDL_LIBS) \ - $(GNURADIO_CORE_LA) - -SWIG_PYTHON_FLAGS = \ - -fvirtual \ - -python \ - -modern \ - -keyword \ - -w511 \ - -outdir . - -STD_SWIG_PYTHON_ARGS = \ - $(SWIG_PYTHON_FLAGS) \ - $(STD_DEFINES_AND_INCLUDES) \ - $(WITH_SWIG_INCLUDES) \ - $(WITH_INCLUDES) - -STD_SWIG_LA_LD_FLAGS = \ - $(PYTHON_LDFLAGS) \ - -module \ - -avoid-version \ - $(NO_UNDEFINED) - -STD_SWIG_LA_LIB_ADD = \ - -lstdc++ - -STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ -SUFFIXES = .i -swig_built_sources = video_sdl.py video_sdl.cc -video_sdl_pythondir = $(pythondir)/$(video_sdl_pythondir_category) -video_sdl_pylibdir = $(pyexecdir)/$(video_sdl_pylibdir_category) -video_sdl_swigincludedir = $(swigincludedir) -video_sdl_swiginclude_HEADERS = \ - video_sdl.i \ - $(video_sdl_swiginclude_headers) - -video_sdl_pylib_LTLIBRARIES = \ - _video_sdl.la - -_video_sdl_la_SOURCES = \ - video_sdl.cc \ - $(video_sdl_la_swig_sources) - -_video_sdl_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(video_sdl_la_swig_libadd) - -_video_sdl_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(video_sdl_la_swig_ldflags) - -_video_sdl_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - $(video_sdl_la_swig_cxxflags) - -video_sdl_python_PYTHON = \ - video_sdl.py \ - $(video_sdl_python) +@PYTHON_TRUE@video_sdl_la_swig_libadd = \ +@PYTHON_TRUE@ libgnuradio-video-sdl.la + +@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \ +@PYTHON_TRUE@ -fvirtual \ +@PYTHON_TRUE@ -python \ +@PYTHON_TRUE@ -modern \ +@PYTHON_TRUE@ -keyword \ +@PYTHON_TRUE@ -w511 \ +@PYTHON_TRUE@ -outdir . + +@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \ +@PYTHON_TRUE@ $(SWIG_PYTHON_FLAGS) \ +@PYTHON_TRUE@ $(STD_DEFINES_AND_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_SWIG_INCLUDES) \ +@PYTHON_TRUE@ $(WITH_INCLUDES) + +@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \ +@PYTHON_TRUE@ $(PYTHON_LDFLAGS) \ +@PYTHON_TRUE@ -module \ +@PYTHON_TRUE@ -avoid-version \ +@PYTHON_TRUE@ $(NO_UNDEFINED) + +@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \ +@PYTHON_TRUE@ -lstdc++ + +@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@ +@PYTHON_TRUE@SUFFIXES = .i +@PYTHON_TRUE@swig_built_sources = video_sdl.py video_sdl.cc +@PYTHON_TRUE@video_sdl_pythondir = $(pythondir)/$(video_sdl_pythondir_category) +@PYTHON_TRUE@video_sdl_pylibdir = $(pyexecdir)/$(video_sdl_pylibdir_category) +@PYTHON_TRUE@video_sdl_swigincludedir = $(swigincludedir) +@PYTHON_TRUE@video_sdl_swiginclude_HEADERS = \ +@PYTHON_TRUE@ video_sdl.i \ +@PYTHON_TRUE@ $(video_sdl_swiginclude_headers) + +@PYTHON_TRUE@video_sdl_pylib_LTLIBRARIES = \ +@PYTHON_TRUE@ _video_sdl.la + +@PYTHON_TRUE@_video_sdl_la_SOURCES = \ +@PYTHON_TRUE@ video_sdl.cc \ +@PYTHON_TRUE@ $(video_sdl_la_swig_sources) + +@PYTHON_TRUE@_video_sdl_la_LIBADD = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LIB_ADD) \ +@PYTHON_TRUE@ $(video_sdl_la_swig_libadd) + +@PYTHON_TRUE@_video_sdl_la_LDFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_LA_LD_FLAGS) \ +@PYTHON_TRUE@ $(video_sdl_la_swig_ldflags) + +@PYTHON_TRUE@_video_sdl_la_CXXFLAGS = \ +@PYTHON_TRUE@ $(STD_SWIG_CXX_FLAGS) \ +@PYTHON_TRUE@ $(video_sdl_la_swig_cxxflags) + +@PYTHON_TRUE@video_sdl_python_PYTHON = \ +@PYTHON_TRUE@ video_sdl.py \ +@PYTHON_TRUE@ $(video_sdl_python) # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +@PYTHON_TRUE@no_dist_files = $(swig_built_sources) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -935,6 +957,37 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): run_tests: $(top_builddir)/config.status $(srcdir)/run_tests.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done install-video_sdl_pylibLTLIBRARIES: $(video_sdl_pylib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(video_sdl_pylibdir)" || $(MKDIR_P) "$(DESTDIR)$(video_sdl_pylibdir)" @@ -967,7 +1020,9 @@ clean-video_sdl_pylibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done _video_sdl.la: $(_video_sdl_la_OBJECTS) $(_video_sdl_la_DEPENDENCIES) - $(_video_sdl_la_LINK) -rpath $(video_sdl_pylibdir) $(_video_sdl_la_OBJECTS) $(_video_sdl_la_LIBADD) $(LIBS) + $(_video_sdl_la_LINK) $(am__video_sdl_la_rpath) $(_video_sdl_la_OBJECTS) $(_video_sdl_la_LIBADD) $(LIBS) +libgnuradio-video-sdl.la: $(libgnuradio_video_sdl_la_OBJECTS) $(libgnuradio_video_sdl_la_DEPENDENCIES) + $(libgnuradio_video_sdl_la_LINK) -rpath $(libdir) $(libgnuradio_video_sdl_la_OBJECTS) $(libgnuradio_video_sdl_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -976,8 +1031,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_video_sdl_la-video_sdl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_video_sdl_la-video_sdl_sink_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_video_sdl_la-video_sdl_sink_uc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_sdl_sink_s.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_sdl_sink_uc.Plo@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1007,20 +1062,6 @@ _video_sdl_la-video_sdl.lo: video_sdl.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_video_sdl_la_CXXFLAGS) $(CXXFLAGS) -c -o _video_sdl_la-video_sdl.lo `test -f 'video_sdl.cc' || echo '$(srcdir)/'`video_sdl.cc -_video_sdl_la-video_sdl_sink_uc.lo: video_sdl_sink_uc.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_video_sdl_la_CXXFLAGS) $(CXXFLAGS) -MT _video_sdl_la-video_sdl_sink_uc.lo -MD -MP -MF $(DEPDIR)/_video_sdl_la-video_sdl_sink_uc.Tpo -c -o _video_sdl_la-video_sdl_sink_uc.lo `test -f 'video_sdl_sink_uc.cc' || echo '$(srcdir)/'`video_sdl_sink_uc.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_video_sdl_la-video_sdl_sink_uc.Tpo $(DEPDIR)/_video_sdl_la-video_sdl_sink_uc.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='video_sdl_sink_uc.cc' object='_video_sdl_la-video_sdl_sink_uc.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_video_sdl_la_CXXFLAGS) $(CXXFLAGS) -c -o _video_sdl_la-video_sdl_sink_uc.lo `test -f 'video_sdl_sink_uc.cc' || echo '$(srcdir)/'`video_sdl_sink_uc.cc - -_video_sdl_la-video_sdl_sink_s.lo: video_sdl_sink_s.cc -@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_video_sdl_la_CXXFLAGS) $(CXXFLAGS) -MT _video_sdl_la-video_sdl_sink_s.lo -MD -MP -MF $(DEPDIR)/_video_sdl_la-video_sdl_sink_s.Tpo -c -o _video_sdl_la-video_sdl_sink_s.lo `test -f 'video_sdl_sink_s.cc' || echo '$(srcdir)/'`video_sdl_sink_s.cc -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/_video_sdl_la-video_sdl_sink_s.Tpo $(DEPDIR)/_video_sdl_la-video_sdl_sink_s.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='video_sdl_sink_s.cc' object='_video_sdl_la-video_sdl_sink_s.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_video_sdl_la_CXXFLAGS) $(CXXFLAGS) -c -o _video_sdl_la-video_sdl_sink_s.lo `test -f 'video_sdl_sink_s.cc' || echo '$(srcdir)/'`video_sdl_sink_s.cc - mostlyclean-libtool: -rm -f *.lo @@ -1288,7 +1329,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(video_sdl_pylibdir)" "$(DESTDIR)$(video_sdl_pythondir)" "$(DESTDIR)$(grincludedir)" "$(DESTDIR)$(video_sdl_swigincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(video_sdl_pylibdir)" "$(DESTDIR)$(video_sdl_pythondir)" "$(DESTDIR)$(grincludedir)" "$(DESTDIR)$(video_sdl_swigincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1322,8 +1363,8 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-generic clean-libtool clean-video_sdl_pylibLTLIBRARIES \ - mostlyclean-am +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-video_sdl_pylibLTLIBRARIES mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1352,7 +1393,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES install-html: install-html-am @@ -1392,7 +1433,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-grincludeHEADERS \ +uninstall-am: uninstall-grincludeHEADERS uninstall-libLTLIBRARIES \ uninstall-video_sdl_pylibLTLIBRARIES \ uninstall-video_sdl_pythonPYTHON \ uninstall-video_sdl_swigincludeHEADERS @@ -1400,22 +1441,23 @@ uninstall-am: uninstall-grincludeHEADERS \ .MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-video_sdl_pylibLTLIBRARIES \ - ctags dist-hook distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-grincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-video_sdl_pylibLTLIBRARIES \ + clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-video_sdl_pylibLTLIBRARIES ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-grincludeHEADERS install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip install-video_sdl_pylibLTLIBRARIES \ install-video_sdl_pythonPYTHON \ install-video_sdl_swigincludeHEADERS installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-grincludeHEADERS \ - uninstall-video_sdl_pylibLTLIBRARIES \ + uninstall-libLTLIBRARIES uninstall-video_sdl_pylibLTLIBRARIES \ uninstall-video_sdl_pythonPYTHON \ uninstall-video_sdl_swigincludeHEADERS @@ -1430,75 +1472,75 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t - @do_recreate=0; \ - if test -f $(srcdir)/Makefile.swig.gen; then \ - if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - else \ - if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ - do_recreate=1; \ - fi; \ - fi; \ - if test "$$do_recreate" == "1"; then \ - echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ - for TFILE in $(TOP_SWIG_IFILES); do \ - TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ - $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ - echo "" >> $(srcdir)/Makefile.swig.gen; \ - done; \ - else \ - echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ - exit -1; \ - fi; - -video_sdl_pythondir_category ?= gnuradio/video_sdl -video_sdl_pylibdir_category ?= $(video_sdl_pythondir_category) - -video_sdl.h video_sdl.py video_sdl.cc: video_sdl.i - trap 'rm -rf $(DEPDIR)/video_sdl-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/video_sdl-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/video_sdl-generate-stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/video_sdl-generate-stamp WHAT=$<; \ - rmdir $(DEPDIR)/video_sdl-generate-lock; \ - else \ - while test -d $(DEPDIR)/video_sdl-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/video_sdl-generate-stamp; \ - exit $$?; \ - fi; - -$(DEPDIR)/video_sdl-generate-stamp: - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(video_sdl_swig_args) \ - -MD -MF $(DEPDIR)/video_sdl.Std \ - -module video_sdl -o video_sdl.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/video_sdl.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl.Std \ - > $(DEPDIR)/video_sdl.Sd; \ - $(RM) $(DEPDIR)/video_sdl.Std; \ - $(MV) $(DEPDIR)/video_sdl.Sd $(DEPDIR)/video_sdl.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/video_sdl.S*; exit 1; \ - fi; - $(RM) $(DEPDIR)/video_sdl.d - cp $(DEPDIR)/video_sdl.Std $(DEPDIR)/video_sdl.d - echo "" >> $(DEPDIR)/video_sdl.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/video_sdl.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/video_sdl.d - $(RM) $(DEPDIR)/video_sdl.Std - touch $(DEPDIR)/video_sdl-generate-stamp +@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t +@PYTHON_TRUE@ @do_recreate=0; \ +@PYTHON_TRUE@ if test -f $(srcdir)/Makefile.swig.gen; then \ +@PYTHON_TRUE@ if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \ +@PYTHON_TRUE@ do_recreate=1; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ if test "$$do_recreate" == "1"; then \ +@PYTHON_TRUE@ echo "Regenerating $(srcdir)/Makefile.swig.gen"; \ +@PYTHON_TRUE@ for TFILE in $(TOP_SWIG_IFILES); do \ +@PYTHON_TRUE@ TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \ +@PYTHON_TRUE@ $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ echo "" >> $(srcdir)/Makefile.swig.gen; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \ +@PYTHON_TRUE@ exit -1; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@video_sdl_pythondir_category ?= gnuradio/video_sdl +@PYTHON_TRUE@video_sdl_pylibdir_category ?= $(video_sdl_pythondir_category) + +@PYTHON_TRUE@video_sdl.h video_sdl.py video_sdl.cc: video_sdl.i +@PYTHON_TRUE@ trap 'rm -rf $(DEPDIR)/video_sdl-generate-*' 1 2 13 15; \ +@PYTHON_TRUE@ if mkdir $(DEPDIR)/video_sdl-generate-lock 2>/dev/null; then \ +@PYTHON_TRUE@ rm -f $(DEPDIR)/video_sdl-generate-stamp; \ +@PYTHON_TRUE@ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/video_sdl-generate-stamp WHAT=$<; \ +@PYTHON_TRUE@ rmdir $(DEPDIR)/video_sdl-generate-lock; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ while test -d $(DEPDIR)/video_sdl-generate-lock; do \ +@PYTHON_TRUE@ sleep 1; \ +@PYTHON_TRUE@ done; \ +@PYTHON_TRUE@ test -f $(DEPDIR)/video_sdl-generate-stamp; \ +@PYTHON_TRUE@ exit $$?; \ +@PYTHON_TRUE@ fi; + +@PYTHON_TRUE@$(DEPDIR)/video_sdl-generate-stamp: +@PYTHON_TRUE@ if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(video_sdl_swig_args) \ +@PYTHON_TRUE@ -MD -MF $(DEPDIR)/video_sdl.Std \ +@PYTHON_TRUE@ -module video_sdl -o video_sdl.cc $(WHAT); then \ +@PYTHON_TRUE@ if test $(host_os) = mingw32; then \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/video_sdl.Sd; \ +@PYTHON_TRUE@ $(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl.Std \ +@PYTHON_TRUE@ > $(DEPDIR)/video_sdl.Sd; \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/video_sdl.Std; \ +@PYTHON_TRUE@ $(MV) $(DEPDIR)/video_sdl.Sd $(DEPDIR)/video_sdl.Std; \ +@PYTHON_TRUE@ fi; \ +@PYTHON_TRUE@ else \ +@PYTHON_TRUE@ $(RM) $(DEPDIR)/video_sdl.S*; exit 1; \ +@PYTHON_TRUE@ fi; +@PYTHON_TRUE@ $(RM) $(DEPDIR)/video_sdl.d +@PYTHON_TRUE@ cp $(DEPDIR)/video_sdl.Std $(DEPDIR)/video_sdl.d +@PYTHON_TRUE@ echo "" >> $(DEPDIR)/video_sdl.d +@PYTHON_TRUE@ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/video_sdl.Std | \ +@PYTHON_TRUE@ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/video_sdl.d +@PYTHON_TRUE@ $(RM) $(DEPDIR)/video_sdl.Std +@PYTHON_TRUE@ touch $(DEPDIR)/video_sdl-generate-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, # we have accurate dependencies for our swig stuff, which is good. -@am__include@ @am__quote@./$(DEPDIR)/video_sdl.d@am__quote@ +@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_sdl.d@am__quote@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gr-wxgui/Makefile.in b/gr-wxgui/Makefile.in index 16839a25..7a20abf3 100644 --- a/gr-wxgui/Makefile.in +++ b/gr-wxgui/Makefile.in @@ -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 # @@ -78,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = README $(dist_etc_DATA) $(srcdir)/Makefile.am \ +DIST_COMMON = README $(am__dist_etc_DATA_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/gr-wxgui.pc.in \ $(top_srcdir)/Makefile.common subdir = gr-wxgui @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -171,6 +171,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__dist_etc_DATA_DIST = gr-wxgui.conf am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -201,7 +202,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = src DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -247,6 +248,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@ @@ -254,6 +256,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@ @@ -272,6 +278,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -281,20 +288,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@ @@ -317,6 +327,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@ @@ -378,6 +390,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@ @@ -390,17 +403,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@ @@ -416,7 +429,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@ @@ -468,6 +480,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@ @@ -498,6 +515,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@ @@ -519,6 +541,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@ @@ -601,26 +633,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@ @@ -651,7 +668,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@ @@ -661,23 +677,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 @@ -689,7 +708,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, @@ -697,10 +716,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@ @@ -716,18 +731,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@ @@ -742,15 +745,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 = @@ -760,11 +765,11 @@ EXTRA_DIST = \ README \ README.gl -SUBDIRS = src -etcdir = $(gr_sysconfdir) -dist_etc_DATA = gr-wxgui.conf -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gr-wxgui.pc +@PYTHON_TRUE@SUBDIRS = src +@PYTHON_TRUE@etcdir = $(gr_prefsdir) +@PYTHON_TRUE@dist_etc_DATA = gr-wxgui.conf +@PYTHON_TRUE@pkgconfigdir = $(libdir)/pkgconfig +@PYTHON_TRUE@pkgconfig_DATA = gr-wxgui.pc all: all-recursive .SUFFIXES: diff --git a/gr-wxgui/src/Makefile.in b/gr-wxgui/src/Makefile.in index d11bab28..2c7b4387 100644 --- a/gr-wxgui/src/Makefile.in +++ b/gr-wxgui/src/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -222,6 +222,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@ @@ -229,6 +230,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@ @@ -247,6 +252,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -256,20 +262,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@ @@ -292,6 +301,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@ @@ -353,6 +364,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@ @@ -365,17 +377,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@ @@ -391,7 +403,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@ @@ -443,6 +454,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@ @@ -473,6 +489,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@ @@ -494,6 +515,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@ @@ -576,26 +607,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@ @@ -626,7 +642,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@ @@ -636,23 +651,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 @@ -664,7 +682,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, @@ -672,10 +690,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@ @@ -691,18 +705,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@ @@ -717,15 +719,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 = diff --git a/gr-wxgui/src/python/Makefile.in b/gr-wxgui/src/python/Makefile.in index 0732a6f0..fb2356fd 100644 --- a/gr-wxgui/src/python/Makefile.in +++ b/gr-wxgui/src/python/Makefile.in @@ -16,29 +16,29 @@ @SET_MAKE@ # -# Copyright 2004,2005,2008 Free Software Foundation, Inc. -# +# Copyright 2004,2005,2008,2009 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. -# +# # -*- 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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -247,6 +247,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@ @@ -254,6 +255,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@ @@ -272,6 +277,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -281,20 +287,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@ @@ -317,6 +326,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@ @@ -378,6 +389,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@ @@ -390,17 +402,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@ @@ -416,7 +428,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@ @@ -468,6 +479,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@ @@ -498,6 +514,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@ @@ -519,6 +540,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@ @@ -601,26 +632,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@ @@ -651,7 +667,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@ @@ -661,23 +676,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 @@ -689,7 +707,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, @@ -697,10 +715,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@ @@ -716,18 +730,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@ @@ -742,15 +744,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 = @@ -785,6 +789,7 @@ ourpython_PYTHON = \ scopesink_nongl.py \ scopesink_gl.py \ scope_window.py \ + termsink.py \ waterfallsink2.py \ waterfallsink_nongl.py \ waterfallsink_gl.py \ diff --git a/gr-wxgui/src/python/plotter/Makefile.in b/gr-wxgui/src/python/plotter/Makefile.in index 1f4b457a..11b1b9b1 100644 --- a/gr-wxgui/src/python/plotter/Makefile.in +++ b/gr-wxgui/src/python/plotter/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -205,6 +205,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@ @@ -212,6 +213,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@ @@ -230,6 +235,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -239,20 +245,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@ @@ -275,6 +284,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@ @@ -336,6 +347,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@ @@ -348,17 +360,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@ @@ -374,7 +386,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@ @@ -426,6 +437,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@ @@ -456,6 +472,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@ @@ -477,6 +498,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@ @@ -559,26 +590,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@ @@ -609,7 +625,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@ @@ -619,23 +634,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 @@ -647,7 +665,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, @@ -655,10 +673,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@ @@ -674,18 +688,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@ @@ -700,15 +702,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 = diff --git a/grc/Makefile.in b/grc/Makefile.in index d9f36679..35d68a76 100644 --- a/grc/Makefile.in +++ b/grc/Makefile.in @@ -36,30 +36,9 @@ # Boston, MA 02110-1301, USA. # -# -# 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. -# - # -*- 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 # @@ -99,10 +78,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(dist_etc_DATA) $(ourpython_PYTHON) \ +DIST_COMMON = $(am__dist_etc_DATA_DIST) $(am__ourpython_PYTHON_DIST) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Makefile.common $(top_srcdir)/grc/Makefile.inc -@XDG_UTILS_TRUE@am__append_1 = freedesktop + $(top_srcdir)/Makefile.common +@PYTHON_TRUE@@XDG_UTILS_TRUE@am__append_1 = freedesktop subdir = grc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -116,36 +95,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 \ @@ -159,9 +141,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 \ @@ -193,6 +172,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__ourpython_PYTHON_DIST = __init__.py am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -216,6 +196,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(ourpythondir)" "$(DESTDIR)$(etcdir)" py_compile = $(top_srcdir)/py-compile +am__dist_etc_DATA_DIST = grc.conf DATA = $(dist_etc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -224,8 +205,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = base blocks examples grc_gnuradio gui python scripts \ - freedesktop +DIST_SUBDIRS = base blocks grc_gnuradio gui python scripts freedesktop DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -271,6 +251,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@ @@ -278,6 +259,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@ @@ -296,6 +281,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -305,20 +291,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@ @@ -341,6 +330,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@ @@ -402,6 +393,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@ @@ -414,17 +406,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@ @@ -440,7 +432,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@ @@ -492,6 +483,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@ @@ -522,6 +518,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@ @@ -543,6 +544,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@ @@ -625,26 +636,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@ @@ -675,7 +671,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@ @@ -685,23 +680,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 @@ -713,7 +711,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, @@ -721,10 +719,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@ @@ -740,18 +734,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@ @@ -766,40 +748,34 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -grc_src_prefix = $(pythondir)/gnuradio/grc -grc_blocksdir = $(pkgdatadir)/grc/blocks -SUBDIRS = base blocks examples grc_gnuradio gui python scripts \ - $(am__append_1) -ourpythondir = $(grc_src_prefix) -ourpython_PYTHON = __init__.py -etcdir = $(gr_sysconfdir) -dist_etc_DATA = grc.conf -EXTRA_DIST = \ - $(srcdir)/__init__.py.in \ - $(srcdir)/grc.conf.in - -BUILT_SOURCES = \ - __init__.py \ - grc.conf - +@PYTHON_TRUE@SUBDIRS = base blocks grc_gnuradio gui python scripts \ +@PYTHON_TRUE@ $(am__append_1) +@PYTHON_TRUE@ourpythondir = $(pkgpythondir)/grc +@PYTHON_TRUE@ourpython_PYTHON = __init__.py +@PYTHON_TRUE@etcdir = $(gr_prefsdir) +@PYTHON_TRUE@dist_etc_DATA = grc.conf +@PYTHON_TRUE@EXTRA_DIST = $(srcdir)/grc.conf.in +@PYTHON_TRUE@BUILT_SOURCES = grc.conf all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/grc/Makefile.inc $(top_srcdir)/Makefile.common $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1224,17 +1200,12 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; -__init__.py: $(srcdir)/__init__.py.in Makefile - sed \ - -e 's|@VERSION[@]|$(VERSION)|g' \ - $< > $@ - -grc.conf: $(srcdir)/grc.conf.in Makefile - sed \ - -e 's|@pythonw[@]|$(PYTHONW)|g' \ - -e 's|@blocksdir[@]|$(grc_blocksdir)|g' \ - -e 's|@docdir[@]|$(gr_docdir)|g' \ - $< > $@ +@PYTHON_TRUE@grc.conf: $(srcdir)/grc.conf.in Makefile +@PYTHON_TRUE@ sed \ +@PYTHON_TRUE@ -e 's|@pythonw[@]|$(PYTHONW)|g' \ +@PYTHON_TRUE@ -e 's|@blocksdir[@]|$(grc_blocksdir)|g' \ +@PYTHON_TRUE@ -e 's|@docdir[@]|$(gr_docdir)|g' \ +@PYTHON_TRUE@ $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/grc/base/Makefile.in b/grc/base/Makefile.in index 20119202..900d6b45 100644 --- a/grc/base/Makefile.in +++ b/grc/base/Makefile.in @@ -36,30 +36,9 @@ # Boston, MA 02110-1301, USA. # -# -# 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. -# - # -*- 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 # @@ -101,7 +80,7 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(dist_ourdata_DATA) $(ourpython_PYTHON) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Makefile.common $(top_srcdir)/grc/Makefile.inc + $(top_srcdir)/Makefile.common subdir = grc/base ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -115,36 +94,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 \ @@ -158,9 +140,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 \ @@ -230,6 +209,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@ @@ -237,6 +217,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@ @@ -255,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -264,20 +249,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@ @@ -300,6 +288,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@ @@ -361,6 +351,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@ @@ -373,17 +364,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@ @@ -399,7 +390,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@ @@ -451,6 +441,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@ @@ -481,6 +476,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@ @@ -502,6 +502,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@ @@ -584,26 +594,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@ @@ -634,7 +629,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@ @@ -644,23 +638,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 @@ -672,7 +669,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, @@ -680,10 +677,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@ @@ -699,18 +692,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@ @@ -725,22 +706,22 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -grc_src_prefix = $(pythondir)/gnuradio/grc -grc_blocksdir = $(pkgdatadir)/grc/blocks -ourpythondir = $(grc_src_prefix)/base +ourpythondir = $(pkgpythondir)/grc/base ourpython_PYTHON = \ odict.py \ ParseXML.py \ @@ -754,7 +735,7 @@ ourpython_PYTHON = \ Port.py \ __init__.py -ourdatadir = $(grc_src_prefix)/base +ourdatadir = $(pkgpythondir)/grc/base dist_ourdata_DATA = \ block_tree.dtd \ flow_graph.dtd @@ -762,7 +743,7 @@ dist_ourdata_DATA = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/grc/Makefile.inc $(top_srcdir)/Makefile.common $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ diff --git a/grc/blocks/Makefile.in b/grc/blocks/Makefile.in index a94af3be..66204eeb 100644 --- a/grc/blocks/Makefile.in +++ b/grc/blocks/Makefile.in @@ -36,30 +36,9 @@ # Boston, MA 02110-1301, USA. # -# -# 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. -# - # -*- 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 # @@ -100,8 +79,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(dist_ourdata_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common \ - $(top_srcdir)/grc/Makefile.inc + $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common subdir = grc/blocks ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -115,36 +93,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 \ @@ -158,9 +139,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 \ @@ -228,6 +206,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@ @@ -235,6 +214,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@ @@ -253,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -262,20 +246,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@ @@ -298,6 +285,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@ @@ -359,6 +348,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@ @@ -371,17 +361,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@ @@ -397,7 +387,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@ @@ -449,6 +438,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@ @@ -479,6 +473,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@ @@ -500,6 +499,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@ @@ -582,26 +591,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@ @@ -632,7 +626,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@ @@ -642,23 +635,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 @@ -670,7 +666,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, @@ -678,10 +674,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@ @@ -697,18 +689,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@ @@ -723,21 +703,21 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -grc_src_prefix = $(pythondir)/gnuradio/grc -grc_blocksdir = $(pkgdatadir)/grc/blocks ourdatadir = $(grc_blocksdir) dist_ourdata_DATA = \ block_tree.xml \ @@ -747,8 +727,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 \ @@ -762,6 +746,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 \ @@ -779,6 +764,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 \ @@ -798,10 +784,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 \ @@ -819,6 +805,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 \ @@ -840,6 +827,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 \ @@ -856,6 +845,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 \ @@ -878,6 +868,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 \ @@ -932,11 +923,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 @@ -944,7 +938,7 @@ dist_ourdata_DATA = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/grc/Makefile.inc $(top_srcdir)/Makefile.common $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ diff --git a/grc/freedesktop/Makefile.in b/grc/freedesktop/Makefile.in index 220c7164..d874918c 100644 --- a/grc/freedesktop/Makefile.in +++ b/grc/freedesktop/Makefile.in @@ -36,30 +36,9 @@ # Boston, MA 02110-1301, USA. # -# -# 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. -# - # -*- 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 # @@ -102,7 +81,7 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = README $(dist_bin_SCRIPTS) $(dist_ourdata_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Makefile.common $(top_srcdir)/grc/Makefile.inc + $(top_srcdir)/Makefile.common subdir = grc/freedesktop ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -116,36 +95,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 \ @@ -159,9 +141,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 \ @@ -230,6 +209,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@ @@ -237,6 +217,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@ @@ -255,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -264,20 +249,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@ @@ -300,6 +288,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@ @@ -361,6 +351,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@ @@ -373,17 +364,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@ @@ -399,7 +390,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@ @@ -451,6 +441,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@ @@ -481,6 +476,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@ @@ -502,6 +502,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@ @@ -584,26 +594,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@ @@ -634,7 +629,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@ @@ -644,23 +638,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 @@ -672,7 +669,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, @@ -680,10 +677,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@ @@ -699,18 +692,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@ @@ -725,21 +706,21 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -grc_src_prefix = $(pythondir)/gnuradio/grc -grc_blocksdir = $(pkgdatadir)/grc/blocks ourdatadir = $(pkgdatadir)/grc/freedesktop dist_ourdata_DATA = \ grc-icon-256.png \ @@ -759,7 +740,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/grc/Makefile.inc $(top_srcdir)/Makefile.common $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ diff --git a/grc/freedesktop/grc_setup_freedesktop b/grc/freedesktop/grc_setup_freedesktop deleted file mode 100644 index b3539cf8..00000000 --- a/grc/freedesktop/grc_setup_freedesktop +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -################################################## -# setup grc on a freedesktop platform -# $1 should be install or uninstall -# $2 is the optional path to the files -# when $2 is unspecified, the path is: -# /home/jcorgan/.local/share/gnuradio/grc/freedesktop -################################################## - -ICON_SIZES="32 48 64 128 256" -MENU_ITEMS="grc usrp2_probe usrp_probe" -if [ -n "$2" ]; then - SRCDIR="$2" -else - SRCDIR="/home/jcorgan/.local/share/gnuradio/grc/freedesktop" -fi - -case "$1" in -'install') - echo "Begin freedesktop install..." - for size in ${ICON_SIZES}; do \ - echo "Install icon: ${size}x${size}" - xdg-icon-resource install --context mimetypes --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context mimetypes --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context apps --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ - xdg-icon-resource install --context apps --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ - done - echo "Install mime type" - xdg-mime install ${SRCDIR}/gnuradio-grc.xml - echo "Install menu items" - for menu_item in ${MENU_ITEMS}; do \ - xdg-desktop-menu install ${SRCDIR}/gnuradio-${menu_item}.desktop; \ - done - echo "Done!" - echo "" - ;; -'uninstall') - echo "Begin freedesktop uninstall..." - for size in ${ICON_SIZES}; do \ - echo "Uninstall icon: ${size}x${size}" - xdg-icon-resource uninstall --context mimetypes --theme gnome --size ${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context mimetypes --size ${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context apps --theme gnome --size ${size} gnuradio-grc; \ - xdg-icon-resource uninstall --context apps --size ${size} gnuradio-grc; \ - done - echo "Uninstall mime type" - xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml - echo "Uninstall menu items" - for menu_item in ${MENU_ITEMS}; do \ - xdg-desktop-menu uninstall gnuradio-${menu_item}.desktop; \ - done - echo "Done!" - echo "" - ;; -*) - echo "Usage: $0 [install|uninstall]" - ;; -esac diff --git a/grc/grc.conf b/grc/grc.conf deleted file mode 100644 index 348e18e3..00000000 --- a/grc/grc.conf +++ /dev/null @@ -1,9 +0,0 @@ -# This file contains system wide configuration data for GNU Radio. -# You may override any setting on a per-user basis by editing -# ~/.gnuradio/config.conf - -[grc] -pythonw = python -doc_dir = /home/jcorgan/.local/share/doc/gnuradio-3.2.2 -global_blocks_path = /home/jcorgan/.local/share/gnuradio/grc/blocks -local_blocks_path = diff --git a/grc/grc_gnuradio/Makefile.in b/grc/grc_gnuradio/Makefile.in index 2e1b318f..57f5e325 100644 --- a/grc/grc_gnuradio/Makefile.in +++ b/grc/grc_gnuradio/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = diff --git a/grc/gui/Makefile.in b/grc/gui/Makefile.in index 95f9fafb..6c4650e2 100644 --- a/grc/gui/Makefile.in +++ b/grc/gui/Makefile.in @@ -36,30 +36,9 @@ # Boston, MA 02110-1301, USA. # -# -# 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. -# - # -*- 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 # @@ -99,8 +78,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(ourpython_PYTHON) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common \ - $(top_srcdir)/grc/Makefile.inc + $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common subdir = grc/gui ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -114,36 +92,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 \ @@ -157,9 +138,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 \ @@ -227,6 +205,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@ @@ -234,6 +213,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@ @@ -252,6 +235,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -261,20 +245,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@ @@ -297,6 +284,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@ @@ -358,6 +347,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@ @@ -370,17 +360,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@ @@ -396,7 +386,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@ @@ -448,6 +437,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@ @@ -478,6 +472,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@ @@ -499,6 +498,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@ @@ -581,26 +590,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@ @@ -631,7 +625,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@ @@ -641,23 +634,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 @@ -669,7 +665,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, @@ -677,10 +673,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@ @@ -696,18 +688,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@ @@ -722,22 +702,22 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -grc_src_prefix = $(pythondir)/gnuradio/grc -grc_blocksdir = $(pkgdatadir)/grc/blocks -ourpythondir = $(grc_src_prefix)/gui +ourpythondir = $(pkgpythondir)/grc/gui ourpython_PYTHON = \ Block.py \ Colors.py \ @@ -759,7 +739,7 @@ ourpython_PYTHON = \ MainWindow.py \ Messages.py \ NotebookPage.py \ - ParamsDialog.py \ + PropsDialog.py \ Preferences.py \ StateCache.py \ __init__.py @@ -767,7 +747,7 @@ ourpython_PYTHON = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/grc/Makefile.inc $(top_srcdir)/Makefile.common $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ diff --git a/grc/python/Makefile.in b/grc/python/Makefile.in index 6b2fe319..a913a5b4 100644 --- a/grc/python/Makefile.in +++ b/grc/python/Makefile.in @@ -36,30 +36,9 @@ # Boston, MA 02110-1301, USA. # -# -# 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. -# - # -*- 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 # @@ -101,7 +80,7 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(dist_ourdata_DATA) $(ourpython_PYTHON) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Makefile.common $(top_srcdir)/grc/Makefile.inc + $(top_srcdir)/Makefile.common subdir = grc/python ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -115,36 +94,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 \ @@ -158,9 +140,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 \ @@ -230,6 +209,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@ @@ -237,6 +217,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@ @@ -255,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -264,20 +249,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@ @@ -300,6 +288,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@ @@ -361,6 +351,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@ @@ -373,17 +364,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@ @@ -399,7 +390,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@ @@ -451,6 +441,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@ @@ -481,6 +476,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@ @@ -502,6 +502,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@ @@ -584,26 +594,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@ @@ -634,7 +629,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@ @@ -644,23 +638,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 @@ -672,7 +669,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, @@ -680,10 +677,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@ @@ -699,18 +692,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@ @@ -725,22 +706,22 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -grc_src_prefix = $(pythondir)/gnuradio/grc -grc_blocksdir = $(pkgdatadir)/grc/blocks -ourpythondir = $(grc_src_prefix)/python +ourpythondir = $(pkgpythondir)/grc/python ourpython_PYTHON = \ convert_hier.py \ expr_utils.py \ @@ -756,7 +737,7 @@ ourpython_PYTHON = \ Port.py \ __init__.py -ourdatadir = $(grc_src_prefix)/python +ourdatadir = $(pkgpythondir)/grc/python dist_ourdata_DATA = \ block.dtd \ default_flow_graph.grc \ @@ -765,7 +746,7 @@ dist_ourdata_DATA = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/grc/Makefile.inc $(top_srcdir)/Makefile.common $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ diff --git a/grc/scripts/Makefile.in b/grc/scripts/Makefile.in index a2258d2c..725bf3f2 100644 --- a/grc/scripts/Makefile.in +++ b/grc/scripts/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008, 2009, 2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -36,30 +36,9 @@ # Boston, MA 02110-1301, USA. # -# -# 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. -# - # -*- 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 # @@ -100,8 +79,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common \ - $(top_srcdir)/grc/Makefile.inc + $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common subdir = grc/scripts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -115,36 +93,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 \ @@ -158,9 +139,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 \ @@ -228,6 +206,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@ @@ -235,6 +214,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@ @@ -253,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -262,20 +246,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@ @@ -298,6 +285,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@ @@ -359,6 +348,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@ @@ -371,17 +361,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@ @@ -397,7 +387,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@ @@ -449,6 +438,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@ @@ -479,6 +473,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@ @@ -500,6 +499,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@ @@ -582,26 +591,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@ @@ -632,7 +626,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@ @@ -642,23 +635,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 @@ -670,7 +666,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, @@ -678,10 +674,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@ @@ -697,18 +689,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@ @@ -723,26 +703,26 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -grc_src_prefix = $(pythondir)/gnuradio/grc -grc_blocksdir = $(pkgdatadir)/grc/blocks dist_bin_SCRIPTS = gnuradio-companion usrp2_probe usrp_probe all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/grc/Makefile.inc $(top_srcdir)/Makefile.common $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ diff --git a/gruel/Makefile.in b/gruel/Makefile.in index 3422b02c..3b87d810 100644 --- a/gruel/Makefile.in +++ b/gruel/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -246,6 +246,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@ @@ -253,6 +254,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@ @@ -271,6 +276,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -280,20 +286,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@ @@ -316,6 +325,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@ @@ -377,6 +388,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@ @@ -389,17 +401,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@ @@ -415,7 +427,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@ @@ -467,6 +478,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@ @@ -497,6 +513,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@ @@ -518,6 +539,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@ @@ -600,26 +631,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@ @@ -650,7 +666,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@ @@ -660,23 +675,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 @@ -688,7 +706,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, @@ -696,10 +714,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@ @@ -715,18 +729,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@ @@ -741,15 +743,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 = diff --git a/gruel/src/Makefile.in b/gruel/src/Makefile.in index e3847085..80e37900 100644 --- a/gruel/src/Makefile.in +++ b/gruel/src/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -199,6 +199,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@ @@ -206,6 +207,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@ @@ -224,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +239,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@ @@ -269,6 +278,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@ @@ -330,6 +341,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@ @@ -342,17 +354,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@ @@ -368,7 +380,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@ @@ -420,6 +431,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@ @@ -450,6 +466,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@ @@ -471,6 +492,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@ @@ -553,26 +584,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@ @@ -603,14 +619,13 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -SUBDIRS = include lib +SUBDIRS = lib include scheme all: all-recursive .SUFFIXES: diff --git a/gruel/src/include/Makefile.in b/gruel/src/include/Makefile.in index 1e522d42..eb5da440 100644 --- a/gruel/src/include/Makefile.in +++ b/gruel/src/include/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -199,6 +199,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@ @@ -206,6 +207,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@ @@ -224,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +239,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@ @@ -269,6 +278,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@ @@ -330,6 +341,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@ @@ -342,17 +354,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@ @@ -368,7 +380,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@ @@ -420,6 +431,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@ @@ -450,6 +466,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@ @@ -471,6 +492,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@ @@ -553,26 +584,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@ @@ -603,7 +619,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@ diff --git a/gruel/src/include/gruel/Makefile.in b/gruel/src/include/gruel/Makefile.in index 7249f5e3..3f71711d 100644 --- a/gruel/src/include/gruel/Makefile.in +++ b/gruel/src/include/gruel/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -209,6 +209,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@ @@ -216,6 +217,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@ @@ -234,6 +239,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -243,20 +249,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@ @@ -279,6 +288,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@ @@ -340,6 +351,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@ @@ -352,17 +364,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@ @@ -378,7 +390,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@ @@ -430,6 +441,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@ @@ -460,6 +476,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@ @@ -481,6 +502,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@ @@ -563,26 +594,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@ @@ -613,7 +629,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@ @@ -623,23 +638,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 @@ -651,7 +669,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, @@ -659,10 +677,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@ @@ -678,18 +692,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@ @@ -704,15 +706,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 = @@ -723,10 +727,19 @@ BUILT_SOURCES = \ gruelincludedir = $(prefix)/include/gruel gruelinclude_HEADERS = \ $(BUILT_SOURCES) \ + msg_accepter.h \ + msg_accepter_msgq.h \ + msg_queue.h \ + msg_passing.h \ + pmt.h \ + pmt_pool.h \ + pmt_serial_tags.h \ + pmt_sugar.h \ realtime.h \ sys_pri.h \ thread_body_wrapper.h \ - thread_group.h + thread_group.h \ + thread.h all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/gruel/src/include/gruel/inet.h b/gruel/src/include/gruel/inet.h deleted file mode 100644 index 61a14683..00000000 --- a/gruel/src/include/gruel/inet.h +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2008 Free Software Foundation, Inc. - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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, see . - */ - -#ifndef INCLUDED_INET_H -#define INCLUDED_INET_H - -#if 1 /* GR_HAVE_ARPA_INET */ -#include -#elif 1 /* GR_HAVE_NETINET_IN */ -#include -#else -#include - -#if 0 /* GR_ARCH_BIGENDIAN */ -// Nothing to do... -static inline uint32_t htonl(uint32_t x){ return x; } -static inline uint16_t htons(uint16_t x){ return x; } -static inline uint32_t ntohl(uint32_t x){ return x; } -static inline uint16_t ntohs(uint16_t x){ return x; } -#else -#if 1 /* GR_HAVE_BYTESWAP */ -#include -#else -static inline uint16_t -bswap_16 (uint16_t x) -{ - return ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)); -} - -static inline uint32_t -bswap_32 (uint32_t x) -{ - return ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) \ - | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)); -} -#endif /* GR_HAVE_BYTESWAP */ - -static inline uint32_t htonl(uint32_t x){ return bswap_32(x); } -static inline uint16_t htons(uint16_t x){ return bswap_16(x); } -static inline uint32_t ntohl(uint32_t x){ return bswap_32(x); } -static inline uint16_t ntohs(uint16_t x){ return bswap_16(x); } -#endif /* GR_ARCH_BIGENDIAN */ - -#endif /* !(GR_HAVE_NETINET_IN || GR_HAVE_ARPA_INET) */ - -static inline uint8_t ntohx(uint8_t x){ return x; } -static inline uint16_t ntohx(uint16_t x){ return ntohs(x); } -static inline uint32_t ntohx(uint32_t x){ return ntohl(x); } -static inline uint8_t htonx(uint8_t x){ return x; } -static inline uint16_t htonx(uint16_t x){ return htons(x); } -static inline uint32_t htonx(uint32_t x){ return htonl(x); } - -#endif /* INCLUDED_INET_H */ diff --git a/gruel/src/lib/Makefile.in b/gruel/src/lib/Makefile.in index 76c200a9..84b2bd3c 100644 --- a/gruel/src/lib/Makefile.in +++ b/gruel/src/lib/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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,8 +79,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Makefile.common +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.common +TESTS = test_gruel$(EXEEXT) +noinst_PROGRAMS = test_gruel$(EXEEXT) subdir = gruel/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -94,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 \ @@ -137,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 \ @@ -186,13 +188,17 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -libgruel_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgruel_la_OBJECTS = realtime.lo sys_pri.lo thread_body_wrapper.lo \ - thread_group.lo +libgruel_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(PMT_LIB) $(MSG_LIB) +am_libgruel_la_OBJECTS = realtime.lo sys_pri.lo thread.lo \ + thread_body_wrapper.lo thread_group.lo libgruel_la_OBJECTS = $(am_libgruel_la_OBJECTS) libgruel_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(libgruel_la_LDFLAGS) $(LDFLAGS) -o $@ +PROGRAMS = $(noinst_PROGRAMS) +am_test_gruel_OBJECTS = test_gruel.$(OBJEXT) +test_gruel_OBJECTS = $(am_test_gruel_OBJECTS) +test_gruel_DEPENDENCIES = pmt/libpmt-qa.la libgruel.la DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -206,12 +212,51 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libgruel_la_SOURCES) -DIST_SOURCES = $(libgruel_la_SOURCES) -HEADERS = $(noinst_HEADERS) +SOURCES = $(libgruel_la_SOURCES) $(test_gruel_SOURCES) +DIST_SOURCES = $(libgruel_la_SOURCES) $(test_gruel_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ @@ -231,6 +276,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@ @@ -238,6 +284,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@ @@ -256,6 +306,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -265,20 +316,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@ @@ -301,6 +355,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@ @@ -362,6 +418,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@ @@ -374,17 +431,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@ @@ -400,7 +457,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@ @@ -452,6 +508,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@ @@ -482,6 +543,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@ @@ -503,6 +569,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@ @@ -585,26 +661,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@ @@ -635,7 +696,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@ @@ -645,23 +705,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 @@ -673,7 +736,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, @@ -681,10 +744,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@ @@ -700,18 +759,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@ @@ -726,37 +773,51 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(GRUEL_INCLUDES) $(WITH_INCLUDES) +SUBDIRS = pmt msg +AM_CPPFLAGS = $(DEFINES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(GRUEL_INCLUDES) $(WITH_INCLUDES) lib_LTLIBRARIES = libgruel.la # magic flags -libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) -version-info 0:0:0 +libgruel_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) $(LTVERSIONFLAGS) + +# ---------------------------------------------------------------- +PMT_LIB = pmt/libpmt.la +MSG_LIB = msg/libmsg.la # These are the source files that go into the gruel shared library libgruel_la_SOURCES = \ - realtime.cc \ - sys_pri.cc \ - thread_body_wrapper.cc \ + realtime.cc \ + sys_pri.cc \ + thread.cc \ + thread_body_wrapper.cc \ thread_group.cc libgruel_la_LIBADD = \ - $(BOOST_THREAD_LIB) + $(BOOST_THREAD_LIB) \ + $(PMT_LIB) \ + $(MSG_LIB) \ + -lstdc++ + -noinst_HEADERS = -all: all-am +# ---------------------------------------------------------------- +test_gruel_SOURCES = test_gruel.cc +test_gruel_LDADD = pmt/libpmt-qa.la libgruel.la +all: all-recursive .SUFFIXES: .SUFFIXES: .cc .lo .o .obj @@ -824,6 +885,18 @@ clean-libLTLIBRARIES: libgruel.la: $(libgruel_la_OBJECTS) $(libgruel_la_DEPENDENCIES) $(libgruel_la_LINK) -rpath $(libdir) $(libgruel_la_OBJECTS) $(libgruel_la_LIBADD) $(LIBS) +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +test_gruel$(EXEEXT): $(test_gruel_OBJECTS) $(test_gruel_DEPENDENCIES) + @rm -f test_gruel$(EXEEXT) + $(CXXLINK) $(test_gruel_OBJECTS) $(test_gruel_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -832,6 +905,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realtime.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sys_pri.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gruel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread_body_wrapper.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread_group.Plo@am__quote@ @@ -862,6 +937,76 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -872,10 +1017,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -894,7 +1052,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ fi; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -914,6 +1072,98 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + col=$$red; res=XPASS; \ + ;; \ + *) \ + col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + col=$$blu; res=SKIP; \ + fi; \ + echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + if test "$$failed" -eq 0; then \ + echo "$$grn$$dashes"; \ + else \ + echo "$$red$$dashes"; \ + fi; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ + else :; fi + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -944,25 +1194,55 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) -installdirs: + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-recursive +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) +installdirs: installdirs-recursive +installdirs-am: for dir in "$(DESTDIR)$(libdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -980,92 +1260,96 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am +clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am + clean-noinstPROGRAMS mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive html-am: -info: info-am +info: info-recursive info-am: install-data-am: -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive install-dvi-am: install-exec-am: install-libLTLIBRARIES -install-html: install-html-am +install-html: install-html-recursive install-html-am: -install-info: install-info-am +install-info: install-info-recursive install-info-am: install-man: -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive install-pdf-am: -install-ps: install-ps-am +install-ps: install-ps-recursive install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: uninstall-am: uninstall-libLTLIBRARIES -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags dist-hook distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ + ctags-recursive install-am install-strip tags-recursive + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-TESTS check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \ + ctags-recursive dist-hook distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + tags tags-recursive uninstall uninstall-am \ + uninstall-libLTLIBRARIES # Base directory for documentation (docdir undefined in autoconf < 1.60) diff --git a/usrp/Makefile.in b/usrp/Makefile.in index e63c2a58..4acbe4a1 100644 --- a/usrp/Makefile.in +++ b/usrp/Makefile.in @@ -71,36 +71,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 \ @@ -114,9 +117,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 \ @@ -224,6 +224,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@ @@ -231,6 +232,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@ @@ -249,6 +254,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -258,20 +264,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@ @@ -294,6 +303,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@ @@ -355,6 +366,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@ @@ -367,17 +379,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@ @@ -393,7 +405,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@ @@ -445,6 +456,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@ @@ -475,6 +491,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@ @@ -496,6 +517,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@ @@ -578,26 +609,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@ @@ -628,7 +644,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@ diff --git a/usrp/doc/Makefile.in b/usrp/doc/Makefile.in index ff55de25..ce10c042 100644 --- a/usrp/doc/Makefile.in +++ b/usrp/doc/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -247,6 +247,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@ @@ -254,6 +255,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@ @@ -272,6 +277,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -281,20 +287,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@ @@ -317,6 +326,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@ @@ -378,6 +389,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@ @@ -390,17 +402,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@ @@ -416,7 +428,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@ @@ -468,6 +479,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@ @@ -498,6 +514,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@ @@ -519,6 +540,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@ @@ -601,26 +632,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@ @@ -651,7 +667,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@ @@ -661,23 +676,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 @@ -689,7 +707,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, @@ -697,10 +715,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@ @@ -716,18 +730,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@ @@ -742,22 +744,24 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT SUBDIRS = other man3dir = $(mandir)/man3 -usrp_docdir = $(prefix)/share/doc/usrp-@VERSION@ +usrp_docdir = $(prefix)/share/doc/usrp-$(DOCVER) EXTRA_DIST = \ Doxyfile.in \ ddc.eps \ diff --git a/usrp/doc/other/Makefile.in b/usrp/doc/other/Makefile.in index 5bb59148..43072a20 100644 --- a/usrp/doc/other/Makefile.in +++ b/usrp/doc/other/Makefile.in @@ -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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -182,6 +182,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@ @@ -189,6 +190,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@ @@ -207,6 +212,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -216,20 +222,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@ @@ -252,6 +261,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@ @@ -313,6 +324,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@ @@ -325,17 +337,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@ @@ -351,7 +363,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@ @@ -403,6 +414,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@ @@ -433,6 +449,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@ @@ -454,6 +475,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@ @@ -536,26 +567,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@ @@ -586,7 +602,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@ @@ -596,23 +611,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 @@ -624,7 +642,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, @@ -632,10 +650,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@ @@ -651,18 +665,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@ @@ -677,15 +679,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 = diff --git a/usrp/firmware/Makefile.in b/usrp/firmware/Makefile.in index cc49aafa..81624a41 100644 --- a/usrp/firmware/Makefile.in +++ b/usrp/firmware/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -199,6 +199,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@ @@ -206,6 +207,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@ @@ -224,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +239,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@ @@ -269,6 +278,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@ @@ -330,6 +341,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@ @@ -342,17 +354,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@ @@ -368,7 +380,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@ @@ -420,6 +431,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@ @@ -450,6 +466,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@ @@ -471,6 +492,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@ @@ -553,26 +584,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@ @@ -603,7 +619,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@ diff --git a/usrp/firmware/include/Makefile.in b/usrp/firmware/include/Makefile.in index aaa6f427..15bff6a6 100644 --- a/usrp/firmware/include/Makefile.in +++ b/usrp/firmware/include/Makefile.in @@ -57,8 +57,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = usrp/firmware/include -DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(usrpinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ $(top_srcdir)/config/acx_pthread.m4 \ @@ -71,36 +71,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 \ @@ -114,9 +117,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,8 +162,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(includedir)" -HEADERS = $(include_HEADERS) $(noinst_HEADERS) +am__installdirs = "$(DESTDIR)$(usrpincludedir)" +HEADERS = $(noinst_HEADERS) $(usrpinclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -186,6 +186,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@ @@ -193,6 +194,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@ @@ -211,6 +216,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -220,20 +226,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@ @@ -256,6 +265,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@ @@ -317,6 +328,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@ @@ -329,17 +341,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@ @@ -355,7 +367,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@ @@ -407,6 +418,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@ @@ -437,6 +453,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@ @@ -458,6 +479,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@ @@ -540,26 +571,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@ @@ -590,14 +606,14 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -include_HEADERS = \ +usrpincludedir = $(includedir)/usrp +usrpinclude_HEADERS = \ usrp_i2c_addr.h \ usrp_spi_defs.h \ fpga_regs_common.h \ @@ -667,26 +683,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-includeHEADERS: $(include_HEADERS) +install-usrpincludeHEADERS: $(usrpinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + test -z "$(usrpincludedir)" || $(MKDIR_P) "$(DESTDIR)$(usrpincludedir)" + @list='$(usrpinclude_HEADERS)'; test -n "$(usrpincludedir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(usrpincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(usrpincludedir)" || exit $$?; \ done -uninstall-includeHEADERS: +uninstall-usrpincludeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + @list='$(usrpinclude_HEADERS)'; test -n "$(usrpincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(includedir)" && rm -f $$files + echo " ( cd '$(DESTDIR)$(usrpincludedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(usrpincludedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -774,7 +790,7 @@ check-am: all-am check: check-am all-am: Makefile $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(usrpincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -822,7 +838,7 @@ info: info-am info-am: -install-data-am: install-includeHEADERS +install-data-am: install-usrpincludeHEADERS install-dvi: install-dvi-am @@ -866,7 +882,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-includeHEADERS +uninstall-am: uninstall-usrpincludeHEADERS .MAKE: install-am install-strip @@ -875,13 +891,14 @@ uninstall-am: uninstall-includeHEADERS distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip \ + install-usrpincludeHEADERS installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS + ps ps-am tags uninstall uninstall-am \ + uninstall-usrpincludeHEADERS fpga_regs_common.v: fpga_regs_common.h generate_regs.py diff --git a/usrp/firmware/lib/Makefile.in b/usrp/firmware/lib/Makefile.in index 83519987..3f7bf05f 100644 --- a/usrp/firmware/lib/Makefile.in +++ b/usrp/firmware/lib/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -159,6 +159,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@ @@ -166,6 +167,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@ @@ -184,6 +189,7 @@ DEFINES = DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -193,20 +199,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@ @@ -236,6 +245,8 @@ LIBOBJS = \ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBUSB_PKG_CONFIG_NAME = @LIBUSB_PKG_CONFIG_NAME@ +LIBVER = @LIBVER@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -297,6 +308,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@ @@ -309,17 +321,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@ @@ -335,7 +347,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@ @@ -387,6 +398,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@ @@ -417,6 +433,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@ @@ -438,6 +459,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@ @@ -520,26 +551,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@ @@ -570,7 +586,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@ diff --git a/usrp/firmware/src/Makefile.in b/usrp/firmware/src/Makefile.in index cd7173bc..749671ed 100644 --- a/usrp/firmware/src/Makefile.in +++ b/usrp/firmware/src/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -199,6 +199,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@ @@ -206,6 +207,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@ @@ -224,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +239,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@ @@ -269,6 +278,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@ @@ -330,6 +341,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@ @@ -342,17 +354,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@ @@ -368,7 +380,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@ @@ -420,6 +431,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@ @@ -450,6 +466,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@ @@ -471,6 +492,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@ @@ -553,26 +584,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@ @@ -603,7 +619,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@ diff --git a/usrp/firmware/src/common/Makefile.in b/usrp/firmware/src/common/Makefile.in index c801c56a..b3f320c5 100644 --- a/usrp/firmware/src/common/Makefile.in +++ b/usrp/firmware/src/common/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -159,6 +159,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@ @@ -166,6 +167,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@ @@ -184,6 +189,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -193,20 +199,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@ @@ -229,6 +238,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@ @@ -290,6 +301,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@ @@ -302,17 +314,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@ @@ -328,7 +340,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@ @@ -380,6 +391,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@ @@ -410,6 +426,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@ @@ -431,6 +452,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@ @@ -513,26 +544,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@ @@ -563,7 +579,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@ diff --git a/usrp/firmware/src/usrp2/Makefile.in b/usrp/firmware/src/usrp2/Makefile.in index 5588ed72..44cb508e 100644 --- a/usrp/firmware/src/usrp2/Makefile.in +++ b/usrp/firmware/src/usrp2/Makefile.in @@ -71,36 +71,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 \ @@ -114,9 +117,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 \ @@ -186,6 +186,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@ @@ -193,6 +194,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@ @@ -211,6 +216,7 @@ DEFINES = -DHAVE_USRP2 DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -220,20 +226,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@ @@ -256,6 +265,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@ @@ -317,6 +328,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@ @@ -329,17 +341,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@ @@ -355,7 +367,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@ @@ -407,6 +418,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@ @@ -437,6 +453,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@ @@ -458,6 +479,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@ @@ -540,26 +571,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@ @@ -590,7 +606,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@ @@ -928,11 +943,11 @@ eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP) $(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS) burn-usrp2-eeprom: eeprom_boot.ihx - $(PYTHON) $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@ + $(PYTHON) $(srcdir)/../common/build_eeprom.py -p$(prefix) -r2 eeprom_boot.ihx > $@ chmod +x $@ burn-usrp4-eeprom: eeprom_boot.ihx - $(PYTHON) $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@ + $(PYTHON) $(srcdir)/../common/build_eeprom.py -p$(prefix) -r4 eeprom_boot.ihx > $@ chmod +x $@ blink_leds.ihx: $(BLINK_LEDS_OBJS) $(LIBDEP) diff --git a/usrp/firmware/src/usrp2/usrp_gpif.c b/usrp/firmware/src/usrp2/usrp_gpif.c deleted file mode 100644 index 1191c8b2..00000000 --- a/usrp/firmware/src/usrp2/usrp_gpif.c +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Machine generated by "edit-gpif". Do not edit by hand. - */ - -// This program configures the General Programmable Interface (GPIF) for FX2. -// Please do not modify sections of text which are marked as "DO NOT EDIT ...". -// -// DO NOT EDIT ... -// GPIF Initialization -// Interface Timing Async -// Internal Ready Init IntRdy=1 -// CTL Out Tristate-able Binary -// SingleWrite WF Select 1 -// SingleRead WF Select 0 -// FifoWrite WF Select 3 -// FifoRead WF Select 2 -// Data Bus Idle Drive Tristate -// END DO NOT EDIT - -// DO NOT EDIT ... -// GPIF Wave Names -// Wave 0 = singlerd -// Wave 1 = singlewr -// Wave 2 = FIFORd -// Wave 3 = FIFOWr - -// GPIF Ctrl Outputs Level -// CTL 0 = WEN# CMOS -// CTL 1 = REN# CMOS -// CTL 2 = OE# CMOS -// CTL 3 = CLRST CMOS -// CTL 4 = unused CMOS -// CTL 5 = BOGUS CMOS - -// GPIF Rdy Inputs -// RDY0 = EF# -// RDY1 = FF# -// RDY2 = unused -// RDY3 = unused -// RDY4 = unused -// RDY5 = TCXpire -// FIFOFlag = FIFOFlag -// IntReady = IntReady -// END DO NOT EDIT -// DO NOT EDIT ... -// -// GPIF Waveform 0: singlerd -// -// Interval 0 1 2 3 4 5 6 Idle (7) -// _________ _________ _________ _________ _________ _________ _________ _________ -// -// AddrMode Same Val Same Val Same Val Same Val Same Val Same Val Same Val -// DataMode NO Data NO Data NO Data NO Data NO Data NO Data NO Data -// NextData SameData SameData SameData SameData SameData SameData SameData -// Int Trig No Int No Int No Int No Int No Int No Int No Int -// IF/Wait Wait 1 Wait 1 Wait 1 Wait 1 Wait 1 Wait 1 Wait 1 -// Term A -// LFunc -// Term B -// Branch1 -// Branch0 -// Re-Exec -// Sngl/CRC Default Default Default Default Default Default Default -// WEN# 0 0 0 0 0 0 0 0 -// REN# 0 0 0 0 0 0 0 0 -// OE# 0 0 0 0 0 0 0 0 -// CLRST 0 0 0 0 0 0 0 0 -// unused 0 0 0 0 0 0 0 0 -// BOGUS 0 0 0 0 0 0 0 0 -// -// END DO NOT EDIT -// DO NOT EDIT ... -// -// GPIF Waveform 1: singlewr -// -// Interval 0 1 2 3 4 5 6 Idle (7) -// _________ _________ _________ _________ _________ _________ _________ _________ -// -// AddrMode Same Val Same Val Same Val Same Val Same Val Same Val Same Val -// DataMode Activate Activate Activate Activate Activate Activate Activate -// NextData SameData SameData SameData SameData SameData SameData SameData -// Int Trig No Int No Int No Int No Int No Int No Int No Int -// IF/Wait Wait 1 IF Wait 1 Wait 1 Wait 1 Wait 1 Wait 1 -// Term A EF# -// LFunc AND -// Term B EF# -// Branch1 ThenIdle -// Branch0 ElseIdle -// Re-Exec No -// Sngl/CRC Default Default Default Default Default Default Default -// WEN# 0 1 1 1 1 1 1 0 -// REN# 0 0 0 0 0 0 0 0 -// OE# 0 0 0 0 0 0 0 0 -// CLRST 0 0 0 0 0 0 0 0 -// unused 0 0 0 0 0 0 0 0 -// BOGUS 0 0 0 0 0 0 0 0 -// -// END DO NOT EDIT -// DO NOT EDIT ... -// -// GPIF Waveform 2: FIFORd -// -// Interval 0 1 2 3 4 5 6 Idle (7) -// _________ _________ _________ _________ _________ _________ _________ _________ -// -// AddrMode Same Val Same Val Same Val Same Val Same Val Same Val Same Val -// DataMode NO Data Activate NO Data NO Data NO Data NO Data NO Data -// NextData SameData SameData SameData SameData SameData SameData SameData -// Int Trig No Int No Int No Int No Int No Int No Int No Int -// IF/Wait Wait 1 IF Wait 1 IF Wait 1 Wait 1 Wait 1 -// Term A TCXpire TCXpire -// LFunc AND AND -// Term B TCXpire TCXpire -// Branch1 Then 2 ThenIdle -// Branch0 Else 1 ElseIdle -// Re-Exec No No -// Sngl/CRC Default Default Default Default Default Default Default -// WEN# 0 0 0 0 0 0 0 0 -// REN# 1 0 0 0 0 0 0 0 -// OE# 1 1 1 0 0 0 0 0 -// CLRST 0 0 0 0 0 0 0 0 -// unused 0 0 0 0 0 0 0 0 -// BOGUS 0 0 0 0 0 0 0 0 -// -// END DO NOT EDIT -// DO NOT EDIT ... -// -// GPIF Waveform 3: FIFOWr -// -// Interval 0 1 2 3 4 5 6 Idle (7) -// _________ _________ _________ _________ _________ _________ _________ _________ -// -// AddrMode Same Val Same Val Same Val Same Val Same Val Same Val Same Val -// DataMode NO Data Activate Activate Activate Activate Activate Activate -// NextData SameData SameData SameData SameData SameData SameData SameData -// Int Trig No Int No Int No Int No Int No Int No Int No Int -// IF/Wait Wait 1 IF Wait 1 Wait 1 Wait 1 Wait 1 Wait 1 -// Term A TCXpire -// LFunc AND -// Term B TCXpire -// Branch1 ThenIdle -// Branch0 Else 1 -// Re-Exec No -// Sngl/CRC Default Default Default Default Default Default Default -// WEN# 0 0 0 0 0 0 0 0 -// REN# 0 0 0 0 0 0 0 0 -// OE# 0 0 0 0 0 0 0 0 -// CLRST 0 0 0 0 0 0 0 0 -// unused 0 0 0 0 0 0 0 0 -// BOGUS 0 0 0 0 0 0 0 0 -// -// END DO NOT EDIT - -// GPIF Program Code - -// DO NOT EDIT ... -// #include "fx2.h" -// #include "fx2regs.h" -// #include "fx2sdly.h" // SYNCDELAY macro -// END DO NOT EDIT - -// DO NOT EDIT ... -const char WaveData[128] = -{ -// Wave 0 -/* LenBr */ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, -/* Opcode*/ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -/* Output*/ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -/* LFun */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, -// Wave 1 -/* LenBr */ 0x01, 0x3F, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, -/* Opcode*/ 0x22, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, -/* Output*/ 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, -/* LFun */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, -// Wave 2 -/* LenBr */ 0x01, 0x11, 0x01, 0x3F, 0x01, 0x01, 0x01, 0x07, -/* Opcode*/ 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, -/* Output*/ 0x06, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, -/* LFun */ 0x00, 0x2D, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x3F, -// Wave 3 -/* LenBr */ 0x01, 0x39, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, -/* Opcode*/ 0x00, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, -/* Output*/ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -/* LFun */ 0x00, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, -}; -// END DO NOT EDIT - -// DO NOT EDIT ... -const char FlowStates[36] = -{ -/* Wave 0 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -/* Wave 1 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -/* Wave 2 FlowStates */ 0x81,0x2D,0x26,0x00,0x04,0x04,0x03,0x02,0x00, -/* Wave 3 FlowStates */ 0x81,0x2D,0x21,0x00,0x04,0x04,0x03,0x02,0x00, -}; -// END DO NOT EDIT - -// DO NOT EDIT ... -const char InitData[7] = -{ -/* Regs */ 0xA0,0x00,0x00,0x00,0xEE,0x4E,0x00 -}; -// END DO NOT EDIT - -// TO DO: You may add additional code below. - diff --git a/usrp/fpga/Makefile.in b/usrp/fpga/Makefile.in index 865fd5b1..c30fb7b4 100644 --- a/usrp/fpga/Makefile.in +++ b/usrp/fpga/Makefile.in @@ -55,9 +55,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.extra \ - $(srcdir)/Makefile.in TODO subdir = usrp/fpga +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ $(top_srcdir)/config/acx_pthread.m4 \ @@ -70,36 +69,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 \ @@ -113,9 +115,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 \ @@ -200,6 +199,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@ @@ -207,6 +207,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@ @@ -225,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -234,20 +239,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@ @@ -270,6 +278,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@ @@ -331,6 +341,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@ @@ -343,17 +354,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@ @@ -369,7 +380,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@ @@ -421,6 +431,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@ @@ -451,6 +466,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@ @@ -472,6 +492,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@ @@ -554,26 +584,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@ @@ -604,7 +619,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@ @@ -612,192 +626,10 @@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ SUBDIRS = rbf -EXTRA_DIST = \ - gen_makefile_extra.py \ - inband_lib/chan_fifo_reader.v \ - inband_lib/channel_demux.v \ - inband_lib/channel_ram.v \ - inband_lib/cmd_reader.v \ - inband_lib/packet_builder.v \ - inband_lib/register_io.v \ - inband_lib/rx_buffer_inband.v \ - inband_lib/tx_buffer_inband.v \ - inband_lib/tx_packer.v \ - inband_lib/usb_packet_fifo.v \ - megacells/accum32.bsf \ - megacells/accum32.cmp \ - megacells/accum32.inc \ - megacells/accum32.v \ - megacells/accum32_bb.v \ - megacells/accum32_inst.v \ - megacells/add32.bsf \ - megacells/add32.cmp \ - megacells/add32.inc \ - megacells/add32.v \ - megacells/add32_bb.v \ - megacells/add32_inst.v \ - megacells/addsub16.bsf \ - megacells/addsub16.cmp \ - megacells/addsub16.inc \ - megacells/addsub16.v \ - megacells/addsub16_bb.v \ - megacells/addsub16_inst.v \ - megacells/bustri.bsf \ - megacells/bustri.cmp \ - megacells/bustri.inc \ - megacells/bustri.v \ - megacells/bustri_bb.v \ - megacells/bustri_inst.v \ - megacells/clk_doubler.v \ - megacells/clk_doubler_bb.v \ - megacells/dspclkpll.v \ - megacells/dspclkpll_bb.v \ - megacells/fifo_1kx16.bsf \ - megacells/fifo_1kx16.cmp \ - megacells/fifo_1kx16.inc \ - megacells/fifo_1kx16.v \ - megacells/fifo_1kx16_bb.v \ - megacells/fifo_1kx16_inst.v \ - megacells/fifo_2k.v \ - megacells/fifo_2k_bb.v \ - megacells/fifo_4k.v \ - megacells/fifo_4k_18.v \ - megacells/fifo_4k_bb.v \ - megacells/fifo_4kx16_dc.bsf \ - megacells/fifo_4kx16_dc.cmp \ - megacells/fifo_4kx16_dc.inc \ - megacells/fifo_4kx16_dc.v \ - megacells/fifo_4kx16_dc_bb.v \ - megacells/fifo_4kx16_dc_inst.v \ - megacells/mylpm_addsub.bsf \ - megacells/mylpm_addsub.cmp \ - megacells/mylpm_addsub.inc \ - megacells/mylpm_addsub.v \ - megacells/mylpm_addsub_bb.v \ - megacells/mylpm_addsub_inst.v \ - megacells/pll.v \ - megacells/pll_bb.v \ - megacells/pll_inst.v \ - megacells/sub32.bsf \ - megacells/sub32.cmp \ - megacells/sub32.inc \ - megacells/sub32.v \ - megacells/sub32_bb.v \ - megacells/sub32_inst.v \ - models/bustri.v \ - models/fifo.v \ - models/fifo_1c_1k.v \ - models/fifo_1c_2k.v \ - models/fifo_1c_4k.v \ - models/fifo_1k.v \ - models/fifo_2k.v \ - models/fifo_4k.v \ - models/fifo_4k_18.v \ - models/pll.v \ - models/ssram.v \ - sdr_lib/adc_interface.v \ - sdr_lib/atr_delay.v \ - sdr_lib/bidir_reg.v \ - sdr_lib/cic_dec_shifter.v \ - sdr_lib/cic_decim.v \ - sdr_lib/cic_int_shifter.v \ - sdr_lib/cic_interp.v \ - sdr_lib/clk_divider.v \ - sdr_lib/cordic.v \ - sdr_lib/cordic_stage.v \ - sdr_lib/ddc.v \ - sdr_lib/dpram.v \ - sdr_lib/duc.v \ - sdr_lib/ext_fifo.v \ - sdr_lib/gen_cordic_consts.py \ - sdr_lib/gen_sync.v \ - sdr_lib/hb/acc.v \ - sdr_lib/hb/coeff_rom.v \ - sdr_lib/hb/halfband_decim.v \ - sdr_lib/hb/halfband_interp.v \ - sdr_lib/hb/hbd_tb/test_hbd.v \ - sdr_lib/hb/mac.v \ - sdr_lib/hb/mult.v \ - sdr_lib/hb/ram16_2port.v \ - sdr_lib/hb/ram16_2sum.v \ - sdr_lib/hb/ram32_2sum.v \ - sdr_lib/io_pins.v \ - sdr_lib/master_control.v \ - sdr_lib/master_control_multi.v \ - sdr_lib/phase_acc.v \ - sdr_lib/ram.v \ - sdr_lib/ram16.v \ - sdr_lib/ram32.v \ - sdr_lib/ram64.v \ - sdr_lib/rssi.v \ - sdr_lib/rx_buffer.v \ - sdr_lib/rx_chain.v \ - sdr_lib/rx_chain_dual.v \ - sdr_lib/rx_dcoffset.v \ - sdr_lib/serial_io.v \ - sdr_lib/setting_reg.v \ - sdr_lib/setting_reg_masked.v \ - sdr_lib/sign_extend.v \ - sdr_lib/strobe_gen.v \ - sdr_lib/tx_buffer.v \ - sdr_lib/tx_chain.v \ - sdr_lib/tx_chain_hb.v \ - tb/cbus_tb.v \ - tb/cordic_tb.v \ - tb/decim_tb.v \ - tb/fullchip_tb.v \ - tb/interp_tb.v \ - tb/justinterp_tb.v \ - tb/usrp_tasks.v \ - toplevel/include/common_config_1rxhb_1tx.vh \ - toplevel/include/common_config_2rx_0tx.vh \ - toplevel/include/common_config_2rxhb_0tx.vh \ - toplevel/include/common_config_2rxhb_2tx.vh \ - toplevel/include/common_config_4rx_0tx.vh \ - toplevel/include/common_config_bottom.vh \ - toplevel/mrfm/biquad_2stage.v \ - toplevel/mrfm/biquad_6stage.v \ - toplevel/mrfm/mrfm.csf \ - toplevel/mrfm/mrfm.esf \ - toplevel/mrfm/mrfm.psf \ - toplevel/mrfm/mrfm.py \ - toplevel/mrfm/mrfm.qpf \ - toplevel/mrfm/mrfm.qsf \ - toplevel/mrfm/mrfm.v \ - toplevel/mrfm/mrfm.vh \ - toplevel/mrfm/mrfm_compensator.v \ - toplevel/mrfm/mrfm_fft.py \ - toplevel/mrfm/mrfm_proc.v \ - toplevel/mrfm/shifter.v \ - toplevel/sizetest/sizetest.csf \ - toplevel/sizetest/sizetest.psf \ - toplevel/sizetest/sizetest.v \ - toplevel/usrp_inband_usb/config.vh \ - toplevel/usrp_inband_usb/usrp_inband_usb.csf \ - toplevel/usrp_inband_usb/usrp_inband_usb.esf \ - toplevel/usrp_inband_usb/usrp_inband_usb.psf \ - toplevel/usrp_inband_usb/usrp_inband_usb.qpf \ - toplevel/usrp_inband_usb/usrp_inband_usb.qsf \ - toplevel/usrp_inband_usb/usrp_inband_usb.v \ - toplevel/usrp_multi/config.vh \ - toplevel/usrp_multi/usrp_multi.csf \ - toplevel/usrp_multi/usrp_multi.esf \ - toplevel/usrp_multi/usrp_multi.psf \ - toplevel/usrp_multi/usrp_multi.qpf \ - toplevel/usrp_multi/usrp_multi.qsf \ - toplevel/usrp_multi/usrp_multi.v \ - toplevel/usrp_std/config.vh \ - toplevel/usrp_std/usrp_std.csf \ - toplevel/usrp_std/usrp_std.esf \ - toplevel/usrp_std/usrp_std.psf \ - toplevel/usrp_std/usrp_std.qpf \ - toplevel/usrp_std/usrp_std.qsf \ - toplevel/usrp_std/usrp_std.v - all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.extra $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ diff --git a/usrp/fpga/rbf/Makefile.in b/usrp/fpga/rbf/Makefile.in index 4c86acfb..05a94122 100644 --- a/usrp/fpga/rbf/Makefile.in +++ b/usrp/fpga/rbf/Makefile.in @@ -69,36 +69,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 \ @@ -112,9 +115,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 \ @@ -199,6 +199,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@ @@ -206,6 +207,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@ @@ -224,6 +229,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +239,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@ @@ -269,6 +278,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@ @@ -330,6 +341,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@ @@ -342,17 +354,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@ @@ -368,7 +380,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@ @@ -420,6 +431,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@ @@ -450,6 +466,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@ @@ -471,6 +492,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@ @@ -553,26 +584,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@ @@ -603,7 +619,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@ diff --git a/usrp/fpga/rbf/rev2/Makefile.in b/usrp/fpga/rbf/rev2/Makefile.in index 71b62ee9..24fa9676 100644 --- a/usrp/fpga/rbf/rev2/Makefile.in +++ b/usrp/fpga/rbf/rev2/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/usrp/fpga/rbf/rev4/Makefile.in b/usrp/fpga/rbf/rev4/Makefile.in index 0630db87..312a3176 100644 --- a/usrp/fpga/rbf/rev4/Makefile.in +++ b/usrp/fpga/rbf/rev4/Makefile.in @@ -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 # @@ -93,36 +93,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 \ @@ -136,9 +139,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 \ @@ -206,6 +206,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@ @@ -213,6 +214,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@ @@ -231,6 +236,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -240,20 +246,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@ @@ -276,6 +285,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@ @@ -337,6 +348,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@ @@ -349,17 +361,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@ @@ -375,7 +387,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@ @@ -427,6 +438,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@ @@ -457,6 +473,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@ @@ -478,6 +499,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@ @@ -560,26 +591,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@ @@ -610,7 +626,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@ @@ -620,23 +635,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 @@ -648,7 +666,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, @@ -656,10 +674,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@ @@ -675,18 +689,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@ @@ -701,15 +703,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 = diff --git a/usrp/host/Makefile.in b/usrp/host/Makefile.in index 14f16841..8552e56e 100644 --- a/usrp/host/Makefile.in +++ b/usrp/host/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2001,2007 Free Software Foundation, Inc. +# Copyright 2001,2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -55,6 +55,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@PYTHON_TRUE@am__append_1 = swig subdir = usrp/host DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -69,36 +70,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 \ @@ -112,9 +116,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 \ @@ -153,7 +154,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = misc lib include apps swig DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -199,6 +200,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@ @@ -206,6 +208,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@ @@ -224,6 +230,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -233,20 +240,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@ @@ -269,6 +279,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@ @@ -330,6 +342,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@ @@ -342,17 +355,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@ @@ -368,7 +381,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@ @@ -420,6 +432,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@ @@ -450,6 +467,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@ @@ -471,6 +493,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@ @@ -553,26 +585,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@ @@ -603,14 +620,13 @@ 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@ with_SWIGDIRPATH = @with_SWIGDIRPATH@ with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ with_dirs = @with_dirs@ -SUBDIRS = misc lib swig apps +SUBDIRS = misc lib include apps $(am__append_1) all: all-recursive .SUFFIXES: diff --git a/usrp/host/apps/Makefile.in b/usrp/host/apps/Makefile.in index 913e01e1..be9e8dae 100644 --- a/usrp/host/apps/Makefile.in +++ b/usrp/host/apps/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2003,2006,2008 Free Software Foundation, Inc. +# Copyright 2003,2006,2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -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 # @@ -97,36 +97,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 \ @@ -140,9 +143,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 \ @@ -240,6 +240,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@ @@ -247,6 +248,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@ @@ -265,6 +270,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -274,20 +280,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@ @@ -310,6 +319,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@ @@ -371,6 +382,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@ @@ -383,17 +395,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@ @@ -409,7 +421,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@ @@ -461,6 +472,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@ @@ -491,6 +507,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@ @@ -512,6 +533,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@ @@ -594,26 +625,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@ @@ -644,7 +660,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@ @@ -654,23 +669,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 @@ -682,7 +700,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, @@ -690,10 +708,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@ @@ -709,18 +723,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@ @@ -735,21 +737,23 @@ 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 = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \ - $(WITH_INCLUDES) + $(USB_INCLUDES) $(WITH_INCLUDES) noinst_HEADERS = \ time_stuff.h diff --git a/usrp/host/lib/Makefile.in b/usrp/host/lib/Makefile.in index 1bb3459c..9432feb5 100644 --- a/usrp/host/lib/Makefile.in +++ b/usrp/host/lib/Makefile.in @@ -17,27 +17,49 @@ # # USRP - Universal Software Radio Peripheral -# -# Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc. -# +# +# Copyright (C) 2003,2004,2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# # This program 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 of the License, or # (at your option) any later version. -# +# # This program 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, Boston, MA 02110-1301 USA +# + +# -*- Makefile -*- +# +# Copyright 2004,2006,2007,2008,2009,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. # # -*- Makefile -*- # -# Copyright 2004,2006,2007,2008,2009 Free Software Foundation, Inc. +# Copyright 2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -56,6 +78,8 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. # + + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -76,8 +100,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Makefile.common +DIST_COMMON = $(am__noinst_PYTHON_DIST) $(am__usrppython_PYTHON_DIST) \ + $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/std_paths.h.in $(top_srcdir)/Makefile.common \ + $(top_srcdir)/Makefile.par.gen subdir = usrp/host/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \ @@ -91,36 +117,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 \ @@ -134,9 +163,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 \ @@ -157,51 +183,119 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = std_paths.h CONFIG_CLEAN_VPATH_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(usrppythondir)" +LTLIBRARIES = $(lib_LTLIBRARIES) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + ../misc/libmisc.la +@FUSB_TECH_darwin_FALSE@libusrp_la_DEPENDENCIES = \ +@FUSB_TECH_darwin_FALSE@ $(am__DEPENDENCIES_2) +@FUSB_TECH_darwin_TRUE@libusrp_la_DEPENDENCIES = \ +@FUSB_TECH_darwin_TRUE@ $(am__DEPENDENCIES_2) \ +@FUSB_TECH_darwin_TRUE@ $(am__DEPENDENCIES_1) +am__libusrp_la_SOURCES_DIST = fusb.cc md5.c usrp_basic.cc \ + usrp_config.cc usrp_dbid.cc usrp_local_sighandler.cc \ + usrp_prims_common.cc usrp_standard.cc db_wbxng_adf4350.cc \ + db_wbxng_adf4350_regs.cc db_boards.cc db_base.cc db_basic.cc \ + db_bitshark_rx.cc db_tv_rx.cc db_tv_rx_mimo.cc db_flexrf.cc \ + db_flexrf_mimo.cc db_dbs_rx.cc db_wbxng.cc db_xcvr2450.cc \ + db_dtt754.cc db_dtt768.cc db_util.cc fusb_darwin.cc \ + fusb_sysconfig_darwin.cc README_OSX circular_buffer.h \ + circular_linked_list.h darwin_libusb.h usrp_prims_libusb0.cc \ + fusb_generic.cc fusb_sysconfig_generic.cc fusb_libusb1.cc \ + fusb_sysconfig_libusb1.cc usrp_prims_libusb1.cc fusb_linux.cc \ + fusb_sysconfig_linux.cc fusb_ra_wb.cc fusb_sysconfig_ra_wb.cc \ + fusb_win32.cc fusb_sysconfig_win32.cc +am__objects_1 = fusb.lo md5.lo usrp_basic.lo usrp_config.lo \ + usrp_dbid.lo usrp_local_sighandler.lo usrp_prims_common.lo \ + usrp_standard.lo db_wbxng_adf4350.lo db_wbxng_adf4350_regs.lo \ + db_boards.lo db_base.lo db_basic.lo db_bitshark_rx.lo \ + db_tv_rx.lo db_tv_rx_mimo.lo db_flexrf.lo db_flexrf_mimo.lo \ + db_dbs_rx.lo db_wbxng.lo db_xcvr2450.lo db_dtt754.lo \ + db_dtt768.lo db_util.lo +am__objects_2 = fusb_darwin.lo fusb_sysconfig_darwin.lo \ + usrp_prims_libusb0.lo +am__objects_3 = fusb_generic.lo fusb_sysconfig_generic.lo \ + usrp_prims_libusb0.lo +am__objects_4 = fusb_libusb1.lo fusb_sysconfig_libusb1.lo \ + usrp_prims_libusb1.lo +am__objects_5 = fusb_linux.lo fusb_sysconfig_linux.lo \ + usrp_prims_libusb0.lo +am__objects_6 = fusb_ra_wb.lo fusb_sysconfig_ra_wb.lo \ + usrp_prims_libusb0.lo +am__objects_7 = fusb_win32.lo fusb_sysconfig_win32.lo \ + usrp_prims_libusb0.lo +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_FALSE@@FUSB_TECH_libusb1_FALSE@@FUSB_TECH_linux_FALSE@@FUSB_TECH_ra_wb_FALSE@@FUSB_TECH_win32_TRUE@am_libusrp_la_OBJECTS = $(am__objects_1) \ +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_FALSE@@FUSB_TECH_libusb1_FALSE@@FUSB_TECH_linux_FALSE@@FUSB_TECH_ra_wb_FALSE@@FUSB_TECH_win32_TRUE@ $(am__objects_7) +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_FALSE@@FUSB_TECH_libusb1_FALSE@@FUSB_TECH_linux_FALSE@@FUSB_TECH_ra_wb_TRUE@am_libusrp_la_OBJECTS = $(am__objects_1) \ +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_FALSE@@FUSB_TECH_libusb1_FALSE@@FUSB_TECH_linux_FALSE@@FUSB_TECH_ra_wb_TRUE@ $(am__objects_6) +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_FALSE@@FUSB_TECH_libusb1_FALSE@@FUSB_TECH_linux_TRUE@am_libusrp_la_OBJECTS = $(am__objects_1) \ +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_FALSE@@FUSB_TECH_libusb1_FALSE@@FUSB_TECH_linux_TRUE@ $(am__objects_5) +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_FALSE@@FUSB_TECH_libusb1_TRUE@am_libusrp_la_OBJECTS = $(am__objects_1) \ +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_FALSE@@FUSB_TECH_libusb1_TRUE@ $(am__objects_4) +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_TRUE@am_libusrp_la_OBJECTS = $(am__objects_1) \ +@FUSB_TECH_darwin_FALSE@@FUSB_TECH_generic_TRUE@ $(am__objects_3) +@FUSB_TECH_darwin_TRUE@am_libusrp_la_OBJECTS = $(am__objects_1) \ +@FUSB_TECH_darwin_TRUE@ $(am__objects_2) +libusrp_la_OBJECTS = $(am_libusrp_la_OBJECTS) +libusrp_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libusrp_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libusrp_la_SOURCES) $(EXTRA_libusrp_la_SOURCES) +DIST_SOURCES = $(am__libusrp_la_SOURCES_DIST) \ + $(EXTRA_libusrp_la_SOURCES) +am__noinst_PYTHON_DIST = gen_usrp_dbid.py check_data.py dump_data.py +am__usrppython_PYTHON_DIST = usrp_dbid.py +py_compile = $(top_srcdir)/py-compile +HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALSA_CFLAGS = @ALSA_CFLAGS@ @@ -221,6 +315,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@ @@ -228,6 +323,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@ @@ -246,6 +345,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +355,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@ @@ -291,6 +394,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@ @@ -352,6 +457,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@ @@ -364,17 +470,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@ @@ -390,7 +496,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@ @@ -442,6 +547,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@ @@ -472,6 +582,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@ @@ -493,6 +608,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@ @@ -575,26 +700,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@ @@ -625,7 +735,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@ @@ -635,23 +744,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 @@ -663,7 +775,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, @@ -671,10 +783,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@ @@ -690,18 +798,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@ @@ -716,24 +812,167 @@ 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 = -MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT -SUBDIRS = legacy -all: all-recursive +STAMPS = $(DEPDIR)/stamp-sources-generate* +MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \ + *.loT stamp-sources-generate +common_INCLUDES = $(USRP_INCLUDES) $(USB_INCLUDES) +lib_LTLIBRARIES = libusrp.la +libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) $(BOOST_LDFLAGS) +libusrp_la_common_LIBADD = \ + $(USB_LIBS) \ + $(BOOST_THREAD_LIB) \ + ../misc/libmisc.la + +@FUSB_TECH_darwin_FALSE@AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) + +# darwin fusb requires gruel (for threading) +@FUSB_TECH_darwin_TRUE@AM_CPPFLAGS = $(common_INCLUDES) $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) +@FUSB_TECH_darwin_FALSE@libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) +@FUSB_TECH_darwin_TRUE@libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(GRUEL_LA) +@FUSB_TECH_darwin_FALSE@libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) +@FUSB_TECH_darwin_TRUE@libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation +EXTRA_DIST = std_paths.h.in usrp_dbid.dat stamp-sources-generate +BUILT_SOURCES = \ + $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h \ + usrp_dbid.cc usrp_dbid.py + +# ---------------------------------------------------------------- +# FUSB_TECH is set at configure time by way of +# usrp/config/usrp_fusb_tech.m4. +# It indicates which fast usb strategy we should be building. +# We currently implement "generic", "darwin", "win32" and "linux" +generic_CODE = \ + fusb_generic.cc \ + fusb_sysconfig_generic.cc \ + usrp_prims_libusb0.cc + +darwin_CODE = \ + fusb_darwin.cc \ + fusb_sysconfig_darwin.cc \ + README_OSX \ + circular_buffer.h \ + circular_linked_list.h \ + darwin_libusb.h \ + usrp_prims_libusb0.cc + +win32_CODE = \ + fusb_win32.cc \ + fusb_sysconfig_win32.cc \ + usrp_prims_libusb0.cc + +linux_CODE = \ + fusb_linux.cc \ + fusb_sysconfig_linux.cc \ + usrp_prims_libusb0.cc + +ra_wb_CODE = \ + fusb_ra_wb.cc \ + fusb_sysconfig_ra_wb.cc \ + usrp_prims_libusb0.cc + +libusb1_CODE = \ + fusb_libusb1.cc \ + fusb_sysconfig_libusb1.cc \ + usrp_prims_libusb1.cc + + +# +# include each _CODE entry here... +# +EXTRA_libusrp_la_SOURCES = \ + $(generic_CODE) \ + $(darwin_CODE) \ + $(win32_CODE) \ + $(linux_CODE) \ + $(ra_wb_CODE) \ + $(libusb1_CODE) + + +# work around automake deficiency +libusrp_la_common_SOURCES = \ + fusb.cc \ + md5.c \ + usrp_basic.cc \ + usrp_config.cc \ + usrp_dbid.cc \ + usrp_local_sighandler.cc \ + usrp_prims_common.cc \ + usrp_standard.cc \ + db_wbxng_adf4350.cc \ + db_wbxng_adf4350_regs.cc \ + db_boards.cc \ + db_base.cc \ + db_basic.cc \ + db_bitshark_rx.cc \ + db_tv_rx.cc \ + db_tv_rx_mimo.cc \ + db_flexrf.cc \ + db_flexrf_mimo.cc \ + db_dbs_rx.cc \ + db_wbxng.cc \ + db_xcvr2450.cc \ + db_dtt754.cc \ + db_dtt768.cc \ + db_util.cc + +@FUSB_TECH_darwin_TRUE@libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(darwin_CODE) +@FUSB_TECH_generic_TRUE@libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE) +@FUSB_TECH_libusb1_TRUE@libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(libusb1_CODE) +@FUSB_TECH_linux_TRUE@libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(linux_CODE) +@FUSB_TECH_ra_wb_TRUE@libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE) +@FUSB_TECH_win32_TRUE@libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(win32_CODE) +noinst_HEADERS = \ + ad9862.h \ + db_base_impl.h \ + db_boards.h \ + db_util.h \ + db_wbxng_adf4350.h \ + db_wbxng_adf4350_regs.h \ + fusb.h \ + fusb_darwin.h \ + fusb_generic.h \ + fusb_linux.h \ + fusb_libusb1.h \ + fusb_ra_wb.h \ + fusb_win32.h \ + md5.h \ + rate_to_regval.h \ + usrp_config.h \ + usrp_primsi.h + +@PYTHON_TRUE@usrppython_PYTHON = \ +@PYTHON_TRUE@ usrp_dbid.py + +@PYTHON_TRUE@noinst_PYTHON = \ +@PYTHON_TRUE@ gen_usrp_dbid.py \ +@PYTHON_TRUE@ check_data.py \ +@PYTHON_TRUE@ dump_data.py + + +# common way for generating sources from templates when using +# BUILT_SOURCES, using parallel build protection. +gen_sources = $(BUILT_SOURCES) +gen_sources_deps = gen_usrp_dbid.py usrp_dbid.dat +par_gen_command = PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) +.SUFFIXES: .c .cc .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.par.gen $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -763,82 +1002,172 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +std_paths.h: $(top_builddir)/config.status $(srcdir)/std_paths.h.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libusrp.la: $(libusrp_la_OBJECTS) $(libusrp_la_DEPENDENCIES) + $(libusrp_la_LINK) -rpath $(libdir) $(libusrp_la_OBJECTS) $(libusrp_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_base.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_basic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_bitshark_rx.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_boards.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_dbs_rx.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_dtt754.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_dtt768.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_flexrf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_flexrf_mimo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_tv_rx.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_tv_rx_mimo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_wbxng.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_wbxng_adf4350.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_wbxng_adf4350_regs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_xcvr2450.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_darwin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_generic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_libusb1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_linux.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_ra_wb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_sysconfig_darwin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_sysconfig_generic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_sysconfig_libusb1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_sysconfig_linux.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_sysconfig_ra_wb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_sysconfig_win32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fusb_win32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_basic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_config.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_dbid.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_local_sighandler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_prims_common.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_prims_libusb0.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_prims_libusb1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_standard.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +.cc.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ +install-usrppythonPYTHON: $(usrppython_PYTHON) + @$(NORMAL_INSTALL) + test -z "$(usrppythondir)" || $(MKDIR_P) "$(DESTDIR)$(usrppythondir)" + @list='$(usrppython_PYTHON)'; dlist=; list2=; test -n "$(usrppythondir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ + if test -f $$b$$p; then \ + $(am__strip_dir) \ + dlist="$$dlist $$f"; \ + list2="$$list2 $$b$$p"; \ + else :; fi; \ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ + for file in $$list2; do echo $$file; done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(usrppythondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(usrppythondir)" || exit $$?; \ + done || exit $$?; \ + if test -n "$$dlist"; then \ + if test -z "$(DESTDIR)"; then \ + PYTHON=$(PYTHON) $(py_compile) --basedir "$(usrppythondir)" $$dlist; \ else \ - local_target="$$target"; \ + PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(usrppythondir)" $$dlist; \ fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done + else :; fi + +uninstall-usrppythonPYTHON: + @$(NORMAL_UNINSTALL) + @list='$(usrppython_PYTHON)'; test -n "$(usrppythondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + filesc=`echo "$$files" | sed 's|$$|c|'`; \ + fileso=`echo "$$files" | sed 's|$$|o|'`; \ + echo " ( cd '$(DESTDIR)$(usrppythondir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(usrppythondir)" && rm -f $$files || exit $$?; \ + echo " ( cd '$(DESTDIR)$(usrppythondir)' && rm -f" $$filesc ")"; \ + cd "$(DESTDIR)$(usrppythondir)" && rm -f $$filesc || exit $$?; \ + echo " ( cd '$(DESTDIR)$(usrppythondir)' && rm -f" $$fileso ")"; \ + cd "$(DESTDIR)$(usrppythondir)" && rm -f $$fileso ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -850,23 +1179,10 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -885,7 +1201,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ fi; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -935,51 +1251,27 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(usrppythondir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-recursive +installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -997,88 +1289,95 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-am -clean-am: clean-generic clean-libtool mostlyclean-am +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am -distclean: distclean-recursive +distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags -dvi: dvi-recursive +dvi: dvi-am dvi-am: -html: html-recursive +html: html-am html-am: -info: info-recursive +info: info-am info-am: -install-data-am: +install-data-am: install-usrppythonPYTHON -install-dvi: install-dvi-recursive +install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-libLTLIBRARIES -install-html: install-html-recursive +install-html: install-html-am install-html-am: -install-info: install-info-recursive +install-info: install-info-am install-info-am: install-man: -install-pdf: install-pdf-recursive +install-pdf: install-pdf-am install-pdf-am: -install-ps: install-ps-recursive +install-ps: install-ps-am install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-recursive +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-recursive +mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic mostlyclean-libtool +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool -pdf: pdf-recursive +pdf: pdf-am pdf-am: -ps: ps-recursive +ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-libLTLIBRARIES uninstall-usrppythonPYTHON -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: all check install install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive dist-hook distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip \ + install-usrppythonPYTHON installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-libLTLIBRARIES \ + uninstall-usrppythonPYTHON # Base directory for documentation (docdir undefined in autoconf < 1.60) @@ -1091,6 +1390,29 @@ dist-hook: $(RM) $(distdir)/$$file; \ done; +STAMPS ?= +EXTRA_DIST ?= +MOSTLYCLEANFILES ?= + +stamp-sources-generate: $(gen_sources_deps) + @rm -f $(DEPDIR)/stamp-sources-generate-tmp + @touch $(DEPDIR)/stamp-sources-generate-tmp + $(par_gen_command) + @mv -f $(DEPDIR)/stamp-sources-generate-tmp $@ + +$(gen_sources): stamp-sources-generate + @if test -f $@; then :; else \ + trap 'rm -rf $(DEPDIR)/stamp-sources-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/stamp-sources-generate-lock 2>/dev/null; then \ + rm -f stamp-sources-generate; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-sources-generate; \ + rmdir $(DEPDIR)/stamp-sources-generate-lock; \ + else \ + while test -d $(DEPDIR)/stamp-sources-generate-lock; do sleep 1; done; \ + test -f stamp-sources-generate; exit $$?; \ + fi; \ + fi; + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/usrp/host/misc/Makefile.in b/usrp/host/misc/Makefile.in index 387c00cb..62cdaae9 100644 --- a/usrp/host/misc/Makefile.in +++ b/usrp/host/misc/Makefile.in @@ -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 # @@ -94,36 +94,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 \ @@ -137,9 +140,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 \ @@ -212,6 +212,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@ @@ -219,6 +220,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@ @@ -237,6 +242,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -246,20 +252,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@ @@ -282,6 +291,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@ @@ -343,6 +354,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@ @@ -355,17 +367,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@ @@ -381,7 +393,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@ @@ -433,6 +444,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@ @@ -463,6 +479,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@ @@ -484,6 +505,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@ @@ -566,26 +597,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@ @@ -616,7 +632,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@ @@ -626,23 +641,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 @@ -654,7 +672,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, @@ -662,10 +680,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@ @@ -681,18 +695,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@ @@ -707,15 +709,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 = diff --git a/usrp/host/swig/Makefile.in b/usrp/host/swig/Makefile.in index 03b4586e..c0a87962 100644 --- a/usrp/host/swig/Makefile.in +++ b/usrp/host/swig/Makefile.in @@ -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 # @@ -142,36 +142,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 \ @@ -185,9 +188,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 \ @@ -284,6 +284,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@ @@ -291,6 +292,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@ @@ -309,6 +314,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -318,20 +324,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@ @@ -354,6 +363,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@ @@ -415,6 +426,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@ @@ -427,17 +439,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@ @@ -453,7 +465,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@ @@ -505,6 +516,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@ @@ -535,6 +551,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@ @@ -556,6 +577,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@ @@ -638,26 +669,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@ @@ -688,7 +704,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@ @@ -698,23 +713,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 @@ -726,7 +744,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, @@ -734,10 +752,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@ @@ -753,18 +767,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@ @@ -779,15 +781,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 = $(DEPDIR)/usrp_prims-generate-* @@ -797,6 +801,7 @@ AM_CPPFLAGS = \ $(USRP_INCLUDES) \ $(PYTHON_CPPFLAGS) \ -I$(srcdir) \ + $(USB_INCLUDES) \ $(WITH_INCLUDES) diff --git a/usrp2/Makefile.in b/usrp2/Makefile.in index 07ae961c..4cc8ee13 100644 --- a/usrp2/Makefile.in +++ b/usrp2/Makefile.in @@ -37,7 +37,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 # @@ -91,36 +91,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 \ @@ -134,9 +137,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 \ @@ -221,6 +221,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@ @@ -228,6 +229,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@ @@ -246,6 +251,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +261,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@ @@ -291,6 +300,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@ @@ -352,6 +363,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@ @@ -364,17 +376,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@ @@ -390,7 +402,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@ @@ -442,6 +453,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@ @@ -472,6 +488,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@ @@ -493,6 +514,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@ @@ -575,26 +606,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@ @@ -625,7 +641,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@ @@ -635,23 +650,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 @@ -663,7 +681,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, @@ -671,10 +689,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@ @@ -690,18 +704,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@ @@ -716,15 +718,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 = diff --git a/usrp2/firmware/Makefile.in b/usrp2/firmware/Makefile.in index 8c66df3e..e7178333 100644 --- a/usrp2/firmware/Makefile.in +++ b/usrp2/firmware/Makefile.in @@ -273,7 +273,8 @@ CLEANFILES = $(ROMS) $(DUMPS) $(BINS) EXTRA_DIST = \ bootstrap \ configure \ - configure.gnu + configure.gnu \ + u2_flash_tool SUBDIRS = config $(am__append_1) all: config.h diff --git a/usrp2/firmware/aclocal.m4 b/usrp2/firmware/aclocal.m4 index b3ffae8d..26d2209d 100644 --- a/usrp2/firmware/aclocal.m4 +++ b/usrp2/firmware/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) diff --git a/usrp2/firmware/apps/Makefile.in b/usrp2/firmware/apps/Makefile.in index 5b8d332b..11cdb70b 100644 --- a/usrp2/firmware/apps/Makefile.in +++ b/usrp2/firmware/apps/Makefile.in @@ -80,10 +80,10 @@ noinst_PROGRAMS = blink_leds$(EXEEXT) blink_leds2$(EXEEXT) \ test_db_spi$(EXEEXT) test_i2c$(EXEEXT) test_sd$(EXEEXT) \ test_ram$(EXEEXT) test_phy_comm$(EXEEXT) test_lsadc$(EXEEXT) \ test_lsdac$(EXEEXT) timer_test$(EXEEXT) tx_standalone$(EXEEXT) \ - txrx$(EXEEXT) factory_test$(EXEEXT) burnrev30$(EXEEXT) \ - burnrev31$(EXEEXT) burnrev40$(EXEEXT) serdes_txrx$(EXEEXT) \ - sd_gentest$(EXEEXT) sd_bounce$(EXEEXT) mimo_tx$(EXEEXT) \ - mimo_tx_slave$(EXEEXT) + txrx$(EXEEXT) txrx_wbx$(EXEEXT) txrx_xcvr$(EXEEXT) \ + factory_test$(EXEEXT) burnrev30$(EXEEXT) burnrev31$(EXEEXT) \ + burnrev40$(EXEEXT) serdes_txrx$(EXEEXT) sd_gentest$(EXEEXT) \ + sd_bounce$(EXEEXT) mimo_tx$(EXEEXT) mimo_tx_slave$(EXEEXT) subdir = apps ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/grc_build.m4 \ @@ -235,6 +235,12 @@ am_txrx_OBJECTS = txrx.$(OBJEXT) app_common_v2.$(OBJEXT) txrx_OBJECTS = $(am_txrx_OBJECTS) txrx_LDADD = $(LDADD) txrx_DEPENDENCIES = ../lib/libu2fw.a +am_txrx_wbx_OBJECTS = txrx.$(OBJEXT) app_common_v2.$(OBJEXT) +txrx_wbx_OBJECTS = $(am_txrx_wbx_OBJECTS) +txrx_wbx_DEPENDENCIES = ../lib/libu2fw_wbx.a +am_txrx_xcvr_OBJECTS = txrx.$(OBJEXT) app_common_v2.$(OBJEXT) +txrx_xcvr_OBJECTS = $(am_txrx_xcvr_OBJECTS) +txrx_xcvr_DEPENDENCIES = ../lib/libu2fw_xcvr.a DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -252,7 +258,8 @@ SOURCES = blink_leds.c blink_leds2.c buf_ram_test.c \ sd_bounce.c sd_gentest.c $(serdes_txrx_SOURCES) set_hw_rev.c \ test1.c test_db_spi.c test_i2c.c test_lsadc.c test_lsdac.c \ test_phy_comm.c test_ram.c test_sd.c timer_test.c \ - tx_standalone.c $(txrx_SOURCES) + tx_standalone.c $(txrx_SOURCES) $(txrx_wbx_SOURCES) \ + $(txrx_xcvr_SOURCES) DIST_SOURCES = blink_leds.c blink_leds2.c buf_ram_test.c \ burn_dbsrx_eeprom.c burnrev30.c burnrev31.c burnrev40.c \ can_i_sub.c echo.c $(eth_serdes_SOURCES) \ @@ -262,7 +269,8 @@ DIST_SOURCES = blink_leds.c blink_leds2.c buf_ram_test.c \ sd_bounce.c sd_gentest.c $(serdes_txrx_SOURCES) set_hw_rev.c \ test1.c test_db_spi.c test_i2c.c test_lsadc.c test_lsdac.c \ test_phy_comm.c test_ram.c test_sd.c timer_test.c \ - tx_standalone.c $(txrx_SOURCES) + tx_standalone.c $(txrx_SOURCES) $(txrx_wbx_SOURCES) \ + $(txrx_xcvr_SOURCES) DATA = $(noinst_DATA) HEADERS = $(noinst_HEADERS) ETAGS = etags @@ -402,11 +410,15 @@ LDADD = ../lib/libu2fw.a # tx_drop_rate_limited_SOURCES = tx_drop_rate_limited.c app_common.c # tx_drop2_SOURCES = tx_drop2.c app_common.c txrx_SOURCES = txrx.c app_common_v2.c +txrx_wbx_SOURCES = txrx.c app_common_v2.c +txrx_xcvr_SOURCES = txrx.c app_common_v2.c factory_test_SOURCES = factory_test.c app_common_v2.c eth_serdes_SOURCES = eth_serdes.c app_passthru_v2.c serdes_txrx_SOURCES = serdes_txrx.c app_common_v2.c mimo_tx_SOURCES = mimo_tx.c mimo_app_common_v2.c mimo_tx_slave_SOURCES = mimo_tx_slave.c app_common_v2.c +txrx_wbx_LDADD = ../lib/libu2fw_wbx.a +txrx_xcvr_LDADD = ../lib/libu2fw_xcvr.a noinst_HEADERS = \ app_common_v2.h \ app_passthru_v2.h \ @@ -551,6 +563,12 @@ tx_standalone$(EXEEXT): $(tx_standalone_OBJECTS) $(tx_standalone_DEPENDENCIES) txrx$(EXEEXT): $(txrx_OBJECTS) $(txrx_DEPENDENCIES) @rm -f txrx$(EXEEXT) $(LINK) $(txrx_OBJECTS) $(txrx_LDADD) $(LIBS) +txrx_wbx$(EXEEXT): $(txrx_wbx_OBJECTS) $(txrx_wbx_DEPENDENCIES) + @rm -f txrx_wbx$(EXEEXT) + $(LINK) $(txrx_wbx_OBJECTS) $(txrx_wbx_LDADD) $(LIBS) +txrx_xcvr$(EXEEXT): $(txrx_xcvr_OBJECTS) $(txrx_xcvr_DEPENDENCIES) + @rm -f txrx_xcvr$(EXEEXT) + $(LINK) $(txrx_xcvr_OBJECTS) $(txrx_xcvr_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/usrp2/firmware/configure b/usrp2/firmware/configure index c98104f2..dbf16dff 100755 --- a/usrp2/firmware/configure +++ b/usrp2/firmware/configure @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.67. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -316,7 +316,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -356,19 +356,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -530,7 +530,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -785,8 +785,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -831,7 +832,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -857,7 +858,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1061,7 +1062,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1077,7 +1078,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1107,8 +1108,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1116,7 +1117,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1134,13 +1135,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1163,7 +1164,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1177,8 +1178,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1193,9 +1194,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1234,11 +1235,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1278,7 +1279,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1422,9 +1423,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1494,7 +1495,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1518,10 +1519,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1557,7 +1558,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1584,7 +1585,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1648,7 +1649,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1674,7 +1675,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1784,11 +1785,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1822,11 +1821,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1839,11 +1836,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1857,11 +1852,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1916,7 +1909,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1931,7 +1929,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2007,7 +2009,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2025,16 +2027,22 @@ ac_config_headers="$ac_config_headers config.h" ac_aux_dir= for ac_dir in . "$srcdir"/.; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in . \"$srcdir\"/." "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in . \"$srcdir\"/." "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2154,11 +2162,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2180,7 +2188,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2190,7 +2198,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2428,7 +2436,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2436,7 +2444,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2470,7 +2478,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2559,7 +2567,7 @@ fi usrp2_with=no if test $passed = no; then if test x$enable_usrp2 = xyes; then - as_fn_error "Component usrp2 has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component usrp2 has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp2." >&5 $as_echo "Not building component usrp2." >&6; } @@ -3010,8 +3018,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3125,9 +3133,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3169,8 +3176,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3227,9 +3234,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3280,8 +3287,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3670,7 +3677,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3686,11 +3693,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -3729,7 +3736,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3745,18 +3752,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4042,7 +4049,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4108,7 +4115,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4240,8 +4247,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4280,7 +4286,7 @@ $as_echo "Component usrp2-firmware requires usrp2, which is not being built or s fi else if test x$usrp2_with = xno; then - as_fn_error "Component usrp2-firmware requires usrp2 to be included as --with-usrp2-firmware[=arg]" "$LINENO" 5 + as_fn_error $? "Component usrp2-firmware requires usrp2 to be included as --with-usrp2-firmware[=arg]" "$LINENO" 5 fi fi fi @@ -4296,8 +4302,7 @@ $as_echo "Component usrp2-firmware requires usrp2, which is not being built or s do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4526,8 +4531,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) - as_fn_error "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac @@ -4599,7 +4604,7 @@ fi usrp2_firmware_with=no if test $passed = no; then if test x$enable_usrp2_firmware = xyes; then - as_fn_error "Component usrp2-firmware has errors; stopping." "$LINENO" 5 + as_fn_error $? "Component usrp2-firmware has errors; stopping." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not building component usrp2-firmware." >&5 $as_echo "Not building component usrp2-firmware." >&6; } @@ -4799,6 +4804,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -4822,20 +4828,20 @@ else fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then - as_fn_error "conditional \"am__fastdepCCAS\" was never defined. + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${BUILDING_USRP2_FIRMWARE_TRUE}" && test -z "${BUILDING_USRP2_FIRMWARE_FALSE}"; then - as_fn_error "conditional \"BUILDING_USRP2_FIRMWARE\" was never defined. + as_fn_error $? "conditional \"BUILDING_USRP2_FIRMWARE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -4985,19 +4991,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -5193,7 +5199,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -5247,7 +5253,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5313,10 +5319,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5334,11 +5340,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -5360,6 +5371,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -5372,7 +5384,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -5381,7 +5393,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -5443,7 +5455,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -5481,7 +5493,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -5498,7 +5510,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -5512,18 +5524,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -5612,20 +5624,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -5653,7 +5673,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -5738,7 +5758,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -5751,7 +5771,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -5779,7 +5799,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -5806,7 +5826,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -5943,22 +5963,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -5969,19 +5989,19 @@ which seems to be undefined. Please make sure it is defined." >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -6131,7 +6151,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -6152,7 +6172,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/usrp2/firmware/lib/Makefile.in b/usrp2/firmware/lib/Makefile.in index ddbcfff0..b0af6212 100644 --- a/usrp2/firmware/lib/Makefile.in +++ b/usrp2/firmware/lib/Makefile.in @@ -88,20 +88,30 @@ AR = ar ARFLAGS = cru libu2fw_a_AR = $(AR) $(ARFLAGS) libu2fw_a_LIBADD = -am_libu2fw_a_OBJECTS = abort.$(OBJEXT) ad9510.$(OBJEXT) \ +am__objects_1 = _exit.$(OBJEXT) abort.$(OBJEXT) ad9510.$(OBJEXT) \ ad9777.$(OBJEXT) bsm12.$(OBJEXT) buffer_pool.$(OBJEXT) \ - clocks.$(OBJEXT) db_basic.$(OBJEXT) db_dbsrx.$(OBJEXT) \ - db_init.$(OBJEXT) db_rfx.$(OBJEXT) db_tvrx.$(OBJEXT) \ - db_xcvr2450.$(OBJEXT) dbsm.$(OBJEXT) eeprom.$(OBJEXT) \ - ethernet.$(OBJEXT) eth_mac.$(OBJEXT) _exit.$(OBJEXT) \ + clocks.$(OBJEXT) db_basic.$(OBJEXT) dbsm.$(OBJEXT) \ + eeprom.$(OBJEXT) eth_mac.$(OBJEXT) ethernet.$(OBJEXT) \ exit.$(OBJEXT) hal_io.$(OBJEXT) hal_uart.$(OBJEXT) \ i2c.$(OBJEXT) lsadc.$(OBJEXT) lsdac.$(OBJEXT) mdelay.$(OBJEXT) \ memcpy_wa.$(OBJEXT) memset_wa.$(OBJEXT) nonstdio.$(OBJEXT) \ - pic.$(OBJEXT) print_mac_addr.$(OBJEXT) \ - print_rmon_regs.$(OBJEXT) print_fxpt.$(OBJEXT) \ - print_buffer.$(OBJEXT) printf.$(OBJEXT) sd.$(OBJEXT) \ - spi.$(OBJEXT) u2_init.$(OBJEXT) + pic.$(OBJEXT) print_buffer.$(OBJEXT) print_fxpt.$(OBJEXT) \ + print_mac_addr.$(OBJEXT) print_rmon_regs.$(OBJEXT) \ + printf.$(OBJEXT) sd.$(OBJEXT) spi.$(OBJEXT) u2_init.$(OBJEXT) +am_libu2fw_a_OBJECTS = $(am__objects_1) db_init.$(OBJEXT) \ + db_bitshark_rx.$(OBJEXT) db_dbsrx.$(OBJEXT) db_rfx.$(OBJEXT) \ + db_tvrx.$(OBJEXT) libu2fw_a_OBJECTS = $(am_libu2fw_a_OBJECTS) +libu2fw_wbx_a_AR = $(AR) $(ARFLAGS) +libu2fw_wbx_a_LIBADD = +am_libu2fw_wbx_a_OBJECTS = $(am__objects_1) db_init_wbx.$(OBJEXT) \ + adf4350.$(OBJEXT) adf4350_regs.$(OBJEXT) db_wbxng.$(OBJEXT) +libu2fw_wbx_a_OBJECTS = $(am_libu2fw_wbx_a_OBJECTS) +libu2fw_xcvr_a_AR = $(AR) $(ARFLAGS) +libu2fw_xcvr_a_LIBADD = +am_libu2fw_xcvr_a_OBJECTS = $(am__objects_1) db_init_xcvr.$(OBJEXT) \ + adf4350.$(OBJEXT) adf4350_regs.$(OBJEXT) db_xcvr2450.$(OBJEXT) +libu2fw_xcvr_a_OBJECTS = $(am_libu2fw_xcvr_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -110,8 +120,10 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libu2fw_a_SOURCES) -DIST_SOURCES = $(libu2fw_a_SOURCES) +SOURCES = $(libu2fw_a_SOURCES) $(libu2fw_wbx_a_SOURCES) \ + $(libu2fw_xcvr_a_SOURCES) +DIST_SOURCES = $(libu2fw_a_SOURCES) $(libu2fw_wbx_a_SOURCES) \ + $(libu2fw_xcvr_a_SOURCES) DATA = $(noinst_DATA) HEADERS = $(noinst_HEADERS) ETAGS = etags @@ -246,9 +258,12 @@ DUMPS = $(noinst_PROGRAMS:=.dump) noinst_DATA = $(BINS) $(ROMS) $(DUMPS) CLEANFILES = $(ROMS) $(DUMPS) $(BINS) noinst_LIBRARIES = \ - libu2fw.a + libu2fw.a \ + libu2fw_wbx.a \ + libu2fw_xcvr.a -libu2fw_a_SOURCES = \ +U2FW_COMMON = \ + _exit.c \ abort.c \ ad9510.c \ ad9777.c \ @@ -256,16 +271,10 @@ libu2fw_a_SOURCES = \ buffer_pool.c \ clocks.c \ db_basic.c \ - db_dbsrx.c \ - db_init.c \ - db_rfx.c \ - db_tvrx.c \ - db_xcvr2450.c \ dbsm.c \ eeprom.c \ - ethernet.c \ eth_mac.c \ - _exit.c \ + ethernet.c \ exit.c \ hal_io.c \ hal_uart.c \ @@ -277,17 +286,41 @@ libu2fw_a_SOURCES = \ memset_wa.c \ nonstdio.c \ pic.c \ + print_buffer.c \ + print_fxpt.c \ print_mac_addr.c \ print_rmon_regs.c \ - print_fxpt.c \ - print_buffer.c \ printf.c \ sd.c \ spi.c \ - u2_init.c + u2_init.c + +libu2fw_a_SOURCES = \ + $(U2FW_COMMON) \ + db_init.c \ + db_bitshark_rx.c \ + db_dbsrx.c \ + db_rfx.c \ + db_tvrx.c + +libu2fw_wbx_a_SOURCES = \ + $(U2FW_COMMON) \ + db_init_wbx.c \ + adf4350.c \ + adf4350_regs.c \ + db_wbxng.c + +libu2fw_xcvr_a_SOURCES = \ + $(U2FW_COMMON) \ + db_init_xcvr.c \ + adf4350.c \ + adf4350_regs.c \ + db_xcvr2450.c noinst_HEADERS = \ ad9510.h \ + adf4350.h \ + adf4350_regs.h \ ad9777.h \ ad9777_regs.h \ bool.h \ @@ -296,6 +329,8 @@ noinst_HEADERS = \ clocks.h \ db.h \ db_base.h \ + db_wbxng.h \ + db_bitshark_rx.h \ dbsm.h \ eth_mac.h \ eth_mac_regs.h \ @@ -364,6 +399,14 @@ libu2fw.a: $(libu2fw_a_OBJECTS) $(libu2fw_a_DEPENDENCIES) -rm -f libu2fw.a $(libu2fw_a_AR) libu2fw.a $(libu2fw_a_OBJECTS) $(libu2fw_a_LIBADD) $(RANLIB) libu2fw.a +libu2fw_wbx.a: $(libu2fw_wbx_a_OBJECTS) $(libu2fw_wbx_a_DEPENDENCIES) + -rm -f libu2fw_wbx.a + $(libu2fw_wbx_a_AR) libu2fw_wbx.a $(libu2fw_wbx_a_OBJECTS) $(libu2fw_wbx_a_LIBADD) + $(RANLIB) libu2fw_wbx.a +libu2fw_xcvr.a: $(libu2fw_xcvr_a_OBJECTS) $(libu2fw_xcvr_a_DEPENDENCIES) + -rm -f libu2fw_xcvr.a + $(libu2fw_xcvr_a_AR) libu2fw_xcvr.a $(libu2fw_xcvr_a_OBJECTS) $(libu2fw_xcvr_a_LIBADD) + $(RANLIB) libu2fw_xcvr.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -375,14 +418,20 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abort.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad9510.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad9777.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adf4350.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adf4350_regs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm12.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer_pool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clocks.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_basic.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_bitshark_rx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_dbsrx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_init.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_init_wbx.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_init_xcvr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_rfx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_tvrx.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_wbxng.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db_xcvr2450.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbsm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom.Po@am__quote@ diff --git a/usrp2/host/Makefile.in b/usrp2/host/Makefile.in index b5fdeb76..c6cbd651 100644 --- a/usrp2/host/Makefile.in +++ b/usrp2/host/Makefile.in @@ -37,7 +37,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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -245,6 +245,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@ @@ -252,6 +253,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@ @@ -270,6 +275,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -279,20 +285,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@ @@ -315,6 +324,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@ @@ -376,6 +387,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@ @@ -388,17 +400,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@ @@ -414,7 +426,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@ @@ -466,6 +477,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@ @@ -496,6 +512,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@ @@ -517,6 +538,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@ @@ -599,26 +630,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@ @@ -649,7 +665,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@ @@ -659,23 +674,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 @@ -687,7 +705,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, @@ -695,10 +713,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@ @@ -714,18 +728,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@ @@ -740,15 +742,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 = diff --git a/usrp2/host/apps/Makefile.in b/usrp2/host/apps/Makefile.in index 4b66732e..66013772 100644 --- a/usrp2/host/apps/Makefile.in +++ b/usrp2/host/apps/Makefile.in @@ -34,7 +34,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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -166,38 +166,34 @@ am_find_usrps_OBJECTS = find_usrps.$(OBJEXT) find_usrps_OBJECTS = $(am_find_usrps_OBJECTS) find_usrps_LDADD = $(LDADD) am__DEPENDENCIES_1 = -find_usrps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +find_usrps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_gen_const_OBJECTS = gen_const.$(OBJEXT) gen_const_OBJECTS = $(am_gen_const_OBJECTS) gen_const_LDADD = $(LDADD) -gen_const_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +gen_const_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_gpio_OBJECTS = gpio.$(OBJEXT) gpio_OBJECTS = $(am_gpio_OBJECTS) gpio_LDADD = $(LDADD) -gpio_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +gpio_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_rx_streaming_samples_OBJECTS = rx_streaming_samples.$(OBJEXT) rx_streaming_samples_OBJECTS = $(am_rx_streaming_samples_OBJECTS) rx_streaming_samples_LDADD = $(LDADD) rx_streaming_samples_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_test_mimo_tx_OBJECTS = test_mimo_tx.$(OBJEXT) test_mimo_tx_OBJECTS = $(am_test_mimo_tx_OBJECTS) test_mimo_tx_LDADD = $(LDADD) test_mimo_tx_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_tx_samples_OBJECTS = tx_samples.$(OBJEXT) tx_samples_OBJECTS = $(am_tx_samples_OBJECTS) tx_samples_LDADD = $(LDADD) -tx_samples_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +tx_samples_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_usrp2_burn_mac_addr_OBJECTS = usrp2_burn_mac_addr.$(OBJEXT) usrp2_burn_mac_addr_OBJECTS = $(am_usrp2_burn_mac_addr_OBJECTS) usrp2_burn_mac_addr_LDADD = $(LDADD) usrp2_burn_mac_addr_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -240,6 +236,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@ @@ -247,6 +244,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@ @@ -265,6 +266,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -274,20 +276,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@ @@ -310,6 +315,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@ @@ -371,6 +378,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@ @@ -383,17 +391,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@ @@ -409,7 +417,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@ @@ -461,6 +468,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@ @@ -491,6 +503,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@ @@ -512,6 +529,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@ @@ -594,26 +621,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@ @@ -644,7 +656,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@ @@ -654,23 +665,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 @@ -682,7 +696,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, @@ -690,10 +704,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@ @@ -709,18 +719,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@ @@ -735,15 +733,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 = @@ -755,9 +755,8 @@ AM_CPPFLAGS = \ $(GRUEL_INCLUDES) LDADD = \ - $(USRP2_LA) \ - $(GRUEL_LA) \ - $(OMNITHREAD_LA) + $(USRP2_LA) \ + $(GRUEL_LA) find_usrps_SOURCES = find_usrps.cc usrp2_burn_mac_addr_SOURCES = usrp2_burn_mac_addr.cc diff --git a/usrp2/host/include/Makefile.in b/usrp2/host/include/Makefile.in index d5ab5f04..4ec25cf6 100644 --- a/usrp2/host/include/Makefile.in +++ b/usrp2/host/include/Makefile.in @@ -37,7 +37,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 # @@ -91,36 +91,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 \ @@ -134,9 +137,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 \ @@ -221,6 +221,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@ @@ -228,6 +229,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@ @@ -246,6 +251,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -255,20 +261,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@ @@ -291,6 +300,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@ @@ -352,6 +363,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@ @@ -364,17 +376,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@ @@ -390,7 +402,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@ @@ -442,6 +453,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@ @@ -472,6 +488,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@ @@ -493,6 +514,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@ @@ -575,26 +606,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@ @@ -625,7 +641,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@ @@ -635,23 +650,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 @@ -663,7 +681,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, @@ -671,10 +689,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@ @@ -690,18 +704,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@ @@ -716,15 +718,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 = diff --git a/usrp2/host/include/usrp2/Makefile.in b/usrp2/host/include/usrp2/Makefile.in index cb2251da..a8817d3c 100644 --- a/usrp2/host/include/usrp2/Makefile.in +++ b/usrp2/host/include/usrp2/Makefile.in @@ -34,7 +34,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 # @@ -89,36 +89,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 \ @@ -132,9 +135,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 \ @@ -204,6 +204,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@ @@ -211,6 +212,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@ @@ -229,6 +234,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -238,20 +244,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@ @@ -274,6 +283,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@ @@ -335,6 +346,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@ @@ -347,17 +359,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@ @@ -373,7 +385,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@ @@ -425,6 +436,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@ @@ -455,6 +471,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@ @@ -476,6 +497,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@ @@ -558,26 +589,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@ @@ -608,7 +624,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@ @@ -618,23 +633,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 @@ -646,7 +664,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, @@ -654,10 +672,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@ @@ -673,18 +687,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@ @@ -699,15 +701,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 = diff --git a/usrp2/host/lib/Makefile.in b/usrp2/host/lib/Makefile.in index 4f11c318..e9618f2d 100644 --- a/usrp2/host/lib/Makefile.in +++ b/usrp2/host/lib/Makefile.in @@ -16,7 +16,7 @@ @SET_MAKE@ # -# Copyright 2007,2008 Free Software Foundation, Inc. +# Copyright 2007,2008,2010 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,7 +34,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 # @@ -92,36 +92,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 \ @@ -135,9 +138,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 \ @@ -185,13 +185,15 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libusrp2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_libusrp2_la_OBJECTS = control.lo copiers.lo copy_handler.lo \ data_handler.lo eth_buffer.lo ethernet.lo find.lo \ open_usrp2_socket.lo pktfilter.lo ring.lo rx_nop_handler.lo \ - rx_sample_handler.lo strtod_si.lo usrp2.lo usrp2_impl.lo \ - usrp2_thread.lo + rx_sample_handler.lo strtod_si.lo usrp2.lo usrp2_impl.lo libusrp2_la_OBJECTS = $(am_libusrp2_la_OBJECTS) +libusrp2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libusrp2_la_LDFLAGS) $(LDFLAGS) -o $@ PROGRAMS = $(bin_PROGRAMS) am_usrp2_socket_opener_OBJECTS = usrp2_socket_opener.$(OBJEXT) usrp2_socket_opener_OBJECTS = $(am_usrp2_socket_opener_OBJECTS) @@ -243,6 +245,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@ @@ -250,6 +253,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@ @@ -268,6 +275,7 @@ DEFINES = @DEFINES@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCVER = @DOCVER@ DOT = @DOT@ DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ @@ -277,20 +285,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@ @@ -313,6 +324,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@ @@ -374,6 +387,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@ @@ -386,17 +400,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@ @@ -412,7 +426,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@ @@ -464,6 +477,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@ @@ -494,6 +512,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@ @@ -515,6 +538,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@ @@ -597,26 +630,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@ @@ -647,7 +665,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@ @@ -657,23 +674,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 @@ -685,7 +705,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, @@ -693,10 +713,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@ @@ -712,18 +728,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@ @@ -738,15 +742,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 = @@ -762,6 +768,7 @@ usrp2_socket_opener_SOURCES = usrp2_socket_opener.cc lib_LTLIBRARIES = \ libusrp2.la +libusrp2_la_LDFLAGS = $(LTVERSIONFLAGS) libusrp2_la_SOURCES = \ control.cc \ copiers.cc \ @@ -777,11 +784,9 @@ libusrp2_la_SOURCES = \ rx_sample_handler.cc \ strtod_si.c \ usrp2.cc \ - usrp2_impl.cc \ - usrp2_thread.cc + usrp2_impl.cc libusrp2_la_LIBADD = \ - $(OMNITHREAD_LA) \ $(GRUEL_LA) \ $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB) @@ -796,8 +801,7 @@ noinst_HEADERS = \ pktfilter.h \ ring.h \ usrp2_bytesex.h \ - usrp2_impl.h \ - usrp2_thread.h + usrp2_impl.h all: all-am @@ -865,7 +869,7 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libusrp2.la: $(libusrp2_la_OBJECTS) $(libusrp2_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libusrp2_la_OBJECTS) $(libusrp2_la_LIBADD) $(LIBS) + $(libusrp2_la_LINK) -rpath $(libdir) $(libusrp2_la_OBJECTS) $(libusrp2_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -935,7 +939,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp2_impl.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp2_socket_opener.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp2_thread.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -- 2.30.2