summaryrefslogtreecommitdiff
path: root/gr-noaa/python
diff options
context:
space:
mode:
authorTom2009-10-06 10:40:39 -0700
committerTom2009-10-06 10:40:39 -0700
commitbbd3df51732b2b63ae9d20e9fddd12229cf6b2ef (patch)
treedbf63fb638238e389ad970f2f4443299491e8fc6 /gr-noaa/python
parent314726ae7457b37f442a2751285b75b0d616c0f4 (diff)
parent3f8026a00c261c788357b3a04f5b338a6cda4d0e (diff)
downloadgnuradio-bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef.tar.gz
gnuradio-bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef.tar.bz2
gnuradio-bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef.zip
Merge branch 'master' into sync
Conflicts: gr-utils/src/python/gr_plot_qt.py gr-utils/src/python/pyqt_plot.py gr-utils/src/python/pyqt_plot.ui
Diffstat (limited to 'gr-noaa/python')
-rw-r--r--gr-noaa/python/Makefile.am27
1 files changed, 27 insertions, 0 deletions
diff --git a/gr-noaa/python/Makefile.am b/gr-noaa/python/Makefile.am
new file mode 100644
index 000000000..869c5f353
--- /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
+