diff options
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.swig.gen | 93 | ||||
| -rw-r--r-- | gr-uhd/swig/Makefile.swig.gen | 112 | ||||
| -rw-r--r-- | gr-usrp/src/Makefile.swig.gen | 112 | ||||
| -rw-r--r-- | usrp/host/swig/Makefile.swig.gen | 112 |
4 files changed, 305 insertions, 124 deletions
diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index a51e8eb87..8759ce00d 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -38,6 +38,16 @@ qtgui_pylibdir_category ?= $(qtgui_pythondir_category) qtgui_pythondir = $(pythondir)/$(qtgui_pythondir_category) qtgui_pylibdir = $(pyexecdir)/$(qtgui_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. +qtgui_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/qtgui +# FIXME: determince whether these should be installed with gnuradio. +qtgui_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. qtgui_swigincludedir = $(swigincludedir) @@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += qtgui.py qtgui_python.cc +if GUILE +swig_built_sources += qtgui.scm qtgui_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 @@ qtgui_python_PYTHON = \ $(qtgui_python) if GUILE -qtgui_pylib_LTLIBRARIES += _qtgui_guile.la - +qtgui_scmlib_LTLIBRARIES = _qtgui_guile.la _qtgui_guile_la_SOURCES = \ - qtgui_guile.cc \ + qtgui_guile.cc \ $(qtgui_la_swig_sources) +qtgui_scm_DATA = qtgui.scm # Guile can use the same flags as python does _qtgui_guile_la_LIBADD = $(_qtgui_python_la_LIBADD) @@ -121,7 +134,8 @@ endif # end of GUILE ## Entry rule for running SWIG -qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i +# $(python_deps) $(guile_deps): qtgui.i +qtgui_python.h qtgui.py qtgui_python.cc: qtgui.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 @@ qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-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,32 +219,23 @@ qtgui_python.h qtgui.py qtgui_python.cc qtgui_guile.cc qtgui_guile.h: qtgui.i exit $$?; \ fi; -$(DEPDIR)/qtgui-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. +qtgui_guile.h qtgui.scm qtgui_guile.cc: qtgui.i if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \ - -MD -MF $(DEPDIR)/qtgui_guile.Std \ - -module qtgui -o qtgui_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/qtgui_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_guile.Std \ - > $(DEPDIR)/qtgui_guile.Sd; \ - $(RM) $(DEPDIR)/qtgui_guile.Std; \ - $(MV) $(DEPDIR)/qtgui_guile.Sd $(DEPDIR)/qtgui_guile.Std; \ - fi; \ + trap 'rm -rf $(DEPDIR)/qtgui-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/qtgui-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/qtgui-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/qtgui-generate-lock; \ else \ - $(RM) $(DEPDIR)/qtgui_guile.S*; exit 1; \ + while test -d $(DEPDIR)/qtgui-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/qtgui-generate-guile-stamp; \ + exit $$?; \ fi; - touch $(DEPDIR)/qtgui-generate-guile-stamp - $(RM) $(DEPDIR)/qtgui_guile.d - cp $(DEPDIR)/qtgui_guile.Std $(DEPDIR)/qtgui_guile.d - echo "" >> $(DEPDIR)/qtgui_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_guile.d - $(RM) $(DEPDIR)/qtgui_guile.Std - touch $(DEPDIR)/qtgui-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/qtgui_guile.d@am__quote@ -endif +endif # end of GUILE $(DEPDIR)/qtgui-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -299,3 +303,36 @@ $(DEPDIR)/qtgui-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/qtgui_python.d@am__quote@ +if GUILE +$(DEPDIR)/qtgui-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) $(qtgui_swig_args) \ + -MD -MF $(DEPDIR)/qtgui_guile.Std \ + -module qtgui -o qtgui_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/qtgui_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui_guile.Std \ + > $(DEPDIR)/qtgui_guile.Sd; \ + $(RM) $(DEPDIR)/qtgui_guile.Std; \ + $(MV) $(DEPDIR)/qtgui_guile.Sd $(DEPDIR)/qtgui_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/qtgui_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/qtgui-generate-guile-stamp + $(RM) $(DEPDIR)/qtgui_guile.d + cp $(DEPDIR)/qtgui_guile.Std $(DEPDIR)/qtgui_guile.d + echo "" >> $(DEPDIR)/qtgui_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui_guile.d + $(RM) $(DEPDIR)/qtgui_guile.Std + touch $(DEPDIR)/qtgui-generate-guile-stamp +else + touch $(DEPDIR)/qtgui-generate-guile-stamp +endif + +@am__include@ @am__quote@./$(DEPDIR)/qtgui_guile.d@am__quote@ + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i + diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen index 36475a12e..d10f6baa5 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 diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen index df2e3acf0..75078862b 100644 --- a/gr-usrp/src/Makefile.swig.gen +++ b/gr-usrp/src/Makefile.swig.gen @@ -38,6 +38,16 @@ usrp_swig_pylibdir_category ?= $(usrp_swig_pythondir_category) usrp_swig_pythondir = $(pythondir)/$(usrp_swig_pythondir_category) usrp_swig_pylibdir = $(pyexecdir)/$(usrp_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. +usrp_swig_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/usrp_swig +# FIXME: determince whether these should be installed with gnuradio. +usrp_swig_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. usrp_swig_swigincludedir = $(swigincludedir) @@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += usrp_swig.py usrp_swig_python.cc +if GUILE +swig_built_sources += usrp_swig.scm usrp_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 @@ usrp_swig_python_PYTHON = \ $(usrp_swig_python) if GUILE -usrp_swig_pylib_LTLIBRARIES += _usrp_swig_guile.la - +usrp_swig_scmlib_LTLIBRARIES = _usrp_swig_guile.la _usrp_swig_guile_la_SOURCES = \ - usrp_swig_guile.cc \ + usrp_swig_guile.cc \ $(usrp_swig_la_swig_sources) +usrp_swig_scm_DATA = usrp_swig.scm # Guile can use the same flags as python does _usrp_swig_guile_la_LIBADD = $(_usrp_swig_python_la_LIBADD) @@ -121,7 +134,8 @@ endif # end of GUILE ## Entry rule for running SWIG -usrp_swig.h usrp_swig.py usrp_swig_python.cc: usrp_swig.i +# $(python_deps) $(guile_deps): usrp_swig.i +usrp_swig_python.h usrp_swig.py usrp_swig_python.cc: usrp_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 @@ usrp_swig.h usrp_swig.py usrp_swig_python.cc: usrp_swig.i ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_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 @@ usrp_swig.h usrp_swig.py usrp_swig_python.cc: usrp_swig.i exit $$?; \ fi; -$(DEPDIR)/usrp_swig-generate-guile-stamp: - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp_swig_swig_args) \ - -MD -MF $(DEPDIR)/usrp_swig.Std \ - -module usrp_swig -o usrp_swig_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp_swig.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \ - > $(DEPDIR)/usrp_swig.Sd; \ - $(RM) $(DEPDIR)/usrp_swig.Std; \ - $(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_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. +usrp_swig_guile.h usrp_swig.scm usrp_swig_guile.cc: usrp_swig.i +if GUILE + trap 'rm -rf $(DEPDIR)/usrp_swig-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/usrp_swig-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/usrp_swig-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/usrp_swig-generate-lock; \ else \ - $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \ + while test -d $(DEPDIR)/usrp_swig-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/usrp_swig-generate-guile-stamp; \ + exit $$?; \ fi; - touch $(DEPDIR)/usrp_swig-generate-guile-stamp +endif # end of GUILE $(DEPDIR)/usrp_swig-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -232,17 +247,17 @@ $(DEPDIR)/usrp_swig-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_swig_swig_args) \ - -MD -MF $(DEPDIR)/usrp_swig.Std \ + -MD -MF $(DEPDIR)/usrp_swig_python.Std \ -module usrp_swig -o usrp_swig_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp_swig.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \ - > $(DEPDIR)/usrp_swig.Sd; \ - $(RM) $(DEPDIR)/usrp_swig.Std; \ - $(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \ + $(RM) $(DEPDIR)/usrp_swig_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig_python.Std \ + > $(DEPDIR)/usrp_swig_python.Sd; \ + $(RM) $(DEPDIR)/usrp_swig_python.Std; \ + $(MV) $(DEPDIR)/usrp_swig_python.Sd $(DEPDIR)/usrp_swig_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \ + $(RM) $(DEPDIR)/usrp_swig_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -254,27 +269,27 @@ $(DEPDIR)/usrp_swig-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/usrp_swig.d + $(RM) $(DEPDIR)/usrp_swig_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/usrp_swig.Std $(DEPDIR)/usrp_swig.d + cp $(DEPDIR)/usrp_swig_python.Std $(DEPDIR)/usrp_swig_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/usrp_swig.d + echo "" >> $(DEPDIR)/usrp_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)/usrp_swig.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/usrp_swig.Std + $(RM) $(DEPDIR)/usrp_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)/usrp_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)/usrp_swig.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/usrp_swig_python.d@am__quote@ + +if GUILE +$(DEPDIR)/usrp_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) $(usrp_swig_swig_args) \ + -MD -MF $(DEPDIR)/usrp_swig_guile.Std \ + -module usrp_swig -o usrp_swig_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/usrp_swig_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig_guile.Std \ + > $(DEPDIR)/usrp_swig_guile.Sd; \ + $(RM) $(DEPDIR)/usrp_swig_guile.Std; \ + $(MV) $(DEPDIR)/usrp_swig_guile.Sd $(DEPDIR)/usrp_swig_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/usrp_swig_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/usrp_swig-generate-guile-stamp + $(RM) $(DEPDIR)/usrp_swig_guile.d + cp $(DEPDIR)/usrp_swig_guile.Std $(DEPDIR)/usrp_swig_guile.d + echo "" >> $(DEPDIR)/usrp_swig_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig_guile.d + $(RM) $(DEPDIR)/usrp_swig_guile.Std + touch $(DEPDIR)/usrp_swig-generate-guile-stamp +else + touch $(DEPDIR)/usrp_swig-generate-guile-stamp +endif + +@am__include@ @am__quote@./$(DEPDIR)/usrp_swig_guile.d@am__quote@ + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen index df9ec8b03..ec804159b 100644 --- a/usrp/host/swig/Makefile.swig.gen +++ b/usrp/host/swig/Makefile.swig.gen @@ -38,6 +38,16 @@ usrp_prims_pylibdir_category ?= $(usrp_prims_pythondir_category) usrp_prims_pythondir = $(pythondir)/$(usrp_prims_pythondir_category) usrp_prims_pylibdir = $(pyexecdir)/$(usrp_prims_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. +usrp_prims_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/usrp_prims +# FIXME: determince whether these should be installed with gnuradio. +usrp_prims_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. usrp_prims_swigincludedir = $(swigincludedir) @@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += usrp_prims.py usrp_prims_python.cc +if GUILE +swig_built_sources += usrp_prims.scm usrp_prims_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 @@ usrp_prims_python_PYTHON = \ $(usrp_prims_python) if GUILE -usrp_prims_pylib_LTLIBRARIES += _usrp_prims_guile.la - +usrp_prims_scmlib_LTLIBRARIES = _usrp_prims_guile.la _usrp_prims_guile_la_SOURCES = \ - usrp_prims_guile.cc \ + usrp_prims_guile.cc \ $(usrp_prims_la_swig_sources) +usrp_prims_scm_DATA = usrp_prims.scm # Guile can use the same flags as python does _usrp_prims_guile_la_LIBADD = $(_usrp_prims_python_la_LIBADD) @@ -121,7 +134,8 @@ endif # end of GUILE ## Entry rule for running SWIG -usrp_prims.h usrp_prims.py usrp_prims_python.cc: usrp_prims.i +# $(python_deps) $(guile_deps): usrp_prims.i +usrp_prims_python.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: ## @@ -178,7 +192,6 @@ usrp_prims.h usrp_prims.py usrp_prims_python.cc: usrp_prims.i ## Tell MAKE to run the rule for creating this stamp. ## $(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 @@ -206,21 +219,23 @@ usrp_prims.h usrp_prims.py usrp_prims_python.cc: usrp_prims.i exit $$?; \ fi; -$(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; \ +# 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. +usrp_prims_guile.h usrp_prims.scm usrp_prims_guile.cc: usrp_prims.i +if GUILE + trap 'rm -rf $(DEPDIR)/usrp_prims-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/usrp_prims-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/usrp_prims-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/usrp_prims-generate-lock; \ else \ - $(RM) $(DEPDIR)/usrp_prims.S*; exit 1; \ + while test -d $(DEPDIR)/usrp_prims-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/usrp_prims-generate-guile-stamp; \ + exit $$?; \ fi; - touch $(DEPDIR)/usrp_prims-generate-guile-stamp +endif # end of GUILE $(DEPDIR)/usrp_prims-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -232,17 +247,17 @@ $(DEPDIR)/usrp_prims-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_prims_swig_args) \ - -MD -MF $(DEPDIR)/usrp_prims.Std \ + -MD -MF $(DEPDIR)/usrp_prims_python.Std \ -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 \ - > $(DEPDIR)/usrp_prims.Sd; \ - $(RM) $(DEPDIR)/usrp_prims.Std; \ - $(MV) $(DEPDIR)/usrp_prims.Sd $(DEPDIR)/usrp_prims.Std; \ + $(RM) $(DEPDIR)/usrp_prims_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims_python.Std \ + > $(DEPDIR)/usrp_prims_python.Sd; \ + $(RM) $(DEPDIR)/usrp_prims_python.Std; \ + $(MV) $(DEPDIR)/usrp_prims_python.Sd $(DEPDIR)/usrp_prims_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/usrp_prims.S*; exit 1; \ + $(RM) $(DEPDIR)/usrp_prims_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -254,27 +269,27 @@ $(DEPDIR)/usrp_prims-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/usrp_prims.d + $(RM) $(DEPDIR)/usrp_prims_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/usrp_prims.Std $(DEPDIR)/usrp_prims.d + cp $(DEPDIR)/usrp_prims_python.Std $(DEPDIR)/usrp_prims_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/usrp_prims.d + echo "" >> $(DEPDIR)/usrp_prims_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)/usrp_prims.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_prims_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/usrp_prims.Std + $(RM) $(DEPDIR)/usrp_prims_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)/usrp_prims-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)/usrp_prims.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/usrp_prims_python.d@am__quote@ + +if GUILE +$(DEPDIR)/usrp_prims-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) $(usrp_prims_swig_args) \ + -MD -MF $(DEPDIR)/usrp_prims_guile.Std \ + -module usrp_prims -o usrp_prims_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/usrp_prims_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims_guile.Std \ + > $(DEPDIR)/usrp_prims_guile.Sd; \ + $(RM) $(DEPDIR)/usrp_prims_guile.Std; \ + $(MV) $(DEPDIR)/usrp_prims_guile.Sd $(DEPDIR)/usrp_prims_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/usrp_prims_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/usrp_prims-generate-guile-stamp + $(RM) $(DEPDIR)/usrp_prims_guile.d + cp $(DEPDIR)/usrp_prims_guile.Std $(DEPDIR)/usrp_prims_guile.d + echo "" >> $(DEPDIR)/usrp_prims_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_prims_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims_guile.d + $(RM) $(DEPDIR)/usrp_prims_guile.Std + touch $(DEPDIR)/usrp_prims-generate-guile-stamp +else + touch $(DEPDIR)/usrp_prims-generate-guile-stamp +endif + +@am__include@ @am__quote@./$(DEPDIR)/usrp_prims_guile.d@am__quote@ + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i |