diff options
| author | Josh Blum | 2011-02-25 16:11:48 -0800 |
|---|---|---|
| committer | Josh Blum | 2011-02-25 16:11:48 -0800 |
| commit | a02bb131f68d5aa66093310c393562671e389778 (patch) | |
| tree | cc234438359b7e734bb00ac08083c2582b0db86b /gr-uhd/grc/Makefile.am | |
| parent | da9e63bf4110c06d9a38f2bde3a665f1ae4addae (diff) | |
| parent | 5bb8acf24e4913d2a969db70476af65c498b032f (diff) | |
| download | gnuradio-a02bb131f68d5aa66093310c393562671e389778.tar.gz gnuradio-a02bb131f68d5aa66093310c393562671e389778.tar.bz2 gnuradio-a02bb131f68d5aa66093310c393562671e389778.zip | |
Merge branch 'gr_uhd_next' into next
Diffstat (limited to 'gr-uhd/grc/Makefile.am')
| -rw-r--r-- | gr-uhd/grc/Makefile.am | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am index 30061a7ec..7e73a5b39 100644 --- a/gr-uhd/grc/Makefile.am +++ b/gr-uhd/grc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2010 Free Software Foundation, Inc. +# Copyright 2010-2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,17 +23,11 @@ include $(top_srcdir)/Makefile.common grcblocksdir = $(grc_blocksdir) -generated_uhd_multi_usrp_blocks = \ - uhd_multi_usrp_source.xml \ - uhd_multi_usrp_sink.xml +generated_uhd_usrp_blocks = \ + uhd_usrp_source.xml \ + uhd_usrp_sink.xml -generated_uhd_single_usrp_blocks = \ - uhd_single_usrp_source.xml \ - uhd_single_usrp_sink.xml - -BUILT_SOURCES += \ - $(generated_uhd_multi_usrp_blocks) \ - $(generated_uhd_single_usrp_blocks) +BUILT_SOURCES += $(generated_uhd_usrp_blocks) dist_grcblocks_DATA = \ uhd_block_tree.xml \ @@ -42,14 +36,8 @@ dist_grcblocks_DATA = \ ######################################################################## # Rules for generating the source and sink xml wrappers ######################################################################## -EXTRA_DIST += \ - $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py \ - $(srcdir)/gen_uhd_single_usrp_blocks_xml.py - -$(generated_uhd_multi_usrp_blocks): $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py - @echo "generating $@..." - $(PYTHON) $< $@ +EXTRA_DIST += $(srcdir)/gen_uhd_usrp_blocks.py -$(generated_uhd_single_usrp_blocks): $(srcdir)/gen_uhd_single_usrp_blocks_xml.py +$(generated_uhd_usrp_blocks): $(srcdir)/gen_uhd_usrp_blocks.py @echo "generating $@..." $(PYTHON) $< $@ |