Update generated files

1 files changed, 65 insertions, 28 deletions

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index a51e8eb87..8759ce00d 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ qtgui_pylibdir_category ?= $(qtgui_pythondir_category)
 qtgui_pythondir = $(pythondir)/$(qtgui_pythondir_category)
 qtgui_pylibdir = $(pyexecdir)/$(qtgui_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.
+qtgui_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/qtgui
+# FIXME: determince whether these should be installed with gnuradio.
+qtgui_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 qtgui_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += qtgui.py qtgui_python.cc
+if GUILE
+swig_built_sources += qtgui.scm qtgui_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 @@ qtgui_python_PYTHON =			\
 	$(qtgui_python)
 
 if GUILE
-qtgui_pylib_LTLIBRARIES += _qtgui_guile.la
-
+qtgui_scmlib_LTLIBRARIES = _qtgui_guile.la
 _qtgui_guile_la_SOURCES = 		\
-	qtgui_guile.cc		\
+	qtgui_guile.cc		        \
 	$(qtgui_la_swig_sources)
+qtgui_scm_DATA = qtgui.scm
 
 # Guile can use the same flags as python does
 _qtgui_guile_la_LIBADD = $(_qtgui_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i
+# $(python_deps) $(guile_deps): qtgui.i
+qtgui_python.h qtgui.py qtgui_python.cc: qtgui.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 @@ qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-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,32 +219,23 @@ qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/qtgui-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.
+qtgui_guile.h qtgui.scm qtgui_guile.cc: qtgui.i
 if GUILE
-	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \
-		-MD -MF $(DEPDIR)/qtgui_guile.Std \
-		-module qtgui -o qtgui_guile.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/qtgui_guile.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_guile.Std \
-			> $(DEPDIR)/qtgui_guile.Sd; \
-		$(RM) $(DEPDIR)/qtgui_guile.Std; \
-		$(MV) $(DEPDIR)/qtgui_guile.Sd $(DEPDIR)/qtgui_guile.Std; \
-	    fi; \
+	trap 'rm -rf $(DEPDIR)/qtgui-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/qtgui-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/qtgui-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/qtgui-generate-lock; \
 	else \
-	    $(RM) $(DEPDIR)/qtgui_guile.S*; exit 1; \
+		while test -d $(DEPDIR)/qtgui-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/qtgui-generate-guile-stamp; \
+		exit $$?; \
 	fi;
-	touch $(DEPDIR)/qtgui-generate-guile-stamp
-	$(RM) $(DEPDIR)/qtgui_guile.d
-	cp $(DEPDIR)/qtgui_guile.Std $(DEPDIR)/qtgui_guile.d
-	echo "" >> $(DEPDIR)/qtgui_guile.d
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_guile.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_guile.d
-	$(RM) $(DEPDIR)/qtgui_guile.Std
-	touch $(DEPDIR)/qtgui-generate-guile-stamp
-
-@am__include@ @am__quote@./$(DEPDIR)/qtgui_guile.d@am__quote@
-endif
+endif				# end of GUILE
 
 $(DEPDIR)/qtgui-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -299,3 +303,36 @@ $(DEPDIR)/qtgui-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/qtgui_python.d@am__quote@
 
+if GUILE
+$(DEPDIR)/qtgui-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) $(qtgui_swig_args) \
+		-MD -MF $(DEPDIR)/qtgui_guile.Std \
+		-module qtgui -o qtgui_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/qtgui_guile.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_guile.Std \
+			> $(DEPDIR)/qtgui_guile.Sd; \
+		$(RM) $(DEPDIR)/qtgui_guile.Std; \
+		$(MV) $(DEPDIR)/qtgui_guile.Sd $(DEPDIR)/qtgui_guile.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/qtgui_guile.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+	$(RM) $(DEPDIR)/qtgui_guile.d
+	cp $(DEPDIR)/qtgui_guile.Std $(DEPDIR)/qtgui_guile.d
+	echo "" >> $(DEPDIR)/qtgui_guile.d
+	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_guile.Std | \
+		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_guile.d
+	$(RM) $(DEPDIR)/qtgui_guile.Std
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+else
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/qtgui_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
+