Merge commit 'origin' into new_eth

Conflicts:
	.gitignore

1 files changed, 35 insertions, 0 deletions

diff --git a/gr-noaa/apps/Makefile.am b/gr-noaa/apps/Makefile.am
new file mode 100644
index 000000000..906638ff1
--- /dev/null
+++ b/gr-noaa/apps/Makefile.am
@@ -0,0 +1,35 @@
+#
+# 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 = \
+	demod_hrpt_file.py \
+	usrp_rx_hrpt.py \
+	usrp_rx_lrit.py
+
+EXTRA_DIST = \
+	demod_hrpt_file.grc \
+	usrp_rx_hrpt.grc \
+	usrp_rx_lrit.grc
+endif