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-usrp/src/Makefile.swig.gen | 59 +++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 14 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 9884b3d4f..df2e3acf0 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/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 += usrp_swig.py usrp_swig.cc
+swig_built_sources += usrp_swig.py usrp_swig_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 @@ usrp_swig_swiginclude_HEADERS =		\
 	$(usrp_swig_swiginclude_headers)
 
 usrp_swig_pylib_LTLIBRARIES =		\
-	_usrp_swig.la
+	_usrp_swig_python.la
 
-_usrp_swig_la_SOURCES = 			\
-	usrp_swig.cc			\
+_usrp_swig_python_la_SOURCES = 		\
+	usrp_swig_python.cc		\
 	$(usrp_swig_la_swig_sources)
 
-_usrp_swig_la_LIBADD =			\
+_usrp_swig_python_la_LIBADD =		\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_swig_la_swig_libadd)
 
-_usrp_swig_la_LDFLAGS =			\
+_usrp_swig_python_la_LDFLAGS =		\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_swig_la_swig_ldflags)
 
-_usrp_swig_la_CXXFLAGS =			\
+_usrp_swig_python_la_CXXFLAGS =		\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(usrp_swig_la_swig_cxxflags)
 
@@ -105,9 +105,23 @@ usrp_swig_python_PYTHON =			\
 	usrp_swig.py			\
 	$(usrp_swig_python)
 
+if GUILE
+usrp_swig_pylib_LTLIBRARIES += _usrp_swig_guile.la
+
+_usrp_swig_guile_la_SOURCES = 		\
+	usrp_swig_guile.cc		\
+	$(usrp_swig_la_swig_sources)
+
+# Guile can use the same flags as python does
+_usrp_swig_guile_la_LIBADD = $(_usrp_swig_python_la_LIBADD)
+_usrp_swig_guile_la_LDFLAGS = $(_usrp_swig_python_la_LDFLAGS)
+_usrp_swig_guile_la_CXXFLAGS = $(_usrp_swig_python_la_CXXFLAGS)
+
+endif				# end of GUILE
+
 ## Entry rule for running SWIG
 
-usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i
+usrp_swig.h usrp_swig.py usrp_swig_python.cc: usrp_swig.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 +173,12 @@ usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/usrp_swig-generate-stamp; \
+		rm -f $(DEPDIR)/usrp_swig-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-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 +202,27 @@ usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/usrp_swig-generate-stamp; \
+		test -f $(DEPDIR)/usrp_swig-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/usrp_swig-generate-stamp:
+$(DEPDIR)/usrp_swig-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp_swig_swig_args) \
+		-MD -MF $(DEPDIR)/usrp_swig.Std \
+		-module usrp_swig -o usrp_swig_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/usrp_swig.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \
+			> $(DEPDIR)/usrp_swig.Sd; \
+		$(RM) $(DEPDIR)/usrp_swig.Std; \
+		$(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/usrp_swig-generate-guile-stamp
+
+$(DEPDIR)/usrp_swig-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 +233,7 @@ $(DEPDIR)/usrp_swig-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_swig_swig_args) \
 		-MD -MF $(DEPDIR)/usrp_swig.Std \
-		-module usrp_swig -o usrp_swig.cc $(WHAT); then \
+		-module usrp_swig -o usrp_swig_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/usrp_swig.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \
@@ -249,7 +280,7 @@ $(DEPDIR)/usrp_swig-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/usrp_swig-generate-stamp
+	touch $(DEPDIR)/usrp_swig-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 f97d37a216d1a3ff888f8b57c0090f9def9dd021 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 18 Oct 2010 19:24:49 -0700
Subject: Update generated files

---
 gr-usrp/src/Makefile.swig.gen | 112 ++++++++++++++++++++++++++++++------------
 1 file changed, 80 insertions(+), 32 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index df2e3acf0..75078862b 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ usrp_swig_pylibdir_category ?= $(usrp_swig_pythondir_category)
 usrp_swig_pythondir = $(pythondir)/$(usrp_swig_pythondir_category)
 usrp_swig_pylibdir = $(pyexecdir)/$(usrp_swig_pylibdir_category)
 
+# The .so libraries for the guile modules get installed whereever guile
+# is installed, usually /usr/lib/guile/gnuradio/
+# FIXME: determince whether these should be installed with gnuradio.
+usrp_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/usrp_swig
+# FIXME: determince whether these should be installed with gnuradio.
+usrp_swig_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 usrp_swig_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += usrp_swig.py usrp_swig_python.cc
+if GUILE
+swig_built_sources += usrp_swig.scm usrp_swig_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 @@ usrp_swig_python_PYTHON =			\
 	$(usrp_swig_python)
 
 if GUILE
-usrp_swig_pylib_LTLIBRARIES += _usrp_swig_guile.la
-
+usrp_swig_scmlib_LTLIBRARIES = _usrp_swig_guile.la
 _usrp_swig_guile_la_SOURCES = 		\
-	usrp_swig_guile.cc		\
+	usrp_swig_guile.cc		        \
 	$(usrp_swig_la_swig_sources)
+usrp_swig_scm_DATA = usrp_swig.scm
 
 # Guile can use the same flags as python does
 _usrp_swig_guile_la_LIBADD = $(_usrp_swig_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-usrp_swig.h usrp_swig.py usrp_swig_python.cc: usrp_swig.i
+# $(python_deps) $(guile_deps): usrp_swig.i
+usrp_swig_python.h usrp_swig.py usrp_swig_python.cc: usrp_swig.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 @@ usrp_swig.h usrp_swig.py usrp_swig_python.cc: usrp_swig.i
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-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,21 +219,23 @@ usrp_swig.h usrp_swig.py usrp_swig_python.cc: usrp_swig.i
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/usrp_swig-generate-guile-stamp:
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp_swig_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_swig.Std \
-		-module usrp_swig -o usrp_swig_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_swig.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \
-			> $(DEPDIR)/usrp_swig.Sd; \
-		$(RM) $(DEPDIR)/usrp_swig.Std; \
-		$(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \
-	    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.
+usrp_swig_guile.h usrp_swig.scm usrp_swig_guile.cc: usrp_swig.i
+if GUILE
+	trap 'rm -rf $(DEPDIR)/usrp_swig-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/usrp_swig-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/usrp_swig-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/usrp_swig-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \
+		while test -d $(DEPDIR)/usrp_swig-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/usrp_swig-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/usrp_swig-generate-guile-stamp
+endif				# end of GUILE
 
 $(DEPDIR)/usrp_swig-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -232,17 +247,17 @@ $(DEPDIR)/usrp_swig-generate-python-stamp:
 ## post-processing on 'mingw32' host OS for the dependency file.
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_swig_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_swig.Std \
+		-MD -MF $(DEPDIR)/usrp_swig_python.Std \
 		-module usrp_swig -o usrp_swig_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_swig.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \
-			> $(DEPDIR)/usrp_swig.Sd; \
-		$(RM) $(DEPDIR)/usrp_swig.Std; \
-		$(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \
+		$(RM) $(DEPDIR)/usrp_swig_python.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig_python.Std \
+			> $(DEPDIR)/usrp_swig_python.Sd; \
+		$(RM) $(DEPDIR)/usrp_swig_python.Std; \
+		$(MV) $(DEPDIR)/usrp_swig_python.Sd $(DEPDIR)/usrp_swig_python.Std; \
 	    fi; \
 	else \
-	    $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \
+	    $(RM) $(DEPDIR)/usrp_swig_python.S*; exit 1; \
 	fi;
 ##
 ## Mess with the SWIG output .Std dependency file, to create a
@@ -254,27 +269,27 @@ $(DEPDIR)/usrp_swig-generate-python-stamp:
 ##
 ## (1) remove the current dependency file
 ##
-	$(RM) $(DEPDIR)/usrp_swig.d
+	$(RM) $(DEPDIR)/usrp_swig_python.d
 ##
 ## (2) Copy the whole SWIG file:
 ##
-	cp $(DEPDIR)/usrp_swig.Std $(DEPDIR)/usrp_swig.d
+	cp $(DEPDIR)/usrp_swig_python.Std $(DEPDIR)/usrp_swig_python.d
 ##
 ## (3) all a carriage return to the end of the dependency file.
 ##
-	echo "" >> $(DEPDIR)/usrp_swig.d
+	echo "" >> $(DEPDIR)/usrp_swig_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)/usrp_swig.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig_python.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig_python.d
 ##
 ## (5) remove the SWIG-generated file
 ##
-	$(RM) $(DEPDIR)/usrp_swig.Std
+	$(RM) $(DEPDIR)/usrp_swig_python.Std
 ##
 ## Create the stamp for this filename generation, to signal success in
 ## executing this rule; allows other threads waiting on this process
@@ -286,5 +301,38 @@ $(DEPDIR)/usrp_swig-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)/usrp_swig.d@am__quote@
+@am__include@ @am__quote@./$(DEPDIR)/usrp_swig_python.d@am__quote@
+
+if GUILE
+$(DEPDIR)/usrp_swig-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) $(usrp_swig_swig_args) \
+		-MD -MF $(DEPDIR)/usrp_swig_guile.Std \
+		-module usrp_swig -o usrp_swig_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/usrp_swig_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig_guile.Std \
+			> $(DEPDIR)/usrp_swig_guile.Sd; \
+		$(RM) $(DEPDIR)/usrp_swig_guile.Std; \
+		$(MV) $(DEPDIR)/usrp_swig_guile.Sd $(DEPDIR)/usrp_swig_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/usrp_swig_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/usrp_swig-generate-guile-stamp
+	$(RM) $(DEPDIR)/usrp_swig_guile.d
+	cp $(DEPDIR)/usrp_swig_guile.Std $(DEPDIR)/usrp_swig_guile.d
+	echo "" >> $(DEPDIR)/usrp_swig_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig_guile.d
+	$(RM) $(DEPDIR)/usrp_swig_guile.Std
+	touch $(DEPDIR)/usrp_swig-generate-guile-stamp
+else
+	touch $(DEPDIR)/usrp_swig-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/usrp_swig_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
 
-- 
cgit 


From 9a55e397415e9a9b144812953c8b9760232105b4 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 18 Oct 2010 20:40:54 -0700
Subject: gitignore swig generated files

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

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/.gitignore b/gr-usrp/src/.gitignore
index 68abaf8aa..b1ea28d48 100644
--- a/gr-usrp/src/.gitignore
+++ b/gr-usrp/src/.gitignore
@@ -6,6 +6,9 @@
 /*.lo
 /usrp_swig.cc
 /usrp_swig.py
+/usrp_swig.scm
+/usrp_swig_python.cc
+/usrp_swig_guile.cc
 /run_tests
 /usrp_dbids.py
 /*.pyc
-- 
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-usrp/src/Makefile.swig.gen | 246 +++++-------------------------------------
 1 file changed, 28 insertions(+), 218 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 75078862b..19a777224 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -41,12 +41,12 @@ usrp_swig_pylibdir = $(pyexecdir)/$(usrp_swig_pylibdir_category)
 # The .so libraries for the guile modules get installed whereever guile
 # is installed, usually /usr/lib/guile/gnuradio/
 # FIXME: determince whether these should be installed with gnuradio.
-usrp_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+usrp_swig_scmlibdir = $(libdir)/guile/gnuradio
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp_swig
 # FIXME: determince whether these should be installed with gnuradio.
-usrp_swig_scmdir = @GUILE_PKDATADIR@/gnuradio
+usrp_swig_scmdir = $(guiledir)/gnuradio
 
 ## SWIG headers are always installed into the same directory.
 
@@ -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 += usrp_swig.py usrp_swig_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 += usrp_swig.py
 if GUILE
-swig_built_sources += usrp_swig.scm usrp_swig_guile.cc
+swig_built_sources += usrp_swig.scm
 endif
 
 ## Various SWIG variables.  These can be overloaded in the including
@@ -96,243 +98,51 @@ usrp_swig_swiginclude_HEADERS =		\
 	$(usrp_swig_swiginclude_headers)
 
 usrp_swig_pylib_LTLIBRARIES =		\
-	_usrp_swig_python.la
+	_usrp_swig.la
 
-_usrp_swig_python_la_SOURCES = 		\
-	usrp_swig_python.cc		\
+_usrp_swig_la_SOURCES = 			\
+	python/usrp_swig.cc		\
 	$(usrp_swig_la_swig_sources)
 
-_usrp_swig_python_la_LIBADD =		\
+_usrp_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_swig_la_swig_libadd)
 
-_usrp_swig_python_la_LDFLAGS =		\
+# _usrp_swig_la_DEPENDENCIES = python/usrp_swig.lo
+
+_usrp_swig_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_swig_la_swig_ldflags)
 
-_usrp_swig_python_la_CXXFLAGS =		\
+_usrp_swig_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(usrp_swig_la_swig_cxxflags)
 
 usrp_swig_python_PYTHON =			\
 	usrp_swig.py			\
-	$(usrp_swig_python)
+	$(usrp_swig)
 
 if GUILE
-usrp_swig_scmlib_LTLIBRARIES = _usrp_swig_guile.la
-_usrp_swig_guile_la_SOURCES = 		\
-	usrp_swig_guile.cc		        \
+usrp_swig_scmlib_LTLIBRARIES = usrp_swig_guile.la
+usrp_swig_guile_la_SOURCES = 		\
+	guile/usrp_swig.cc			\
 	$(usrp_swig_la_swig_sources)
 usrp_swig_scm_DATA = usrp_swig.scm
 
 # Guile can use the same flags as python does
-_usrp_swig_guile_la_LIBADD = $(_usrp_swig_python_la_LIBADD)
-_usrp_swig_guile_la_LDFLAGS = $(_usrp_swig_python_la_LDFLAGS)
-_usrp_swig_guile_la_CXXFLAGS = $(_usrp_swig_python_la_CXXFLAGS)
-
-endif				# end of GUILE
+usrp_swig_guile_la_LIBADD = $(_usrp_swig_la_LIBADD)
+usrp_swig_guile_la_LDFLAGS = $(_usrp_swig_la_LDFLAGS)
+usrp_swig_guile_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS)
 
-## Entry rule for running SWIG
-
-# $(python_deps) $(guile_deps): usrp_swig.i
-usrp_swig_python.h usrp_swig.py usrp_swig_python.cc: usrp_swig.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)/usrp_swig-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)/usrp_swig-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)/usrp_swig-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)/usrp_swig-generate-*stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-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)/usrp_swig-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)/usrp_swig-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)/usrp_swig-generate-python-stamp; \
-		exit $$?; \
-	fi;
+guile/usrp_swig.lo: usrp_swig.lo
+usrp_swig.scm: usrp_swig.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.
-usrp_swig_guile.h usrp_swig.scm usrp_swig_guile.cc: usrp_swig.i
-if GUILE
-	trap 'rm -rf $(DEPDIR)/usrp_swig-generate-*' 1 2 13 15; \
-	if mkdir $(DEPDIR)/usrp_swig-generate-lock 2>/dev/null; then \
-		rm -f $(DEPDIR)/usrp_swig-generate-*stamp; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-guile-stamp WHAT=$<; \
-		rmdir $(DEPDIR)/usrp_swig-generate-lock; \
-	else \
-		while test -d $(DEPDIR)/usrp_swig-generate-lock; do \
-			sleep 1; \
-		done; \
-		test -f $(DEPDIR)/usrp_swig-generate-guile-stamp; \
-		exit $$?; \
-	fi;
 endif				# end of GUILE
 
-$(DEPDIR)/usrp_swig-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) $(usrp_swig_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_swig_python.Std \
-		-module usrp_swig -o usrp_swig_python.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_swig_python.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig_python.Std \
-			> $(DEPDIR)/usrp_swig_python.Sd; \
-		$(RM) $(DEPDIR)/usrp_swig_python.Std; \
-		$(MV) $(DEPDIR)/usrp_swig_python.Sd $(DEPDIR)/usrp_swig_python.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/usrp_swig_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)/usrp_swig_python.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/usrp_swig_python.Std $(DEPDIR)/usrp_swig_python.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/usrp_swig_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)/usrp_swig_python.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig_python.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/usrp_swig_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)/usrp_swig-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)/usrp_swig_python.d@am__quote@
-
-if GUILE
-$(DEPDIR)/usrp_swig-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) $(usrp_swig_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_swig_guile.Std \
-		-module usrp_swig -o usrp_swig_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_swig_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig_guile.Std \
-			> $(DEPDIR)/usrp_swig_guile.Sd; \
-		$(RM) $(DEPDIR)/usrp_swig_guile.Std; \
-		$(MV) $(DEPDIR)/usrp_swig_guile.Sd $(DEPDIR)/usrp_swig_guile.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/usrp_swig_guile.S*; exit 1; \
-	fi;
-	touch $(DEPDIR)/usrp_swig-generate-guile-stamp
-	$(RM) $(DEPDIR)/usrp_swig_guile.d
-	cp $(DEPDIR)/usrp_swig_guile.Std $(DEPDIR)/usrp_swig_guile.d
-	echo "" >> $(DEPDIR)/usrp_swig_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig_guile.d
-	$(RM) $(DEPDIR)/usrp_swig_guile.Std
-	touch $(DEPDIR)/usrp_swig-generate-guile-stamp
-else
-	touch $(DEPDIR)/usrp_swig-generate-guile-stamp
-endif
-
-@am__include@ @am__quote@./$(DEPDIR)/usrp_swig_guile.d@am__quote@
+python/usrp_swig.lo:
+usrp_swig.lo: usrp_swig.py usrp_swig.scm
+usrp_swig.py: usrp_swig.i
 
-#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+-include python/usrp_swig.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-usrp/src/Makefile.swig.gen | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 19a777224..72a4285d6 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -41,7 +41,7 @@ usrp_swig_pylibdir = $(pyexecdir)/$(usrp_swig_pylibdir_category)
 # The .so libraries for the guile modules get installed whereever guile
 # is installed, usually /usr/lib/guile/gnuradio/
 # FIXME: determince whether these should be installed with gnuradio.
-usrp_swig_scmlibdir = $(libdir)/guile/gnuradio
+usrp_swig_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp_swig
@@ -124,16 +124,16 @@ usrp_swig_python_PYTHON =			\
 	$(usrp_swig)
 
 if GUILE
-usrp_swig_scmlib_LTLIBRARIES = usrp_swig_guile.la
-usrp_swig_guile_la_SOURCES = 		\
+usrp_swig_scmlib_LTLIBRARIES = libguile-usrp_swig.la
+libguile_usrp_swig_la_SOURCES = 		\
 	guile/usrp_swig.cc			\
 	$(usrp_swig_la_swig_sources)
 usrp_swig_scm_DATA = usrp_swig.scm
 
 # Guile can use the same flags as python does
-usrp_swig_guile_la_LIBADD = $(_usrp_swig_la_LIBADD)
-usrp_swig_guile_la_LDFLAGS = $(_usrp_swig_la_LDFLAGS)
-usrp_swig_guile_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS)
+libguile_usrp_swig_la_LIBADD = $(_usrp_swig_la_LIBADD)
+libguile_usrp_swig_la_LDFLAGS = $(_usrp_swig_la_LDFLAGS)
+libguile_usrp_swig_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS)
 
 guile/usrp_swig.lo: usrp_swig.lo
 usrp_swig.scm: usrp_swig.i
-- 
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-usrp/src/usrp_swig.i | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index 2a47877c3..5ab594383 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -141,3 +141,13 @@ usrp_source_c_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 %}
+
+#if SWIGGUILE
+%scheme %{
+(load-extension "libguile-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
-- 
cgit 


From 2c54f4a56304b3dba7a66ed1baf06dc0bd8393e8 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Sun, 31 Oct 2010 10:12:43 -0700
Subject: additional regenerated files

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

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 72a4285d6..7099b0bd9 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -46,7 +46,7 @@ usrp_swig_scmlibdir = $(libdir)
 # The scm files for the guile modules get installed where ever guile
 # is installed, usually /usr/share/guile/site/usrp_swig
 # FIXME: determince whether these should be installed with gnuradio.
-usrp_swig_scmdir = $(guiledir)/gnuradio
+usrp_swig_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
@@ -128,7 +128,7 @@ usrp_swig_scmlib_LTLIBRARIES = libguile-usrp_swig.la
 libguile_usrp_swig_la_SOURCES = 		\
 	guile/usrp_swig.cc			\
 	$(usrp_swig_la_swig_sources)
-usrp_swig_scm_DATA = usrp_swig.scm
+nobase_usrp_swig_scm_DATA = gnuradio/usrp_swig.scm gnuradio/usrp_swig-primitive.scm
 
 # Guile can use the same flags as python does
 libguile_usrp_swig_la_LIBADD = $(_usrp_swig_la_LIBADD)
@@ -137,6 +137,9 @@ libguile_usrp_swig_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS)
 
 guile/usrp_swig.lo: usrp_swig.lo
 usrp_swig.scm: usrp_swig.i
+gnuradio/usrp_swig-primitive.scm: usrp_swig.scm
+
+-include guile/usrp_swig.d
 
 endif				# end of GUILE
 
-- 
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-usrp/src/Makefile.swig.gen | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 7099b0bd9..c5ead816e 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/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 += usrp_swig.py
-if GUILE
-swig_built_sources += usrp_swig.scm
-endif
+# swig_built_sources += usrp_swig.py
+# if GUILE
+# swig_built_sources += gnuradio/usrp_swig.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_usrp_swig_la_LIBADD = $(_usrp_swig_la_LIBADD)
 libguile_usrp_swig_la_LDFLAGS = $(_usrp_swig_la_LDFLAGS)
 libguile_usrp_swig_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS)
 
-guile/usrp_swig.lo: usrp_swig.lo
-usrp_swig.scm: usrp_swig.i
-gnuradio/usrp_swig-primitive.scm: usrp_swig.scm
+guile/usrp_swig.cc: gnuradio/usrp_swig.scm
+gnuradio/usrp_swig.scm: usrp_swig.i
+gnuradio/usrp_swig-primitive.scm: gnuradio/usrp_swig.scm
 
 -include guile/usrp_swig.d
 
 endif				# end of GUILE
 
-python/usrp_swig.lo:
 usrp_swig.lo: usrp_swig.py usrp_swig.scm
 usrp_swig.py: usrp_swig.i
 
-- 
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-usrp/src/Makefile.swig.gen | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index c5ead816e..5e99ac1b4 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -67,28 +67,10 @@ usrp_swig_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)/usrp_swig-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 += usrp_swig.py
-# if GUILE
-# swig_built_sources += gnuradio/usrp_swig.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 @@ _usrp_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_swig_la_swig_libadd)
 
-# _usrp_swig_la_DEPENDENCIES = python/usrp_swig.lo
-
 _usrp_swig_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_swig_la_swig_ldflags)
@@ -123,14 +103,20 @@ usrp_swig_python_PYTHON =			\
 	usrp_swig.py			\
 	$(usrp_swig)
 
+python/usrp_swig.cc: usrp_swig.py
+usrp_swig.py: usrp_swig.i
+
+# Include the python dependencies for this file
+-include python/usrp_swig.d
+# end of PYTHON
+
 if GUILE
 usrp_swig_scmlib_LTLIBRARIES = libguile-usrp_swig.la
-libguile_usrp_swig_la_SOURCES = 		\
+libguile_usrp_swig_la_SOURCES =		\
 	guile/usrp_swig.cc			\
 	$(usrp_swig_la_swig_sources)
 nobase_usrp_swig_scm_DATA = gnuradio/usrp_swig.scm gnuradio/usrp_swig-primitive.scm
 
-# Guile can use the same flags as python does
 libguile_usrp_swig_la_LIBADD = $(_usrp_swig_la_LIBADD)
 libguile_usrp_swig_la_LDFLAGS = $(_usrp_swig_la_LDFLAGS)
 libguile_usrp_swig_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/usrp_swig.cc: gnuradio/usrp_swig.scm
 gnuradio/usrp_swig.scm: usrp_swig.i
 gnuradio/usrp_swig-primitive.scm: gnuradio/usrp_swig.scm
 
+# Include the guile dependencies for this file
 -include guile/usrp_swig.d
 
 endif				# end of GUILE
 
-usrp_swig.lo: usrp_swig.py usrp_swig.scm
-usrp_swig.py: usrp_swig.i
-
--include python/usrp_swig.d
 
-- 
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-usrp/src/Makefile.swig.gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 5e99ac1b4..1bb9e3bf4 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -101,7 +101,7 @@ _usrp_swig_la_CXXFLAGS =			\
 
 usrp_swig_python_PYTHON =			\
 	usrp_swig.py			\
-	$(usrp_swig)
+	$(usrp_swig_python)
 
 python/usrp_swig.cc: usrp_swig.py
 usrp_swig.py: usrp_swig.i
-- 
cgit 


From 8c81cf7d318d99f508e81bffcfd4c12ba0a2966e Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 16 Nov 2010 21:40:55 -0800
Subject: Fix guile related problem with gr-usrp

---
 gr-usrp/src/usrp_base.i | 1 +
 gr-usrp/src/usrp_swig.i | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/usrp_base.i b/gr-usrp/src/usrp_base.i
index d0ece1fb2..0fd62911f 100644
--- a/gr-usrp/src/usrp_base.i
+++ b/gr-usrp/src/usrp_base.i
@@ -24,6 +24,7 @@
 #include "usrp_base.h"
 %}
 
+%ignore usrp_base;
 class usrp_base : public gr_sync_block 
 {
 protected:
diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index 5ab594383..32f2cb41e 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -39,6 +39,7 @@
 %include "usrp_sink_c.i"
 %include "usrp_sink_s.i"
 
+#ifdef SWIGPYTHON
 //---Allow a more Pythonic interface
 %pythoncode %{
 
@@ -141,6 +142,8 @@ usrp_source_c_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 %}
+#endif
+
 
 #if SWIGGUILE
 %scheme %{
-- 
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-usrp/src/Makefile.swig.gen | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 1bb9e3bf4..789b4f06a 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -79,6 +79,7 @@ usrp_swig_swiginclude_HEADERS =		\
 	usrp_swig.i			\
 	$(usrp_swig_swiginclude_headers)
 
+if PYTHON
 usrp_swig_pylib_LTLIBRARIES =		\
 	_usrp_swig.la
 
@@ -86,6 +87,10 @@ _usrp_swig_la_SOURCES = 			\
 	python/usrp_swig.cc		\
 	$(usrp_swig_la_swig_sources)
 
+usrp_swig_python_PYTHON =			\
+	usrp_swig.py			\
+	$(usrp_swig_python)
+
 _usrp_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_swig_la_swig_libadd)
@@ -99,27 +104,34 @@ _usrp_swig_la_CXXFLAGS =			\
 	-I$(top_builddir) 		\
 	$(usrp_swig_la_swig_cxxflags)
 
-usrp_swig_python_PYTHON =			\
-	usrp_swig.py			\
-	$(usrp_swig_python)
-
 python/usrp_swig.cc: usrp_swig.py
 usrp_swig.py: usrp_swig.i
 
 # Include the python dependencies for this file
 -include python/usrp_swig.d
-# end of PYTHON
+
+endif		# end of if python
 
 if GUILE
-usrp_swig_scmlib_LTLIBRARIES = libguile-usrp_swig.la
+
+usrp_swig_scmlib_LTLIBRARIES = 		\
+	libguile-usrp_swig.la
 libguile_usrp_swig_la_SOURCES =		\
 	guile/usrp_swig.cc			\
 	$(usrp_swig_la_swig_sources)
-nobase_usrp_swig_scm_DATA = gnuradio/usrp_swig.scm gnuradio/usrp_swig-primitive.scm
-
-libguile_usrp_swig_la_LIBADD = $(_usrp_swig_la_LIBADD)
-libguile_usrp_swig_la_LDFLAGS = $(_usrp_swig_la_LDFLAGS)
-libguile_usrp_swig_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS)
+nobase_usrp_swig_scm_DATA = 		\
+	gnuradio/usrp_swig.scm 		\
+	gnuradio/usrp_swig-primitive.scm
+libguile_usrp_swig_la_LIBADD = 		\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(usrp_swig_la_swig_libadd)
+libguile_usrp_swig_la_LDFLAGS = 		\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(usrp_swig_la_swig_ldflags)
+libguile_usrp_swig_la_CXXFLAGS = 		\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(usrp_swig_la_swig_cxxflags)
 
 guile/usrp_swig.cc: gnuradio/usrp_swig.scm
 gnuradio/usrp_swig.scm: usrp_swig.i
-- 
cgit 


From 64bdee166b0d852992873f7d37906d4c61a94b94 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 00:06:15 -0800
Subject: Confirm we can load guile usrp module

---
 gr-usrp/src/Makefile.am        | 17 ++++++++++++++---
 gr-usrp/src/gnuradio/usrp.scm  | 27 +++++++++++++++++++++++++++
 gr-usrp/src/run_guile_tests.in | 14 ++++++++++++++
 gr-usrp/src/usrp.test          | 37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 gr-usrp/src/gnuradio/usrp.scm
 create mode 100644 gr-usrp/src/run_guile_tests.in
 create mode 100644 gr-usrp/src/usrp.test

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index db5be4ade..9c1f4b525 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -20,6 +20,7 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 # ----------------------------------------------------------------
 # Misc. build/installation activities
@@ -30,6 +31,10 @@ DISTCLEANFILES = run_tests
 
 noinst_PYTHON =	qa_usrp.py
 
+nobase_guile_DATA = gnuradio/usrp.scm
+
+TESTS = 
+
 # ----------------------------------------------------------------
 # The straight C++ library
 
@@ -67,10 +72,8 @@ grinclude_HEADERS = \
 	usrp_source_c.h \
 	usrp_source_s.h
 
-if PYTHON
 # ----------------------------------------------------------------
 # The SWIG library
-TESTS = run_tests
 
 TOP_SWIG_IFILES =		\
 	usrp_swig.i
@@ -105,11 +108,19 @@ usrp_swig_swiginclude_headers =	\
 	usrp_sink_s.i		\
 	usrp_standard.i
 
-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)
+
+
+if PYTHON
+TESTS += run_tests
 endif
+
+if GUILE
+TESTS += run_guile_tests
+endif
+
diff --git a/gr-usrp/src/gnuradio/usrp.scm b/gr-usrp/src/gnuradio/usrp.scm
new file mode 100644
index 000000000..e01c9454a
--- /dev/null
+++ b/gr-usrp/src/gnuradio/usrp.scm
@@ -0,0 +1,27 @@
+;;;
+;;; 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/>.
+;;;
+
+;;; Semi bogus module that just re-exports the usrp_swig module
+
+(define-module (gnuradio usrp)
+  #:use-module (gnuradio export-safely)
+  #:use-module (gnuradio usrp_swig)
+  #:duplicates (merge-generics replace check))
+
+(re-export-all '(gnuradio usrp_swig))
diff --git a/gr-usrp/src/run_guile_tests.in b/gr-usrp/src/run_guile_tests.in
new file mode 100644
index 000000000..5d08b0dd5
--- /dev/null
+++ b/gr-usrp/src/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-usrp/src/usrp.test b/gr-usrp/src/usrp.test
new file mode 100644
index 000000000..740fe3055
--- /dev/null
+++ b/gr-usrp/src/usrp.test
@@ -0,0 +1,37 @@
+;;; -*- 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))
+
+;;; Just see if we can import the module...
+;;; They may not have a USRP attached and powered up
+
+(use-modules (gnuradio usrp))
-- 
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-usrp/src/Makefile.am | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 9c1f4b525..7a16fe5b1 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -22,18 +22,16 @@
 include $(top_srcdir)/Makefile.common
 include $(top_srcdir)/Makefile.swig
 
-# ----------------------------------------------------------------
-# Misc. build/installation activities
-
-EXTRA_DIST = run_tests.in
 
-DISTCLEANFILES = run_tests
+TESTS =
+EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA)
+DISTCLEANFILES += run_tests run_guile_tests
 
 noinst_PYTHON =	qa_usrp.py
 
+if GUILE
 nobase_guile_DATA = gnuradio/usrp.scm
-
-TESTS = 
+endif
 
 # ----------------------------------------------------------------
 # The straight C++ library
@@ -109,13 +107,6 @@ usrp_swig_swiginclude_headers =	\
 	usrp_standard.i
 
 
-# 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)
-
-
 if PYTHON
 TESTS += run_tests
 endif
-- 
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-usrp/src/.gitignore          | 1 +
 gr-usrp/src/gnuradio/.gitignore | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 gr-usrp/src/gnuradio/.gitignore

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/.gitignore b/gr-usrp/src/.gitignore
index b1ea28d48..1514f0d6b 100644
--- a/gr-usrp/src/.gitignore
+++ b/gr-usrp/src/.gitignore
@@ -10,5 +10,6 @@
 /usrp_swig_python.cc
 /usrp_swig_guile.cc
 /run_tests
+/run_guile_tests
 /usrp_dbids.py
 /*.pyc
diff --git a/gr-usrp/src/gnuradio/.gitignore b/gr-usrp/src/gnuradio/.gitignore
new file mode 100644
index 000000000..0c4d489ab
--- /dev/null
+++ b/gr-usrp/src/gnuradio/.gitignore
@@ -0,0 +1,2 @@
+usrp_swig-primitive.scm
+usrp_swig.scm
-- 
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-usrp/src/.gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/.gitignore b/gr-usrp/src/.gitignore
index 1514f0d6b..96caf587f 100644
--- a/gr-usrp/src/.gitignore
+++ b/gr-usrp/src/.gitignore
@@ -7,9 +7,10 @@
 /usrp_swig.cc
 /usrp_swig.py
 /usrp_swig.scm
-/usrp_swig_python.cc
-/usrp_swig_guile.cc
 /run_tests
 /run_guile_tests
 /usrp_dbids.py
 /*.pyc
+/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-usrp/src/usrp_swig.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index 32f2cb41e..b18aa50f7 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -147,7 +147,7 @@ usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
+(load-extension "libguile-gnuradio-usrp_swig" "scm_init_gnuradio_usrp_swig_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-usrp/src/Makefile.swig.gen | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
index 789b4f06a..c122d6dd9 100644
--- a/gr-usrp/src/Makefile.swig.gen
+++ b/gr-usrp/src/Makefile.swig.gen
@@ -115,20 +115,20 @@ endif		# end of if python
 if GUILE
 
 usrp_swig_scmlib_LTLIBRARIES = 		\
-	libguile-usrp_swig.la
-libguile_usrp_swig_la_SOURCES =		\
+	libguile-gnuradio-usrp_swig.la
+libguile_gnuradio_usrp_swig_la_SOURCES =	\
 	guile/usrp_swig.cc			\
 	$(usrp_swig_la_swig_sources)
 nobase_usrp_swig_scm_DATA = 		\
 	gnuradio/usrp_swig.scm 		\
 	gnuradio/usrp_swig-primitive.scm
-libguile_usrp_swig_la_LIBADD = 		\
+libguile_gnuradio_usrp_swig_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_swig_la_swig_libadd)
-libguile_usrp_swig_la_LDFLAGS = 		\
+libguile_gnuradio_usrp_swig_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_swig_la_swig_ldflags)
-libguile_usrp_swig_la_CXXFLAGS = 		\
+libguile_gnuradio_usrp_swig_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
 	$(usrp_swig_la_swig_cxxflags)
-- 
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-usrp/src/usrp_swig.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index b18aa50f7..b1797d758 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -147,7 +147,7 @@ usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
 
 #if SWIGGUILE
 %scheme %{
-(load-extension "libguile-gnuradio-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
+(load-extension-global "libguile-gnuradio-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
 %}
 
 %goops %{
-- 
cgit 


From fd8f86713d8f9de79850b9e7aabde7c453b7e890 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 27 Dec 2010 22:56:47 -0800
Subject: Add missing .test files to tarball.

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

(limited to 'gr-usrp/src')

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 7a16fe5b1..a0c6b7a82 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -28,6 +28,7 @@ EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA)
 DISTCLEANFILES += run_tests run_guile_tests
 
 noinst_PYTHON =	qa_usrp.py
+noinst_GUILE  = usrp.test
 
 if GUILE
 nobase_guile_DATA = gnuradio/usrp.scm
-- 
cgit