diff options
| author | Rob Savoye <rob@welcomehome.org> | 2010-10-18 21:45:11 -0600 |
|---|---|---|
| committer | Eric Blossom <eb@comsec.com> | 2010-11-10 12:10:45 -0800 |
| commit | 25bf9bbd0c5b702acf26e05d5a9966fd323f6614 (patch) | |
| tree | 2bd20d415c4f6ad212ee60938382a4661250d856 /gr-pager | |
| parent | 3d55841ec05f1a09eb2de304f9ad30b9ed068986 (diff) | |
don't ifdef the target away. regenerate .gen files.
Diffstat (limited to 'gr-pager')
| -rw-r--r-- | gr-pager/swig/Makefile.swig.gen | 51 |
1 files changed, 44 insertions, 7 deletions
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen index b260bf4ce7..1721fbfe56 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 |