diff options
| author | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
| commit | 559d397de9ba937f470d27a7ad8b8d15f8f2f90f (patch) | |
| tree | 221f32c0c10e55f9072fb22623e01fcd1dd63353 /gr-uhd/grc/Makefile.am | |
| parent | a6b5781e36ff75adb1e4d39d755d4ab8f5efd9dd (diff) | |
| parent | 53eee1c624794056fcba50a5eb50b864cbf159dd (diff) | |
| download | gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.gz gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.bz2 gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.zip | |
Merge branch 'next' into tagging
Diffstat (limited to 'gr-uhd/grc/Makefile.am')
| -rw-r--r-- | gr-uhd/grc/Makefile.am | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am index a19a28f03..d424ca709 100644 --- a/gr-uhd/grc/Makefile.am +++ b/gr-uhd/grc/Makefile.am @@ -23,31 +23,37 @@ include $(top_srcdir)/Makefile.common grcblocksdir = $(grc_blocksdir) -generated_uhd_mimo_blocks = \ - uhd_mimo_source.xml \ - uhd_mimo_sink.xml +generated_uhd_multi_usrp_blocks = \ + uhd_multi_usrp_source.xml \ + uhd_multi_usrp_sink.xml generated_uhd_single_usrp_blocks = \ uhd_single_usrp_source.xml \ uhd_single_usrp_sink.xml BUILT_SOURCES = \ - $(generated_uhd_mimo_blocks) \ + $(generated_uhd_multi_usrp_blocks) \ $(generated_uhd_single_usrp_blocks) dist_grcblocks_DATA = \ - $(BUILT_SOURCES) \ + uhd_block_tree.xml \ + $(BUILT_SOURCES) + +# add the deprecated files +dist_grcblocks_DATA += \ + uhd_mimo_source.xml \ + uhd_mimo_sink.xml \ uhd_simple_source.xml \ uhd_simple_sink.xml ######################################################################## -# Rules for generating the mimo source and sink blocks +# Rules for generating the source and sink xml wrappers ######################################################################## EXTRA_DIST = \ - $(srcdir)/gen_uhd_mimo_blocks_xml.py \ + $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py \ $(srcdir)/gen_uhd_single_usrp_blocks_xml.py -$(generated_uhd_mimo_blocks): $(srcdir)/gen_uhd_mimo_blocks_xml.py +$(generated_uhd_multi_usrp_blocks): $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py @echo "generating $@..." $(PYTHON) $< $@ |