From 821aa4341a2ad6b69cbb829bcf2d31638f67a878 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Sun, 11 Oct 2009 12:47:46 -0700
Subject: [PATCH] Moved command-line apps into apps subdirectory

---
 config/grc_gr_pager.m4                   |  1 +
 gr-pager/Makefile.am                     |  4 +++
 gr-pager/apps/.gitignore                 |  2 ++
 gr-pager/apps/Makefile.am                | 31 ++++++++++++++++++++++++
 gr-pager/{src => apps}/usrp_flex.py      |  0
 gr-pager/{src => apps}/usrp_flex_all.py  |  0
 gr-pager/{src => apps}/usrp_flex_band.py |  0
 gr-pager/src/Makefile.am                 |  5 ----
 8 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 gr-pager/apps/.gitignore
 create mode 100644 gr-pager/apps/Makefile.am
 rename gr-pager/{src => apps}/usrp_flex.py (100%)
 rename gr-pager/{src => apps}/usrp_flex_all.py (100%)
 rename gr-pager/{src => apps}/usrp_flex_band.py (100%)

diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4
index 23af7a9c..8b493219 100644
--- a/config/grc_gr_pager.m4
+++ b/config/grc_gr_pager.m4
@@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_PAGER],[
     AC_CONFIG_FILES([\
         gr-pager/Makefile \
 	gr-pager/gnuradio-pager.pc \
+	gr-pager/apps/Makefile \
         gr-pager/src/Makefile \
         gr-pager/src/run_tests
     ])
diff --git a/gr-pager/Makefile.am b/gr-pager/Makefile.am
index d73e4050..984e6479 100644
--- a/gr-pager/Makefile.am
+++ b/gr-pager/Makefile.am
@@ -23,5 +23,9 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = src
 
+if PYTHON
+SUBDIRS += apps
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 dist_pkgconfig_DATA = gnuradio-pager.pc
diff --git a/gr-pager/apps/.gitignore b/gr-pager/apps/.gitignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/gr-pager/apps/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/gr-pager/apps/Makefile.am b/gr-pager/apps/Makefile.am
new file mode 100644
index 00000000..64a79f59
--- /dev/null
+++ b/gr-pager/apps/Makefile.am
@@ -0,0 +1,31 @@
+#
+# Copyright 2009 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
+
+if PYTHON
+
+dist_bin_SCRIPTS = \
+	usrp_flex.py \
+	usrp_flex_all.py \
+	usrp_flex_band.py 
+
+endif
diff --git a/gr-pager/src/usrp_flex.py b/gr-pager/apps/usrp_flex.py
similarity index 100%
rename from gr-pager/src/usrp_flex.py
rename to gr-pager/apps/usrp_flex.py
diff --git a/gr-pager/src/usrp_flex_all.py b/gr-pager/apps/usrp_flex_all.py
similarity index 100%
rename from gr-pager/src/usrp_flex_all.py
rename to gr-pager/apps/usrp_flex_all.py
diff --git a/gr-pager/src/usrp_flex_band.py b/gr-pager/apps/usrp_flex_band.py
similarity index 100%
rename from gr-pager/src/usrp_flex_band.py
rename to gr-pager/apps/usrp_flex_band.py
diff --git a/gr-pager/src/Makefile.am b/gr-pager/src/Makefile.am
index d084d05f..8a9f90d5 100644
--- a/gr-pager/src/Makefile.am
+++ b/gr-pager/src/Makefile.am
@@ -59,11 +59,6 @@ libgnuradio_pager_la_LDFLAGS =	\
 
 if PYTHON
 
-dist_bin_SCRIPTS = \
-	usrp_flex.py \
-	usrp_flex_all.py \
-	usrp_flex_band.py
-
 ##############################
 # SWIG interface and library
 TESTS = run_tests
-- 
2.30.2