Removed autotools, gr-waveform, some cleanup

Nick Foster owes Nick Corgan a six-pack of beer!

18 files changed, 0 insertions, 751 deletions

diff --git a/gr-trellis/.gitignore b/gr-trellis/.gitignore
deleted file mode 100644
index f3462d009..000000000
--- a/gr-trellis/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/configure
-/config.h.in
-/stamp-h.in
-/libtool
-/config.log
-/config.h
-/config.cache
-/config.status
-/missing
-/stamp-h
-/stamp-h1
-/.deps
-/.libs
-/*.la
-/*.lo
-/autom4te.cache
-/*.cache
-/missing
-/make.log
-/*.pc
diff --git a/gr-trellis/Makefile.am b/gr-trellis/Makefile.am
deleted file mode 100644
index 89d190ecf..000000000
--- a/gr-trellis/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright 2004,2006 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 = src grc doc
-
-pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = gnuradio-trellis.pc
diff --git a/gr-trellis/doc/.gitignore b/gr-trellis/doc/.gitignore
deleted file mode 100644
index 98c25189f..000000000
--- a/gr-trellis/doc/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile
-/Makefile.in
-/*.html
diff --git a/gr-trellis/doc/Makefile.am b/gr-trellis/doc/Makefile.am
deleted file mode 100644
index 9e6b81ac0..000000000
--- a/gr-trellis/doc/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright 2004,2005,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
-
-HTML_FILES =
-
-if HAS_XMLTO
-HTML_FILES += \
-    gr-trellis.html
-endif
-
-all: $(HTML_FILES)
-
-EXTRA_DIST += \
-    gr-trellis.xml \
-    make_numbered_listing.py \
-    test_tcm.py \
-    test_tcm.py.xml \
-    test_viterbi_equalization1.py \
-    test_viterbi_equalization1.py.xml
-
-BUILT_XML_FILES = 			
-
-htmldocdir = $(gr_docdir)/html
-htmldoc_DATA = $(HTML_FILES)
-
-# ----------------------------------------------------------------
-
-gr-trellis.html : gr-trellis.xml
-	xmlto html-nochunks $(top_srcdir)/gr-trellis/doc/gr-trellis.xml
-
-test_tcm.py.xml : test_tcm.py make_numbered_listing.py
-	$(srcdir)/make_numbered_listing.py $<
-
-test_viterbi_equalization1.py.xml : test_viterbi_equalization1.py make_numbered_listing.py
-	$(srcdir)/make_numbered_listing.py $<
-
-clean-local:
-	$(RM) -fr $(HTML_FILES) *~
diff --git a/gr-trellis/grc/.gitignore b/gr-trellis/grc/.gitignore
deleted file mode 100644
index f3462d009..000000000
--- a/gr-trellis/grc/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/configure
-/config.h.in
-/stamp-h.in
-/libtool
-/config.log
-/config.h
-/config.cache
-/config.status
-/missing
-/stamp-h
-/stamp-h1
-/.deps
-/.libs
-/*.la
-/*.lo
-/autom4te.cache
-/*.cache
-/missing
-/make.log
-/*.pc
diff --git a/gr-trellis/grc/Makefile.am b/gr-trellis/grc/Makefile.am
deleted file mode 100644
index 518c7f055..000000000
--- a/gr-trellis/grc/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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
-
-grcblocksdir = $(grc_blocksdir)
-
-dist_grcblocks_DATA = \
-	trellis_encoder_xx.xml \
-	trellis_siso_combined_f.xml       \
-	trellis_viterbi_x.xml \
-	trellis_metrics_x.xml     \
-	trellis_siso_f.xml \
-	trellis_permutation.xml   \
-	trellis_viterbi_combined_xx.xml \
-        trellis_sccc_encoder_xx.xml \
-        trellis_sccc_decoder_x.xml \
-        trellis_sccc_decoder_combined_xx.xml \
-        trellis_pccc_encoder_xx.xml  \
-        trellis_pccc_decoder_x.xml  \
-        trellis_pccc_decoder_combined_xx.xml 
diff --git a/gr-trellis/src/.gitignore b/gr-trellis/src/.gitignore
deleted file mode 100644
index bb3f27777..000000000
--- a/gr-trellis/src/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/howto.cc
-/howto.py
diff --git a/gr-trellis/src/Makefile.am b/gr-trellis/src/Makefile.am
deleted file mode 100644
index 79e9d626a..000000000
--- a/gr-trellis/src/Makefile.am
+++ /dev/null
@@ -1,25 +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.
-# 
-
-SUBDIRS = lib 
-if PYTHON
-SUBDIRS += python examples
-endif
diff --git a/gr-trellis/src/examples/.gitignore b/gr-trellis/src/examples/.gitignore
deleted file mode 100644
index c400497f5..000000000
--- a/gr-trellis/src/examples/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gr-trellis/src/examples/Makefile.am b/gr-trellis/src/examples/Makefile.am
deleted file mode 100644
index 92aeadfad..000000000
--- a/gr-trellis/src/examples/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright 2004,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 = fsm_files
-
-ourdatadir = $(exampledir)/trellis
-
-dist_ourdata_DATA =	\
-        README
-
-dist_ourdata_SCRIPTS =			\
-	fsm_utils.py			\
-	test_tcm.py			\
-	test_tcm_parallel.py		\
-	test_tcm_combined.py		\
-	test_sccc_hard.py		\
-	test_sccc_soft.py     		\
-	test_sccc_turbo.py    		\
-	test_viterbi_equalization1.py	\
-	test_viterbi_equalization.py	\
-	test_turbo_equalization.py	\
-	test_turbo_equalization1.py	\
-	test_turbo_equalization2.py
diff --git a/gr-trellis/src/examples/fsm_files/.gitignore b/gr-trellis/src/examples/fsm_files/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-trellis/src/examples/fsm_files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-trellis/src/examples/fsm_files/Makefile.am b/gr-trellis/src/examples/fsm_files/Makefile.am
deleted file mode 100644
index c4cbb2e93..000000000
--- a/gr-trellis/src/examples/fsm_files/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright 2004,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
-
-ourdatadir = $(exampledir)/trellis/fsm_files
-
-dist_ourdata_DATA =		\
-	awgn1o2_128.fsm		\
-	awgn1o2_16.fsm		\
-	awgn1o2_4.fsm		\
-	awgn1o2_8.fsm		\
-	awgn2o3_16.fsm		\
-	awgn2o3_4.fsm		\
-	awgn2o3_4_msb.fsm	\
-	awgn2o3_4_msbG.fsm	\
-	awgn2o3_8.fsm		\
-	awgn2o4_4.fsm		\
-	disconnected.fsm	\
-	rep3.fsm		\
-	rep5.fsm		\
-	simple.fsm
diff --git a/gr-trellis/src/lib/.gitignore b/gr-trellis/src/lib/.gitignore
deleted file mode 100644
index 7a866aead..000000000
--- a/gr-trellis/src/lib/.gitignore
+++ /dev/null
@@ -1,193 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/trellis.cc
-/trellis.py
-/wip
-/trellis_encoder_bs.cc
-/trellis_metrics_c.h
-/trellis_metrics_c.i
-/trellis_metrics_f.cc
-/trellis_viterbi_i.h
-/trellis_viterbi_combined_i.h
-/trellis_viterbi_i.i
-/trellis_viterbi_combined_i.i
-/trellis_metrics_i.h
-/trellis_metrics_i.i
-/trellis_encoder_bb.cc
-/trellis_encoder_ss.cc
-/trellis_viterbi_combined_s.h
-/trellis_viterbi_s.h
-/trellis_viterbi_combined_s.i
-/trellis_viterbi_s.i
-/trellis_metrics_s.h
-/trellis_metrics_s.i
-/trellis_encoder_si.h
-/trellis_encoder_si.i
-/trellis_metrics_i.cc
-/trellis_viterbi_s.cc
-/trellis_viterbi_combined_s.cc
-/trellis_encoder_ss.h
-/trellis_encoder_ss.i
-/trellis_encoder_bi.cc
-/trellis_encoder_bi.h
-/trellis_encoder_bi.i
-/trellis_encoder_ii.cc
-/trellis_viterbi_combined_b.cc
-/trellis_viterbi_b.cc
-/trellis_encoder_bs.h
-/trellis_encoder_bs.i
-/trellis_viterbi_combined_b.h
-/trellis_viterbi_b.h
-/trellis_viterbi_combined_b.i
-/trellis_viterbi_b.i
-/trellis_encoder_si.cc
-/trellis_metrics_f.h
-/trellis_metrics_f.i
-/trellis_encoder_ii.h
-/trellis_encoder_ii.i
-/trellis_metrics_c.cc
-/trellis_viterbi_combined_i.cc
-/trellis_viterbi_i.cc
-/trellis_encoder_bb.h
-/trellis_encoder_bb.i
-/trellis_sccc_encoder_bb.cc
-/trellis_sccc_encoder_bb.h
-/trellis_sccc_encoder_bb.i
-/trellis_sccc_encoder_bi.cc
-/trellis_sccc_encoder_bi.h
-/trellis_sccc_encoder_bi.i
-/trellis_sccc_encoder_bs.cc
-/trellis_sccc_encoder_bs.h
-/trellis_sccc_encoder_bs.i
-/trellis_sccc_encoder_ii.cc
-/trellis_sccc_encoder_ii.h
-/trellis_sccc_encoder_ii.i
-/trellis_sccc_encoder_si.cc
-/trellis_sccc_encoder_si.h
-/trellis_sccc_encoder_si.i
-/trellis_sccc_encoder_ss.cc
-/trellis_sccc_encoder_ss.h
-/trellis_sccc_encoder_ss.i
-/trellis_metrics_s.cc
-/trellis_viterbi_combined_fs.h
-/trellis_viterbi_combined_fs.i
-/trellis_viterbi_combined_fi.cc
-/trellis_viterbi_combined_is.h
-/trellis_viterbi_combined_is.i
-/trellis_viterbi_combined_ci.h
-/trellis_viterbi_combined_ci.i
-/trellis_viterbi_combined_cs.cc
-/trellis_viterbi_combined_is.cc
-/trellis_viterbi_combined_si.h
-/trellis_viterbi_combined_si.i
-/trellis_viterbi_combined_ss.cc
-/trellis_viterbi_combined_fb.cc
-/trellis_viterbi_combined_fi.h
-/trellis_viterbi_combined_fi.i
-/trellis_viterbi_combined_cb.h
-/trellis_viterbi_combined_cb.i
-/trellis_viterbi_combined_ci.cc
-/trellis_viterbi_combined_ii.cc
-/trellis_viterbi_combined_ii.h
-/trellis_viterbi_combined_ii.i
-/trellis_viterbi_combined_sb.h
-/trellis_viterbi_combined_sb.i
-/trellis_viterbi_combined_si.cc
-/trellis_viterbi_combined_fb.h
-/trellis_viterbi_combined_fb.i
-/trellis_viterbi_combined_ib.h
-/trellis_viterbi_combined_ib.i
-/trellis_viterbi_combined_cs.h
-/trellis_viterbi_combined_cs.i
-/trellis_viterbi_combined_fs.cc
-/trellis_viterbi_combined_cb.cc
-/trellis_viterbi_combined_ss.h
-/trellis_viterbi_combined_ss.i
-/trellis_viterbi_combined_ib.cc
-/trellis_viterbi_combined_sb.cc
-/trellis_sccc_decoder_combined_fb.h
-/trellis_sccc_decoder_combined_fb.i
-/trellis_sccc_decoder_combined_fb.cc
-/trellis_sccc_decoder_combined_fs.h
-/trellis_sccc_decoder_combined_fs.i
-/trellis_sccc_decoder_combined_fs.cc
-/trellis_sccc_decoder_combined_fi.h
-/trellis_sccc_decoder_combined_fi.i
-/trellis_sccc_decoder_combined_fi.cc
-/trellis_sccc_decoder_combined_cb.h
-/trellis_sccc_decoder_combined_cb.i
-/trellis_sccc_decoder_combined_cb.cc
-/trellis_sccc_decoder_combined_cs.h
-/trellis_sccc_decoder_combined_cs.i
-/trellis_sccc_decoder_combined_cs.cc
-/trellis_sccc_decoder_combined_ci.h
-/trellis_sccc_decoder_combined_ci.i
-/trellis_sccc_decoder_combined_ci.cc
-/trellis_sccc_decoder_b.h
-/trellis_sccc_decoder_b.i
-/trellis_sccc_decoder_b.cc
-/trellis_sccc_decoder_s.h
-/trellis_sccc_decoder_s.i
-/trellis_sccc_decoder_s.cc
-/trellis_sccc_decoder_i.h
-/trellis_sccc_decoder_i.i
-/trellis_sccc_decoder_i.cc
-/trellis_pccc_decoder_b.h
-/trellis_pccc_decoder_b.i
-/trellis_pccc_decoder_b.cc
-/trellis_pccc_decoder_s.h
-/trellis_pccc_decoder_s.i
-/trellis_pccc_decoder_s.cc
-/trellis_pccc_decoder_i.h
-/trellis_pccc_decoder_i.i
-/trellis_pccc_decoder_i.cc
-/trellis_pccc_encoder_bb.cc
-/trellis_pccc_encoder_bb.h
-/trellis_pccc_encoder_bb.i
-/trellis_pccc_encoder_bi.cc
-/trellis_pccc_encoder_bi.h
-/trellis_pccc_encoder_bi.i
-/trellis_pccc_encoder_bs.cc
-/trellis_pccc_encoder_bs.h
-/trellis_pccc_encoder_bs.i
-/trellis_pccc_encoder_ii.cc
-/trellis_pccc_encoder_ii.h
-/trellis_pccc_encoder_ii.i
-/trellis_pccc_encoder_si.cc
-/trellis_pccc_encoder_si.h
-/trellis_pccc_encoder_si.i
-/trellis_pccc_encoder_ss.cc
-/trellis_pccc_encoder_ss.h
-/trellis_pccc_encoder_ss.i
-/trellis_pccc_decoder_combined_cb.cc
-/trellis_pccc_decoder_combined_cb.h
-/trellis_pccc_decoder_combined_cb.i
-/trellis_pccc_decoder_combined_ci.cc
-/trellis_pccc_decoder_combined_ci.h
-/trellis_pccc_decoder_combined_ci.i
-/trellis_pccc_decoder_combined_cs.cc
-/trellis_pccc_decoder_combined_cs.h
-/trellis_pccc_decoder_combined_cs.i
-/trellis_pccc_decoder_combined_fb.cc
-/trellis_pccc_decoder_combined_fb.h
-/trellis_pccc_decoder_combined_fb.i
-/trellis_pccc_decoder_combined_fi.cc
-/trellis_pccc_decoder_combined_fi.h
-/trellis_pccc_decoder_combined_fi.i
-/trellis_pccc_decoder_combined_fs.cc
-/trellis_pccc_decoder_combined_fs.h
-/trellis_pccc_decoder_combined_fs.i
-/trellis_generated.i
-/generate-stamp
-/stamp-*
-/run_guile_tests
-/gnuradio
-/guile
-/python
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
deleted file mode 100644
index ea28ea538..000000000
--- a/gr-trellis/src/lib/Makefile.am
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# Copyright 2004,2005,2006,2007,2008,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,
-# Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-TESTS =
-
-EXTRA_DIST += \
-	run_guile_tests.in \
-	trellis.test
-
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-	$(GR_DIGITAL_INCLUDES) \
-	$(WITH_INCLUDES)
-
-# ----------------------------------------------------------------
-# these scripts generate trellis codes from template files
-
-core_generator = 				\
-	generate_all.py				\
-	generate_trellis.py			\
-	trellis_encoder_XX.cc.t			\
-	trellis_encoder_XX.h.t			\
-	trellis_encoder_XX.i.t			\
-	trellis_sccc_encoder_XX.cc.t		\
-	trellis_sccc_encoder_XX.h.t		\
-	trellis_sccc_encoder_XX.i.t		\
-	trellis_pccc_encoder_XX.cc.t		\
-	trellis_pccc_encoder_XX.h.t		\
-	trellis_pccc_encoder_XX.i.t		\
-	trellis_metrics_X.cc.t			\
-	trellis_metrics_X.h.t			\
-	trellis_metrics_X.i.t			\
-	trellis_viterbi_combined_XX.cc.t	\
-	trellis_viterbi_combined_XX.h.t		\
-	trellis_viterbi_combined_XX.i.t		\
-	trellis_sccc_decoder_combined_XX.cc.t	\
-	trellis_sccc_decoder_combined_XX.h.t	\
-	trellis_sccc_decoder_combined_XX.i.t	\
-	trellis_sccc_decoder_X.cc.t		\
-	trellis_sccc_decoder_X.h.t		\
-	trellis_sccc_decoder_X.i.t		\
-	trellis_pccc_decoder_X.cc.t		\
-	trellis_pccc_decoder_X.h.t		\
-	trellis_pccc_decoder_X.i.t		\
-	trellis_pccc_decoder_combined_XX.cc.t	\
-	trellis_pccc_decoder_combined_XX.h.t	\
-	trellis_pccc_decoder_combined_XX.i.t	\
-	trellis_viterbi_X.cc.t			\
-	trellis_viterbi_X.h.t			\
-	trellis_viterbi_X.i.t
-
-# Source built by Python into $(builddir)
-python_built_sources =		\
-	$(GENERATED_H)		\
-	$(GENERATED_I)		\
-	$(GENERATED_CC)		\
-	trellis_generated.i
-
-EXTRA_DIST += 			\
-	$(core_generator)
-
-# These headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS =			\
-        trellis_api.h				\
-        fsm.h				\
-        quicksort_index.h		\
-        base.h				\
-        interleaver.h			\
-        calc_metric.h		\
-        core_algorithms.h		\
-        trellis_permutation.h		\
-        siso_type.h		\
-	trellis_siso_f.h		\
-	trellis_siso_combined_f.h	\
-	trellis_constellation_metrics_cf.h \
-	$(GENERATED_H)
-
-lib_LTLIBRARIES = libgnuradio-trellis.la
-
-libgnuradio_trellis_la_SOURCES = 	\
-        fsm.cc				\
-        quicksort_index.cc		\
-        base.cc				\
-        interleaver.cc			\
-        calc_metric.cc		\
-        core_algorithms.cc		\
-        trellis_permutation.cc		\
-	trellis_siso_f.cc		\
-	trellis_siso_combined_f.cc	\
-	trellis_constellation_metrics_cf.cc \
-	$(GENERATED_CC)
-
-libgnuradio_trellis_la_LIBADD =	\
-	$(GNURADIO_CORE_LA)
-
-libgnuradio_trellis_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-trellis.py trellis.scm:	trellis_generated.i
-
-#################################
-# SWIG interface and library
-
-TOP_SWIG_DOC_IFILES = \
-	trellis_swig_doc.i
-
-TOP_SWIG_IFILES = 			\
-	$(TOP_SWIG_DOC_IFILES) 	\
-	trellis.i
-
-BUILT_SOURCES += \
-	$(TOP_SWIG_DOC_IFILES)
-
-EXTRA_DIST += \
-	$(TOP_SWIG_DOC_IFILES)
-
-$(TOP_SWIG_DOC_IFILES):
-	`echo "" > $@`
-
-# Install so that they end up available as:
-#   import gnuradio.trellis
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-trellis_pythondir_category =		\
-	gnuradio
-
-# additional libraries for linking with the SWIG-generated library
-trellis_la_swig_libadd =		\
-	libgnuradio-trellis.la
-
-# additional SWIG files to be installed
-trellis_swiginclude_headers = 		\
-	$(GENERATED_I)			\
-	fsm.i				\
-	interleaver.i			\
-	trellis_permutation.i		\
-	trellis_siso_f.i		\
-	trellis_siso_combined_f.i	\
-	trellis_constellation_metrics_cf.i \
-	trellis_generated.i		\
-	$(TOP_SWIG_DOC_IFILES)
-
-# Do creation and inclusion of other Makefiles last
-
-# include the srcdir's Makefile.gen; doing this creates an implicit
-# dependency between $(srcdir)/Makefile.in and $(srcdir)/Makefile.gen.
-include $(srcdir)/Makefile.gen
-
-# common way for generating local Makefile.gen
-makefile_gen_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) do_makefile=1 do_sources=0 $(PYTHON) $(srcdir)/generate_all.py
-include $(top_srcdir)/Makefile.gen.gen
-
-# common way for generating sources from templates when using
-# BUILT_SOURCES, using parallel build protection.
-gen_sources = $(python_built_sources)
-gen_sources_deps = $(core_generator)
-par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
-include $(top_srcdir)/Makefile.par.gen
-
-BUILT_SOURCES += $(python_built_sources)
-
-# Location of non-standard SWIG interface files
-trellis_swig_args =    \
-	$(GR_DIGITAL_INCLUDES)
-
-if GUILE
-TESTS += run_guile_tests
-endif
diff --git a/gr-trellis/src/lib/run_guile_tests.in b/gr-trellis/src/lib/run_guile_tests.in
deleted file mode 100644
index 5d08b0dd5..000000000
--- a/gr-trellis/src/lib/run_guile_tests.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. @top_builddir@/setup_guile_test_env
-
-# 1st argument is absolute path to hand coded guile source directory
-# 2nd argument is absolute path to component C++ shared library build directory
-# 3nd argument is absolute path to component SWIG build directory
-
-add_local_paths \
-    @srcdir@ \
-    @abs_builddir@ \
-    @abs_builddir@
-
-@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@
diff --git a/gr-trellis/src/python/.gitignore b/gr-trellis/src/python/.gitignore
deleted file mode 100644
index bf03975bb..000000000
--- a/gr-trellis/src/python/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
-/run_tests
diff --git a/gr-trellis/src/python/Makefile.am b/gr-trellis/src/python/Makefile.am
deleted file mode 100644
index 808ac4fb7..000000000
--- a/gr-trellis/src/python/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright 2004,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
-
-EXTRA_DIST += run_tests.in		\
-	awgn1o2_4.fsm
-
-
-TESTS = run_tests
-
-
-noinst_PYTHON = 			\
-	qa_trellis.py			
diff --git a/gr-trellis/src/python/run_tests.in b/gr-trellis/src/python/run_tests.in
deleted file mode 100644
index fcb078663..000000000
--- a/gr-trellis/src/python/run_tests.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# 1st parameter is absolute path to component source directory
-# 2nd parameter is absolute path to component build directory
-# 3rd parameter is path to Python QA directory
-
-PYTHONPATH=@top_builddir@/gr-digital/swig:@top_builddir@/gr-digital/swig/.libs:@top_srcdir@/gr-digital/swig:$PYTHONPATH
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-trellis \
-    @abs_top_builddir@/gr-trellis \
-    @srcdir@