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-atsc/src/lib/Makefile.swig.gen | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index e52d65335..0fc085b60 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/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 += atsc.py atsc.cc
+swig_built_sources += atsc.py atsc-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 @@ atsc_pylib_LTLIBRARIES =		\
 	_atsc.la
 
 _atsc_la_SOURCES = 			\
-	atsc.cc			\
+	atsc-python.cc			\
 	$(atsc_la_swig_sources)
 
 _atsc_la_LIBADD =			\
@@ -107,7 +107,7 @@ atsc_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-atsc.h atsc.py atsc.cc: atsc.i
+atsc.h atsc.py atsc-python.cc: atsc.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 @@ atsc.h atsc.py atsc.cc: atsc.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/atsc-generate-stamp; \
+		rm -f $(DEPDIR)/atsc-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-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 @@ atsc.h atsc.py atsc.cc: atsc.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/atsc-generate-stamp; \
+		test -f $(DEPDIR)/atsc-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/atsc-generate-stamp:
+$(DEPDIR)/atsc-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(atsc_swig_args) \
+		-MD -MF $(DEPDIR)/atsc.Std \
+		-module atsc -o atsc-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/atsc.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \
+			> $(DEPDIR)/atsc.Sd; \
+		$(RM) $(DEPDIR)/atsc.Std; \
+		$(MV) $(DEPDIR)/atsc.Sd $(DEPDIR)/atsc.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/atsc.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/atsc-generate-guile-stamp
+
+$(DEPDIR)/atsc-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)/atsc-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(atsc_swig_args) \
 		-MD -MF $(DEPDIR)/atsc.Std \
-		-module atsc -o atsc.cc $(WHAT); then \
+		-module atsc -o atsc-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/atsc.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/atsc-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/atsc-generate-stamp
+	touch $(DEPDIR)/atsc-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-atsc/src/lib/Makefile.swig.gen | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 0fc085b60..4ecd70cf2 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/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 += atsc.py atsc-python.cc
+swig_built_sources += atsc.py atsc_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 @@ atsc_swiginclude_HEADERS =		\
 	$(atsc_swiginclude_headers)
 
 atsc_pylib_LTLIBRARIES =		\
-	_atsc.la
+	_atsc_python.la
 
-_atsc_la_SOURCES = 			\
-	atsc-python.cc			\
+_atsc_python_la_SOURCES = 		\
+	atsc_python.cc		\
 	$(atsc_la_swig_sources)
 
-_atsc_la_LIBADD =			\
+_atsc_python_la_LIBADD =		\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(atsc_la_swig_libadd)
 
-_atsc_la_LDFLAGS =			\
+_atsc_python_la_LDFLAGS =		\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(atsc_la_swig_ldflags)
 
-_atsc_la_CXXFLAGS =			\
+_atsc_python_la_CXXFLAGS =		\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(atsc_la_swig_cxxflags)
 
@@ -105,9 +105,23 @@ atsc_python_PYTHON =			\
 	atsc.py			\
 	$(atsc_python)
 
+if GUILE
+atsc_pylib_LTLIBRARIES += _atsc_guile.la
+
+_atsc_guile_la_SOURCES = 		\
+	atsc_guile.cc		\
+	$(atsc_la_swig_sources)
+
+# Guile can use the same flags as python does
+_atsc_guile_la_LIBADD = $(_atsc_python_la_LIBADD)
+_atsc_guile_la_LDFLAGS = $(_atsc_python_la_LDFLAGS)
+_atsc_guile_la_CXXFLAGS = $(_atsc_python_la_CXXFLAGS)
+
+endif				# end of GUILE
+
 ## Entry rule for running SWIG
 
-atsc.h atsc.py atsc-python.cc: atsc.i
+atsc.h atsc.py atsc_python.cc: atsc.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 @@ atsc.h atsc.py atsc-python.cc: atsc.i
 	fi;
 
 $(DEPDIR)/atsc-generate-guile-stamp:
+if GUILE
 	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(atsc_swig_args) \
 		-MD -MF $(DEPDIR)/atsc.Std \
-		-module atsc -o atsc-guile.cc $(WHAT); then \
+		-module atsc -o atsc_guile.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/atsc.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \
@@ -207,6 +222,7 @@ $(DEPDIR)/atsc-generate-guile-stamp:
 	    $(RM) $(DEPDIR)/atsc.S*; exit 1; \
 	fi;
 	touch $(DEPDIR)/atsc-generate-guile-stamp
+endif
 
 $(DEPDIR)/atsc-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -219,7 +235,7 @@ $(DEPDIR)/atsc-generate-python-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(atsc_swig_args) \
 		-MD -MF $(DEPDIR)/atsc.Std \
-		-module atsc -o atsc-python.cc $(WHAT); then \
+		-module atsc -o atsc_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/atsc.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \
-- 
cgit 


From b866f36454af0defea79d84647a8a1652fb2fbdb Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Sat, 16 Oct 2010 09:46:48 -0600
Subject: regenerated after changes to .i files

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

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 4ecd70cf2..20c82275c 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -121,7 +121,7 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-atsc.h atsc.py atsc_python.cc: atsc.i
+atsc_python.h atsc.py atsc_python.cc atsc_guile.cc atsc_guile.h: atsc.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 @@ atsc.h atsc.py atsc_python.cc: atsc.i
 $(DEPDIR)/atsc-generate-guile-stamp:
 if GUILE
 	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(atsc_swig_args) \
-		-MD -MF $(DEPDIR)/atsc.Std \
+		-MD -MF $(DEPDIR)/atsc_guile.Std \
 		-module atsc -o atsc_guile.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/atsc.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \
-			> $(DEPDIR)/atsc.Sd; \
-		$(RM) $(DEPDIR)/atsc.Std; \
-		$(MV) $(DEPDIR)/atsc.Sd $(DEPDIR)/atsc.Std; \
+		$(RM) $(DEPDIR)/atsc_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc_guile.Std \
+			> $(DEPDIR)/atsc_guile.Sd; \
+		$(RM) $(DEPDIR)/atsc_guile.Std; \
+		$(MV) $(DEPDIR)/atsc_guile.Sd $(DEPDIR)/atsc_guile.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/atsc.S*; exit 1; \
+	    $(RM) $(DEPDIR)/atsc_guile.S*; exit 1; \
 	fi;
 	touch $(DEPDIR)/atsc-generate-guile-stamp
+	$(RM) $(DEPDIR)/atsc_guile.d
+	cp $(DEPDIR)/atsc_guile.Std $(DEPDIR)/atsc_guile.d
+	echo "" >> $(DEPDIR)/atsc_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_guile.d
+	$(RM) $(DEPDIR)/atsc_guile.Std
+	touch $(DEPDIR)/atsc-generate-guile-stamp
+
+@am__include@ @am__quote@./$(DEPDIR)/atsc_guile.d@am__quote@
 endif
 
 $(DEPDIR)/atsc-generate-python-stamp:
@@ -234,17 +243,17 @@ $(DEPDIR)/atsc-generate-python-stamp:
 ## post-processing on 'mingw32' host OS for the dependency file.
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(atsc_swig_args) \
-		-MD -MF $(DEPDIR)/atsc.Std \
+		-MD -MF $(DEPDIR)/atsc_python.Std \
 		-module atsc -o atsc_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/atsc.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \
-			> $(DEPDIR)/atsc.Sd; \
-		$(RM) $(DEPDIR)/atsc.Std; \
-		$(MV) $(DEPDIR)/atsc.Sd $(DEPDIR)/atsc.Std; \
+		$(RM) $(DEPDIR)/atsc_python.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc_python.Std \
+			> $(DEPDIR)/atsc_python.Sd; \
+		$(RM) $(DEPDIR)/atsc_python.Std; \
+		$(MV) $(DEPDIR)/atsc_python.Sd $(DEPDIR)/atsc_python.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/atsc.S*; exit 1; \
+	    $(RM) $(DEPDIR)/atsc_python.S*; exit 1; \
 	fi;
 ##
 ## Mess with the SWIG output .Std dependency file, to create a
@@ -256,27 +265,27 @@ $(DEPDIR)/atsc-generate-python-stamp:
 ##
 ## (1) remove the current dependency file
 ##
-	$(RM) $(DEPDIR)/atsc.d
+	$(RM) $(DEPDIR)/atsc_python.d
 ##
 ## (2) Copy the whole SWIG file:
 ##
-	cp $(DEPDIR)/atsc.Std $(DEPDIR)/atsc.d
+	cp $(DEPDIR)/atsc_python.Std $(DEPDIR)/atsc_python.d
 ##
 ## (3) all a carriage return to the end of the dependency file.
 ##
-	echo "" >> $(DEPDIR)/atsc.d
+	echo "" >> $(DEPDIR)/atsc_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)/atsc.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc_python.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_python.d
 ##
 ## (5) remove the SWIG-generated file
 ##
-	$(RM) $(DEPDIR)/atsc.Std
+	$(RM) $(DEPDIR)/atsc_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)/atsc-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)/atsc.d@am__quote@
+@am__include@ @am__quote@./$(DEPDIR)/atsc_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-atsc/src/lib/Makefile.swig.gen | 54 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 20c82275c..fb05951cc 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -206,33 +206,6 @@ atsc_python.h atsc.py atsc_python.cc atsc_guile.cc atsc_guile.h: atsc.i
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/atsc-generate-guile-stamp:
-if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(atsc_swig_args) \
-		-MD -MF $(DEPDIR)/atsc_guile.Std \
-		-module atsc -o atsc_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/atsc_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc_guile.Std \
-			> $(DEPDIR)/atsc_guile.Sd; \
-		$(RM) $(DEPDIR)/atsc_guile.Std; \
-		$(MV) $(DEPDIR)/atsc_guile.Sd $(DEPDIR)/atsc_guile.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/atsc_guile.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/atsc-generate-guile-stamp
-	$(RM) $(DEPDIR)/atsc_guile.d
-	cp $(DEPDIR)/atsc_guile.Std $(DEPDIR)/atsc_guile.d
-	echo "" >> $(DEPDIR)/atsc_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_guile.d
-	$(RM) $(DEPDIR)/atsc_guile.Std
-	touch $(DEPDIR)/atsc-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/atsc_guile.d@am__quote@
-endif
-
 $(DEPDIR)/atsc-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)/atsc-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/atsc_python.d@am__quote@
 
+$(DEPDIR)/atsc-generate-guile-stamp:
+if GUILE
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(atsc_swig_args) \
+		-MD -MF $(DEPDIR)/atsc_guile.Std \
+		-module atsc -o atsc_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/atsc_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc_guile.Std \
+			> $(DEPDIR)/atsc_guile.Sd; \
+		$(RM) $(DEPDIR)/atsc_guile.Std; \
+		$(MV) $(DEPDIR)/atsc_guile.Sd $(DEPDIR)/atsc_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/atsc_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/atsc-generate-guile-stamp
+	$(RM) $(DEPDIR)/atsc_guile.d
+	cp $(DEPDIR)/atsc_guile.Std $(DEPDIR)/atsc_guile.d
+	echo "" >> $(DEPDIR)/atsc_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_guile.d
+	$(RM) $(DEPDIR)/atsc_guile.Std
+	touch $(DEPDIR)/atsc-generate-guile-stamp
+
+@am__include@ @am__quote@./$(DEPDIR)/atsc_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-atsc/src/lib/Makefile.swig.gen | 51 +++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 7 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index fb05951cc..3db57acd0 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ atsc_pylibdir_category ?= $(atsc_pythondir_category)
 atsc_pythondir = $(pythondir)/$(atsc_pythondir_category)
 atsc_pylibdir = $(pyexecdir)/$(atsc_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.
+atsc_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/atsc
+# FIXME: determince whether these should be installed with gnuradio.
+atsc_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 atsc_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += atsc.py atsc_python.cc
+if GUILE
+swig_built_sources += atsc.scm atsc_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 @@ atsc_python_PYTHON =			\
 	$(atsc_python)
 
 if GUILE
-atsc_pylib_LTLIBRARIES += _atsc_guile.la
-
+atsc_scmlib_LTLIBRARIES = _atsc_guile.la
 _atsc_guile_la_SOURCES = 		\
-	atsc_guile.cc		\
+	atsc_guile.cc		        \
 	$(atsc_la_swig_sources)
+atsc_scm_DATA = atsc.scm
 
 # Guile can use the same flags as python does
 _atsc_guile_la_LIBADD = $(_atsc_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-atsc_python.h atsc.py atsc_python.cc atsc_guile.cc atsc_guile.h: atsc.i
+# $(python_deps) $(guile_deps): atsc.i
+atsc_python.h atsc.py atsc_python.cc: atsc.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 @@ atsc_python.h atsc.py atsc_python.cc atsc_guile.cc atsc_guile.h: atsc.i
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-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 @@ atsc_python.h atsc.py atsc_python.cc atsc_guile.cc atsc_guile.h: atsc.i
 		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.
+atsc_guile.h atsc.scm atsc_guile.cc: atsc.i
+if GUILE
+	trap 'rm -rf $(DEPDIR)/atsc-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/atsc-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/atsc-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/atsc-generate-lock; \
+	else \
+		while test -d $(DEPDIR)/atsc-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/atsc-generate-guile-stamp; \
+		exit $$?; \
+	fi;
+endif				# end of GUILE
+
 $(DEPDIR)/atsc-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)/atsc-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/atsc_python.d@am__quote@
 
-$(DEPDIR)/atsc-generate-guile-stamp:
 if GUILE
+$(DEPDIR)/atsc-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) $(atsc_swig_args) \
 		-MD -MF $(DEPDIR)/atsc_guile.Std \
 		-module atsc -o atsc_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
 		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_guile.d
 	$(RM) $(DEPDIR)/atsc_guile.Std
 	touch $(DEPDIR)/atsc-generate-guile-stamp
+else
+	touch $(DEPDIR)/atsc-generate-guile-stamp
+endif
 
 @am__include@ @am__quote@./$(DEPDIR)/atsc_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-atsc/src/lib/Makefile.swig.gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 3db57acd0..af4d6437e 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -303,8 +303,8 @@ $(DEPDIR)/atsc-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/atsc_python.d@am__quote@
 
-if GUILE
 $(DEPDIR)/atsc-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) $(atsc_swig_args) \
-- 
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-atsc/src/lib/Makefile.swig.gen | 241 ++++----------------------------------
 1 file changed, 25 insertions(+), 216 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index af4d6437e..440366fd8 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/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 += atsc.py atsc_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 += atsc.py
 if GUILE
-swig_built_sources += atsc.scm atsc_guile.cc
+swig_built_sources += atsc.scm
 endif
 
 ## Various SWIG variables.  These can be overloaded in the including
@@ -96,243 +98,50 @@ atsc_swiginclude_HEADERS =		\
 	$(atsc_swiginclude_headers)
 
 atsc_pylib_LTLIBRARIES =		\
-	_atsc_python.la
+	_atsc.la
 
-_atsc_python_la_SOURCES = 		\
-	atsc_python.cc		\
+_atsc_la_SOURCES = 			\
+	python/atsc.cc		\
 	$(atsc_la_swig_sources)
 
-_atsc_python_la_LIBADD =		\
+_atsc_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(atsc_la_swig_libadd)
 
-_atsc_python_la_LDFLAGS =		\
+# _atsc_la_DEPENDENCIES = python/atsc.lo
+
+_atsc_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(atsc_la_swig_ldflags)
 
-_atsc_python_la_CXXFLAGS =		\
+_atsc_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(atsc_la_swig_cxxflags)
 
 atsc_python_PYTHON =			\
 	atsc.py			\
-	$(atsc_python)
+	$(atsc)
 
 if GUILE
-atsc_scmlib_LTLIBRARIES = _atsc_guile.la
-_atsc_guile_la_SOURCES = 		\
-	atsc_guile.cc		        \
+atsc_scmlib_LTLIBRARIES = atsc_guile.la
+atsc_guile_la_SOURCES = 		\
+	guile/atsc.cc			\
 	$(atsc_la_swig_sources)
 atsc_scm_DATA = atsc.scm
 
 # Guile can use the same flags as python does
-_atsc_guile_la_LIBADD = $(_atsc_python_la_LIBADD)
-_atsc_guile_la_LDFLAGS = $(_atsc_python_la_LDFLAGS)
-_atsc_guile_la_CXXFLAGS = $(_atsc_python_la_CXXFLAGS)
-
-endif				# end of GUILE
+atsc_guile_la_LIBADD = $(_atsc_la_LIBADD)
+atsc_guile_la_LDFLAGS = $(_atsc_la_LDFLAGS)
+atsc_guile_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
 
-## Entry rule for running SWIG
-
-# $(python_deps) $(guile_deps): atsc.i
-atsc_python.h atsc.py atsc_python.cc: atsc.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)/atsc-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)/atsc-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)/atsc-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)/atsc-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-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)/atsc-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)/atsc-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)/atsc-generate-python-stamp; \
-		exit $$?; \
-	fi;
+guile/atsc.lo: atsc.lo
+atsc.scm: atsc.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.
-atsc_guile.h atsc.scm atsc_guile.cc: atsc.i
-if GUILE
-	trap 'rm -rf $(DEPDIR)/atsc-generate-*' 1 2 13 15; \
-	if mkdir $(DEPDIR)/atsc-generate-lock 2>/dev/null; then \
-		rm -f $(DEPDIR)/atsc-generate-*stamp; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-guile-stamp WHAT=$<; \
-		rmdir $(DEPDIR)/atsc-generate-lock; \
-	else \
-		while test -d $(DEPDIR)/atsc-generate-lock; do \
-			sleep 1; \
-		done; \
-		test -f $(DEPDIR)/atsc-generate-guile-stamp; \
-		exit $$?; \
-	fi;
 endif				# end of GUILE
 
-$(DEPDIR)/atsc-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) $(atsc_swig_args) \
-		-MD -MF $(DEPDIR)/atsc_python.Std \
-		-module atsc -o atsc_python.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/atsc_python.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc_python.Std \
-			> $(DEPDIR)/atsc_python.Sd; \
-		$(RM) $(DEPDIR)/atsc_python.Std; \
-		$(MV) $(DEPDIR)/atsc_python.Sd $(DEPDIR)/atsc_python.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/atsc_python.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) $(DEPDIR)/atsc_python.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/atsc_python.Std $(DEPDIR)/atsc_python.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/atsc_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)/atsc_python.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_python.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/atsc_python.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)/atsc-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@./$(DEPDIR)/atsc_python.d@am__quote@
-
-$(DEPDIR)/atsc-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) $(atsc_swig_args) \
-		-MD -MF $(DEPDIR)/atsc_guile.Std \
-		-module atsc -o atsc_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/atsc_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc_guile.Std \
-			> $(DEPDIR)/atsc_guile.Sd; \
-		$(RM) $(DEPDIR)/atsc_guile.Std; \
-		$(MV) $(DEPDIR)/atsc_guile.Sd $(DEPDIR)/atsc_guile.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/atsc_guile.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/atsc-generate-guile-stamp
-	$(RM) $(DEPDIR)/atsc_guile.d
-	cp $(DEPDIR)/atsc_guile.Std $(DEPDIR)/atsc_guile.d
-	echo "" >> $(DEPDIR)/atsc_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_guile.d
-	$(RM) $(DEPDIR)/atsc_guile.Std
-	touch $(DEPDIR)/atsc-generate-guile-stamp
-else
-	touch $(DEPDIR)/atsc-generate-guile-stamp
-endif
-
-@am__include@ @am__quote@./$(DEPDIR)/atsc_guile.d@am__quote@
+python/atsc.lo:
+atsc.lo: atsc.py atsc.scm
+atsc.py: atsc.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-atsc/src/lib/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index bf9c6626a..a82c37913 100644
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -84,7 +84,8 @@ libgnuradio_atsc_la_SOURCES = 			\
 	create_atsci_equalizer.cc		\
 	create_atsci_fs_checker.cc		\
 	create_atsci_fs_correlator.cc		\
-	plinfo.cc				
+	plinfo.cc				\
+	python/atsc.cc
 
 BUILT_SOURCES = 				\
 	atsci_viterbi_mux.cc
-- 
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-atsc/src/lib/Makefile.swig.gen | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 440366fd8..feb978673 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -41,12 +41,12 @@ atsc_pylibdir = $(pyexecdir)/$(atsc_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.
-atsc_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+atsc_scmlibdir = $(libdir)/guile/gnuradio
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/atsc
 # FIXME: determince whether these should be installed with gnuradio.
-atsc_scmdir = @GUILE_PKDATADIR@/gnuradio
+atsc_scmdir = $(guiledir)/gnuradio
 
 ## SWIG headers are always installed into the same directory.
 
@@ -144,4 +144,5 @@ python/atsc.lo:
 atsc.lo: atsc.py atsc.scm
 atsc.py: atsc.i
 
+-include python/atsc.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-atsc/src/lib/Makefile.swig.gen | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index feb978673..73db7909b 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -41,7 +41,7 @@ atsc_pylibdir = $(pyexecdir)/$(atsc_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.
-atsc_scmlibdir = $(libdir)/guile/gnuradio
+atsc_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/atsc
@@ -124,16 +124,16 @@ atsc_python_PYTHON =			\
 	$(atsc)
 
 if GUILE
-atsc_scmlib_LTLIBRARIES = atsc_guile.la
-atsc_guile_la_SOURCES = 		\
+atsc_scmlib_LTLIBRARIES = libguile-atsc.la
+libguile_atsc_la_SOURCES = 		\
 	guile/atsc.cc			\
 	$(atsc_la_swig_sources)
 atsc_scm_DATA = atsc.scm
 
 # Guile can use the same flags as python does
-atsc_guile_la_LIBADD = $(_atsc_la_LIBADD)
-atsc_guile_la_LDFLAGS = $(_atsc_la_LDFLAGS)
-atsc_guile_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
+libguile_atsc_la_LIBADD = $(_atsc_la_LIBADD)
+libguile_atsc_la_LDFLAGS = $(_atsc_la_LDFLAGS)
+libguile_atsc_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
 
 guile/atsc.lo: atsc.lo
 atsc.scm: atsc.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-atsc/src/lib/Makefile.swig.gen | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 73db7909b..2a07d4f1d 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -46,7 +46,7 @@ atsc_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/atsc
 # FIXME: determince whether these should be installed with gnuradio.
-atsc_scmdir = $(guiledir)/gnuradio
+atsc_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ atsc_scmlib_LTLIBRARIES = libguile-atsc.la
 libguile_atsc_la_SOURCES = 		\
 	guile/atsc.cc			\
 	$(atsc_la_swig_sources)
-atsc_scm_DATA = atsc.scm
+nobase_atsc_scm_DATA = gnuradio/atsc.scm gnuradio/atsc-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_atsc_la_LIBADD = $(_atsc_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_atsc_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
 
 guile/atsc.lo: atsc.lo
 atsc.scm: atsc.i
+gnuradio/atsc-primitive.scm: atsc.scm
+
+-include guile/atsc.d
 
 endif				# end of GUILE
 
-- 
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-atsc/src/lib/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index a82c37913..1ca31d14b 100644
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -84,8 +84,8 @@ libgnuradio_atsc_la_SOURCES = 			\
 	create_atsci_equalizer.cc		\
 	create_atsci_fs_checker.cc		\
 	create_atsci_fs_correlator.cc		\
-	plinfo.cc				\
-	python/atsc.cc
+	plinfo.cc
+
 
 BUILT_SOURCES = 				\
 	atsci_viterbi_mux.cc
-- 
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-atsc/src/lib/Makefile.swig.gen | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 2a07d4f1d..f4667c5c6 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/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 += atsc.py
-if GUILE
-swig_built_sources += atsc.scm
-endif
+# swig_built_sources += atsc.py
+# if GUILE
+# swig_built_sources += gnuradio/atsc.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_atsc_la_LIBADD = $(_atsc_la_LIBADD)
 libguile_atsc_la_LDFLAGS = $(_atsc_la_LDFLAGS)
 libguile_atsc_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
 
-guile/atsc.lo: atsc.lo
-atsc.scm: atsc.i
-gnuradio/atsc-primitive.scm: atsc.scm
+guile/atsc.cc: gnuradio/atsc.scm
+gnuradio/atsc.scm: atsc.i
+gnuradio/atsc-primitive.scm: gnuradio/atsc.scm
 
 -include guile/atsc.d
 
 endif				# end of GUILE
 
-python/atsc.lo:
 atsc.lo: atsc.py atsc.scm
 atsc.py: atsc.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-atsc/src/lib/Makefile.swig.gen | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index f4667c5c6..8b53ada78 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -67,28 +67,10 @@ atsc_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)/atsc-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 += atsc.py
-# if GUILE
-# swig_built_sources += gnuradio/atsc.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 @@ _atsc_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(atsc_la_swig_libadd)
 
-# _atsc_la_DEPENDENCIES = python/atsc.lo
-
 _atsc_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(atsc_la_swig_ldflags)
@@ -123,14 +103,20 @@ atsc_python_PYTHON =			\
 	atsc.py			\
 	$(atsc)
 
+python/atsc.cc: atsc.py
+atsc.py: atsc.i
+
+# Include the python dependencies for this file
+-include python/atsc.d
+# end of PYTHON
+
 if GUILE
 atsc_scmlib_LTLIBRARIES = libguile-atsc.la
-libguile_atsc_la_SOURCES = 		\
-	guile/atsc.cc			\
+libguile_atsc_la_SOURCES = \
+	guile/atsc.cc				       \
 	$(atsc_la_swig_sources)
 nobase_atsc_scm_DATA = gnuradio/atsc.scm gnuradio/atsc-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_atsc_la_LIBADD = $(_atsc_la_LIBADD)
 libguile_atsc_la_LDFLAGS = $(_atsc_la_LDFLAGS)
 libguile_atsc_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/atsc.cc: gnuradio/atsc.scm
 gnuradio/atsc.scm: atsc.i
 gnuradio/atsc-primitive.scm: gnuradio/atsc.scm
 
+# Include the guile dependencies for this file
 -include guile/atsc.d
 
 endif				# end of GUILE
 
-atsc.lo: atsc.py atsc.scm
-atsc.py: atsc.i
-
--include python/atsc.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-atsc/src/lib/Makefile.swig.gen | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 8b53ada78..12557677f 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -112,8 +112,8 @@ atsc.py: atsc.i
 
 if GUILE
 atsc_scmlib_LTLIBRARIES = libguile-atsc.la
-libguile_atsc_la_SOURCES = \
-	guile/atsc.cc				       \
+libguile_atsc_la_SOURCES =		\
+	guile/atsc.cc			\
 	$(atsc_la_swig_sources)
 nobase_atsc_scm_DATA = gnuradio/atsc.scm gnuradio/atsc-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-atsc/src/lib/Makefile.swig.gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 12557677f..6598894ed 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -101,7 +101,7 @@ _atsc_la_CXXFLAGS =			\
 
 atsc_python_PYTHON =			\
 	atsc.py			\
-	$(atsc)
+	$(atsc_python)
 
 python/atsc.cc: atsc.py
 atsc.py: atsc.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-atsc/src/lib/Makefile.swig.gen | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 6598894ed..b39a56ad6 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -79,6 +79,7 @@ atsc_swiginclude_HEADERS =		\
 	atsc.i			\
 	$(atsc_swiginclude_headers)
 
+if PYTHON
 atsc_pylib_LTLIBRARIES =		\
 	_atsc.la
 
@@ -86,6 +87,10 @@ _atsc_la_SOURCES = 			\
 	python/atsc.cc		\
 	$(atsc_la_swig_sources)
 
+atsc_python_PYTHON =			\
+	atsc.py			\
+	$(atsc_python)
+
 _atsc_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(atsc_la_swig_libadd)
@@ -99,27 +104,34 @@ _atsc_la_CXXFLAGS =			\
 	-I$(top_builddir) 		\
 	$(atsc_la_swig_cxxflags)
 
-atsc_python_PYTHON =			\
-	atsc.py			\
-	$(atsc_python)
-
 python/atsc.cc: atsc.py
 atsc.py: atsc.i
 
 # Include the python dependencies for this file
 -include python/atsc.d
-# end of PYTHON
+
+endif		# end of if python
 
 if GUILE
-atsc_scmlib_LTLIBRARIES = libguile-atsc.la
+
+atsc_scmlib_LTLIBRARIES = 		\
+	libguile-atsc.la
 libguile_atsc_la_SOURCES =		\
 	guile/atsc.cc			\
 	$(atsc_la_swig_sources)
-nobase_atsc_scm_DATA = gnuradio/atsc.scm gnuradio/atsc-primitive.scm
-
-libguile_atsc_la_LIBADD = $(_atsc_la_LIBADD)
-libguile_atsc_la_LDFLAGS = $(_atsc_la_LDFLAGS)
-libguile_atsc_la_CXXFLAGS = $(_atsc_la_CXXFLAGS)
+nobase_atsc_scm_DATA = 		\
+	gnuradio/atsc.scm 		\
+	gnuradio/atsc-primitive.scm
+libguile_atsc_la_LIBADD = 		\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(atsc_la_swig_libadd)
+libguile_atsc_la_LDFLAGS = 		\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(atsc_la_swig_ldflags)
+libguile_atsc_la_CXXFLAGS = 		\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(atsc_la_swig_cxxflags)
 
 guile/atsc.cc: gnuradio/atsc.scm
 gnuradio/atsc.scm: atsc.i
-- 
cgit 


From 99dc38c8f81fe388b13bf46e3f53cc272765249e Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 13:49:59 -0800
Subject: Consistently use TESTS += in conditionals

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

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am
index 37b60e6a4..98aead0fa 100644
--- a/gr-atsc/src/python/Makefile.am
+++ b/gr-atsc/src/python/Makefile.am
@@ -36,8 +36,7 @@ dist_ourdata_SCRIPTS =  \
 	xlate.py	\
 	viterbi-out.py
 
-TESTS = 				\
-	run_tests
+TESTS = run_tests
 
 noinst_PYTHON = 			\
 	atsc_utils.py			\
-- 
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-atsc/src/lib/Makefile.am    | 19 ++++++-------------
 gr-atsc/src/python/Makefile.am |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index 1ca31d14b..b1bda90ff 100644
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2004,2005,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2001,2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,11 +20,12 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
 	$(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
-EXTRA_DIST =					\
+EXTRA_DIST +=					\
 	atsci_viterbi_gen.cc			\
 	gen_encoder.py				\
 	qa_atsci_trellis_encoder_t1_input.dat	\
@@ -87,7 +88,7 @@ libgnuradio_atsc_la_SOURCES = 			\
 	plinfo.cc
 
 
-BUILT_SOURCES = 				\
+BUILT_SOURCES += 				\
 	atsci_viterbi_mux.cc
 
 libgnuradio_atsc_la_LIBADD = 			\
@@ -211,12 +212,11 @@ test_atsci_LDADD   =  		\
 #  Cleanup
 # ------------------------------------------------------------------------
 
-CLEANFILES = atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT)
+CLEANFILES += atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT)
 
-if PYTHON
 # ------------------------------------------------------------------------
 #  This is the swig-ish part of the Makefile.
-#  It builds the atsc module which we'll load into python
+#  It builds the atsc modules which we'll load into python or guile
 # ------------------------------------------------------------------------
 
 TOP_SWIG_IFILES = 		\
@@ -233,11 +233,4 @@ atsc_pythondir_category =	\
 atsc_la_swig_libadd =		\
 	libgnuradio-atsc.la
 
-include $(top_srcdir)/Makefile.swig
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES += $(swig_built_sources)
 
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
-endif
diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am
index 98aead0fa..7b2f5c871 100644
--- a/gr-atsc/src/python/Makefile.am
+++ b/gr-atsc/src/python/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST =		\
+EXTRA_DIST +=		\
 	run_tests.in
 
 ourdatadir = $(exampledir)/atsc
-- 
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-atsc/src/lib/.gitignore | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/.gitignore b/gr-atsc/src/lib/.gitignore
index 01e4ffe9a..7cd5d520b 100644
--- a/gr-atsc/src/lib/.gitignore
+++ b/gr-atsc/src/lib/.gitignore
@@ -12,3 +12,6 @@
 /atsci_viterbi_mux.cc
 /test_atsci
 /*.pyc
+/gnuradio
+/guile
+/python
-- 
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-atsc/src/lib/Makefile.swig.gen | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index b39a56ad6..7dbb98b46 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 atsc_scmlib_LTLIBRARIES = 		\
-	libguile-atsc.la
-libguile_atsc_la_SOURCES =		\
+	libguile-gnuradio-atsc.la
+libguile_gnuradio_atsc_la_SOURCES =	\
 	guile/atsc.cc			\
 	$(atsc_la_swig_sources)
 nobase_atsc_scm_DATA = 		\
 	gnuradio/atsc.scm 		\
 	gnuradio/atsc-primitive.scm
-libguile_atsc_la_LIBADD = 		\
+libguile_gnuradio_atsc_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(atsc_la_swig_libadd)
-libguile_atsc_la_LDFLAGS = 		\
+libguile_gnuradio_atsc_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(atsc_la_swig_ldflags)
-libguile_atsc_la_CXXFLAGS = 		\
+libguile_gnuradio_atsc_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(atsc_la_swig_cxxflags)
-- 
cgit 


From 48f9ca90e0cbcbfe67b0e10889c60928d9be5c49 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 17 Jan 2011 16:37:45 -0800
Subject: gr math simplification:

Replaces gr_gcd, gr_isnan, and gr_signbit one-time instances with boot math calls.
No point in wrapping these utility math functions into gnuradio when they are
1) provided by boost
2) only called once

Removes gr_math.cc, and configure checks for isnan.
---
 gr-atsc/src/lib/atsci_equalizer_lms2.cc | 5 +++--
 gr-atsc/src/lib/atsci_sssr.cc           | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.cc b/gr-atsc/src/lib/atsci_equalizer_lms2.cc
index 345f6209f..f9fb57c7b 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms2.cc
+++ b/gr-atsc/src/lib/atsci_equalizer_lms2.cc
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <gr_math.h>
 #include <stdio.h>
+#include <boost/math/special_functions/fpclassify.hpp>
 
 using std::min;
 using std::max;
@@ -55,7 +56,7 @@ wrap (int d)
 static inline float 
 slice (float d)
 {
-  if (gr_isnan (d))
+  if (boost::math::isnan (d))
     return 0.0;
   
   if (d >= 0.0){
@@ -247,7 +248,7 @@ atsci_equalizer_lms2::filter1 (const float input[])
     acc -= d_taps_fb[i] * d_old_output[wrap(i + d_output_ptr)];
   }
 
-  if (gr_isnan (acc)){
+  if (boost::math::isnan (acc)){
     abort ();
   }
 
diff --git a/gr-atsc/src/lib/atsci_sssr.cc b/gr-atsc/src/lib/atsci_sssr.cc
index dc5c01b0d..4ccee85de 100644
--- a/gr-atsc/src/lib/atsci_sssr.cc
+++ b/gr-atsc/src/lib/atsci_sssr.cc
@@ -28,6 +28,7 @@
 #include <atsci_diag_output.h>
 #include <gr_math.h>
 #include <stdio.h>
+#include <boost/math/special_functions/sign.hpp>
 
 /*
  * ----------------------------------------------------------------
@@ -141,7 +142,7 @@ atsci_sssr::update (sssr::sample_t sample_in,	 // input
   double qo = d_quad_filter.update (sample_in);
   d_quad_output[d_counter] = qo;
 
-  int bit = gr_signbit (sample_in) ^ 1;	// slice on sign: + => 1, - => 0
+  int bit = boost::math::signbit (sample_in) ^ 1;	// slice on sign: + => 1, - => 0
   int corr_out = d_correlator.update (bit);
   int weight = sipp (corr_out);
   int corr_value = d_integrator.update (weight, d_counter);
-- 
cgit 


From 05cc02cec03507c47846a668c92e6dcc4ba2e71e Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 18 Jan 2011 01:00:15 -0800
Subject: cleanup mkdir usage with boost filesystem:

Replaced copy/pasted code and MKDIR_TAKES_ONE_ARG #ifdefs
with portable boost filesystem path and directory creation.

Gets the correct home directory on windows systems: APPDATA.
Replaces large amounts of copypasta with single lines of code.
Removes MKDIR_TAKES_ONE_ARG configuration checks from m4 files.
Adds boost filesystem and system library as build dependencies.
---
 gr-atsc/src/lib/test_atsci.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/test_atsci.cc b/gr-atsc/src/lib/test_atsci.cc
index 184895a90..46833ab5d 100644
--- a/gr-atsc/src/lib/test_atsci.cc
+++ b/gr-atsc/src/lib/test_atsci.cc
@@ -28,11 +28,8 @@
 int 
 main (int argc, char **argv)
 {
-  char path[200];
-  get_unittest_path ("gr_atsc.xml", path, 200);
-
   CppUnit::TextTestRunner runner;
-  std::ofstream xmlfile(path);
+  std::ofstream xmlfile(get_unittest_path("gr_atsc.xml").c_str());
   CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
 
   runner.addTest (qa_atsc::suite ());
-- 
cgit 


From ebb0f56da62e9ff16928b32cc525f24c93a99e0b Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sat, 22 Jan 2011 14:54:20 -0500
Subject: Updating copyright.

---
 gr-atsc/src/lib/test_atsci.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-atsc')

diff --git a/gr-atsc/src/lib/test_atsci.cc b/gr-atsc/src/lib/test_atsci.cc
index 46833ab5d..031ca42ae 100644
--- a/gr-atsc/src/lib/test_atsci.cc
+++ b/gr-atsc/src/lib/test_atsci.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2002,2006,2010 Free Software Foundation, Inc.
+ * Copyright 2002,2006,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
-- 
cgit