Merge branch 'next'

11 files changed, 0 insertions, 267 deletions

diff --git a/gr-wxgui/.gitignore b/gr-wxgui/.gitignore
deleted file mode 100644
index cdcf41b15..000000000
--- a/gr-wxgui/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.cache
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/make.log
-/missing
-/missing
-/mkinstalldirs
-/py-compile
-/stamp-h
-/stamp-h.in
-/stamp-h1
diff --git a/gr-wxgui/Makefile.am b/gr-wxgui/Makefile.am
deleted file mode 100644
index cfc7a429c..000000000
--- a/gr-wxgui/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright 2004,2006,2008 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 += \
-    gr-wxgui.pc.in \
-    README \
-    README.gl
-
-if PYTHON
-SUBDIRS = src grc
-
-etcdir = $(gr_prefsdir)
-dist_etc_DATA = gr-wxgui.conf
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gr-wxgui.pc
-endif
diff --git a/gr-wxgui/grc/.gitignore b/gr-wxgui/grc/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-wxgui/grc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-wxgui/grc/Makefile.am b/gr-wxgui/grc/Makefile.am
deleted file mode 100644
index d8c7b3471..000000000
--- a/gr-wxgui/grc/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# 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
-
-grcblocksdir = $(grc_blocksdir)
-dist_grcblocks_DATA = \
-	notebook.xml \
-	variable_check_box.xml \
-	variable_chooser.xml \
-	variable_slider.xml \
-	variable_static_text.xml \
-	variable_text_box.xml \
-	wxgui_constellationsink2.xml \
-	wxgui_fftsink2.xml \
-	wxgui_histosink2.xml \
-	wxgui_numbersink2.xml \
-	wxgui_scopesink2.xml \
-	wxgui_termsink.xml \
-	wxgui_waterfallsink2.xml
-
-#The wxgui module contains a top_block + wxgui frame.
-wxgui_pythondir = $(pythondir)/grc_gnuradio/wxgui
-wxgui_python_PYTHON = \
-	__init__.py \
-	panel.py \
-	top_block_gui.py
diff --git a/gr-wxgui/src/.gitignore b/gr-wxgui/src/.gitignore
deleted file mode 100644
index f9c5da0db..000000000
--- a/gr-wxgui/src/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gr-wxgui/src/Makefile.am b/gr-wxgui/src/Makefile.am
deleted file mode 100644
index b6207ff05..000000000
--- a/gr-wxgui/src/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright 2004 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
-
-SUBDIRS = python
diff --git a/gr-wxgui/src/python/.gitignore b/gr-wxgui/src/python/.gitignore
deleted file mode 100644
index f9c5da0db..000000000
--- a/gr-wxgui/src/python/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gr-wxgui/src/python/Makefile.am b/gr-wxgui/src/python/Makefile.am
deleted file mode 100644
index 2382d599c..000000000
--- a/gr-wxgui/src/python/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Copyright 2004,2005,2008,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
-
-SUBDIRS = plotter
-
-# Install this stuff so that it ends up as the gnuradio.wxgui module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/wxgui
-
-ourpythondir = $(grpythondir)/wxgui
-ourlibdir    = $(grpyexecdir)/wxgui
-
-ourpython_PYTHON =			\
-	__init__.py			\
-	common.py			\
-	constants.py			\
-	constsink_gl.py			\
-	const_window.py			\
-	form.py				\
-	fftsink2.py			\
-	fftsink_nongl.py		\
-	fftsink_gl.py			\
-	fft_window.py			\
-	gui.py				\
-	histosink_gl.py			\
-	histo_window.py			\
-	numbersink2.py			\
-	number_window.py		\
-	plot.py				\
-	powermate.py			\
-	pubsub.py			\
-	scopesink2.py			\
-	scopesink_nongl.py		\
-	scopesink_gl.py			\
-	scope_window.py			\
-	termsink.py			\
-	waterfallsink2.py		\
-	waterfallsink_nongl.py		\
-	waterfallsink_gl.py		\
-	waterfall_window.py		\
-	slider.py			\
-	stdgui2.py
-
-formspythondir = $(grpythondir)/wxgui/forms
-
-formspython_PYTHON = \
-	forms/__init__.py \
-	forms/forms.py \
-	forms/converters.py
diff --git a/gr-wxgui/src/python/forms/.gitignore b/gr-wxgui/src/python/forms/.gitignore
deleted file mode 100644
index a74b07aee..000000000
--- a/gr-wxgui/src/python/forms/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/gr-wxgui/src/python/plotter/.gitignore b/gr-wxgui/src/python/plotter/.gitignore
deleted file mode 100644
index b6950912c..000000000
--- a/gr-wxgui/src/python/plotter/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile
-/Makefile.in
-/*.pyc
diff --git a/gr-wxgui/src/python/plotter/Makefile.am b/gr-wxgui/src/python/plotter/Makefile.am
deleted file mode 100644
index d00f0a425..000000000
--- a/gr-wxgui/src/python/plotter/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright 2004,2005,2008,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
-
-# Install this stuff so that it ends up as the gnuradio.wxgui module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/wxgui
-
-ourpythondir = $(grpythondir)/wxgui/plotter
-ourlibdir    = $(grpyexecdir)/wxgui/plotter
-
-ourpython_PYTHON =			\
-	__init__.py			\
-	bar_plotter.py		\
-	channel_plotter.py		\
-	common.py			\
-	gltext.py			\
-	grid_plotter_base.py	\
-	plotter_base.py			\
-	waterfall_plotter.py
-