3 files changed, 59 insertions, 47 deletions

diff --git a/gr-howto-write-a-block/swig/Makefile.am b/gr-howto-write-a-block/swig/Makefile.am
index d55c8070d..87134af93 100644
--- a/gr-howto-write-a-block/swig/Makefile.am
+++ b/gr-howto-write-a-block/swig/Makefile.am
@@ -28,13 +28,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib
 # SWIG interfaces and libraries
 
 TOP_SWIG_IFILES = \
-	howto.i
+	howto_swig.i
 
 # Install so that they end up available as:
 #   import howto
 # This ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/$(modname)
-howto_la_swig_libadd =		\
+howto_swig_la_swig_libadd = \
 	$(top_builddir)/lib/libgnuradio-howto.la
 
 # additional SWIG files to be installed
diff --git a/gr-howto-write-a-block/swig/Makefile.swig.gen b/gr-howto-write-a-block/swig/Makefile.swig.gen
index 72d8a09aa..310cfb8da 100644
--- a/gr-howto-write-a-block/swig/Makefile.swig.gen
+++ b/gr-howto-write-a-block/swig/Makefile.swig.gen
@@ -20,37 +20,37 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-# Makefile.swig.gen for howto.i
+# Makefile.swig.gen for howto_swig.i
 
 ## Default install locations for these files:
 ##
 ## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/howto
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/howto_swig
 ## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/howto
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/howto_swig
 ##
 ## The following can be overloaded to change the install location, but
 ## this has to be done in the including Makefile.am -before-
 ## Makefile.swig is included.
 
-howto_pythondir_category ?= gnuradio/howto
-howto_pylibdir_category ?= $(howto_pythondir_category)
-howto_pythondir = $(pythondir)/$(howto_pythondir_category)
-howto_pylibdir = $(pyexecdir)/$(howto_pylibdir_category)
+howto_swig_pythondir_category ?= gnuradio/howto_swig
+howto_swig_pylibdir_category ?= $(howto_swig_pythondir_category)
+howto_swig_pythondir = $(pythondir)/$(howto_swig_pythondir_category)
+howto_swig_pylibdir = $(pyexecdir)/$(howto_swig_pylibdir_category)
 
 # The .so libraries for the guile modules get installed whereever guile
 # is installed, usually /usr/lib/guile/gnuradio/
 # FIXME: determince whether these should be installed with gnuradio.
-howto_scmlibdir = $(libdir)
+howto_swig_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/howto
+# is installed, usually /usr/share/guile/site/howto_swig
 # FIXME: determince whether these should be installed with gnuradio.
-howto_scmdir = $(guiledir)
+howto_swig_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
-howto_swigincludedir = $(swigincludedir)
+howto_swig_swigincludedir = $(swigincludedir)
 
 ## This is a template file for a "generated" Makefile addition (in
 ## this case, "Makefile.swig.gen").  By including the top-level
@@ -75,58 +75,70 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
 
-howto_swiginclude_HEADERS =		\
-	howto.i			\
-	$(howto_swiginclude_headers)
+howto_swig_swiginclude_HEADERS =		\
+	howto_swig.i			\
+	$(howto_swig_swiginclude_headers)
 
-howto_pylib_LTLIBRARIES =		\
-	_howto.la
+if PYTHON
+howto_swig_pylib_LTLIBRARIES =		\
+	_howto_swig.la
 
-_howto_la_SOURCES = 			\
-	python/howto.cc		\
-	$(howto_la_swig_sources)
+_howto_swig_la_SOURCES = 			\
+	python/howto_swig.cc		\
+	$(howto_swig_la_swig_sources)
 
-_howto_la_LIBADD =			\
+howto_swig_python_PYTHON =			\
+	howto_swig.py			\
+	$(howto_swig_python)
+
+_howto_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
-	$(howto_la_swig_libadd)
+	$(howto_swig_la_swig_libadd)
 
-_howto_la_LDFLAGS =			\
+_howto_swig_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(howto_la_swig_ldflags)
+	$(howto_swig_la_swig_ldflags)
 
-_howto_la_CXXFLAGS =			\
+_howto_swig_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
-	$(howto_la_swig_cxxflags)
-
-howto_python_PYTHON =			\
-	howto.py			\
-	$(howto_python)
+	$(howto_swig_la_swig_cxxflags)
 
-python/howto.cc: howto.py
-howto.py: howto.i
+python/howto_swig.cc: howto_swig.py
+howto_swig.py: howto_swig.i
 
 # Include the python dependencies for this file
--include python/howto.d
-# end of PYTHON
+-include python/howto_swig.d
+
+endif		# end of if python
 
 if GUILE
-howto_scmlib_LTLIBRARIES = libguile-howto.la
-libguile_howto_la_SOURCES =		\
-	guile/howto.cc			\
-	$(howto_la_swig_sources)
-nobase_howto_scm_DATA = gnuradio/howto.scm gnuradio/howto-primitive.scm
 
-libguile_howto_la_LIBADD = $(_howto_la_LIBADD)
-libguile_howto_la_LDFLAGS = $(_howto_la_LDFLAGS)
-libguile_howto_la_CXXFLAGS = $(_howto_la_CXXFLAGS)
+howto_swig_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-howto_swig.la
+libguile_gnuradio_howto_swig_la_SOURCES =	\
+	guile/howto_swig.cc			\
+	$(howto_swig_la_swig_sources)
+nobase_howto_swig_scm_DATA = 		\
+	gnuradio/howto_swig.scm 		\
+	gnuradio/howto_swig-primitive.scm
+libguile_gnuradio_howto_swig_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(howto_swig_la_swig_libadd)
+libguile_gnuradio_howto_swig_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(howto_swig_la_swig_ldflags)
+libguile_gnuradio_howto_swig_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(howto_swig_la_swig_cxxflags)
 
-guile/howto.cc: gnuradio/howto.scm
-gnuradio/howto.scm: howto.i
-gnuradio/howto-primitive.scm: gnuradio/howto.scm
+guile/howto_swig.cc: gnuradio/howto_swig.scm
+gnuradio/howto_swig.scm: howto_swig.i
+gnuradio/howto_swig-primitive.scm: gnuradio/howto_swig.scm
 
 # Include the guile dependencies for this file
--include guile/howto.d
+-include guile/howto_swig.d
 
 endif				# end of GUILE
 
diff --git a/gr-howto-write-a-block/swig/howto.i b/gr-howto-write-a-block/swig/howto_swig.i
index 868df5739..868df5739 100644
--- a/gr-howto-write-a-block/swig/howto.i
+++ b/gr-howto-write-a-block/swig/howto_swig.i