From 5e9908fbec19ce9309c12ea61c0303e6666e981a Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 18 Oct 2010 01:03:11 -0700
Subject: uhd: removed utils warning functions, moved into the lower level
 wrappers

---
 gr-uhd/lib/Makefile.am | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index 1260201a5..69a41e788 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -29,7 +29,6 @@ AM_CPPFLAGS = \
 lib_LTLIBRARIES = libgnuradio-uhd.la
 
 libgnuradio_uhd_la_SOURCES = \
-	utils.cc \
 	uhd_mimo_source.cc \
 	uhd_mimo_sink.cc \
 	uhd_simple_source.cc \
@@ -51,5 +50,4 @@ grinclude_HEADERS = \
 	uhd_single_usrp_source.h \
 	uhd_single_usrp_sink.h
 
-noinst_HEADERS = \
-	utils.h
+noinst_HEADERS =
-- 
cgit 


From 4ac5545625d3d6df9881695f764c9c94049edb7b Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 18 Oct 2010 12:18:13 -0700
Subject: uhd: added multi usrp skeleton and added deprecation note to other
 headers

---
 gr-uhd/lib/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index 69a41e788..d9a296c75 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -31,6 +31,8 @@ lib_LTLIBRARIES = libgnuradio-uhd.la
 libgnuradio_uhd_la_SOURCES = \
 	uhd_mimo_source.cc \
 	uhd_mimo_sink.cc \
+	uhd_multi_usrp_source.cc \
+	uhd_multi_usrp_sink.cc \
 	uhd_simple_source.cc \
 	uhd_simple_sink.cc \
 	uhd_single_usrp_source.cc \
@@ -43,10 +45,8 @@ libgnuradio_uhd_la_LIBADD = \
 libgnuradio_uhd_la_LDFLAGS = $(LTVERSIONFLAGS)
 
 grinclude_HEADERS = \
-	uhd_mimo_source.h \
-	uhd_mimo_sink.h \
-	uhd_simple_source.h \
-	uhd_simple_sink.h \
+	uhd_multi_usrp_source.h \
+	uhd_multi_usrp_sink.h \
 	uhd_single_usrp_source.h \
 	uhd_single_usrp_sink.h
 
-- 
cgit 


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/lib/Makefile.am | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index d9a296c75..b4b1abfc6 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -29,15 +29,18 @@ AM_CPPFLAGS = \
 lib_LTLIBRARIES = libgnuradio-uhd.la
 
 libgnuradio_uhd_la_SOURCES = \
-	uhd_mimo_source.cc \
-	uhd_mimo_sink.cc \
 	uhd_multi_usrp_source.cc \
 	uhd_multi_usrp_sink.cc \
-	uhd_simple_source.cc \
-	uhd_simple_sink.cc \
 	uhd_single_usrp_source.cc \
 	uhd_single_usrp_sink.cc
 
+# add the deprecated sources
+libgnuradio_uhd_la_SOURCES += \
+	uhd_mimo_source.cc \
+	uhd_mimo_sink.cc \
+	uhd_simple_source.cc \
+	uhd_simple_sink.cc
+
 libgnuradio_uhd_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
 	$(UHD_LIBS)
-- 
cgit