8 files changed, 4 insertions, 277 deletions
diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt
index 5fdc2b218..558248d08 100644
--- a/gruel/CMakeLists.txt
+++ b/gruel/CMakeLists.txt
@@ -81,7 +81,6 @@ CPACK_COMPONENT("gruel_swig"
 # Add subdirectories
 ########################################################################
 add_subdirectory(src/include/gruel)
-add_subdirectory(src/scheme/gnuradio)
 add_subdirectory(src/lib)
 if(ENABLE_PYTHON)
     add_subdirectory(src/swig)
diff --git a/gruel/src/lib/pmt/CMakeLists.txt b/gruel/src/lib/pmt/CMakeLists.txt
index a708fa7ad..a8e15cac6 100644
--- a/gruel/src/lib/pmt/CMakeLists.txt
+++ b/gruel/src/lib/pmt/CMakeLists.txt
@@ -26,9 +26,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ########################################################################
 # Generate serial tags header file
 ########################################################################
-get_filename_component(SCHEME_DIR
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../scheme/gnuradio ABSOLUTE
-)
 
 get_filename_component(PMT_SERIAL_TAGS_H
     ${CMAKE_CURRENT_BINARY_DIR}/../../include/gruel/pmt_serial_tags.h ABSOLUTE
@@ -36,11 +33,11 @@ get_filename_component(PMT_SERIAL_TAGS_H
 
 add_custom_command(
     OUTPUT ${PMT_SERIAL_TAGS_H}
-    DEPENDS ${SCHEME_DIR}/gen-serial-tags.py
-    DEPENDS ${SCHEME_DIR}/pmt-serial-tags.scm
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen-serial-tags.py
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pmt-serial-tags.scm
     COMMAND ${PYTHON_EXECUTABLE}
-        ${SCHEME_DIR}/gen-serial-tags.py
-        ${SCHEME_DIR}/pmt-serial-tags.scm
+        ${CMAKE_CURRENT_SOURCE_DIR}/gen-serial-tags.py
+        ${CMAKE_CURRENT_SOURCE_DIR}/pmt-serial-tags.scm
         ${PMT_SERIAL_TAGS_H}
 )
 
diff --git a/gruel/src/scheme/gnuradio/gen-serial-tags.py b/gruel/src/lib/pmt/gen-serial-tags.py
index 18e927beb..18e927beb 100644
--- a/gruel/src/scheme/gnuradio/gen-serial-tags.py
+++ b/gruel/src/lib/pmt/gen-serial-tags.py
diff --git a/gruel/src/scheme/gnuradio/pmt-serial-tags.scm b/gruel/src/lib/pmt/pmt-serial-tags.scm
index 646a751ea..646a751ea 100644
--- a/gruel/src/scheme/gnuradio/pmt-serial-tags.scm
+++ b/gruel/src/lib/pmt/pmt-serial-tags.scm
diff --git a/gruel/src/scheme/gnuradio/CMakeLists.txt b/gruel/src/scheme/gnuradio/CMakeLists.txt
deleted file mode 100644
index 4ff4f7feb..000000000
--- a/gruel/src/scheme/gnuradio/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 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,
-# Boston, MA 02110-1301, USA.
-
-########################################################################
-
-install(FILES
-    pmt-serial-tags.scm
-    pmt-serialize.scm
-    macros-etc.scm
-DESTINATION ${GR_PKG_DATA_DIR} COMPONENT "gruel_swig")
diff --git a/gruel/src/scheme/gnuradio/macros-etc.scm b/gruel/src/scheme/gnuradio/macros-etc.scm
deleted file mode 100644
index ac2a4a342..000000000
--- a/gruel/src/scheme/gnuradio/macros-etc.scm
+++ /dev/null
@@ -1,50 +0,0 @@
-;;; -*- scheme -*-
-;;;
-;;; Copyright 2007 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.
-;;;
-
-(define-module (gnuradio macros-etc)
-  :export (atom? when unless for-each-in-file))
-
-(define (atom? obj)
-  (not (pair? obj)))
-
-(defmacro when (pred . body)
-  `(if ,pred (begin ,@body) #f))
-
-(defmacro unless (pred . body)
-  `(if (not ,pred) (begin ,@body) #f))
-
-
-(define (for-each-in-file file f)
-  (let ((port (if (port? file)
-		  file
-		  (open-input-file file))))
-    (letrec
-     ((loop
-       (lambda (port form)
-	 (cond ((eof-object? form)
-		(when (not (eq? port file))
-		      (close-input-port port))
-		#t)
-	       (else
-		(f form)
-		(set! form #f)		; for GC
-		(loop port (read port)))))))
-     (loop port (read port)))))
diff --git a/gruel/src/scheme/gnuradio/pmt-serialize.scm b/gruel/src/scheme/gnuradio/pmt-serialize.scm
deleted file mode 100644
index c1d32d75b..000000000
--- a/gruel/src/scheme/gnuradio/pmt-serialize.scm
+++ /dev/null
@@ -1,48 +0,0 @@
-;;;
-;;; Copyright 2007 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.
-;;;
-
-;;; An implementation of pmt_serialize in scheme.
-;;; Currently handles only symbols and pairs.  They're all we need for now.
-
-(define-module (gnuradio pmt-serialize)
-  :export (pmt-serialize))
-
-(load-from-path "gnuradio/pmt-serial-tags")
-
-(define (pmt-serialize obj put-byte)
-  (define (put-u16 x)
-    (put-byte (logand (ash x -8) #xff))
-    (put-byte (logand x #xff)))
-    
-  (cond ((null? obj)
-	 (put-byte pst-null))
-	((symbol? obj)
-	 (let* ((sym-as-bytes (map char->integer (string->list (symbol->string obj))))
-		(len (length sym-as-bytes)))
-	   (put-byte pst-symbol)
-	   (put-u16 len)
-	   (for-each put-byte sym-as-bytes)))
-	
-	((pair? obj)
-	 (put-byte pst-pair)
-	 (pmt-serialize (car obj) put-byte)
-	 (pmt-serialize (cdr obj) put-byte))
-	(else
-	 (throw 'not-implemented "pmt-serialize" obj))))
diff --git a/gruel/src/swig/Makefile.swig.gen b/gruel/src/swig/Makefile.swig.gen
deleted file mode 100644
index 0abba0299..000000000
--- a/gruel/src/swig/Makefile.swig.gen
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- Makefile -*-
-#
-# 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.
-# 
-
-# Makefile.swig.gen for pmt_swig.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/pmt_swig
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/pmt_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.
-
-pmt_swig_pythondir_category ?= gnuradio/pmt_swig
-pmt_swig_pylibdir_category ?= $(pmt_swig_pythondir_category)
-pmt_swig_pythondir = $(pythondir)/$(pmt_swig_pythondir_category)
-pmt_swig_pylibdir = $(pyexecdir)/$(pmt_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.
-pmt_swig_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/pmt_swig
-# FIXME: determince whether these should be installed with gnuradio.
-pmt_swig_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-pmt_swig_swigincludedir = $(gruelswigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-pmt_swig_swiginclude_HEADERS =		\
-	pmt_swig.i			\
-	$(pmt_swig_swiginclude_headers)
-
-if PYTHON
-pmt_swig_pylib_LTLIBRARIES =		\
-	_pmt_swig.la
-
-_pmt_swig_la_SOURCES = 			\
-	python/pmt_swig.cc		\
-	$(pmt_swig_la_swig_sources)
-
-pmt_swig_python_PYTHON =			\
-	pmt_swig.py			\
-	$(pmt_swig_python)
-
-_pmt_swig_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(pmt_swig_la_swig_libadd)
-
-_pmt_swig_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(pmt_swig_la_swig_ldflags)
-
-_pmt_swig_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(pmt_swig_la_swig_cxxflags)
-
-python/pmt_swig.cc: pmt_swig.py
-pmt_swig.py: pmt_swig.i 
-
-# Include the python dependencies for this file
--include python/pmt_swig.d
-
-endif		# end of if python
-
-if GUILE
-
-pmt_swig_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-pmt_swig.la
-libguile_gnuradio_pmt_swig_la_SOURCES =	\
-	guile/pmt_swig.cc			\
-	$(pmt_swig_la_swig_sources)
-nobase_pmt_swig_scm_DATA = 		\
-	gnuradio/pmt_swig.scm 		\
-	gnuradio/pmt_swig-primitive.scm
-libguile_gnuradio_pmt_swig_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(pmt_swig_la_swig_libadd)
-libguile_gnuradio_pmt_swig_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(pmt_swig_la_swig_ldflags)
-libguile_gnuradio_pmt_swig_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(pmt_swig_la_swig_cxxflags)
-
-guile/pmt_swig.cc: gnuradio/pmt_swig.scm
-gnuradio/pmt_swig.scm: pmt_swig.i
-gnuradio/pmt_swig-primitive.scm: gnuradio/pmt_swig.scm
-
-# Include the guile dependencies for this file
--include guile/pmt_swig.d
-
-endif				# end of GUILE
-
-