regenerated after changes to the template

1 files changed, 26 insertions, 10 deletions

diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen
index e0b2bfd53..ab23f1618 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-python.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
@@ -83,21 +83,21 @@ qtgui_swiginclude_HEADERS =		\
 	$(qtgui_swiginclude_headers)
 
 qtgui_pylib_LTLIBRARIES =		\
-	_qtgui.la
+	_qtgui_python.la
 
-_qtgui_la_SOURCES = 			\
-	qtgui-python.cc			\
+_qtgui_python_la_SOURCES = 		\
+	qtgui_python.cc		\
 	$(qtgui_la_swig_sources)
 
-_qtgui_la_LIBADD =			\
+_qtgui_python_la_LIBADD =		\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(qtgui_la_swig_libadd)
 
-_qtgui_la_LDFLAGS =			\
+_qtgui_python_la_LDFLAGS =		\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(qtgui_la_swig_ldflags)
 
-_qtgui_la_CXXFLAGS =			\
+_qtgui_python_la_CXXFLAGS =		\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(qtgui_la_swig_cxxflags)
 
@@ -105,9 +105,23 @@ qtgui_python_PYTHON =			\
 	qtgui.py			\
 	$(qtgui_python)
 
+if GUILE
+qtgui_pylib_LTLIBRARIES += _qtgui_guile.la
+
+_qtgui_guile_la_SOURCES = 		\
+	qtgui_guile.cc		\
+	$(qtgui_la_swig_sources)
+
+# Guile can use the same flags as python does
+_qtgui_guile_la_LIBADD = $(_qtgui_python_la_LIBADD)
+_qtgui_guile_la_LDFLAGS = $(_qtgui_python_la_LDFLAGS)
+_qtgui_guile_la_CXXFLAGS = $(_qtgui_python_la_CXXFLAGS)
+
+endif				# end of GUILE
+
 ## Entry rule for running SWIG
 
-qtgui.h qtgui.py qtgui-python.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:
 ##
@@ -193,9 +207,10 @@ qtgui.h qtgui.py qtgui-python.cc: qtgui.i
 	fi;
 
 $(DEPDIR)/qtgui-generate-guile-stamp:
+if GUILE
 	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \
 		-MD -MF $(DEPDIR)/qtgui.Std \
-		-module qtgui -o qtgui-guile.cc $(WHAT); then \
+		-module qtgui -o qtgui_guile.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/qtgui.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \
@@ -207,6 +222,7 @@ $(DEPDIR)/qtgui-generate-guile-stamp:
 	    $(RM) $(DEPDIR)/qtgui.S*; exit 1; \
 	fi;
 	touch $(DEPDIR)/qtgui-generate-guile-stamp
+endif
 
 $(DEPDIR)/qtgui-generate-python-stamp:
 ## This rule will be called only by the first process issuing the
@@ -219,7 +235,7 @@ $(DEPDIR)/qtgui-generate-python-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \
 		-MD -MF $(DEPDIR)/qtgui.Std \
-		-module qtgui -o qtgui-python.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 \