regenerated after changes to the template

1 files changed, 45 insertions, 14 deletions

diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
index 00de3e423..df9ec8b03 100644
--- a/usrp/host/swig/Makefile.swig.gen
+++ b/usrp/host/swig/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_prims.py usrp_prims.cc
+swig_built_sources += usrp_prims.py usrp_prims_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_prims_swiginclude_HEADERS =		\
 	$(usrp_prims_swiginclude_headers)
 
 usrp_prims_pylib_LTLIBRARIES =		\
-	_usrp_prims.la
+	_usrp_prims_python.la
 
-_usrp_prims_la_SOURCES = 			\
-	usrp_prims.cc			\
+_usrp_prims_python_la_SOURCES = 		\
+	usrp_prims_python.cc		\
 	$(usrp_prims_la_swig_sources)
 
-_usrp_prims_la_LIBADD =			\
+_usrp_prims_python_la_LIBADD =		\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_prims_la_swig_libadd)
 
-_usrp_prims_la_LDFLAGS =			\
+_usrp_prims_python_la_LDFLAGS =		\
 	$(STD_SWIG_LA_LD_FLAGS)		\
 	$(usrp_prims_la_swig_ldflags)
 
-_usrp_prims_la_CXXFLAGS =			\
+_usrp_prims_python_la_CXXFLAGS =		\
 	$(STD_SWIG_CXX_FLAGS)		\
 	$(usrp_prims_la_swig_cxxflags)
 
@@ -105,9 +105,23 @@ usrp_prims_python_PYTHON =			\
 	usrp_prims.py			\
 	$(usrp_prims_python)
 
+if GUILE
+usrp_prims_pylib_LTLIBRARIES += _usrp_prims_guile.la
+
+_usrp_prims_guile_la_SOURCES = 		\
+	usrp_prims_guile.cc		\
+	$(usrp_prims_la_swig_sources)
+
+# Guile can use the same flags as python does
+_usrp_prims_guile_la_LIBADD = $(_usrp_prims_python_la_LIBADD)
+_usrp_prims_guile_la_LDFLAGS = $(_usrp_prims_python_la_LDFLAGS)
+_usrp_prims_guile_la_CXXFLAGS = $(_usrp_prims_python_la_CXXFLAGS)
+
+endif				# end of GUILE
+
 ## Entry rule for running SWIG
 
-usrp_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i
+usrp_prims.h usrp_prims.py usrp_prims_python.cc: usrp_prims.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_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i
 ##
 ## Remove the stamp associated with this filename.
 ##
-		rm -f $(DEPDIR)/usrp_prims-generate-stamp; \
+		rm -f $(DEPDIR)/usrp_prims-generate-*stamp; \
 ##
 ## Tell MAKE to run the rule for creating this stamp.
 ##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-python-stamp WHAT=$<; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-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_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i
 ## Succeed if and only if the first process succeeded; exit this
 ## process returning the status of the generated stamp.
 ##
-		test -f $(DEPDIR)/usrp_prims-generate-stamp; \
+		test -f $(DEPDIR)/usrp_prims-generate-python-stamp; \
 		exit $$?; \
 	fi;
 
-$(DEPDIR)/usrp_prims-generate-stamp:
+$(DEPDIR)/usrp_prims-generate-guile-stamp:
+	if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp_prims_swig_args) \
+		-MD -MF $(DEPDIR)/usrp_prims.Std \
+		-module usrp_prims -o usrp_prims_guile.cc $(WHAT); then \
+	    if test $(host_os) = mingw32; then \
+		$(RM) $(DEPDIR)/usrp_prims.Sd; \
+		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims.Std \
+			> $(DEPDIR)/usrp_prims.Sd; \
+		$(RM) $(DEPDIR)/usrp_prims.Std; \
+		$(MV) $(DEPDIR)/usrp_prims.Sd $(DEPDIR)/usrp_prims.Std; \
+	    fi; \
+	else \
+	    $(RM) $(DEPDIR)/usrp_prims.S*; exit 1; \
+	fi;
+	touch $(DEPDIR)/usrp_prims-generate-guile-stamp
+
+$(DEPDIR)/usrp_prims-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_prims-generate-stamp:
 ##
 	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_prims_swig_args) \
 		-MD -MF $(DEPDIR)/usrp_prims.Std \
-		-module usrp_prims -o usrp_prims.cc $(WHAT); then \
+		-module usrp_prims -o usrp_prims_python.cc $(WHAT); then \
 	    if test $(host_os) = mingw32; then \
 		$(RM) $(DEPDIR)/usrp_prims.Sd; \
 		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims.Std \
@@ -249,7 +280,7 @@ $(DEPDIR)/usrp_prims-generate-stamp:
 ## executing this rule; allows other threads waiting on this process
 ## to continue.
 ##
-	touch $(DEPDIR)/usrp_prims-generate-stamp
+	touch $(DEPDIR)/usrp_prims-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,