gr-utils: move non-GUI apps using old libusrp(2) into gr-usrp or gr-usrp2

One step (of many) to convert GNU Radio to use new Ettus Research UHD driver.

12 files changed, 48 insertions, 9 deletions

diff --git a/config/grc_gr_usrp2.m4 b/config/grc_gr_usrp2.m4
index 3d64db6d6..4ee29861b 100644
--- a/config/grc_gr_usrp2.m4
+++ b/config/grc_gr_usrp2.m4
@@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_USRP2],[
 
     AC_CONFIG_FILES([ \
         gr-usrp2/Makefile \
+	gr-usrp2/apps/Makefile \
         gr-usrp2/grc/Makefile \
 	gr-usrp2/gnuradio-usrp2.pc \
         gr-usrp2/src/Makefile \
diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am
index c3955ad9d..5d5cab678 100644
--- a/gr-usrp/apps/Makefile.am
+++ b/gr-usrp/apps/Makefile.am
@@ -52,3 +52,14 @@ usrp_rx_cfile_SOURCES = 	\
 
 usrp_siggen_SOURCES = 	\
     usrp_siggen.cc
+
+if PYTHON
+
+bin_SCRIPTS = \
+    lsusrp \
+    usrp_print_db.py \
+    usrp_rx_cfile.py \
+    usrp_test_counting.py \
+    usrp_test_loopback.py
+
+endif
diff --git a/gr-utils/src/python/lsusrp b/gr-usrp/apps/lsusrp
index d2eab33fe..d2eab33fe 100755
--- a/gr-utils/src/python/lsusrp
+++ b/gr-usrp/apps/lsusrp
diff --git a/gr-utils/src/python/usrp_print_db.py b/gr-usrp/apps/usrp_print_db.py
index b082cb073..b082cb073 100755
--- a/gr-utils/src/python/usrp_print_db.py
+++ b/gr-usrp/apps/usrp_print_db.py
diff --git a/gr-utils/src/python/usrp_rx_cfile.py b/gr-usrp/apps/usrp_rx_cfile.py
index 3ac9fb56f..3ac9fb56f 100755
--- a/gr-utils/src/python/usrp_rx_cfile.py
+++ b/gr-usrp/apps/usrp_rx_cfile.py
diff --git a/gr-utils/src/python/usrp_test_counting.py b/gr-usrp/apps/usrp_test_counting.py
index a8300afe2..a8300afe2 100755
--- a/gr-utils/src/python/usrp_test_counting.py
+++ b/gr-usrp/apps/usrp_test_counting.py
diff --git a/gr-utils/src/python/usrp_test_loopback.py b/gr-usrp/apps/usrp_test_loopback.py
index b58ac06ae..b58ac06ae 100755
--- a/gr-utils/src/python/usrp_test_loopback.py
+++ b/gr-usrp/apps/usrp_test_loopback.py
diff --git a/gr-usrp2/Makefile.am b/gr-usrp2/Makefile.am
index f6120884a..895032fb0 100644
--- a/gr-usrp2/Makefile.am
+++ b/gr-usrp2/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = src
+SUBDIRS = src apps
 
 if PYTHON
 SUBDIRS += grc
diff --git a/gr-usrp2/apps/.gitignore b/gr-usrp2/apps/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/gr-usrp2/apps/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/gr-usrp2/apps/Makefile.am b/gr-usrp2/apps/Makefile.am
new file mode 100644
index 000000000..e1cec4cfc
--- /dev/null
+++ b/gr-usrp2/apps/Makefile.am
@@ -0,0 +1,32 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+EXTRA_DIST += \
+    $(bin_SCRIPTS)
+
+if PYTHON
+
+bin_SCRIPTS = \
+    usrp2_rx_cfile.py
+
+endif
diff --git a/gr-utils/src/python/usrp2_rx_cfile.py b/gr-usrp2/apps/usrp2_rx_cfile.py
index 1f23eee4e..1f23eee4e 100755
--- a/gr-utils/src/python/usrp2_rx_cfile.py
+++ b/gr-usrp2/apps/usrp2_rx_cfile.py
diff --git a/gr-utils/src/python/Makefile.am b/gr-utils/src/python/Makefile.am
index 450032266..b422bfd05 100644
--- a/gr-utils/src/python/Makefile.am
+++ b/gr-utils/src/python/Makefile.am
@@ -50,16 +50,9 @@ bin_SCRIPTS = \
     gr_plot_short.py \
     gr_plot_qt.py \
     gr_filter_design.py \
-    lsusrp \
     usrp_fft.py \
     usrp_oscope.py \
-    usrp_print_db.py \
-    usrp_rx_cfile.py \
     usrp_rx_nogui.py \
     usrp_siggen.py \
     usrp_siggen_gui.py \
-    usrp_test_counting.py \
-    usrp_test_loopback.py \
-    usrp2_fft.py \
-    usrp2_rx_cfile.py
-
+    usrp2_fft.py