9 files changed, 112 insertions, 112 deletions
diff --git a/gnuradio-core/src/lib/swig/.gitignore b/gnuradio-core/src/lib/swig/.gitignore
index 5c514650d..0018a2a54 100644
--- a/gnuradio-core/src/lib/swig/.gitignore
+++ b/gnuradio-core/src/lib/swig/.gitignore
@@ -10,51 +10,51 @@
 /swigrun.py
 /swigrun_wrap.c
 /Makefile.swigdeps.new
-/gnuradio_swig_py_runtime.d
-/gnuradio_swig_py_general.d
-/gnuradio_swig_py_gengen.d
-/gnuradio_swig_py_filter.d
-/gnuradio_swig_py_io.d
+/gnuradio_core_runtime.d
+/gnuradio_core_general.d
+/gnuradio_core_gengen.d
+/gnuradio_core_filter.d
+/gnuradio_core_io.d
 /gnuradio_swig_bug_workaround.h
-/gnuradio_swig_py_runtime.cc
-/gnuradio_swig_py_runtime.h
-/gnuradio_swig_py_runtime.py
-/gnuradio_swig_py_general.cc
-/gnuradio_swig_py_general.h
-/gnuradio_swig_py_general.py
-/gnuradio_swig_py_gengen.cc
-/gnuradio_swig_py_gengen.h
-/gnuradio_swig_py_gengen.py
-/gnuradio_swig_py_filter.cc
-/gnuradio_swig_py_filter.h
-/gnuradio_swig_py_filter.py
-/gnuradio_swig_py_io.cc
-/gnuradio_swig_py_io.h
-/gnuradio_swig_py_io.py
-/gnuradio_swig_py_hier.cc
-/gnuradio_swig_py_hier.h
-/gnuradio_swig_py_hier.py
-/gnuradio_swig_py_filter_python.cc
-/gnuradio_swig_py_filter_python.h
-/gnuradio_swig_py_general_python.cc
-/gnuradio_swig_py_general_python.h
-/gnuradio_swig_py_gengen_python.cc
-/gnuradio_swig_py_gengen_python.h
-/gnuradio_swig_py_hier_python.cc
-/gnuradio_swig_py_hier_python.h
-/gnuradio_swig_py_io_python.cc
-/gnuradio_swig_py_io_python.h
-/gnuradio_swig_py_runtime_python.cc
-/gnuradio_swig_py_runtime_python.h
-/gnuradio_swig_py_filter.scm
-/gnuradio_swig_py_filter_guile.cc
-/gnuradio_swig_py_general.scm
-/gnuradio_swig_py_general_guile.cc
-/gnuradio_swig_py_gengen.scm
-/gnuradio_swig_py_gengen_guile.cc
-/gnuradio_swig_py_hier.scm
-/gnuradio_swig_py_hier_guile.cc
-/gnuradio_swig_py_io.scm
-/gnuradio_swig_py_io_guile.cc
-/gnuradio_swig_py_runtime.scm
-/gnuradio_swig_py_runtime_guile.cc
+/gnuradio_core_runtime.cc
+/gnuradio_core_runtime.h
+/gnuradio_core_runtime.py
+/gnuradio_core_general.cc
+/gnuradio_core_general.h
+/gnuradio_core_general.py
+/gnuradio_core_gengen.cc
+/gnuradio_core_gengen.h
+/gnuradio_core_gengen.py
+/gnuradio_core_filter.cc
+/gnuradio_core_filter.h
+/gnuradio_core_filter.py
+/gnuradio_core_io.cc
+/gnuradio_core_io.h
+/gnuradio_core_io.py
+/gnuradio_core_hier.cc
+/gnuradio_core_hier.h
+/gnuradio_core_hier.py
+/gnuradio_core_filter_python.cc
+/gnuradio_core_filter_python.h
+/gnuradio_core_general_python.cc
+/gnuradio_core_general_python.h
+/gnuradio_core_gengen_python.cc
+/gnuradio_core_gengen_python.h
+/gnuradio_core_hier_python.cc
+/gnuradio_core_hier_python.h
+/gnuradio_core_io_python.cc
+/gnuradio_core_io_python.h
+/gnuradio_core_runtime_python.cc
+/gnuradio_core_runtime_python.h
+/gnuradio_core_filter.scm
+/gnuradio_core_filter_guile.cc
+/gnuradio_core_general.scm
+/gnuradio_core_general_guile.cc
+/gnuradio_core_gengen.scm
+/gnuradio_core_gengen_guile.cc
+/gnuradio_core_hier.scm
+/gnuradio_core_hier_guile.cc
+/gnuradio_core_io.scm
+/gnuradio_core_io_guile.cc
+/gnuradio_core_runtime.scm
+/gnuradio_core_runtime_guile.cc
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 67d188957..f354efe0b 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -35,13 +35,13 @@ endif
 # X86_64, g++'s resident set size was 650MB!
 # ----------------------------------------------------------------
 
-TOP_SWIG_IFILES =			\
-	gnuradio_swig_py_runtime.i	\
-	gnuradio_swig_py_general.i	\
-	gnuradio_swig_py_gengen.i	\
-	gnuradio_swig_py_filter.i	\
-	gnuradio_swig_py_io.i		\
-	gnuradio_swig_py_hier.i
+TOP_SWIG_IFILES =		\
+	gnuradio_core_runtime.i	\
+	gnuradio_core_general.i	\
+	gnuradio_core_gengen.i	\
+	gnuradio_core_filter.i	\
+	gnuradio_core_io.i	\
+	gnuradio_core_hier.i
 
 
 # SWIG headers get installed in ${prefix}/include/gnuradio/swig
@@ -73,8 +73,8 @@ ourpython_PYTHON = gnuradio_swig_python.py
 # ----------------------------------------------------------------
 # FIXME As of swig 1.3.31, this still seems to be required...
 
-gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.py $(srcdir)/gen-swig-bug-fix
-	$(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_swig_py_runtime.cc $@
+gnuradio_swig_bug_workaround.h : gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix
+	$(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = gnuradio_swig_bug_workaround.h
@@ -83,20 +83,20 @@ grinclude_HEADERS = gnuradio_swig_bug_workaround.h
 #   import gnuradio.gr
 # This ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio/gr
-gnuradio_swig_py_runtime_pythondir_category = gnuradio/gr
-gnuradio_swig_py_general_pythondir_category = gnuradio/gr
-gnuradio_swig_py_gengen_pythondir_category  = gnuradio/gr
-gnuradio_swig_py_filter_pythondir_category  = gnuradio/gr
-gnuradio_swig_py_io_pythondir_category      = gnuradio/gr
-gnuradio_swig_py_hier_pythondir_category    = gnuradio/gr
+gnuradio_core_runtime_pythondir_category = gnuradio/gr
+gnuradio_core_general_pythondir_category = gnuradio/gr
+gnuradio_core_gengen_pythondir_category  = gnuradio/gr
+gnuradio_core_filter_pythondir_category  = gnuradio/gr
+gnuradio_core_io_pythondir_category      = gnuradio/gr
+gnuradio_core_hier_pythondir_category    = gnuradio/gr
 
 # additional libraries for linking with each SWIG-generated library
-gnuradio_swig_py_runtime_la_swig_libadd = $(GNURADIO_CORE_LA)
-gnuradio_swig_py_general_la_swig_libadd = $(GNURADIO_CORE_LA)
-gnuradio_swig_py_gengen_la_swig_libadd  = $(GNURADIO_CORE_LA)
-gnuradio_swig_py_filter_la_swig_libadd  = $(GNURADIO_CORE_LA)
-gnuradio_swig_py_io_la_swig_libadd      = $(GNURADIO_CORE_LA)
-gnuradio_swig_py_hier_la_swig_libadd    = $(GNURADIO_CORE_LA)
+gnuradio_core_runtime_la_swig_libadd = $(GNURADIO_CORE_LA)
+gnuradio_core_general_la_swig_libadd = $(GNURADIO_CORE_LA)
+gnuradio_core_gengen_la_swig_libadd  = $(GNURADIO_CORE_LA)
+gnuradio_core_filter_la_swig_libadd  = $(GNURADIO_CORE_LA)
+gnuradio_core_io_la_swig_libadd      = $(GNURADIO_CORE_LA)
+gnuradio_core_hier_la_swig_libadd    = $(GNURADIO_CORE_LA)
 
 # add some of the variables generated inside the Makefile.swig
 
@@ -118,5 +118,5 @@ no_dist_files = $(swig_built_sources)
 
 # Compile a .i to what guile needs. We use -o to set the output file name,
 # or even with -outdir guile in SWIG_GUILE_ARGS, swig keeps putting a 
-# gnuradio_swig_py_*_wrap.cxx in the source directory.
+# gnuradio_core_*_wrap.cxx in the source directory.
 
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i
index e40af08ca..d9751d0f1 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2009 Free Software Foundation, Inc.
- * 
+ * Copyright 2006,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio_swig_py_filter" "SWIG_init")
+(load-extension "libguile-gnuradio_core_filter" "SWIG_init")
 %}
  #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i
index c4e9c070d..07ef90e34 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2009 Free Software Foundation, Inc.
- * 
+ * Copyright 2006,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio_swig_py_general" "SWIG_init")
+(load-extension "libguile-gnuradio_core_general" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i
index 54e1b0944..ea78d8af6 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2009 Free Software Foundation, Inc.
- * 
+ * Copyright 2006,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio_swig_py_gengen" "SWIG_init")
+(load-extension "libguile-gnuradio_core_gengen" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
index 61029b120..f69b80334 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Free Software Foundation, Inc.
- * 
+ * Copyright 2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio_swig_py_heir" "SWIG_init")
+(load-extension "libguile-gnuradio_core_heir" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i
index d7d206ef8..82acae747 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2009 Free Software Foundation, Inc.
- * 
+ * Copyright 2006,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -31,6 +31,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio_swig_py_io" "SWIG_init")
+(load-extension "libguile-gnuradio_core_io" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i
index 088ae4cf8..3cc0a053d 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Free Software Foundation, Inc.
- * 
+ * Copyright 2009,2010 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,
@@ -34,6 +34,6 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio_swig_py_runtime" "SWIG_init")
+(load-extension "libguile-gnuradio_core_runtime" "SWIG_init")
 %}
 #endif
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py b/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
index 5324b2309..8f9fffd5c 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
+++ b/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2006,2009 Free Software Foundation, Inc.
+# Copyright 2006,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,9 +20,9 @@
 
 # This file implements the old gnuradio_swig_python namespace
 
-from gnuradio_swig_py_runtime import *
-from gnuradio_swig_py_general import *
-from gnuradio_swig_py_gengen import *
-from gnuradio_swig_py_filter import *
-from gnuradio_swig_py_io import *
-from gnuradio_swig_py_hier import *
+from gnuradio_core_runtime import *
+from gnuradio_core_general import *
+from gnuradio_core_gengen import *
+from gnuradio_core_filter import *
+from gnuradio_core_io import *
+from gnuradio_core_hier import *