Update generated files

1 files changed, 80 insertions, 32 deletions

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