6 files changed, 12 insertions, 12 deletions
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 3d1cc1754..572a22485 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -56,7 +56,7 @@ libgnuradio_usrp_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
 	$(USRP_LA)			
 
-libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 grinclude_HEADERS = \
 	usrp_base.h \
diff --git a/gr-usrp/src/qa_usrp.py b/gr-usrp/src/qa_usrp.py
index db2d32624..06e630330 100755
--- a/gr-usrp/src/qa_usrp.py
+++ b/gr-usrp/src/qa_usrp.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,7 +23,7 @@
 from gnuradio import gr, gr_unittest
 import usrp_swig
 
-class qa_usrp (gr_unittest.TestCase):
+class test_usrp (gr_unittest.TestCase):
 
     def setUp (self):
         self.tb = gr.top_block ()
@@ -37,4 +37,4 @@ class qa_usrp (gr_unittest.TestCase):
         pass
     
 if __name__ == '__main__':
-    gr_unittest.main ()
+    gr_unittest.run(test_usrp, "test_usrp.xml")
diff --git a/gr-usrp/src/usrp_sink_c.cc b/gr-usrp/src/usrp_sink_c.cc
index 40750b477..7054158d8 100644
--- a/gr-usrp/src/usrp_sink_c.cc
+++ b/gr-usrp/src/usrp_sink_c.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006,2009 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -40,7 +40,7 @@ usrp_make_sink_c (int which_board,
 		   const std::string firmware_filename
 		   ) throw (std::runtime_error)
 {
-  return usrp_sink_c_sptr (new usrp_sink_c (which_board,
+  return gnuradio::get_initial_sptr(new usrp_sink_c (which_board,
 					      interp_rate,
 					      nchan,
 					      mux,
diff --git a/gr-usrp/src/usrp_sink_s.cc b/gr-usrp/src/usrp_sink_s.cc
index 1f51da24d..1ffaeed96 100644
--- a/gr-usrp/src/usrp_sink_s.cc
+++ b/gr-usrp/src/usrp_sink_s.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006,2009 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -40,7 +40,7 @@ usrp_make_sink_s (int which_board,
 		   const std::string firmware_filename
 		   ) throw (std::runtime_error)
 {
-  return usrp_sink_s_sptr (new usrp_sink_s (which_board,
+  return gnuradio::get_initial_sptr(new usrp_sink_s (which_board,
 					      interp_rate,
 					      nchan,
 					      mux,
diff --git a/gr-usrp/src/usrp_source_c.cc b/gr-usrp/src/usrp_source_c.cc
index 26d95dc1b..9055f3ee7 100644
--- a/gr-usrp/src/usrp_source_c.cc
+++ b/gr-usrp/src/usrp_source_c.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006,2009 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -43,7 +43,7 @@ usrp_make_source_c (int which_board,
 		     const std::string firmware_filename
 		     ) throw (std::runtime_error)
 {
-  return usrp_source_c_sptr (new usrp_source_c (which_board,
+  return gnuradio::get_initial_sptr(new usrp_source_c (which_board,
 						  decim_rate,
 						  nchan,
 						  mux,
diff --git a/gr-usrp/src/usrp_source_s.cc b/gr-usrp/src/usrp_source_s.cc
index 88b8495d3..8e1c2f188 100644
--- a/gr-usrp/src/usrp_source_s.cc
+++ b/gr-usrp/src/usrp_source_s.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006,2009 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -43,7 +43,7 @@ usrp_make_source_s (int which_board,
 		     const std::string firmware_filename
 		     ) throw (std::runtime_error)
 {
-  return usrp_source_s_sptr (new usrp_source_s (which_board,
+  return gnuradio::get_initial_sptr(new usrp_source_s (which_board,
 						  decim_rate, 
 						  nchan,
 						  mux,