diff options
| author | Nick Foster | 2011-04-13 17:18:14 -0700 |
|---|---|---|
| committer | Nick Foster | 2011-04-13 17:18:14 -0700 |
| commit | 9b7d444aaebbe0708e9703bce30c63b63bc81825 (patch) | |
| tree | 29121aa250decfb1ed9ca7876e1857eec8779d83 /gr-uhd/grc/Makefile.am | |
| parent | 258186d5ca2e811ced7ea637fd16e3ed3bb5573e (diff) | |
| parent | e8ff9ef4bb77517428e1208ff4b3551a38107bbd (diff) | |
| download | gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.gz gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.bz2 gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid
Conflicts:
volk/Makefile.common
volk/lib/qa_utils.cc
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) $< $@ |