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

1 files changed, 44 insertions, 7 deletions

diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
index 5c2158cce..285925dfe 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ cvsd_vocoder_pylibdir_category ?= $(cvsd_vocoder_pythondir_category)
 cvsd_vocoder_pythondir = $(pythondir)/$(cvsd_vocoder_pythondir_category)
 cvsd_vocoder_pylibdir = $(pyexecdir)/$(cvsd_vocoder_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.
+cvsd_vocoder_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/cvsd_vocoder
+# FIXME: determince whether these should be installed with gnuradio.
+cvsd_vocoder_scmdir = @GUILE_PKDATADIR@/gnuradio
+
 ## SWIG headers are always installed into the same directory.
 
 cvsd_vocoder_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## be added manually by the including Makefile.am .
 
 swig_built_sources += cvsd_vocoder.py cvsd_vocoder_python.cc
+if GUILE
+swig_built_sources += cvsd_vocoder.scm cvsd_vocoder_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 @@ cvsd_vocoder_python_PYTHON =			\
 	$(cvsd_vocoder_python)
 
 if GUILE
-cvsd_vocoder_pylib_LTLIBRARIES += _cvsd_vocoder_guile.la
-
+cvsd_vocoder_scmlib_LTLIBRARIES = _cvsd_vocoder_guile.la
 _cvsd_vocoder_guile_la_SOURCES = 		\
-	cvsd_vocoder_guile.cc		\
+	cvsd_vocoder_guile.cc		        \
 	$(cvsd_vocoder_la_swig_sources)
+cvsd_vocoder_scm_DATA = cvsd_vocoder.scm
 
 # Guile can use the same flags as python does
 _cvsd_vocoder_guile_la_LIBADD = $(_cvsd_vocoder_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif				# end of GUILE
 
 ## Entry rule for running SWIG
 
-cvsd_vocoder_python.h cvsd_vocoder.py cvsd_vocoder_python.cc cvsd_vocoder_guile.cc cvsd_vocoder_guile.h: cvsd_vocoder.i
+# $(python_deps) $(guile_deps): cvsd_vocoder.i
+cvsd_vocoder_python.h cvsd_vocoder.py cvsd_vocoder_python.cc: cvsd_vocoder.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 @@ cvsd_vocoder_python.h cvsd_vocoder.py cvsd_vocoder_python.cc cvsd_vocoder_guile.
 ## Tell MAKE to run the rule for creating this stamp.
 ##
 		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/cvsd_vocoder-generate-python-stamp WHAT=$<; \
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/cvsd_vocoder-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 @@ cvsd_vocoder_python.h cvsd_vocoder.py cvsd_vocoder_python.cc cvsd_vocoder_guile.
 		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.
+cvsd_vocoder_guile.h cvsd_vocoder.scm cvsd_vocoder_guile.cc: cvsd_vocoder.i
+if GUILE
+	trap 'rm -rf $(DEPDIR)/cvsd_vocoder-generate-*' 1 2 13 15; \
+	if mkdir $(DEPDIR)/cvsd_vocoder-generate-lock 2>/dev/null; then \
+		rm -f $(DEPDIR)/cvsd_vocoder-generate-*stamp; \
+		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/cvsd_vocoder-generate-guile-stamp WHAT=$<; \
+		rmdir $(DEPDIR)/cvsd_vocoder-generate-lock; \
+	else \
+		while test -d $(DEPDIR)/cvsd_vocoder-generate-lock; do \
+			sleep 1; \
+		done; \
+		test -f $(DEPDIR)/cvsd_vocoder-generate-guile-stamp; \
+		exit $$?; \
+	fi;
+endif				# end of GUILE
+
 $(DEPDIR)/cvsd_vocoder-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)/cvsd_vocoder-generate-python-stamp:
 
 @am__include@ @am__quote@./$(DEPDIR)/cvsd_vocoder_python.d@am__quote@
 
-$(DEPDIR)/cvsd_vocoder-generate-guile-stamp:
 if GUILE
+$(DEPDIR)/cvsd_vocoder-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) $(cvsd_vocoder_swig_args) \
 		-MD -MF $(DEPDIR)/cvsd_vocoder_guile.Std \
 		-module cvsd_vocoder -o cvsd_vocoder_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
 		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/cvsd_vocoder_guile.d
 	$(RM) $(DEPDIR)/cvsd_vocoder_guile.Std
 	touch $(DEPDIR)/cvsd_vocoder-generate-guile-stamp
+else
+	touch $(DEPDIR)/cvsd_vocoder-generate-guile-stamp
+endif
 
 @am__include@ @am__quote@./$(DEPDIR)/cvsd_vocoder_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i