regenerated from template

1 files changed, 26 insertions, 9 deletions

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index f40f0d881..e0b2bfd53 100644
--- a/gr-qtgui/src/lib/Makefile.swig.gen
+++ b/gr-qtgui/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 += qtgui.py qtgui.cc
+swig_built_sources += qtgui.py qtgui-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 @@ qtgui_pylib_LTLIBRARIES =		\
 	_qtgui.la
 
 _qtgui_la_SOURCES = 			\
-	qtgui.cc			\
+	qtgui-python.cc			\
 	$(qtgui_la_swig_sources)
 
 _qtgui_la_LIBADD =			\
@@ -107,7 +107,7 @@ qtgui_python_PYTHON =			\
 
 ## Entry rule for running SWIG
 
-qtgui.h qtgui.py qtgui.cc: qtgui.i
+qtgui.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:
 ##
@@ -159,11 +159,12 @@ qtgui.h qtgui.py qtgui.cc: qtgui.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/qtgui-generate-stamp; \
+		rm -f $(DEPDIR)/qtgui-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-stamp WHAT=$<; \
+		$(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
@@ -187,11 +188,27 @@ qtgui.h qtgui.py qtgui.cc: qtgui.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/qtgui-generate-stamp; \
+		test -f $(DEPDIR)/qtgui-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/qtgui-generate-stamp:
+$(DEPDIR)/qtgui-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \
+		-MD -MF $(DEPDIR)/qtgui.Std \
+		-module qtgui -o qtgui-guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/qtgui.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
+			> $(DEPDIR)/qtgui.Sd; \
+		$(RM) $(DEPDIR)/qtgui.Std; \
+		$(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/qtgui.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/qtgui-generate-guile-stamp
+
+$(DEPDIR)/qtgui-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)/qtgui-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \
 		-MD -MF $(DEPDIR)/qtgui.Std \
-		-module qtgui -o qtgui.cc $(WHAT); then \
+		-module qtgui -o qtgui-python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/qtgui.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
@@ -249,7 +266,7 @@ $(DEPDIR)/qtgui-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/qtgui-generate-stamp
+	touch $(DEPDIR)/qtgui-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,