don't ifdef the target away. regenerate .gen files.

1 files changed, 44 insertions, 7 deletions

diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen
index 8d140095c..fb925d80e 100644
--- a/gr-usrp2/src/Makefile.swig.gen
+++ b/gr-usrp2/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ usrp2_pylibdir_category ?= $(usrp2_pythondir_category)
 usrp2_pythondir = $(pythondir)/$(usrp2_pythondir_category)
 usrp2_pylibdir = $(pyexecdir)/$(usrp2_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.
+usrp2_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/usrp2
+# FIXME: determince whether these should be installed with gnuradio.
+usrp2_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 usrp2_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += usrp2.py usrp2_python.cc
+if GUILE
+swig_built_sources += usrp2.scm usrp2_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 @@ usrp2_python_PYTHON =			\
 	$(usrp2_python)
 
 if GUILE
-usrp2_pylib_LTLIBRARIES += _usrp2_guile.la
-
+usrp2_scmlib_LTLIBRARIES = _usrp2_guile.la
 _usrp2_guile_la_SOURCES = 		\
-	usrp2_guile.cc		\
+	usrp2_guile.cc		        \
 	$(usrp2_la_swig_sources)
+usrp2_scm_DATA = usrp2.scm
 
 # Guile can use the same flags as python does
 _usrp2_guile_la_LIBADD = $(_usrp2_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-usrp2_python.h usrp2.py usrp2_python.cc usrp2_guile.cc usrp2_guile.h: usrp2.i
+# $(python_deps) $(guile_deps): usrp2.i
+usrp2_python.h usrp2.py usrp2_python.cc: usrp2.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 @@ usrp2_python.h usrp2.py usrp2_python.cc usrp2_guile.cc usrp2_guile.h: usrp2.i
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-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,6 +219,24 @@ usrp2_python.h usrp2.py usrp2_python.cc usrp2_guile.cc usrp2_guile.h: usrp2.i
 		exit $$?; \
 	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.
+usrp2_guile.h usrp2.scm usrp2_guile.cc: usrp2.i
+if GUILE
+	trap 'rm -rf $(DEPDIR)/usrp2-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/usrp2-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/usrp2-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/usrp2-generate-lock; \
+	else \
+		while test -d $(DEPDIR)/usrp2-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/usrp2-generate-guile-stamp; \
+		exit $$?; \
+	fi;
+endif				# end of GUILE
+
 $(DEPDIR)/usrp2-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
@@ -272,8 +303,10 @@ $(DEPDIR)/usrp2-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/usrp2_python.d@am__quote@
 
-$(DEPDIR)/usrp2-generate-guile-stamp:
 if GUILE
+$(DEPDIR)/usrp2-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) $(usrp2_swig_args) \
 		-MD -MF $(DEPDIR)/usrp2_guile.Std \
 		-module usrp2 -o usrp2_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
 		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2_guile.d
 	$(RM) $(DEPDIR)/usrp2_guile.Std
 	touch $(DEPDIR)/usrp2-generate-guile-stamp
+else
+	touch $(DEPDIR)/usrp2-generate-guile-stamp
+endif
 
 @am__include@ @am__quote@./$(DEPDIR)/usrp2_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i