From e2216220f85d3e9d93db3946aa0e68e59309d1c2 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Sun, 20 Sep 2009 09:49:10 -0700
Subject: [PATCH] Reorganization of directories

Moved apps into own directory
Added (empty) python directory
---
 config/grc_gr_noaa.m4                  |  2 ++
 gr-noaa/Makefile.am                    |  6 ++---
 gr-noaa/apps/Makefile.am               | 33 ++++++++++++++++++++++++++
 gr-noaa/{grc => apps}/usrp_rx_hrpt.grc |  0
 gr-noaa/{grc => apps}/usrp_rx_hrpt.py  |  0
 gr-noaa/{grc => apps}/usrp_rx_lrit.grc |  0
 gr-noaa/{grc => apps}/usrp_rx_lrit.py  |  0
 gr-noaa/grc/Makefile.am                |  7 ------
 gr-noaa/python/Makefile.am             | 27 +++++++++++++++++++++
 9 files changed, 64 insertions(+), 11 deletions(-)
 create mode 100644 gr-noaa/apps/Makefile.am
 rename gr-noaa/{grc => apps}/usrp_rx_hrpt.grc (100%)
 rename gr-noaa/{grc => apps}/usrp_rx_hrpt.py (100%)
 rename gr-noaa/{grc => apps}/usrp_rx_lrit.grc (100%)
 rename gr-noaa/{grc => apps}/usrp_rx_lrit.py (100%)
 create mode 100644 gr-noaa/python/Makefile.am

diff --git a/config/grc_gr_noaa.m4 b/config/grc_gr_noaa.m4
index 260d8d06..fbc31fc2 100644
--- a/config/grc_gr_noaa.m4
+++ b/config/grc_gr_noaa.m4
@@ -25,8 +25,10 @@ AC_DEFUN([GRC_GR_NOAA],[
 
     AC_CONFIG_FILES([\
         gr-noaa/Makefile \
+	gr-noaa/apps/Makefile \
 	gr-noaa/grc/Makefile \
 	gr-noaa/lib/Makefile \
+	gr-noaa/python/Makefile \
 	gr-noaa/swig/Makefile \
     ])
 
diff --git a/gr-noaa/Makefile.am b/gr-noaa/Makefile.am
index fa03f108..f3f4f6a3 100644
--- a/gr-noaa/Makefile.am
+++ b/gr-noaa/Makefile.am
@@ -21,11 +21,9 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = lib 
+SUBDIRS = lib grc
 
 if PYTHON
-SUBDIRS += swig
+SUBDIRS += swig python apps
 endif
 
-SUBDIRS += grc
-
diff --git a/gr-noaa/apps/Makefile.am b/gr-noaa/apps/Makefile.am
new file mode 100644
index 00000000..23b8240c
--- /dev/null
+++ b/gr-noaa/apps/Makefile.am
@@ -0,0 +1,33 @@
+#
+# 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_rx_hrpt.py \
+	usrp_rx_lrit.py
+
+EXTRA_DIST = \
+	usrp_rx_hrpt.grc \
+	usrp_rx_lrit.grc
+endif
diff --git a/gr-noaa/grc/usrp_rx_hrpt.grc b/gr-noaa/apps/usrp_rx_hrpt.grc
similarity index 100%
rename from gr-noaa/grc/usrp_rx_hrpt.grc
rename to gr-noaa/apps/usrp_rx_hrpt.grc
diff --git a/gr-noaa/grc/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
similarity index 100%
rename from gr-noaa/grc/usrp_rx_hrpt.py
rename to gr-noaa/apps/usrp_rx_hrpt.py
diff --git a/gr-noaa/grc/usrp_rx_lrit.grc b/gr-noaa/apps/usrp_rx_lrit.grc
similarity index 100%
rename from gr-noaa/grc/usrp_rx_lrit.grc
rename to gr-noaa/apps/usrp_rx_lrit.grc
diff --git a/gr-noaa/grc/usrp_rx_lrit.py b/gr-noaa/apps/usrp_rx_lrit.py
similarity index 100%
rename from gr-noaa/grc/usrp_rx_lrit.py
rename to gr-noaa/apps/usrp_rx_lrit.py
diff --git a/gr-noaa/grc/Makefile.am b/gr-noaa/grc/Makefile.am
index 4e4c0bae..9f1f8819 100644
--- a/gr-noaa/grc/Makefile.am
+++ b/gr-noaa/grc/Makefile.am
@@ -23,15 +23,8 @@ include $(top_srcdir)/Makefile.common
 
 grcblocksdir = $(prefix)/share/gnuradio/grc/blocks
 
-dist_bin_SCRIPTS = \
-	usrp_rx_hrpt.py \
-	usrp_rx_lrit.py
-
 dist_grcblocks_DATA = \
 	noaa_hrpt_deframer.xml \
 	noaa_hrpt_pll_cf.xml \
 	noaa_hrpt_sync_fb.xml
 
-EXTRA_DIST = \
-	usrp_rx_hrpt.grc \
-	usrp_rx_lrit.grc
diff --git a/gr-noaa/python/Makefile.am b/gr-noaa/python/Makefile.am
new file mode 100644
index 00000000..869c5f35
--- /dev/null
+++ b/gr-noaa/python/Makefile.am
@@ -0,0 +1,27 @@
+#
+# 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
+
+endif
+
-- 
2.47.2