From f97d37a216d1a3ff888f8b57c0090f9def9dd021 Mon Sep 17 00:00:00 2001
From: Eric Blossom <eb@comsec.com>
Date: Mon, 18 Oct 2010 19:24:49 -0700
Subject: Update generated files
---
gr-uhd/swig/Makefile.swig.gen | 112 ++++++++++++++++++++++++++++++------------
1 file changed, 80 insertions(+), 32 deletions(-)
(limited to 'gr-uhd/swig/Makefile.swig.gen')
diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index 36475a12ee..d10f6baa59 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -38,6 +38,16 @@ uhd_swig_pylibdir_category ?= $(uhd_swig_pythondir_category)
uhd_swig_pythondir = $(pythondir)/$(uhd_swig_pythondir_category)
uhd_swig_pylibdir = $(pyexecdir)/$(uhd_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.
+uhd_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/uhd_swig
+# FIXME: determince whether these should be installed with gnuradio.
+uhd_swig_scmdir = @GUILE_PKDATADIR@/gnuradio
+
## SWIG headers are always installed into the same directory.
uhd_swig_swigincludedir = $(swigincludedir)
@@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
## be added manually by the including Makefile.am .
swig_built_sources += uhd_swig.py uhd_swig_python.cc
+if GUILE
+swig_built_sources += uhd_swig.scm uhd_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 @@ uhd_swig_python_PYTHON = \
$(uhd_swig_python)
if GUILE
-uhd_swig_pylib_LTLIBRARIES += _uhd_swig_guile.la
-
+uhd_swig_scmlib_LTLIBRARIES = _uhd_swig_guile.la
_uhd_swig_guile_la_SOURCES = \
- uhd_swig_guile.cc \
+ uhd_swig_guile.cc \
$(uhd_swig_la_swig_sources)
+uhd_swig_scm_DATA = uhd_swig.scm
# Guile can use the same flags as python does
_uhd_swig_guile_la_LIBADD = $(_uhd_swig_python_la_LIBADD)
@@ -121,7 +134,8 @@ endif # end of GUILE
## Entry rule for running SWIG
-uhd_swig.h uhd_swig.py uhd_swig_python.cc: uhd_swig.i
+# $(python_deps) $(guile_deps): uhd_swig.i
+uhd_swig_python.h uhd_swig.py uhd_swig_python.cc: uhd_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 @@ uhd_swig.h uhd_swig.py uhd_swig_python.cc: uhd_swig.i
## Tell MAKE to run the rule for creating this stamp.
##
$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-python-stamp WHAT=$<; \
- $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_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,21 +219,23 @@ uhd_swig.h uhd_swig.py uhd_swig_python.cc: uhd_swig.i
exit $$?; \
fi;
-$(DEPDIR)/uhd_swig-generate-guile-stamp:
- if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(uhd_swig_swig_args) \
- -MD -MF $(DEPDIR)/uhd_swig.Std \
- -module uhd_swig -o uhd_swig_guile.cc $(WHAT); then \
- if test $(host_os) = mingw32; then \
- $(RM) $(DEPDIR)/uhd_swig.Sd; \
- $(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \
- > $(DEPDIR)/uhd_swig.Sd; \
- $(RM) $(DEPDIR)/uhd_swig.Std; \
- $(MV) $(DEPDIR)/uhd_swig.Sd $(DEPDIR)/uhd_swig.Std; \
- 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.
+uhd_swig_guile.h uhd_swig.scm uhd_swig_guile.cc: uhd_swig.i
+if GUILE
+ trap 'rm -rf $(DEPDIR)/uhd_swig-generate-*' 1 2 13 15; \
+ if mkdir $(DEPDIR)/uhd_swig-generate-lock 2>/dev/null; then \
+ rm -f $(DEPDIR)/uhd_swig-generate-*stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-guile-stamp WHAT=$<; \
+ rmdir $(DEPDIR)/uhd_swig-generate-lock; \
else \
- $(RM) $(DEPDIR)/uhd_swig.S*; exit 1; \
+ while test -d $(DEPDIR)/uhd_swig-generate-lock; do \
+ sleep 1; \
+ done; \
+ test -f $(DEPDIR)/uhd_swig-generate-guile-stamp; \
+ exit $$?; \
fi;
- touch $(DEPDIR)/uhd_swig-generate-guile-stamp
+endif # end of GUILE
$(DEPDIR)/uhd_swig-generate-python-stamp:
## This rule will be called only by the first process issuing the
@@ -232,17 +247,17 @@ $(DEPDIR)/uhd_swig-generate-python-stamp:
## post-processing on 'mingw32' host OS for the dependency file.
##
if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(uhd_swig_swig_args) \
- -MD -MF $(DEPDIR)/uhd_swig.Std \
+ -MD -MF $(DEPDIR)/uhd_swig_python.Std \
-module uhd_swig -o uhd_swig_python.cc $(WHAT); then \
if test $(host_os) = mingw32; then \
- $(RM) $(DEPDIR)/uhd_swig.Sd; \
- $(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \
- > $(DEPDIR)/uhd_swig.Sd; \
- $(RM) $(DEPDIR)/uhd_swig.Std; \
- $(MV) $(DEPDIR)/uhd_swig.Sd $(DEPDIR)/uhd_swig.Std; \
+ $(RM) $(DEPDIR)/uhd_swig_python.Sd; \
+ $(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig_python.Std \
+ > $(DEPDIR)/uhd_swig_python.Sd; \
+ $(RM) $(DEPDIR)/uhd_swig_python.Std; \
+ $(MV) $(DEPDIR)/uhd_swig_python.Sd $(DEPDIR)/uhd_swig_python.Std; \
fi; \
else \
- $(RM) $(DEPDIR)/uhd_swig.S*; exit 1; \
+ $(RM) $(DEPDIR)/uhd_swig_python.S*; exit 1; \
fi;
##
## Mess with the SWIG output .Std dependency file, to create a
@@ -254,27 +269,27 @@ $(DEPDIR)/uhd_swig-generate-python-stamp:
##
## (1) remove the current dependency file
##
- $(RM) $(DEPDIR)/uhd_swig.d
+ $(RM) $(DEPDIR)/uhd_swig_python.d
##
## (2) Copy the whole SWIG file:
##
- cp $(DEPDIR)/uhd_swig.Std $(DEPDIR)/uhd_swig.d
+ cp $(DEPDIR)/uhd_swig_python.Std $(DEPDIR)/uhd_swig_python.d
##
## (3) all a carriage return to the end of the dependency file.
##
- echo "" >> $(DEPDIR)/uhd_swig.d
+ echo "" >> $(DEPDIR)/uhd_swig_python.d
##
## (4) from the SWIG file, remove the first line (the target); remove
## trailing " \" and " " from each line. Append ":" to each line,
## followed by 2 carriage returns, then append this to the end of
## the dependency file.
##
- $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/uhd_swig.Std | \
- awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig.d
+ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/uhd_swig_python.Std | \
+ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig_python.d
##
## (5) remove the SWIG-generated file
##
- $(RM) $(DEPDIR)/uhd_swig.Std
+ $(RM) $(DEPDIR)/uhd_swig_python.Std
##
## Create the stamp for this filename generation, to signal success in
## executing this rule; allows other threads waiting on this process
@@ -286,5 +301,38 @@ $(DEPDIR)/uhd_swig-generate-python-stamp:
# not guaranteed to be portable, but will probably work. If it works,
# we have accurate dependencies for our swig stuff, which is good.
-@am__include@ @am__quote@./$(DEPDIR)/uhd_swig.d@am__quote@
+@am__include@ @am__quote@./$(DEPDIR)/uhd_swig_python.d@am__quote@
+
+if GUILE
+$(DEPDIR)/uhd_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) $(uhd_swig_swig_args) \
+ -MD -MF $(DEPDIR)/uhd_swig_guile.Std \
+ -module uhd_swig -o uhd_swig_guile.cc $(WHAT); then \
+ if test $(host_os) = mingw32; then \
+ $(RM) $(DEPDIR)/uhd_swig_guile.Sd; \
+ $(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig_guile.Std \
+ > $(DEPDIR)/uhd_swig_guile.Sd; \
+ $(RM) $(DEPDIR)/uhd_swig_guile.Std; \
+ $(MV) $(DEPDIR)/uhd_swig_guile.Sd $(DEPDIR)/uhd_swig_guile.Std; \
+ fi; \
+ else \
+ $(RM) $(DEPDIR)/uhd_swig_guile.S*; exit 1; \
+ fi;
+ touch $(DEPDIR)/uhd_swig-generate-guile-stamp
+ $(RM) $(DEPDIR)/uhd_swig_guile.d
+ cp $(DEPDIR)/uhd_swig_guile.Std $(DEPDIR)/uhd_swig_guile.d
+ echo "" >> $(DEPDIR)/uhd_swig_guile.d
+ $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/uhd_swig_guile.Std | \
+ awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/uhd_swig_guile.d
+ $(RM) $(DEPDIR)/uhd_swig_guile.Std
+ touch $(DEPDIR)/uhd_swig-generate-guile-stamp
+else
+ touch $(DEPDIR)/uhd_swig-generate-guile-stamp
+endif
+
+@am__include@ @am__quote@./$(DEPDIR)/uhd_swig_guile.d@am__quote@
+
+#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i
--
cgit v1.2.3