From b47b9ca40ecf49afa44c993b8da9af4ff876c9ba Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Wed, 13 Oct 2010 22:25:16 -0600
Subject: regenerated from template

---
 gr-trellis/src/lib/Makefile.swig.gen | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 1a9656b8f..05f03ee77 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += trellis.py trellis.cc
+swig_built_sources += trellis.py trellis-python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -86,7 +86,7 @@ trellis_pylib_LTLIBRARIES =		\
 	_trellis.la
 
 _trellis_la_SOURCES = 			\
-	trellis.cc			\
+	trellis-python.cc			\
 	$(trellis_la_swig_sources)
 
 _trellis_la_LIBADD =			\
@@ -107,7 +107,7 @@ trellis_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-trellis.h trellis.py trellis.cc: trellis.i
+trellis.h trellis.py trellis-python.cc: trellis.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -159,11 +159,12 @@ trellis.h trellis.py trellis.cc: trellis.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/trellis-generate-stamp; \
+		rm -f $(DEPDIR)/trellis-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -187,11 +188,27 @@ trellis.h trellis.py trellis.cc: trellis.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/trellis-generate-stamp; \
+		test -f $(DEPDIR)/trellis-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/trellis-generate-stamp:
+$(DEPDIR)/trellis-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \
+		-MD -MF $(DEPDIR)/trellis.Std \
+		-module trellis -o trellis-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/trellis.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \
+			> $(DEPDIR)/trellis.Sd; \
+		$(RM) $(DEPDIR)/trellis.Std; \
+		$(MV) $(DEPDIR)/trellis.Sd $(DEPDIR)/trellis.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/trellis.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/trellis-generate-guile-stamp
+
+$(DEPDIR)/trellis-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
 ## removing the actual stamp file in order to guarantee that MAKE will
@@ -202,7 +219,7 @@ $(DEPDIR)/trellis-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(trellis_swig_args) \
 		-MD -MF $(DEPDIR)/trellis.Std \
-		-module trellis -o trellis.cc $(WHAT); then \
+		-module trellis -o trellis-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/trellis.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/trellis-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/trellis-generate-stamp
+	touch $(DEPDIR)/trellis-generate-python-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
-- 
cgit 


From ed4094208c501e91838ccc333059e4731e8ae908 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 14 Oct 2010 12:34:08 -0600
Subject: regenerated after changes to the template

---
 gr-trellis/src/lib/Makefile.swig.gen | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 05f03ee77..8d9557d67 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += trellis.py trellis-python.cc
+swig_built_sources += trellis.py trellis_python.cc
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -83,21 +83,21 @@ trellis_swiginclude_HEADERS =		\
 	$(trellis_swiginclude_headers)
 
 trellis_pylib_LTLIBRARIES =		\
-	_trellis.la
+	_trellis_python.la
 
-_trellis_la_SOURCES = 			\
-	trellis-python.cc			\
+_trellis_python_la_SOURCES = 		\
+	trellis_python.cc		\
 	$(trellis_la_swig_sources)
 
-_trellis_la_LIBADD =			\
+_trellis_python_la_LIBADD =		\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(trellis_la_swig_libadd)
 
-_trellis_la_LDFLAGS =			\
+_trellis_python_la_LDFLAGS =		\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(trellis_la_swig_ldflags)
 
-_trellis_la_CXXFLAGS =			\
+_trellis_python_la_CXXFLAGS =		\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(trellis_la_swig_cxxflags)
 
@@ -105,9 +105,23 @@ trellis_python_PYTHON =			\
 	trellis.py			\
 	$(trellis_python)
 
+if GUILE
+trellis_pylib_LTLIBRARIES += _trellis_guile.la
+
+_trellis_guile_la_SOURCES = 		\
+	trellis_guile.cc		\
+	$(trellis_la_swig_sources)
+
+# Guile can use the same flags as python does
+_trellis_guile_la_LIBADD = $(_trellis_python_la_LIBADD)
+_trellis_guile_la_LDFLAGS = $(_trellis_python_la_LDFLAGS)
+_trellis_guile_la_CXXFLAGS = $(_trellis_python_la_CXXFLAGS)
+
+endif				# end of GUILE
+
 ## Entry rule for running SWIG
 
-trellis.h trellis.py trellis-python.cc: trellis.i
+trellis.h trellis.py trellis_python.cc: trellis.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -193,9 +207,10 @@ trellis.h trellis.py trellis-python.cc: trellis.i
 	fi;
 
 $(DEPDIR)/trellis-generate-guile-stamp:
+if GUILE
 	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \
 		-MD -MF $(DEPDIR)/trellis.Std \
-		-module trellis -o trellis-guile.cc $(WHAT); then \
+		-module trellis -o trellis_guile.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/trellis.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \
@@ -207,6 +222,7 @@ $(DEPDIR)/trellis-generate-guile-stamp:
 	    $(RM) $(DEPDIR)/trellis.S*; exit 1; \
 	fi;
 	touch $(DEPDIR)/trellis-generate-guile-stamp
+endif
 
 $(DEPDIR)/trellis-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -219,7 +235,7 @@ $(DEPDIR)/trellis-generate-python-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(trellis_swig_args) \
 		-MD -MF $(DEPDIR)/trellis.Std \
-		-module trellis -o trellis-python.cc $(WHAT); then \
+		-module trellis -o trellis_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/trellis.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \
-- 
cgit 


From 6b98045ebd36a336e642135f34a0591130c3a651 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 16 Oct 2010 08:55:47 -0600
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 53 +++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 22 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 8d9557d67..1400b3192 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -121,7 +121,7 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-trellis.h trellis.py trellis_python.cc: trellis.i
+trellis_python.h trellis.py trellis_python.cc trellis_guile.cc trellis_guile.h: trellis.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -209,19 +209,28 @@ trellis.h trellis.py trellis_python.cc: trellis.i
 $(DEPDIR)/trellis-generate-guile-stamp:
 if GUILE
 	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \
-		-MD -MF $(DEPDIR)/trellis.Std \
+		-MD -MF $(DEPDIR)/trellis_guile.Std \
 		-module trellis -o trellis_guile.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/trellis.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \
-			> $(DEPDIR)/trellis.Sd; \
-		$(RM) $(DEPDIR)/trellis.Std; \
-		$(MV) $(DEPDIR)/trellis.Sd $(DEPDIR)/trellis.Std; \
+		$(RM) $(DEPDIR)/trellis_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis_guile.Std \
+			> $(DEPDIR)/trellis_guile.Sd; \
+		$(RM) $(DEPDIR)/trellis_guile.Std; \
+		$(MV) $(DEPDIR)/trellis_guile.Sd $(DEPDIR)/trellis_guile.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/trellis.S*; exit 1; \
+	    $(RM) $(DEPDIR)/trellis_guile.S*; exit 1; \
 	fi;
 	touch $(DEPDIR)/trellis-generate-guile-stamp
+	$(RM) $(DEPDIR)/trellis_guile.d
+	cp $(DEPDIR)/trellis_guile.Std $(DEPDIR)/trellis_guile.d
+	echo "" >> $(DEPDIR)/trellis_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis_guile.d
+	$(RM) $(DEPDIR)/trellis_guile.Std
+	touch $(DEPDIR)/trellis-generate-guile-stamp
+
+@am__include@ @am__quote@./$(DEPDIR)/trellis_guile.d@am__quote@
 endif
 
 $(DEPDIR)/trellis-generate-python-stamp:
@@ -234,17 +243,17 @@ $(DEPDIR)/trellis-generate-python-stamp:
 ## post-processing on 'mingw32' host OS for the dependency file.
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(trellis_swig_args) \
-		-MD -MF $(DEPDIR)/trellis.Std \
+		-MD -MF $(DEPDIR)/trellis_python.Std \
 		-module trellis -o trellis_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/trellis.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \
-			> $(DEPDIR)/trellis.Sd; \
-		$(RM) $(DEPDIR)/trellis.Std; \
-		$(MV) $(DEPDIR)/trellis.Sd $(DEPDIR)/trellis.Std; \
+		$(RM) $(DEPDIR)/trellis_python.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis_python.Std \
+			> $(DEPDIR)/trellis_python.Sd; \
+		$(RM) $(DEPDIR)/trellis_python.Std; \
+		$(MV) $(DEPDIR)/trellis_python.Sd $(DEPDIR)/trellis_python.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/trellis.S*; exit 1; \
+	    $(RM) $(DEPDIR)/trellis_python.S*; exit 1; \
 	fi;
 ##
 ## Mess with the SWIG output .Std dependency file, to create a
@@ -256,27 +265,27 @@ $(DEPDIR)/trellis-generate-python-stamp:
 ##
 ## (1) remove the current dependency file
 ##
-	$(RM) $(DEPDIR)/trellis.d
+	$(RM) $(DEPDIR)/trellis_python.d
 ##
 ## (2) Copy the whole SWIG file:
 ##
-	cp $(DEPDIR)/trellis.Std $(DEPDIR)/trellis.d
+	cp $(DEPDIR)/trellis_python.Std $(DEPDIR)/trellis_python.d
 ##
 ## (3) all a carriage return to the end of the dependency file.
 ##
-	echo "" >> $(DEPDIR)/trellis.d
+	echo "" >> $(DEPDIR)/trellis_python.d
 ##
 ## (4) from the SWIG file, remove the first line (the target); remove
 ##     trailing " \" and " " from each line.  Append ":" to each line,
 ##     followed by 2 carriage returns, then append this to the end of
 ##     the dependency file.
 ##
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis_python.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis_python.d
 ##
 ## (5) remove the SWIG-generated file
 ##
-	$(RM) $(DEPDIR)/trellis.Std
+	$(RM) $(DEPDIR)/trellis_python.Std
 ##
 ## Create the stamp for this filename generation, to signal success in
 ## executing this rule; allows other threads waiting on this process
@@ -288,5 +297,5 @@ $(DEPDIR)/trellis-generate-python-stamp:
 # not guaranteed to be portable, but will probably work.  If it works,
 # we have accurate dependencies for our swig stuff, which is good.
 
-@am__include@ @am__quote@./$(DEPDIR)/trellis.d@am__quote@
+@am__include@ @am__quote@./$(DEPDIR)/trellis_python.d@am__quote@
 
-- 
cgit 


From 5ea1059c943a8a6dcb67c2a151f27b84b653f549 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 18 Oct 2010 18:15:58 -0600
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 54 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 1400b3192..00d51a17a 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -206,33 +206,6 @@ trellis_python.h trellis.py trellis_python.cc trellis_guile.cc trellis_guile.h:
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/trellis-generate-guile-stamp:
-if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \
-		-MD -MF $(DEPDIR)/trellis_guile.Std \
-		-module trellis -o trellis_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/trellis_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis_guile.Std \
-			> $(DEPDIR)/trellis_guile.Sd; \
-		$(RM) $(DEPDIR)/trellis_guile.Std; \
-		$(MV) $(DEPDIR)/trellis_guile.Sd $(DEPDIR)/trellis_guile.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/trellis_guile.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/trellis-generate-guile-stamp
-	$(RM) $(DEPDIR)/trellis_guile.d
-	cp $(DEPDIR)/trellis_guile.Std $(DEPDIR)/trellis_guile.d
-	echo "" >> $(DEPDIR)/trellis_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis_guile.d
-	$(RM) $(DEPDIR)/trellis_guile.Std
-	touch $(DEPDIR)/trellis-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/trellis_guile.d@am__quote@
-endif
-
 $(DEPDIR)/trellis-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
@@ -299,3 +272,30 @@ $(DEPDIR)/trellis-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/trellis_python.d@am__quote@
 
+$(DEPDIR)/trellis-generate-guile-stamp:
+if GUILE
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \
+		-MD -MF $(DEPDIR)/trellis_guile.Std \
+		-module trellis -o trellis_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/trellis_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis_guile.Std \
+			> $(DEPDIR)/trellis_guile.Sd; \
+		$(RM) $(DEPDIR)/trellis_guile.Std; \
+		$(MV) $(DEPDIR)/trellis_guile.Sd $(DEPDIR)/trellis_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/trellis_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/trellis-generate-guile-stamp
+	$(RM) $(DEPDIR)/trellis_guile.d
+	cp $(DEPDIR)/trellis_guile.Std $(DEPDIR)/trellis_guile.d
+	echo "" >> $(DEPDIR)/trellis_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis_guile.d
+	$(RM) $(DEPDIR)/trellis_guile.Std
+	touch $(DEPDIR)/trellis-generate-guile-stamp
+
+@am__include@ @am__quote@./$(DEPDIR)/trellis_guile.d@am__quote@
+endif
+
-- 
cgit 


From 25bf9bbd0c5b702acf26e05d5a9966fd323f6614 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 18 Oct 2010 21:45:11 -0600
Subject: don't ifdef the target away. regenerate .gen files.

---
 gr-trellis/src/lib/Makefile.swig.gen | 51 +++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 7 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 00d51a17a..49734f88e 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ trellis_pylibdir_category ?= $(trellis_pythondir_category)
 trellis_pythondir = $(pythondir)/$(trellis_pythondir_category)
 trellis_pylibdir = $(pyexecdir)/$(trellis_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.
+trellis_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/trellis
+# FIXME: determince whether these should be installed with gnuradio.
+trellis_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 trellis_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += trellis.py trellis_python.cc
+if GUILE
+swig_built_sources += trellis.scm trellis_guile.cc
+endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -106,11 +119,11 @@ trellis_python_PYTHON =			\
 	$(trellis_python)
 
 if GUILE
-trellis_pylib_LTLIBRARIES += _trellis_guile.la
-
+trellis_scmlib_LTLIBRARIES = _trellis_guile.la
 _trellis_guile_la_SOURCES = 		\
-	trellis_guile.cc		\
+	trellis_guile.cc		        \
 	$(trellis_la_swig_sources)
+trellis_scm_DATA = trellis.scm
 
 # Guile can use the same flags as python does
 _trellis_guile_la_LIBADD = $(_trellis_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-trellis_python.h trellis.py trellis_python.cc trellis_guile.cc trellis_guile.h: trellis.i
+# $(python_deps) $(guile_deps): trellis.i
+trellis_python.h trellis.py trellis_python.cc: trellis.i
 ## This rule will get called only when MAKE decides that one of the
 ## targets needs to be created or re-created, because:
 ##
@@ -178,7 +192,6 @@ trellis_python.h trellis.py trellis_python.cc trellis_guile.cc trellis_guile.h:
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-guile-stamp WHAT=$<; \
 ##
 ## Now that the .cc, .h, and .py files have been (re)created from the
 ## .i file, future checking of this rule during the same MAKE
@@ -206,6 +219,24 @@ trellis_python.h trellis.py trellis_python.cc trellis_guile.cc trellis_guile.h:
 		exit $$?; \
 	fi;
 
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
+trellis_guile.h trellis.scm trellis_guile.cc: trellis.i
+if GUILE
+	trap 'rm -rf $(DEPDIR)/trellis-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/trellis-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/trellis-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/trellis-generate-lock; \
+	else \
+		while test -d $(DEPDIR)/trellis-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/trellis-generate-guile-stamp; \
+		exit $$?; \
+	fi;
+endif				# end of GUILE
+
 $(DEPDIR)/trellis-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
 ## above rule to succeed in creating the lock directory, after
@@ -272,8 +303,10 @@ $(DEPDIR)/trellis-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/trellis_python.d@am__quote@
 
-$(DEPDIR)/trellis-generate-guile-stamp:
 if GUILE
+$(DEPDIR)/trellis-generate-guile-stamp:
+# the comments for the target above apply to this target as well, but it seemed
+# silly to include them twice. The only main change is for guile.
 	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \
 		-MD -MF $(DEPDIR)/trellis_guile.Std \
 		-module trellis -o trellis_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
 		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis_guile.d
 	$(RM) $(DEPDIR)/trellis_guile.Std
 	touch $(DEPDIR)/trellis-generate-guile-stamp
+else
+	touch $(DEPDIR)/trellis-generate-guile-stamp
+endif
 
 @am__include@ @am__quote@./$(DEPDIR)/trellis_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
 
-- 
cgit 


From 42753aad1c8170bf1a4d4003d636ac5a81cbbda3 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 18 Oct 2010 22:07:32 -0600
Subject: regeneratd

---
 gr-trellis/src/lib/Makefile.swig.gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 49734f88e..0dba365b7 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -303,8 +303,8 @@ $(DEPDIR)/trellis-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/trellis_python.d@am__quote@
 
-if GUILE
 $(DEPDIR)/trellis-generate-guile-stamp:
+if GUILE
 # the comments for the target above apply to this target as well, but it seemed
 # silly to include them twice. The only main change is for guile.
 	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \
-- 
cgit 


From 03418fed87089ce9ea3e354632d5f151a1b33ebd Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Tue, 19 Oct 2010 22:02:29 -0600
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 66 ++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 0dba365b7..2b07c671e 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -247,17 +247,17 @@ $(DEPDIR)/trellis-generate-python-stamp:
 ## post-processing on 'mingw32' host OS for the dependency file.
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(trellis_swig_args) \
-		-MD -MF $(DEPDIR)/trellis_python.Std \
-		-module trellis -o trellis_python.cc $(WHAT); then \
+		-MD -MF python/$(DEPDIR)/trellis.Std \
+		-module trellis -o python/trellis.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/trellis_python.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis_python.Std \
-			> $(DEPDIR)/trellis_python.Sd; \
-		$(RM) $(DEPDIR)/trellis_python.Std; \
-		$(MV) $(DEPDIR)/trellis_python.Sd $(DEPDIR)/trellis_python.Std; \
+		$(RM) python/$(DEPDIR)/trellis.Sd; \
+		$(SED) 's,\\\\,/,g' < python/$(DEPDIR)/trellis.Std \
+			> python/$(DEPDIR)/trellis.Sd; \
+		$(RM) python/$(DEPDIR)/trellis.Std; \
+		$(MV) python/$(DEPDIR)/trellis.Sd python/$(DEPDIR)/trellis.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/trellis_python.S*; exit 1; \
+	    $(RM) $(DEPDIR)/trellis.S*; exit 1; \
 	fi;
 ##
 ## Mess with the SWIG output .Std dependency file, to create a
@@ -269,27 +269,27 @@ $(DEPDIR)/trellis-generate-python-stamp:
 ##
 ## (1) remove the current dependency file
 ##
-	$(RM) $(DEPDIR)/trellis_python.d
+	$(RM) python/$(DEPDIR)/trellis.d
 ##
 ## (2) Copy the whole SWIG file:
 ##
-	cp $(DEPDIR)/trellis_python.Std $(DEPDIR)/trellis_python.d
+	cp python/$(DEPDIR)/trellis.Std python/$(DEPDIR)/trellis.d
 ##
 ## (3) all a carriage return to the end of the dependency file.
 ##
-	echo "" >> $(DEPDIR)/trellis_python.d
+	echo "" >> python/$(DEPDIR)/trellis.d
 ##
 ## (4) from the SWIG file, remove the first line (the target); remove
 ##     trailing " \" and " " from each line.  Append ":" to each line,
 ##     followed by 2 carriage returns, then append this to the end of
 ##     the dependency file.
 ##
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis_python.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis_python.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < python/$(DEPDIR)/trellis.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> python/$(DEPDIR)/trellis.d
 ##
 ## (5) remove the SWIG-generated file
 ##
-	$(RM) $(DEPDIR)/trellis_python.Std
+	$(RM) python/$(DEPDIR)/trellis.Std
 ##
 ## Create the stamp for this filename generation, to signal success in
 ## executing this rule; allows other threads waiting on this process
@@ -301,38 +301,38 @@ $(DEPDIR)/trellis-generate-python-stamp:
 # not guaranteed to be portable, but will probably work.  If it works,
 # we have accurate dependencies for our swig stuff, which is good.
 
-@am__include@ @am__quote@./$(DEPDIR)/trellis_python.d@am__quote@
+@am__include@ @am__quote@./python/$(DEPDIR)/trellis.d@am__quote@
 
 $(DEPDIR)/trellis-generate-guile-stamp:
 if GUILE
 # the comments for the target above apply to this target as well, but it seemed
 # silly to include them twice. The only main change is for guile.
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \
-		-MD -MF $(DEPDIR)/trellis_guile.Std \
-		-module trellis -o trellis_guile.cc $(WHAT); then \
+	if $(SWIG) $(STD_SWIG_ARGS) $(trellis_swig_args) \
+		-MD -MF guile/$(DEPDIR)/trellis.Std \
+		-module trellis -o guile/trellis.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/trellis_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis_guile.Std \
-			> $(DEPDIR)/trellis_guile.Sd; \
-		$(RM) $(DEPDIR)/trellis_guile.Std; \
-		$(MV) $(DEPDIR)/trellis_guile.Sd $(DEPDIR)/trellis_guile.Std; \
+		$(RM) guile/$(DEPDIR)/trellis.Sd; \
+		$(SED) 's,\\\\,/,g' < guile/$(DEPDIR)/trellis.Std \
+			> guile/$(DEPDIR)/trellis.Sd; \
+		$(RM) guile/$(DEPDIR)/trellis.Std; \
+		$(MV) guile/$(DEPDIR)/trellis.Sd guile/$(DEPDIR)/trellis.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/trellis_guile.S*; exit 1; \
+	    $(RM) guile/$(DEPDIR)/trellis.S*; exit 1; \
 	fi;
 	touch $(DEPDIR)/trellis-generate-guile-stamp
-	$(RM) $(DEPDIR)/trellis_guile.d
-	cp $(DEPDIR)/trellis_guile.Std $(DEPDIR)/trellis_guile.d
-	echo "" >> $(DEPDIR)/trellis_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/trellis_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis_guile.d
-	$(RM) $(DEPDIR)/trellis_guile.Std
-	touch $(DEPDIR)/trellis-generate-guile-stamp
+	$(RM) guile/$(DEPDIR)/trellis.d
+	cp guile/$(DEPDIR)/trellis.Std $(DEPDIR)/trellis.d
+	echo "" >> guile/$(DEPDIR)/trellis.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < guile/$(DEPDIR)/trellis.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> guile/$(DEPDIR)/trellis.d
+	$(RM) guile/$(DEPDIR)/trellis.Std
+	touch guile/$(DEPDIR)/trellis-generate-guile-stamp
 else
-	touch $(DEPDIR)/trellis-generate-guile-stamp
+	touch guile/$(DEPDIR)/trellis-generate-guile-stamp
 endif
 
-@am__include@ @am__quote@./$(DEPDIR)/trellis_guile.d@am__quote@
+@am__include@ @am__quote@./$(DEPDIR)/trellis.d@am__quote@
 
 #gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
 
-- 
cgit 


From aa162012cc25cf080ee744a2cb795a6154fcca86 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 21 Oct 2010 13:16:05 -0600
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 241 ++++-------------------------------
 1 file changed, 25 insertions(+), 216 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 2b07c671e..0da0b5c81 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -82,9 +82,11 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## .h file is sometimes built, but not always ... so that one has to
 ## be added manually by the including Makefile.am .
 
-swig_built_sources += trellis.py trellis_python.cc
+# generating the py or scm file also generates the .cc or .h files,
+# but dependencies work better without the .cc ort .h files listed.
+swig_built_sources += trellis.py
 if GUILE
-swig_built_sources += trellis.scm trellis_guile.cc
+swig_built_sources += trellis.scm
 endif
 
 ## Various SWIG variables.  These can be overloaded in the including
@@ -96,243 +98,50 @@ trellis_swiginclude_HEADERS =		\
 	$(trellis_swiginclude_headers)
 
 trellis_pylib_LTLIBRARIES =		\
-	_trellis_python.la
+	_trellis.la
 
-_trellis_python_la_SOURCES = 		\
-	trellis_python.cc		\
+_trellis_la_SOURCES = 			\
+	python/trellis.cc		\
 	$(trellis_la_swig_sources)
 
-_trellis_python_la_LIBADD =		\
+_trellis_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(trellis_la_swig_libadd)
 
-_trellis_python_la_LDFLAGS =		\
+# _trellis_la_DEPENDENCIES = python/trellis.lo
+
+_trellis_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(trellis_la_swig_ldflags)
 
-_trellis_python_la_CXXFLAGS =		\
+_trellis_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(trellis_la_swig_cxxflags)
 
 trellis_python_PYTHON =			\
 	trellis.py			\
-	$(trellis_python)
+	$(trellis)
 
 if GUILE
-trellis_scmlib_LTLIBRARIES = _trellis_guile.la
-_trellis_guile_la_SOURCES = 		\
-	trellis_guile.cc		        \
+trellis_scmlib_LTLIBRARIES = trellis_guile.la
+trellis_guile_la_SOURCES = 		\
+	guile/trellis.cc			\
 	$(trellis_la_swig_sources)
 trellis_scm_DATA = trellis.scm
 
 # Guile can use the same flags as python does
-_trellis_guile_la_LIBADD = $(_trellis_python_la_LIBADD)
-_trellis_guile_la_LDFLAGS = $(_trellis_python_la_LDFLAGS)
-_trellis_guile_la_CXXFLAGS = $(_trellis_python_la_CXXFLAGS)
-
-endif				# end of GUILE
+trellis_guile_la_LIBADD = $(_trellis_la_LIBADD)
+trellis_guile_la_LDFLAGS = $(_trellis_la_LDFLAGS)
+trellis_guile_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
 
-## Entry rule for running SWIG
-
-# $(python_deps) $(guile_deps): trellis.i
-trellis_python.h trellis.py trellis_python.cc: trellis.i
-## This rule will get called only when MAKE decides that one of the
-## targets needs to be created or re-created, because:
-##
-## * The .i file is newer than any or all of the generated files;
-##
-## * Any or all of the .cc, .h, or .py files does not exist and is
-##   needed (in the case this file is not needed, the rule for it is
-##   ignored); or
-##
-## * Some SWIG-based dependecy of the .cc file isn't met and hence the
-##   .cc file needs be be regenerated.  Explanation: Because MAKE
-##   knows how to handle dependencies for .cc files (regardless of
-##   their name or extension), then the .cc file is used as a target
-##   instead of the .i file -- but with the dependencies of the .i
-##   file.  It is this last reason why the line:
-##
-##     	if test -f $@; then :; else
-##
-##   cannot be used in this case: If a .i file dependecy is not met,
-##   then the .cc file needs to be rebuilt.  But if the stamp is newer
-##   than the .cc file, and the .cc file exists, then in the original
-##   version (with the 'test' above) the internal MAKE call will not
-##   be issued and hence the .cc file will not be rebuilt.
-##
-## Once execution gets to here, it should always proceed no matter the
-## state of a stamp (as discussed in link above).  The
-## $(DEPDIR)/trellis-generate stuff is used to allow for parallel
-## builds to "do the right thing".  The stamp has no relationship with
-## either the target files or dependency file; it is used solely for
-## the protection of multiple builds during a given call to MAKE.
-##
-## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
-## (15).  At a caught signal, the quoted command will be issued before
-## exiting.  In this case, remove any stamp, whether temporary of not.
-## The trap is valid until the process exits; the process includes all
-## commands appended via "\"s.
-##
-	trap 'rm -rf $(DEPDIR)/trellis-generate-*' 1 2 13 15; \
-##
-## Create a temporary directory, which acts as a lock.  The first
-## process to create the directory will succeed and issue the MAKE
-## command to do the actual work, while all subsequent processes will
-## fail -- leading them to wait for the first process to finish.
-##
-	if mkdir $(DEPDIR)/trellis-generate-lock 2>/dev/null; then \
-##
-## This code is being executed by the first process to succeed in
-## creating the directory lock.
-##
-## Remove the stamp associated with this filename.
-##
-		rm -f $(DEPDIR)/trellis-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-python-stamp WHAT=$<; \
-##
-## Now that the .cc, .h, and .py files have been (re)created from the
-## .i file, future checking of this rule during the same MAKE
-## execution will come back that the rule doesn't need to be executed
-## because none of the conditions mentioned at the start of this rule
-## will be positive.  Remove the the directory lock, which frees up
-## any waiting process(es) to continue.
-##
-		rmdir $(DEPDIR)/trellis-generate-lock; \
-	else \
-##
-## This code is being executed by any follower processes while the
-## directory lock is in place.
-##
-## Wait until the first process is done, testing once per second.
-##
-		while test -d $(DEPDIR)/trellis-generate-lock; do \
-			sleep 1; \
-		done; \
-##
-## Succeed if and only if the first process succeeded; exit this
-## process returning the status of the generated stamp.
-##
-		test -f $(DEPDIR)/trellis-generate-python-stamp; \
-		exit $$?; \
-	fi;
+guile/trellis.lo: trellis.lo
+trellis.scm: trellis.i
 
-# the comments for the target above apply to this target as well, but it seemed
-# silly to include them twice. The only main change is for guile.
-trellis_guile.h trellis.scm trellis_guile.cc: trellis.i
-if GUILE
-	trap 'rm -rf $(DEPDIR)/trellis-generate-*' 1 2 13 15; \
-	if mkdir $(DEPDIR)/trellis-generate-lock 2>/dev/null; then \
-		rm -f $(DEPDIR)/trellis-generate-*stamp; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-guile-stamp WHAT=$<; \
-		rmdir $(DEPDIR)/trellis-generate-lock; \
-	else \
-		while test -d $(DEPDIR)/trellis-generate-lock; do \
-			sleep 1; \
-		done; \
-		test -f $(DEPDIR)/trellis-generate-guile-stamp; \
-		exit $$?; \
-	fi;
 endif				# end of GUILE
 
-$(DEPDIR)/trellis-generate-python-stamp:
-## This rule will be called only by the first process issuing the
-## above rule to succeed in creating the lock directory, after
-## removing the actual stamp file in order to guarantee that MAKE will
-## execute this rule.
-##
-## Call SWIG to generate the various output files; special
-## post-processing on 'mingw32' host OS for the dependency file.
-##
-	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(trellis_swig_args) \
-		-MD -MF python/$(DEPDIR)/trellis.Std \
-		-module trellis -o python/trellis.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) python/$(DEPDIR)/trellis.Sd; \
-		$(SED) 's,\\\\,/,g' < python/$(DEPDIR)/trellis.Std \
-			> python/$(DEPDIR)/trellis.Sd; \
-		$(RM) python/$(DEPDIR)/trellis.Std; \
-		$(MV) python/$(DEPDIR)/trellis.Sd python/$(DEPDIR)/trellis.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/trellis.S*; exit 1; \
-	fi;
-##
-## Mess with the SWIG output .Std dependency file, to create a
-## dependecy file valid for the input .i file: Basically, simulate the
-## dependency file created for libraries by GNU's libtool for C++,
-## where all of the dependencies for the target are first listed, then
-## each individual dependency is listed as a target with no further
-## dependencies.
-##
-## (1) remove the current dependency file
-##
-	$(RM) python/$(DEPDIR)/trellis.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp python/$(DEPDIR)/trellis.Std python/$(DEPDIR)/trellis.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> python/$(DEPDIR)/trellis.d
-##
-## (4) from the SWIG file, remove the first line (the target); remove
-##     trailing " \" and " " from each line.  Append ":" to each line,
-##     followed by 2 carriage returns, then append this to the end of
-##     the dependency file.
-##
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < python/$(DEPDIR)/trellis.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> python/$(DEPDIR)/trellis.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) python/$(DEPDIR)/trellis.Std
-##
-## Create the stamp for this filename generation, to signal success in
-## executing this rule; allows other threads waiting on this process
-## to continue.
-##
-	touch $(DEPDIR)/trellis-generate-python-stamp
-
-# KLUDGE: Force runtime include of a SWIG dependency file.  This is
-# not guaranteed to be portable, but will probably work.  If it works,
-# we have accurate dependencies for our swig stuff, which is good.
-
-@am__include@ @am__quote@./python/$(DEPDIR)/trellis.d@am__quote@
-
-$(DEPDIR)/trellis-generate-guile-stamp:
-if GUILE
-# the comments for the target above apply to this target as well, but it seemed
-# silly to include them twice. The only main change is for guile.
-	if $(SWIG) $(STD_SWIG_ARGS) $(trellis_swig_args) \
-		-MD -MF guile/$(DEPDIR)/trellis.Std \
-		-module trellis -o guile/trellis.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) guile/$(DEPDIR)/trellis.Sd; \
-		$(SED) 's,\\\\,/,g' < guile/$(DEPDIR)/trellis.Std \
-			> guile/$(DEPDIR)/trellis.Sd; \
-		$(RM) guile/$(DEPDIR)/trellis.Std; \
-		$(MV) guile/$(DEPDIR)/trellis.Sd guile/$(DEPDIR)/trellis.Std; \
-	    fi; \
-	else \
-	    $(RM) guile/$(DEPDIR)/trellis.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/trellis-generate-guile-stamp
-	$(RM) guile/$(DEPDIR)/trellis.d
-	cp guile/$(DEPDIR)/trellis.Std $(DEPDIR)/trellis.d
-	echo "" >> guile/$(DEPDIR)/trellis.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < guile/$(DEPDIR)/trellis.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> guile/$(DEPDIR)/trellis.d
-	$(RM) guile/$(DEPDIR)/trellis.Std
-	touch guile/$(DEPDIR)/trellis-generate-guile-stamp
-else
-	touch guile/$(DEPDIR)/trellis-generate-guile-stamp
-endif
-
-@am__include@ @am__quote@./$(DEPDIR)/trellis.d@am__quote@
+python/trellis.lo:
+trellis.lo: trellis.py trellis.scm
+trellis.py: trellis.i
 
-#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
 
-- 
cgit 


From 32a71023bf7350167fdd4f3797d384d47cafd71f Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 21 Oct 2010 13:17:11 -0600
Subject: add python/*.cc to SOURCES so dependencies work properly.

---
 gr-trellis/src/lib/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 3e1803554..4223474f7 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -77,7 +77,7 @@ libgnuradio_trellis_la_SOURCES = 	\
         trellis_permutation.cc		\
 	trellis_siso_f.cc		\
 	trellis_siso_combined_f.cc	\
-	$(GENERATED_CC)
+	python/trellis.cc
 
 libgnuradio_trellis_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)
-- 
cgit 


From 1e34972f4433cbfef3500fc73a285c7c436cfd6b Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 22 Oct 2010 22:00:09 -0700
Subject: Rengenerate Makefile.swig.gen's

---
 gr-trellis/src/lib/Makefile.swig.gen | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 0da0b5c81..62762fa13 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -41,12 +41,12 @@ trellis_pylibdir = $(pyexecdir)/$(trellis_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.
-trellis_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+trellis_scmlibdir = $(libdir)/guile/gnuradio
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/trellis
 # FIXME: determince whether these should be installed with gnuradio.
-trellis_scmdir = @GUILE_PKDATADIR@/gnuradio
+trellis_scmdir = $(guiledir)/gnuradio
 
 ## SWIG headers are always installed into the same directory.
 
@@ -144,4 +144,5 @@ python/trellis.lo:
 trellis.lo: trellis.py trellis.scm
 trellis.py: trellis.i
 
+-include python/trellis.d
 
-- 
cgit 


From 6421d47062f4bf5abbdf26142616a5965f1edfa0 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 22 Oct 2010 23:28:06 -0700
Subject: regenerate

---
 gr-trellis/src/lib/Makefile.swig.gen | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 62762fa13..c43717d4b 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -41,7 +41,7 @@ trellis_pylibdir = $(pyexecdir)/$(trellis_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.
-trellis_scmlibdir = $(libdir)/guile/gnuradio
+trellis_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/trellis
@@ -124,16 +124,16 @@ trellis_python_PYTHON =			\
 	$(trellis)
 
 if GUILE
-trellis_scmlib_LTLIBRARIES = trellis_guile.la
-trellis_guile_la_SOURCES = 		\
+trellis_scmlib_LTLIBRARIES = libguile-trellis.la
+libguile_trellis_la_SOURCES = 		\
 	guile/trellis.cc			\
 	$(trellis_la_swig_sources)
 trellis_scm_DATA = trellis.scm
 
 # Guile can use the same flags as python does
-trellis_guile_la_LIBADD = $(_trellis_la_LIBADD)
-trellis_guile_la_LDFLAGS = $(_trellis_la_LDFLAGS)
-trellis_guile_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
+libguile_trellis_la_LIBADD = $(_trellis_la_LIBADD)
+libguile_trellis_la_LDFLAGS = $(_trellis_la_LDFLAGS)
+libguile_trellis_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
 
 guile/trellis.lo: trellis.lo
 trellis.scm: trellis.i
-- 
cgit 


From 40fac3c4a2f5f1f6dde79e96be8f40535e11343b Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 30 Oct 2010 12:14:16 -0600
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index c43717d4b..ec6f97ecb 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -46,7 +46,7 @@ trellis_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/trellis
 # FIXME: determince whether these should be installed with gnuradio.
-trellis_scmdir = $(guiledir)/gnuradio
+trellis_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ trellis_scmlib_LTLIBRARIES = libguile-trellis.la
 libguile_trellis_la_SOURCES = 		\
 	guile/trellis.cc			\
 	$(trellis_la_swig_sources)
-trellis_scm_DATA = trellis.scm
+nobase_trellis_scm_DATA = gnuradio/trellis.scm gnuradio/trellis-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_trellis_la_LIBADD = $(_trellis_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_trellis_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
 
 guile/trellis.lo: trellis.lo
 trellis.scm: trellis.i
+gnuradio/trellis-primitive.scm: trellis.scm
+
+-include guile/trellis.d
 
 endif				# end of GUILE
 
-- 
cgit 


From d94769a975612072dc03fa378bc79856c07cd66b Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 30 Oct 2010 12:14:41 -0600
Subject: add load-extension support

---
 gr-trellis/src/lib/trellis.i | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index ed1fe29ca..63b4c2659 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -44,3 +44,12 @@
 
 %include "trellis_generated.i"
 
+#if SWIGGUILE
+%scheme %{
+(load-extension "libguile-trellis" "scm_init_gnuradio_trellis_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
-- 
cgit 


From 0282499102abcef25849ae3a5255902502c1382a Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Sun, 31 Oct 2010 13:24:29 -0700
Subject: Remove swig generated python code from C++-only libraries

---
 gr-trellis/src/lib/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 4223474f7..6e4499f3c 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -76,8 +76,7 @@ libgnuradio_trellis_la_SOURCES = 	\
         trellis_calc_metric.cc		\
         trellis_permutation.cc		\
 	trellis_siso_f.cc		\
-	trellis_siso_combined_f.cc	\
-	python/trellis.cc
+	trellis_siso_combined_f.cc
 
 libgnuradio_trellis_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)
-- 
cgit 


From 3d4f2b9a3888c7d5684b70c89f0be3101d43879d Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Sun, 31 Oct 2010 17:29:07 -0700
Subject: Add $(GENERATED_CC) backing to _SOURCES

Now passes make check if --disable-gr-usrp.
---
 gr-trellis/src/lib/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 6e4499f3c..3e1803554 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -76,7 +76,8 @@ libgnuradio_trellis_la_SOURCES = 	\
         trellis_calc_metric.cc		\
         trellis_permutation.cc		\
 	trellis_siso_f.cc		\
-	trellis_siso_combined_f.cc
+	trellis_siso_combined_f.cc	\
+	$(GENERATED_CC)
 
 libgnuradio_trellis_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)
-- 
cgit 


From 2b11c904da6799b6a7240d64d2ba37ddcaf1e479 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 1 Nov 2010 16:06:37 -0600
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index ec6f97ecb..4417d4909 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
 # generating the py or scm file also generates the .cc or .h files,
 # but dependencies work better without the .cc ort .h files listed.
-swig_built_sources += trellis.py
-if GUILE
-swig_built_sources += trellis.scm
-endif
+# swig_built_sources += trellis.py
+# if GUILE
+# swig_built_sources += gnuradio/trellis.scm
+# endif
 
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
@@ -135,15 +135,14 @@ libguile_trellis_la_LIBADD = $(_trellis_la_LIBADD)
 libguile_trellis_la_LDFLAGS = $(_trellis_la_LDFLAGS)
 libguile_trellis_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
 
-guile/trellis.lo: trellis.lo
-trellis.scm: trellis.i
-gnuradio/trellis-primitive.scm: trellis.scm
+guile/trellis.cc: gnuradio/trellis.scm
+gnuradio/trellis.scm: trellis.i
+gnuradio/trellis-primitive.scm: gnuradio/trellis.scm
 
 -include guile/trellis.d
 
 endif				# end of GUILE
 
-python/trellis.lo:
 trellis.lo: trellis.py trellis.scm
 trellis.py: trellis.i
 
-- 
cgit 


From 0939607d0b4a3ae047ceff60fab300000c7d2069 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 1 Nov 2010 19:02:55 -0600
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 37 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 4417d4909..8edc2a743 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -67,28 +67,10 @@ trellis_swigincludedir = $(swigincludedir)
 ## right thing.  For more info, see <
 ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
 
-## Stamps used to ensure parallel make does the right thing.  These
-## are removed by "make clean", but otherwise unused except during the
-## parallel built.  These will not be included in a tarball, because
-## the SWIG-generated files will be removed from the distribution.
-
-STAMPS += $(DEPDIR)/trellis-generate-*
-
 ## Other cleaned files: dependency files generated by SWIG or this Makefile
 
 MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
-## Add the .py and .cc files to the list of SWIG built sources.  The
-## .h file is sometimes built, but not always ... so that one has to
-## be added manually by the including Makefile.am .
-
-# generating the py or scm file also generates the .cc or .h files,
-# but dependencies work better without the .cc ort .h files listed.
-# swig_built_sources += trellis.py
-# if GUILE
-# swig_built_sources += gnuradio/trellis.scm
-# endif
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -108,8 +90,6 @@ _trellis_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(trellis_la_swig_libadd)
 
-# _trellis_la_DEPENDENCIES = python/trellis.lo
-
 _trellis_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(trellis_la_swig_ldflags)
@@ -123,14 +103,20 @@ trellis_python_PYTHON =			\
 	trellis.py			\
 	$(trellis)
 
+python/trellis.cc: trellis.py
+trellis.py: trellis.i
+
+# Include the python dependencies for this file
+-include python/trellis.d
+# end of PYTHON
+
 if GUILE
 trellis_scmlib_LTLIBRARIES = libguile-trellis.la
-libguile_trellis_la_SOURCES = 		\
-	guile/trellis.cc			\
+libguile_trellis_la_SOURCES = \
+	guile/trellis.cc				       \
 	$(trellis_la_swig_sources)
 nobase_trellis_scm_DATA = gnuradio/trellis.scm gnuradio/trellis-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_trellis_la_LIBADD = $(_trellis_la_LIBADD)
 libguile_trellis_la_LDFLAGS = $(_trellis_la_LDFLAGS)
 libguile_trellis_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/trellis.cc: gnuradio/trellis.scm
 gnuradio/trellis.scm: trellis.i
 gnuradio/trellis-primitive.scm: gnuradio/trellis.scm
 
+# Include the guile dependencies for this file
 -include guile/trellis.d
 
 endif				# end of GUILE
 
-trellis.lo: trellis.py trellis.scm
-trellis.py: trellis.i
-
--include python/trellis.d
 
-- 
cgit 


From df92b7c6315c567e58e0d9c293d7c9c2699023d3 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 10 Nov 2010 13:01:38 -0800
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 8edc2a743..986ff53cc 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -112,8 +112,8 @@ trellis.py: trellis.i
 
 if GUILE
 trellis_scmlib_LTLIBRARIES = libguile-trellis.la
-libguile_trellis_la_SOURCES = \
-	guile/trellis.cc				       \
+libguile_trellis_la_SOURCES =		\
+	guile/trellis.cc			\
 	$(trellis_la_swig_sources)
 nobase_trellis_scm_DATA = gnuradio/trellis.scm gnuradio/trellis-primitive.scm
 
-- 
cgit 


From 8180bb1d7020e07c9b0a217820c68d07f0d98a74 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 16 Nov 2010 21:33:50 -0800
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 986ff53cc..45163f10a 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -101,7 +101,7 @@ _trellis_la_CXXFLAGS =			\
 
 trellis_python_PYTHON =			\
 	trellis.py			\
-	$(trellis)
+	$(trellis_python)
 
 python/trellis.cc: trellis.py
 trellis.py: trellis.i
-- 
cgit 


From ff877cabe2384dc2155ef5af92ee8b959fd29806 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Fri, 19 Nov 2010 08:07:52 -0700
Subject: regenerated

---
 gr-trellis/src/lib/Makefile.swig.gen | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 45163f10a..32127c7c5 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -79,6 +79,7 @@ trellis_swiginclude_HEADERS =		\
 	trellis.i			\
 	$(trellis_swiginclude_headers)
 
+if PYTHON
 trellis_pylib_LTLIBRARIES =		\
 	_trellis.la
 
@@ -86,6 +87,10 @@ _trellis_la_SOURCES = 			\
 	python/trellis.cc		\
 	$(trellis_la_swig_sources)
 
+trellis_python_PYTHON =			\
+	trellis.py			\
+	$(trellis_python)
+
 _trellis_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(trellis_la_swig_libadd)
@@ -99,27 +104,34 @@ _trellis_la_CXXFLAGS =			\
 	-I$(top_builddir) 		\
 	$(trellis_la_swig_cxxflags)
 
-trellis_python_PYTHON =			\
-	trellis.py			\
-	$(trellis_python)
-
 python/trellis.cc: trellis.py
 trellis.py: trellis.i
 
 # Include the python dependencies for this file
 -include python/trellis.d
-# end of PYTHON
+
+endif		# end of if python
 
 if GUILE
-trellis_scmlib_LTLIBRARIES = libguile-trellis.la
+
+trellis_scmlib_LTLIBRARIES = 		\
+	libguile-trellis.la
 libguile_trellis_la_SOURCES =		\
 	guile/trellis.cc			\
 	$(trellis_la_swig_sources)
-nobase_trellis_scm_DATA = gnuradio/trellis.scm gnuradio/trellis-primitive.scm
-
-libguile_trellis_la_LIBADD = $(_trellis_la_LIBADD)
-libguile_trellis_la_LDFLAGS = $(_trellis_la_LDFLAGS)
-libguile_trellis_la_CXXFLAGS = $(_trellis_la_CXXFLAGS)
+nobase_trellis_scm_DATA = 		\
+	gnuradio/trellis.scm 		\
+	gnuradio/trellis-primitive.scm
+libguile_trellis_la_LIBADD = 		\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(trellis_la_swig_libadd)
+libguile_trellis_la_LDFLAGS = 		\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(trellis_la_swig_ldflags)
+libguile_trellis_la_CXXFLAGS = 		\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(trellis_la_swig_cxxflags)
 
 guile/trellis.cc: gnuradio/trellis.scm
 gnuradio/trellis.scm: trellis.i
-- 
cgit 


From a213cbed474164ed31a26fd4dbdbe3f13c293b6e Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 23 Nov 2010 21:44:15 -0800
Subject: Enable guile test for trellis

---
 gr-trellis/src/lib/Makefile.am        | 15 +++++++++++---
 gr-trellis/src/lib/run_guile_tests.in | 14 +++++++++++++
 gr-trellis/src/lib/trellis.test       | 39 +++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 gr-trellis/src/lib/run_guile_tests.in
 create mode 100644 gr-trellis/src/lib/trellis.test

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 3e1803554..57982629b 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,6 +20,14 @@
 # 
 
 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) $(WITH_INCLUDES)
 
@@ -85,7 +93,6 @@ libgnuradio_trellis_la_LIBADD =	\
 libgnuradio_trellis_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 
-if PYTHON
 #################################
 # SWIG interface and library
 
@@ -130,7 +137,6 @@ 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
 
-include $(top_srcdir)/Makefile.swig
 
 # add some of the variables generated inside the Makefile.swig.gen
 BUILT_SOURCES =				\
@@ -139,4 +145,7 @@ BUILT_SOURCES =				\
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+
+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
new file mode 100644
index 000000000..5d08b0dd5
--- /dev/null
+++ b/gr-trellis/src/lib/run_guile_tests.in
@@ -0,0 +1,14 @@
+#!/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/lib/trellis.test b/gr-trellis/src/lib/trellis.test
new file mode 100644
index 000000000..fd650cdf1
--- /dev/null
+++ b/gr-trellis/src/lib/trellis.test
@@ -0,0 +1,39 @@
+;;; -*- Scheme -*-
+;;;
+;;; 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+;;;
+
+;;; If you're using Emacs's Scheme mode:
+;;;   (put 'with-test-prefix 'scheme-indent-function 1)
+
+;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
+;;; See also the very end of the file, where the test-equal, test-eqv
+;;; and test-eq macros are defined.
+
+(define-module (test-module)
+  #:use-module (oop goops)
+  #:use-module (gnuradio core)
+  #:use-module (gnuradio test-suite lib)
+  #:duplicates (merge-generics replace check))
+  
+
+;;; See if we can import the module...
+(use-modules (gnuradio trellis))
+
+;;; Now do some real testing, like that in ../python/qa_trellis.py
+
-- 
cgit 


From 5c686d0989c961ff1c5d20c3d9de4d86759ca3af Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 23 Nov 2010 22:26:25 -0800
Subject: Add disabled guile test to trellis

---
 gr-trellis/src/lib/trellis.test | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/trellis.test b/gr-trellis/src/lib/trellis.test
index fd650cdf1..d370ab18c 100644
--- a/gr-trellis/src/lib/trellis.test
+++ b/gr-trellis/src/lib/trellis.test
@@ -36,4 +36,18 @@
 (use-modules (gnuradio trellis))
 
 ;;; Now do some real testing, like that in ../python/qa_trellis.py
+;;; FIXME later.  Other problems to deal with.  Looks like
+;;; I don't understand the constructor to <fsm>
+
+(read-set! keywords 'prefix)
+
+'(with-test-prefix "test-001-fsm"
+  (let* ((I 2)
+	 (S 4)
+	 (O 4)
+	 (NS #(0 2 0 2 1 3 1 3))
+	 (OS #(0 3 3 0 1 2 2 1))
+	 (f (make <fsm> :I I :S S :O O :NS NS :OS OS)))
+    (test-equal (list I S O NS OS)
+		(list (gr:I f) (gr:S f) (gr:O f) (gr:NS f) (gr:OS f)))))
 
-- 
cgit 


From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 17:29:11 -0800
Subject: Major Makefile.am housecleaning.  Passes distcheck.

Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
---
 gr-trellis/src/lib/Makefile.am | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 57982629b..b23b5b467 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.swig
 
 TESTS =
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	run_guile_tests.in \
 	trellis.test
 
@@ -57,7 +57,7 @@ python_built_sources =		\
 	$(GENERATED_CC)		\
 	trellis_generated.i
 
-EXTRA_DIST = 			\
+EXTRA_DIST += 			\
 	$(core_generator)
 
 # These headers get installed in ${prefix}/include/gnuradio
@@ -137,14 +137,7 @@ 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
 
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES =				\
-	$(python_built_sources) 	\
-	$(swig_built_sources)
-
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
+BUILT_SOURCES += $(python_built_sources)
 
 if GUILE
 TESTS += run_guile_tests
-- 
cgit 


From 401465831199fa8e29f36d604d9004020a657e72 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 18:35:20 -0800
Subject: Update .gitignore's

---
 gr-trellis/src/lib/.gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/.gitignore b/gr-trellis/src/lib/.gitignore
index 8932c3611..fd893256c 100644
--- a/gr-trellis/src/lib/.gitignore
+++ b/gr-trellis/src/lib/.gitignore
@@ -97,3 +97,4 @@
 /trellis_generated.i
 /generate-stamp
 /stamp-*
+/run_guile_tests
-- 
cgit 


From b005e7d9f481ed39591d97ef697621368e6505c0 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 19:08:21 -0800
Subject: Update .gitignore's

---
 gr-trellis/src/lib/.gitignore | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/.gitignore b/gr-trellis/src/lib/.gitignore
index fd893256c..5dcb1c2c7 100644
--- a/gr-trellis/src/lib/.gitignore
+++ b/gr-trellis/src/lib/.gitignore
@@ -98,3 +98,6 @@
 /generate-stamp
 /stamp-*
 /run_guile_tests
+/gnuradio
+/guile
+/python
-- 
cgit 


From 0b5f66113f43d2ba94a1ca741b5ce65e1f9f2c02 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 3 Dec 2010 23:30:54 -0800
Subject: Rename libguile- to libguile-gnuradio- to match guile library naming
 convention.

The stuff in gnuradio-core ends up with funky names, but that could
be fixed by renaming gnuradio_core_filter.i -> core_filter.i etc.
---
 gr-trellis/src/lib/trellis.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index 63b4c2659..32b7a0a00 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -46,7 +46,7 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-trellis" "scm_init_gnuradio_trellis_module")
+(load-extension "libguile-gnuradio-trellis" "scm_init_gnuradio_trellis_module")
 %}
 
 %goops %{
-- 
cgit 


From 6df0423fe1880f5c33daa333604552ea68ac9593 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 3 Dec 2010 23:34:24 -0800
Subject: Regenerated Makefile.swig.gen's

---
 gr-trellis/src/lib/Makefile.swig.gen | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 32127c7c5..784c146cf 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 trellis_scmlib_LTLIBRARIES = 		\
-	libguile-trellis.la
-libguile_trellis_la_SOURCES =		\
+	libguile-gnuradio-trellis.la
+libguile_gnuradio_trellis_la_SOURCES =	\
 	guile/trellis.cc			\
 	$(trellis_la_swig_sources)
 nobase_trellis_scm_DATA = 		\
 	gnuradio/trellis.scm 		\
 	gnuradio/trellis-primitive.scm
-libguile_trellis_la_LIBADD = 		\
+libguile_gnuradio_trellis_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(trellis_la_swig_libadd)
-libguile_trellis_la_LDFLAGS = 		\
+libguile_gnuradio_trellis_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(trellis_la_swig_ldflags)
-libguile_trellis_la_CXXFLAGS = 		\
+libguile_gnuradio_trellis_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(trellis_la_swig_cxxflags)
-- 
cgit 


From e0f038f1fbeb28b7a4678d0a90b7132836e10a21 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Tue, 7 Dec 2010 11:59:33 -0700
Subject: trellis_generated.i has to be generated first, befofre we can
 generate anything else.

---
 gr-trellis/src/lib/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index b23b5b467..08e75291a 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -92,6 +92,7 @@ libgnuradio_trellis_la_LIBADD =	\
 
 libgnuradio_trellis_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
+trellis.py trellis.scm:	trellis_generated.i
 
 #################################
 # SWIG interface and library
-- 
cgit 


From 08907ee94fb6c34531d57b988324c67c26c8b747 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Fri, 10 Dec 2010 16:15:40 -0800
Subject: Use load-extension-global instead of load-extension

---
 gr-trellis/src/lib/trellis.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-trellis/src/lib')

diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index 32b7a0a00..d035cea54 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -46,7 +46,7 @@
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio-trellis" "scm_init_gnuradio_trellis_module")
+(load-extension-global "libguile-gnuradio-trellis" "scm_init_gnuradio_trellis_module")
 %}
 
 %goops %{
-- 
cgit