From d029af43c3367a4611185ade70639cc6b7cc5e3d Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 18 Oct 2010 14:09:23 -0700
Subject: uhd: created multi usrp grc wrapper generator, removed mimo gen and
 checked in its generated files

---
 gr-uhd/grc/Makefile.am | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'gr-uhd/grc/Makefile.am')

diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am
index a19a28f03..04b7dca36 100644
--- a/gr-uhd/grc/Makefile.am
+++ b/gr-uhd/grc/Makefile.am
@@ -23,31 +23,36 @@ 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) \
+	$(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) $< $@
 
-- 
cgit 


From 1e5db4248e2488e0f1b44ac1405d78e16c2408d8 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 18 Oct 2010 16:13:10 -0700
Subject: uhd: work on multi usrp blocks, use block tree to categorize blocks,
 deprecate mimo blocks

---
 gr-uhd/grc/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-uhd/grc/Makefile.am')

diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am
index 04b7dca36..d424ca709 100644
--- a/gr-uhd/grc/Makefile.am
+++ b/gr-uhd/grc/Makefile.am
@@ -36,6 +36,7 @@ BUILT_SOURCES = \
 	$(generated_uhd_single_usrp_blocks)
 
 dist_grcblocks_DATA = \
+	uhd_block_tree.xml \
 	$(BUILT_SOURCES)
 
 # add the deprecated files
-- 
cgit