summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.swig.gen.t2
-rw-r--r--gr-atsc/src/lib/Makefile.swig.gen51
-rw-r--r--gr-audio-alsa/src/Makefile.swig.gen51
-rw-r--r--gr-audio-oss/src/Makefile.swig.gen51
-rw-r--r--gr-cvsd-vocoder/src/lib/Makefile.swig.gen51
-rw-r--r--gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen51
-rw-r--r--gr-msdd6000/src/Makefile.swig.gen102
-rw-r--r--gr-noaa/swig/Makefile.swig.gen51
-rw-r--r--gr-pager/swig/Makefile.swig.gen51
-rw-r--r--gr-radio-astronomy/src/lib/Makefile.swig.gen51
-rw-r--r--gr-trellis/src/lib/Makefile.swig.gen51
-rw-r--r--gr-usrp2/src/Makefile.swig.gen51
-rw-r--r--gr-video-sdl/src/Makefile.swig.gen51
13 files changed, 573 insertions, 92 deletions
diff --git a/Makefile.swig.gen.t b/Makefile.swig.gen.t
index 64594d608..8ae65a57e 100644
--- a/Makefile.swig.gen.t
+++ b/Makefile.swig.gen.t
@@ -303,8 +303,8 @@ $(DEPDIR)/@NAME@-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/@NAME@_python.d@am__quote@
-if GUILE
$(DEPDIR)/@NAME@-generate-guile-stamp:
+if GUILE
# 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) $(@NAME@_swig_args) \
diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index fb05951cc..3db57acd0 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ atsc_pylibdir_category ?= $(atsc_pythondir_category)
atsc_pythondir = $(pythondir)/$(atsc_pythondir_category)
atsc_pylibdir = $(pyexecdir)/$(atsc_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.
+atsc_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/atsc
+# FIXME: determince whether these should be installed with gnuradio.
+atsc_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
atsc_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += atsc.py atsc_python.cc
+if GUILE
+swig_built_sources += atsc.scm atsc_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 @@ atsc_python_PYTHON = \
$(atsc_python)
if GUILE
-atsc_pylib_LTLIBRARIES += _atsc_guile.la
-
+atsc_scmlib_LTLIBRARIES = _atsc_guile.la
_atsc_guile_la_SOURCES = \
- atsc_guile.cc \
+ atsc_guile.cc \
$(atsc_la_swig_sources)
+atsc_scm_DATA = atsc.scm
# Guile can use the same flags as python does
_atsc_guile_la_LIBADD = $(_atsc_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-atsc_python.h atsc.py atsc_python.cc atsc_guile.cc atsc_guile.h: atsc.i
+# $(python_deps) $(guile_deps): atsc.i
+atsc_python.h atsc.py atsc_python.cc: atsc.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 @@ atsc_python.h atsc.py atsc_python.cc atsc_guile.cc atsc_guile.h: atsc.i
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-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 @@ atsc_python.h atsc.py atsc_python.cc atsc_guile.cc atsc_guile.h: atsc.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.
+atsc_guile.h atsc.scm atsc_guile.cc: atsc.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/atsc-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/atsc-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/atsc-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/atsc-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/atsc-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/atsc-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/atsc-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)/atsc-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/atsc_python.d@am__quote@
-$(DEPDIR)/atsc-generate-guile-stamp:
if GUILE
+$(DEPDIR)/atsc-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) $(atsc_swig_args) \
-MD -MF $(DEPDIR)/atsc_guile.Std \
-module atsc -o atsc_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc_guile.d
$(RM) $(DEPDIR)/atsc_guile.Std
touch $(DEPDIR)/atsc-generate-guile-stamp
+else
+ touch $(DEPDIR)/atsc-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/atsc_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen
index 6c39e2002..1036ec3b4 100644
--- a/gr-audio-alsa/src/Makefile.swig.gen
+++ b/gr-audio-alsa/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ audio_alsa_pylibdir_category ?= $(audio_alsa_pythondir_category)
audio_alsa_pythondir = $(pythondir)/$(audio_alsa_pythondir_category)
audio_alsa_pylibdir = $(pyexecdir)/$(audio_alsa_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.
+audio_alsa_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/audio_alsa
+# FIXME: determince whether these should be installed with gnuradio.
+audio_alsa_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
audio_alsa_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += audio_alsa.py audio_alsa_python.cc
+if GUILE
+swig_built_sources += audio_alsa.scm audio_alsa_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 @@ audio_alsa_python_PYTHON = \
$(audio_alsa_python)
if GUILE
-audio_alsa_pylib_LTLIBRARIES += _audio_alsa_guile.la
-
+audio_alsa_scmlib_LTLIBRARIES = _audio_alsa_guile.la
_audio_alsa_guile_la_SOURCES = \
- audio_alsa_guile.cc \
+ audio_alsa_guile.cc \
$(audio_alsa_la_swig_sources)
+audio_alsa_scm_DATA = audio_alsa.scm
# Guile can use the same flags as python does
_audio_alsa_guile_la_LIBADD = $(_audio_alsa_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-audio_alsa_python.h audio_alsa.py audio_alsa_python.cc audio_alsa_guile.cc audio_alsa_guile.h: audio_alsa.i
+# $(python_deps) $(guile_deps): audio_alsa.i
+audio_alsa_python.h audio_alsa.py audio_alsa_python.cc: audio_alsa.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 @@ audio_alsa_python.h audio_alsa.py audio_alsa_python.cc audio_alsa_guile.cc audio
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_alsa-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_alsa-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 @@ audio_alsa_python.h audio_alsa.py audio_alsa_python.cc audio_alsa_guile.cc audio
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.
+audio_alsa_guile.h audio_alsa.scm audio_alsa_guile.cc: audio_alsa.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/audio_alsa-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/audio_alsa-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/audio_alsa-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_alsa-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/audio_alsa-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/audio_alsa-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/audio_alsa-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/audio_alsa-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)/audio_alsa-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/audio_alsa_python.d@am__quote@
-$(DEPDIR)/audio_alsa-generate-guile-stamp:
if GUILE
+$(DEPDIR)/audio_alsa-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) $(audio_alsa_swig_args) \
-MD -MF $(DEPDIR)/audio_alsa_guile.Std \
-module audio_alsa -o audio_alsa_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_alsa_guile.d
$(RM) $(DEPDIR)/audio_alsa_guile.Std
touch $(DEPDIR)/audio_alsa-generate-guile-stamp
+else
+ touch $(DEPDIR)/audio_alsa-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/audio_alsa_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen
index a4ebec83a..d2440f684 100644
--- a/gr-audio-oss/src/Makefile.swig.gen
+++ b/gr-audio-oss/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ audio_oss_pylibdir_category ?= $(audio_oss_pythondir_category)
audio_oss_pythondir = $(pythondir)/$(audio_oss_pythondir_category)
audio_oss_pylibdir = $(pyexecdir)/$(audio_oss_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.
+audio_oss_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/audio_oss
+# FIXME: determince whether these should be installed with gnuradio.
+audio_oss_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
audio_oss_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += audio_oss.py audio_oss_python.cc
+if GUILE
+swig_built_sources += audio_oss.scm audio_oss_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 @@ audio_oss_python_PYTHON = \
$(audio_oss_python)
if GUILE
-audio_oss_pylib_LTLIBRARIES += _audio_oss_guile.la
-
+audio_oss_scmlib_LTLIBRARIES = _audio_oss_guile.la
_audio_oss_guile_la_SOURCES = \
- audio_oss_guile.cc \
+ audio_oss_guile.cc \
$(audio_oss_la_swig_sources)
+audio_oss_scm_DATA = audio_oss.scm
# Guile can use the same flags as python does
_audio_oss_guile_la_LIBADD = $(_audio_oss_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-audio_oss_python.h audio_oss.py audio_oss_python.cc audio_oss_guile.cc audio_oss_guile.h: audio_oss.i
+# $(python_deps) $(guile_deps): audio_oss.i
+audio_oss_python.h audio_oss.py audio_oss_python.cc: audio_oss.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 @@ audio_oss_python.h audio_oss.py audio_oss_python.cc audio_oss_guile.cc audio_oss
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_oss-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_oss-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 @@ audio_oss_python.h audio_oss.py audio_oss_python.cc audio_oss_guile.cc audio_oss
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.
+audio_oss_guile.h audio_oss.scm audio_oss_guile.cc: audio_oss.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/audio_oss-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/audio_oss-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/audio_oss-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_oss-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/audio_oss-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/audio_oss-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/audio_oss-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/audio_oss-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)/audio_oss-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/audio_oss_python.d@am__quote@
-$(DEPDIR)/audio_oss-generate-guile-stamp:
if GUILE
+$(DEPDIR)/audio_oss-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) $(audio_oss_swig_args) \
-MD -MF $(DEPDIR)/audio_oss_guile.Std \
-module audio_oss -o audio_oss_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/audio_oss_guile.d
$(RM) $(DEPDIR)/audio_oss_guile.Std
touch $(DEPDIR)/audio_oss-generate-guile-stamp
+else
+ touch $(DEPDIR)/audio_oss-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/audio_oss_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
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
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
index ed7331896..4577445cb 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ gsm_full_rate_pylibdir_category ?= $(gsm_full_rate_pythondir_category)
gsm_full_rate_pythondir = $(pythondir)/$(gsm_full_rate_pythondir_category)
gsm_full_rate_pylibdir = $(pyexecdir)/$(gsm_full_rate_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.
+gsm_full_rate_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/gsm_full_rate
+# FIXME: determince whether these should be installed with gnuradio.
+gsm_full_rate_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
gsm_full_rate_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += gsm_full_rate.py gsm_full_rate_python.cc
+if GUILE
+swig_built_sources += gsm_full_rate.scm gsm_full_rate_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 @@ gsm_full_rate_python_PYTHON = \
$(gsm_full_rate_python)
if GUILE
-gsm_full_rate_pylib_LTLIBRARIES += _gsm_full_rate_guile.la
-
+gsm_full_rate_scmlib_LTLIBRARIES = _gsm_full_rate_guile.la
_gsm_full_rate_guile_la_SOURCES = \
- gsm_full_rate_guile.cc \
+ gsm_full_rate_guile.cc \
$(gsm_full_rate_la_swig_sources)
+gsm_full_rate_scm_DATA = gsm_full_rate.scm
# Guile can use the same flags as python does
_gsm_full_rate_guile_la_LIBADD = $(_gsm_full_rate_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-gsm_full_rate_python.h gsm_full_rate.py gsm_full_rate_python.cc gsm_full_rate_guile.cc gsm_full_rate_guile.h: gsm_full_rate.i
+# $(python_deps) $(guile_deps): gsm_full_rate.i
+gsm_full_rate_python.h gsm_full_rate.py gsm_full_rate_python.cc: gsm_full_rate.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 @@ gsm_full_rate_python.h gsm_full_rate.py gsm_full_rate_python.cc gsm_full_rate_gu
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gsm_full_rate-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gsm_full_rate-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 @@ gsm_full_rate_python.h gsm_full_rate.py gsm_full_rate_python.cc gsm_full_rate_gu
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.
+gsm_full_rate_guile.h gsm_full_rate.scm gsm_full_rate_guile.cc: gsm_full_rate.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/gsm_full_rate-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/gsm_full_rate-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/gsm_full_rate-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gsm_full_rate-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/gsm_full_rate-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/gsm_full_rate-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/gsm_full_rate-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/gsm_full_rate-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)/gsm_full_rate-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/gsm_full_rate_python.d@am__quote@
-$(DEPDIR)/gsm_full_rate-generate-guile-stamp:
if GUILE
+$(DEPDIR)/gsm_full_rate-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) $(gsm_full_rate_swig_args) \
-MD -MF $(DEPDIR)/gsm_full_rate_guile.Std \
-module gsm_full_rate -o gsm_full_rate_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gsm_full_rate_guile.d
$(RM) $(DEPDIR)/gsm_full_rate_guile.Std
touch $(DEPDIR)/gsm_full_rate-generate-guile-stamp
+else
+ touch $(DEPDIR)/gsm_full_rate-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/gsm_full_rate_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen
index 460c81e88..50ba1ab38 100644
--- a/gr-msdd6000/src/Makefile.swig.gen
+++ b/gr-msdd6000/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ msdd_pylibdir_category ?= $(msdd_pythondir_category)
msdd_pythondir = $(pythondir)/$(msdd_pythondir_category)
msdd_pylibdir = $(pyexecdir)/$(msdd_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.
+msdd_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/msdd
+# FIXME: determince whether these should be installed with gnuradio.
+msdd_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
msdd_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += msdd.py msdd_python.cc
+if GUILE
+swig_built_sources += msdd.scm msdd_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 @@ msdd_python_PYTHON = \
$(msdd_python)
if GUILE
-msdd_pylib_LTLIBRARIES += _msdd_guile.la
-
+msdd_scmlib_LTLIBRARIES = _msdd_guile.la
_msdd_guile_la_SOURCES = \
- msdd_guile.cc \
+ msdd_guile.cc \
$(msdd_la_swig_sources)
+msdd_scm_DATA = msdd.scm
# Guile can use the same flags as python does
_msdd_guile_la_LIBADD = $(_msdd_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-msdd_python.h msdd.py msdd_python.cc msdd_guile.cc msdd_guile.h: msdd.i
+# $(python_deps) $(guile_deps): msdd.i
+msdd_python.h msdd.py msdd_python.cc: msdd.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 @@ msdd_python.h msdd.py msdd_python.cc msdd_guile.cc msdd_guile.h: msdd.i
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-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 @@ msdd_python.h msdd.py msdd_python.cc msdd_guile.cc msdd_guile.h: msdd.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.
+msdd_guile.h msdd.scm msdd_guile.cc: msdd.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/msdd-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/msdd-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/msdd-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/msdd-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/msdd-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/msdd-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/msdd-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)/msdd-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/msdd_python.d@am__quote@
-$(DEPDIR)/msdd-generate-guile-stamp:
if GUILE
+$(DEPDIR)/msdd-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) $(msdd_swig_args) \
-MD -MF $(DEPDIR)/msdd_guile.Std \
-module msdd -o msdd_guile.cc $(WHAT); then \
@@ -295,9 +328,13 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_guile.d
$(RM) $(DEPDIR)/msdd_guile.Std
touch $(DEPDIR)/msdd-generate-guile-stamp
+else
+ touch $(DEPDIR)/msdd-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/msdd_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
# -*- Makefile -*-
#
@@ -339,6 +376,16 @@ msdd_rs_pylibdir_category ?= $(msdd_rs_pythondir_category)
msdd_rs_pythondir = $(pythondir)/$(msdd_rs_pythondir_category)
msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_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.
+msdd_rs_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/msdd_rs
+# FIXME: determince whether these should be installed with gnuradio.
+msdd_rs_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
msdd_rs_swigincludedir = $(swigincludedir)
@@ -374,6 +421,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += msdd_rs.py msdd_rs_python.cc
+if GUILE
+swig_built_sources += msdd_rs.scm msdd_rs_guile.cc
+endif
## Various SWIG variables. These can be overloaded in the including
## Makefile.am by setting the variable value there, then including
@@ -407,11 +457,11 @@ msdd_rs_python_PYTHON = \
$(msdd_rs_python)
if GUILE
-msdd_rs_pylib_LTLIBRARIES += _msdd_rs_guile.la
-
+msdd_rs_scmlib_LTLIBRARIES = _msdd_rs_guile.la
_msdd_rs_guile_la_SOURCES = \
- msdd_rs_guile.cc \
+ msdd_rs_guile.cc \
$(msdd_rs_la_swig_sources)
+msdd_rs_scm_DATA = msdd_rs.scm
# Guile can use the same flags as python does
_msdd_rs_guile_la_LIBADD = $(_msdd_rs_python_la_LIBADD)
@@ -422,7 +472,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-msdd_rs_python.h msdd_rs.py msdd_rs_python.cc msdd_rs_guile.cc msdd_rs_guile.h: msdd_rs.i
+# $(python_deps) $(guile_deps): msdd_rs.i
+msdd_rs_python.h msdd_rs.py msdd_rs_python.cc: msdd_rs.i
## This rule will get called only when MAKE decides that one of the
## targets needs to be created or re-created, because:
##
@@ -479,7 +530,6 @@ msdd_rs_python.h msdd_rs.py msdd_rs_python.cc msdd_rs_guile.cc msdd_rs_guile.h:
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-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
@@ -507,6 +557,24 @@ msdd_rs_python.h msdd_rs.py msdd_rs_python.cc msdd_rs_guile.cc msdd_rs_guile.h:
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.
+msdd_rs_guile.h msdd_rs.scm msdd_rs_guile.cc: msdd_rs.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/msdd_rs-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/msdd_rs-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/msdd_rs-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/msdd_rs-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/msdd_rs-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/msdd_rs-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/msdd_rs-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/msdd_rs-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
@@ -573,8 +641,10 @@ $(DEPDIR)/msdd_rs-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/msdd_rs_python.d@am__quote@
-$(DEPDIR)/msdd_rs-generate-guile-stamp:
if GUILE
+$(DEPDIR)/msdd_rs-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) $(msdd_rs_swig_args) \
-MD -MF $(DEPDIR)/msdd_rs_guile.Std \
-module msdd_rs -o msdd_rs_guile.cc $(WHAT); then \
@@ -596,7 +666,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/msdd_rs_guile.d
$(RM) $(DEPDIR)/msdd_rs_guile.Std
touch $(DEPDIR)/msdd_rs-generate-guile-stamp
+else
+ touch $(DEPDIR)/msdd_rs-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/msdd_rs_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen
index f86b94730..08dfe370b 100644
--- a/gr-noaa/swig/Makefile.swig.gen
+++ b/gr-noaa/swig/Makefile.swig.gen
@@ -38,6 +38,16 @@ noaa_swig_pylibdir_category ?= $(noaa_swig_pythondir_category)
noaa_swig_pythondir = $(pythondir)/$(noaa_swig_pythondir_category)
noaa_swig_pylibdir = $(pyexecdir)/$(noaa_swig_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.
+noaa_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/noaa_swig
+# FIXME: determince whether these should be installed with gnuradio.
+noaa_swig_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
noaa_swig_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += noaa_swig.py noaa_swig_python.cc
+if GUILE
+swig_built_sources += noaa_swig.scm noaa_swig_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 @@ noaa_swig_python_PYTHON = \
$(noaa_swig_python)
if GUILE
-noaa_swig_pylib_LTLIBRARIES += _noaa_swig_guile.la
-
+noaa_swig_scmlib_LTLIBRARIES = _noaa_swig_guile.la
_noaa_swig_guile_la_SOURCES = \
- noaa_swig_guile.cc \
+ noaa_swig_guile.cc \
$(noaa_swig_la_swig_sources)
+noaa_swig_scm_DATA = noaa_swig.scm
# Guile can use the same flags as python does
_noaa_swig_guile_la_LIBADD = $(_noaa_swig_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-noaa_swig_python.h noaa_swig.py noaa_swig_python.cc noaa_swig_guile.cc noaa_swig_guile.h: noaa_swig.i
+# $(python_deps) $(guile_deps): noaa_swig.i
+noaa_swig_python.h noaa_swig.py noaa_swig_python.cc: noaa_swig.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 @@ noaa_swig_python.h noaa_swig.py noaa_swig_python.cc noaa_swig_guile.cc noaa_swig
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/noaa_swig-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/noaa_swig-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 @@ noaa_swig_python.h noaa_swig.py noaa_swig_python.cc noaa_swig_guile.cc noaa_swig
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.
+noaa_swig_guile.h noaa_swig.scm noaa_swig_guile.cc: noaa_swig.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/noaa_swig-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/noaa_swig-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/noaa_swig-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/noaa_swig-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/noaa_swig-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/noaa_swig-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/noaa_swig-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/noaa_swig-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)/noaa_swig-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/noaa_swig_python.d@am__quote@
-$(DEPDIR)/noaa_swig-generate-guile-stamp:
if GUILE
+$(DEPDIR)/noaa_swig-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) $(noaa_swig_swig_args) \
-MD -MF $(DEPDIR)/noaa_swig_guile.Std \
-module noaa_swig -o noaa_swig_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/noaa_swig_guile.d
$(RM) $(DEPDIR)/noaa_swig_guile.Std
touch $(DEPDIR)/noaa_swig-generate-guile-stamp
+else
+ touch $(DEPDIR)/noaa_swig-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/noaa_swig_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index b260bf4ce..1721fbfe5 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -38,6 +38,16 @@ pager_swig_pylibdir_category ?= $(pager_swig_pythondir_category)
pager_swig_pythondir = $(pythondir)/$(pager_swig_pythondir_category)
pager_swig_pylibdir = $(pyexecdir)/$(pager_swig_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.
+pager_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/pager_swig
+# FIXME: determince whether these should be installed with gnuradio.
+pager_swig_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
pager_swig_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += pager_swig.py pager_swig_python.cc
+if GUILE
+swig_built_sources += pager_swig.scm pager_swig_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 @@ pager_swig_python_PYTHON = \
$(pager_swig_python)
if GUILE
-pager_swig_pylib_LTLIBRARIES += _pager_swig_guile.la
-
+pager_swig_scmlib_LTLIBRARIES = _pager_swig_guile.la
_pager_swig_guile_la_SOURCES = \
- pager_swig_guile.cc \
+ pager_swig_guile.cc \
$(pager_swig_la_swig_sources)
+pager_swig_scm_DATA = pager_swig.scm
# Guile can use the same flags as python does
_pager_swig_guile_la_LIBADD = $(_pager_swig_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-pager_swig_python.h pager_swig.py pager_swig_python.cc pager_swig_guile.cc pager_swig_guile.h: pager_swig.i
+# $(python_deps) $(guile_deps): pager_swig.i
+pager_swig_python.h pager_swig.py pager_swig_python.cc: pager_swig.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 @@ pager_swig_python.h pager_swig.py pager_swig_python.cc pager_swig_guile.cc pager
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-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 @@ pager_swig_python.h pager_swig.py pager_swig_python.cc pager_swig_guile.cc pager
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.
+pager_swig_guile.h pager_swig.scm pager_swig_guile.cc: pager_swig.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/pager_swig-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/pager_swig-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/pager_swig-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/pager_swig-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/pager_swig-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/pager_swig-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/pager_swig-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/pager_swig-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)/pager_swig-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/pager_swig_python.d@am__quote@
-$(DEPDIR)/pager_swig-generate-guile-stamp:
if GUILE
+$(DEPDIR)/pager_swig-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) $(pager_swig_swig_args) \
-MD -MF $(DEPDIR)/pager_swig_guile.Std \
-module pager_swig -o pager_swig_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/pager_swig_guile.d
$(RM) $(DEPDIR)/pager_swig_guile.Std
touch $(DEPDIR)/pager_swig-generate-guile-stamp
+else
+ touch $(DEPDIR)/pager_swig-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/pager_swig_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen
index 4c19ef3d2..04c75217e 100644
--- a/gr-radio-astronomy/src/lib/Makefile.swig.gen
+++ b/gr-radio-astronomy/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ ra_pylibdir_category ?= $(ra_pythondir_category)
ra_pythondir = $(pythondir)/$(ra_pythondir_category)
ra_pylibdir = $(pyexecdir)/$(ra_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.
+ra_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/ra
+# FIXME: determince whether these should be installed with gnuradio.
+ra_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
ra_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += ra.py ra_python.cc
+if GUILE
+swig_built_sources += ra.scm ra_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 @@ ra_python_PYTHON = \
$(ra_python)
if GUILE
-ra_pylib_LTLIBRARIES += _ra_guile.la
-
+ra_scmlib_LTLIBRARIES = _ra_guile.la
_ra_guile_la_SOURCES = \
- ra_guile.cc \
+ ra_guile.cc \
$(ra_la_swig_sources)
+ra_scm_DATA = ra.scm
# Guile can use the same flags as python does
_ra_guile_la_LIBADD = $(_ra_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-ra_python.h ra.py ra_python.cc ra_guile.cc ra_guile.h: ra.i
+# $(python_deps) $(guile_deps): ra.i
+ra_python.h ra.py ra_python.cc: ra.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 @@ ra_python.h ra.py ra_python.cc ra_guile.cc ra_guile.h: ra.i
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/ra-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/ra-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 @@ ra_python.h ra.py ra_python.cc ra_guile.cc ra_guile.h: ra.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.
+ra_guile.h ra.scm ra_guile.cc: ra.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/ra-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/ra-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/ra-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/ra-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/ra-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/ra-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/ra-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/ra-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)/ra-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/ra_python.d@am__quote@
-$(DEPDIR)/ra-generate-guile-stamp:
if GUILE
+$(DEPDIR)/ra-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) $(ra_swig_args) \
-MD -MF $(DEPDIR)/ra_guile.Std \
-module ra -o ra_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/ra_guile.d
$(RM) $(DEPDIR)/ra_guile.Std
touch $(DEPDIR)/ra-generate-guile-stamp
+else
+ touch $(DEPDIR)/ra-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/ra_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 00d51a17a..49734f88e 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ trellis_pylibdir_category ?= $(trellis_pythondir_category)
trellis_pythondir = $(pythondir)/$(trellis_pythondir_category)
trellis_pylibdir = $(pyexecdir)/$(trellis_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.
+trellis_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/trellis
+# FIXME: determince whether these should be installed with gnuradio.
+trellis_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
trellis_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += trellis.py trellis_python.cc
+if GUILE
+swig_built_sources += trellis.scm trellis_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 @@ trellis_python_PYTHON = \
$(trellis_python)
if GUILE
-trellis_pylib_LTLIBRARIES += _trellis_guile.la
-
+trellis_scmlib_LTLIBRARIES = _trellis_guile.la
_trellis_guile_la_SOURCES = \
- trellis_guile.cc \
+ trellis_guile.cc \
$(trellis_la_swig_sources)
+trellis_scm_DATA = trellis.scm
# Guile can use the same flags as python does
_trellis_guile_la_LIBADD = $(_trellis_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-trellis_python.h trellis.py trellis_python.cc trellis_guile.cc trellis_guile.h: trellis.i
+# $(python_deps) $(guile_deps): trellis.i
+trellis_python.h trellis.py trellis_python.cc: trellis.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 @@ trellis_python.h trellis.py trellis_python.cc trellis_guile.cc trellis_guile.h:
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-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 @@ trellis_python.h trellis.py trellis_python.cc trellis_guile.cc trellis_guile.h:
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.
+trellis_guile.h trellis.scm trellis_guile.cc: trellis.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/trellis-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/trellis-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/trellis-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/trellis-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/trellis-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/trellis-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/trellis-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/trellis-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)/trellis-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/trellis_python.d@am__quote@
-$(DEPDIR)/trellis-generate-guile-stamp:
if GUILE
+$(DEPDIR)/trellis-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) $(trellis_swig_args) \
-MD -MF $(DEPDIR)/trellis_guile.Std \
-module trellis -o trellis_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/trellis_guile.d
$(RM) $(DEPDIR)/trellis_guile.Std
touch $(DEPDIR)/trellis-generate-guile-stamp
+else
+ touch $(DEPDIR)/trellis-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/trellis_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
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
diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen
index 57e78cb07..729d759a1 100644
--- a/gr-video-sdl/src/Makefile.swig.gen
+++ b/gr-video-sdl/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ video_sdl_pylibdir_category ?= $(video_sdl_pythondir_category)
video_sdl_pythondir = $(pythondir)/$(video_sdl_pythondir_category)
video_sdl_pylibdir = $(pyexecdir)/$(video_sdl_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.
+video_sdl_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/video_sdl
+# FIXME: determince whether these should be installed with gnuradio.
+video_sdl_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
video_sdl_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += video_sdl.py video_sdl_python.cc
+if GUILE
+swig_built_sources += video_sdl.scm video_sdl_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 @@ video_sdl_python_PYTHON = \
$(video_sdl_python)
if GUILE
-video_sdl_pylib_LTLIBRARIES += _video_sdl_guile.la
-
+video_sdl_scmlib_LTLIBRARIES = _video_sdl_guile.la
_video_sdl_guile_la_SOURCES = \
- video_sdl_guile.cc \
+ video_sdl_guile.cc \
$(video_sdl_la_swig_sources)
+video_sdl_scm_DATA = video_sdl.scm
# Guile can use the same flags as python does
_video_sdl_guile_la_LIBADD = $(_video_sdl_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-video_sdl_python.h video_sdl.py video_sdl_python.cc video_sdl_guile.cc video_sdl_guile.h: video_sdl.i
+# $(python_deps) $(guile_deps): video_sdl.i
+video_sdl_python.h video_sdl.py video_sdl_python.cc: video_sdl.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 @@ video_sdl_python.h video_sdl.py video_sdl_python.cc video_sdl_guile.cc video_sdl
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/video_sdl-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/video_sdl-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 @@ video_sdl_python.h video_sdl.py video_sdl_python.cc video_sdl_guile.cc video_sdl
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.
+video_sdl_guile.h video_sdl.scm video_sdl_guile.cc: video_sdl.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/video_sdl-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/video_sdl-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/video_sdl-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/video_sdl-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/video_sdl-generate-lock; \
+ else \
+ while test -d $(DEPDIR)/video_sdl-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/video_sdl-generate-guile-stamp; \
+ exit $$?; \
+ fi;
+endif # end of GUILE
+
$(DEPDIR)/video_sdl-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)/video_sdl-generate-python-stamp:
@am__include@ @am__quote@./$(DEPDIR)/video_sdl_python.d@am__quote@
-$(DEPDIR)/video_sdl-generate-guile-stamp:
if GUILE
+$(DEPDIR)/video_sdl-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) $(video_sdl_swig_args) \
-MD -MF $(DEPDIR)/video_sdl_guile.Std \
-module video_sdl -o video_sdl_guile.cc $(WHAT); then \
@@ -295,7 +328,11 @@ if GUILE
awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/video_sdl_guile.d
$(RM) $(DEPDIR)/video_sdl_guile.Std
touch $(DEPDIR)/video_sdl-generate-guile-stamp
+else
+ touch $(DEPDIR)/video_sdl-generate-guile-stamp
+endif
@am__include@ @am__quote@./$(DEPDIR)/video_sdl_guile.d@am__quote@
-endif
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i