From b47b9ca40ecf49afa44c993b8da9af4ff876c9ba Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 13 Oct 2010 22:25:16 -0600 Subject: regenerated from template --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 210 ++++++++++++++++++++------- 1 file changed, 156 insertions(+), 54 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index e24ba5a96..fab8afd62 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.cc +swig_built_sources += gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime-python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -86,7 +86,7 @@ gnuradio_swig_py_runtime_pylib_LTLIBRARIES = \ _gnuradio_swig_py_runtime.la _gnuradio_swig_py_runtime_la_SOURCES = \ - gnuradio_swig_py_runtime.cc \ + gnuradio_swig_py_runtime-python.cc \ $(gnuradio_swig_py_runtime_la_swig_sources) _gnuradio_swig_py_runtime_la_LIBADD = \ @@ -107,7 +107,7 @@ gnuradio_swig_py_runtime_python_PYTHON = \ ## Entry rule for running SWIG -gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.cc: gnuradio_swig_py_runtime.i +gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime-python.cc: gnuradio_swig_py_runtime.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -159,11 +159,12 @@ gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime. ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp; \ + rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-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 @@ -187,11 +188,27 @@ gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime. ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp; \ + test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp: +$(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \ + -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime-guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \ + > $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_runtime.Sd $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp + +$(DEPDIR)/gnuradio_swig_py_runtime-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 ## removing the actual stamp file in order to guarantee that MAKE will @@ -202,7 +219,7 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \ - -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime.cc $(WHAT); then \ + -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime-python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \ @@ -249,7 +266,7 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-stamp + touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, @@ -331,7 +348,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_general.py gnuradio_swig_py_general.cc +swig_built_sources += gnuradio_swig_py_general.py gnuradio_swig_py_general-python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -345,7 +362,7 @@ gnuradio_swig_py_general_pylib_LTLIBRARIES = \ _gnuradio_swig_py_general.la _gnuradio_swig_py_general_la_SOURCES = \ - gnuradio_swig_py_general.cc \ + gnuradio_swig_py_general-python.cc \ $(gnuradio_swig_py_general_la_swig_sources) _gnuradio_swig_py_general_la_LIBADD = \ @@ -366,7 +383,7 @@ gnuradio_swig_py_general_python_PYTHON = \ ## Entry rule for running SWIG -gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general.cc: gnuradio_swig_py_general.i +gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general-python.cc: gnuradio_swig_py_general.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -418,11 +435,12 @@ gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general. ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-stamp; \ + rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-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 @@ -446,11 +464,27 @@ gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general. ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/gnuradio_swig_py_general-generate-stamp; \ + test -f $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_general-generate-stamp: +$(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_general_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \ + -module gnuradio_swig_py_general -o gnuradio_swig_py_general-guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \ + > $(DEPDIR)/gnuradio_swig_py_general.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_general.Sd $(DEPDIR)/gnuradio_swig_py_general.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp + +$(DEPDIR)/gnuradio_swig_py_general-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 ## removing the actual stamp file in order to guarantee that MAKE will @@ -461,7 +495,7 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_general_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \ - -module gnuradio_swig_py_general -o gnuradio_swig_py_general.cc $(WHAT); then \ + -module gnuradio_swig_py_general -o gnuradio_swig_py_general-python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \ @@ -508,7 +542,7 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/gnuradio_swig_py_general-generate-stamp + touch $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, @@ -590,7 +624,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc +swig_built_sources += gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen-python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -604,7 +638,7 @@ gnuradio_swig_py_gengen_pylib_LTLIBRARIES = \ _gnuradio_swig_py_gengen.la _gnuradio_swig_py_gengen_la_SOURCES = \ - gnuradio_swig_py_gengen.cc \ + gnuradio_swig_py_gengen-python.cc \ $(gnuradio_swig_py_gengen_la_swig_sources) _gnuradio_swig_py_gengen_la_LIBADD = \ @@ -625,7 +659,7 @@ gnuradio_swig_py_gengen_python_PYTHON = \ ## Entry rule for running SWIG -gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc: gnuradio_swig_py_gengen.i +gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen-python.cc: gnuradio_swig_py_gengen.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -677,11 +711,12 @@ gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc: ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp; \ + rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-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 @@ -705,11 +740,27 @@ gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc: ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp; \ + test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp: +$(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \ + -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen-guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \ + > $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_gengen.Sd $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp + +$(DEPDIR)/gnuradio_swig_py_gengen-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 ## removing the actual stamp file in order to guarantee that MAKE will @@ -720,7 +771,7 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \ - -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen.cc $(WHAT); then \ + -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen-python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \ @@ -767,7 +818,7 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-stamp + touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, @@ -849,7 +900,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc +swig_built_sources += gnuradio_swig_py_filter.py gnuradio_swig_py_filter-python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -863,7 +914,7 @@ gnuradio_swig_py_filter_pylib_LTLIBRARIES = \ _gnuradio_swig_py_filter.la _gnuradio_swig_py_filter_la_SOURCES = \ - gnuradio_swig_py_filter.cc \ + gnuradio_swig_py_filter-python.cc \ $(gnuradio_swig_py_filter_la_swig_sources) _gnuradio_swig_py_filter_la_LIBADD = \ @@ -884,7 +935,7 @@ gnuradio_swig_py_filter_python_PYTHON = \ ## Entry rule for running SWIG -gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc: gnuradio_swig_py_filter.i +gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter-python.cc: gnuradio_swig_py_filter.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -936,11 +987,12 @@ gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc: ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp; \ + rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-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 @@ -964,11 +1016,27 @@ gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc: ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp; \ + test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_filter-generate-stamp: +$(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_filter_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \ + -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter-guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \ + > $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_filter.Sd $(DEPDIR)/gnuradio_swig_py_filter.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp + +$(DEPDIR)/gnuradio_swig_py_filter-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 ## removing the actual stamp file in order to guarantee that MAKE will @@ -979,7 +1047,7 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_filter_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \ - -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc $(WHAT); then \ + -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter-python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \ @@ -1026,7 +1094,7 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/gnuradio_swig_py_filter-generate-stamp + touch $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, @@ -1108,7 +1176,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_io.py gnuradio_swig_py_io.cc +swig_built_sources += gnuradio_swig_py_io.py gnuradio_swig_py_io-python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -1122,7 +1190,7 @@ gnuradio_swig_py_io_pylib_LTLIBRARIES = \ _gnuradio_swig_py_io.la _gnuradio_swig_py_io_la_SOURCES = \ - gnuradio_swig_py_io.cc \ + gnuradio_swig_py_io-python.cc \ $(gnuradio_swig_py_io_la_swig_sources) _gnuradio_swig_py_io_la_LIBADD = \ @@ -1143,7 +1211,7 @@ gnuradio_swig_py_io_python_PYTHON = \ ## Entry rule for running SWIG -gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_swig_py_io.i +gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io-python.cc: gnuradio_swig_py_io.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1195,11 +1263,12 @@ gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_sw ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-stamp; \ + rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-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 @@ -1223,11 +1292,27 @@ gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_sw ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/gnuradio_swig_py_io-generate-stamp; \ + test -f $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_io-generate-stamp: +$(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_io_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \ + -module gnuradio_swig_py_io -o gnuradio_swig_py_io-guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \ + > $(DEPDIR)/gnuradio_swig_py_io.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_io.Sd $(DEPDIR)/gnuradio_swig_py_io.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp + +$(DEPDIR)/gnuradio_swig_py_io-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 ## removing the actual stamp file in order to guarantee that MAKE will @@ -1238,7 +1323,7 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_io_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \ - -module gnuradio_swig_py_io -o gnuradio_swig_py_io.cc $(WHAT); then \ + -module gnuradio_swig_py_io -o gnuradio_swig_py_io-python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \ @@ -1285,7 +1370,7 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/gnuradio_swig_py_io-generate-stamp + touch $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, @@ -1367,7 +1452,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc +swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier-python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -1381,7 +1466,7 @@ gnuradio_swig_py_hier_pylib_LTLIBRARIES = \ _gnuradio_swig_py_hier.la _gnuradio_swig_py_hier_la_SOURCES = \ - gnuradio_swig_py_hier.cc \ + gnuradio_swig_py_hier-python.cc \ $(gnuradio_swig_py_hier_la_swig_sources) _gnuradio_swig_py_hier_la_LIBADD = \ @@ -1402,7 +1487,7 @@ gnuradio_swig_py_hier_python_PYTHON = \ ## Entry rule for running SWIG -gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnuradio_swig_py_hier.i +gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier-python.cc: gnuradio_swig_py_hier.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1454,11 +1539,12 @@ gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnura ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \ + rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-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 @@ -1482,11 +1568,27 @@ gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnura ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp; \ + test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_hier-generate-stamp: +$(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_hier_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \ + -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier-guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \ + > $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_hier.Sd $(DEPDIR)/gnuradio_swig_py_hier.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp + +$(DEPDIR)/gnuradio_swig_py_hier-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 ## removing the actual stamp file in order to guarantee that MAKE will @@ -1497,7 +1599,7 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_hier_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \ - -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier.cc $(WHAT); then \ + -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier-python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \ @@ -1544,7 +1646,7 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/gnuradio_swig_py_hier-generate-stamp + touch $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp # KLUDGE: Force runtime include of a SWIG dependency file. This is # not guaranteed to be portable, but will probably work. If it works, -- cgit From 29fef37cdee9eced2ff7c6ff44da2e8e8fa88aa7 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 13 Oct 2010 22:27:08 -0600 Subject: split out _SOURCES into separate values for the different scripting languages. --- gnuradio-core/src/lib/swig/Makefile.am | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 1a50b8c8e..afd6ef268 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -32,6 +32,7 @@ swiginclude_HEADERS = \ gnuradio.i \ gr_swig_block_magic.i \ gr_shared_ptr.i +# std_complex.i # special install for this top-level Python script which includes all # of the split Python libraries. @@ -88,7 +89,7 @@ include $(top_srcdir)/Makefile.swig # include the SWIG-generated .h files in the BUILT SOURCES, since they # aren't by default when using Makefile.swig; order doesn't matter. -BUILT_SOURCES = \ +PYTHON_GEN = \ gnuradio_swig_py_runtime.h \ gnuradio_swig_py_general.h \ gnuradio_swig_py_gengen.h \ @@ -98,6 +99,15 @@ BUILT_SOURCES = \ $(grinclude_HEADERS) \ $(swig_built_sources) +BUILT_GUILE = \ + $(grinclude_HEADERS) \ + $(swig_built_sources) + +BUILT_SOURCES = $(PYTHON_GEN) +if GUILE +BUILT_SOURCES += $(BUILT_GUILE) +endif + # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) -endif +endif # end of if python -- cgit From ed4094208c501e91838ccc333059e4731e8ae908 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 14 Oct 2010 12:34:08 -0600 Subject: regenerated after changes to the template --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 216 +++++++++++++++++++-------- 1 file changed, 156 insertions(+), 60 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index fab8afd62..9d7112169 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -72,7 +72,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime-python.cc +swig_built_sources += gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -83,21 +83,21 @@ gnuradio_swig_py_runtime_swiginclude_HEADERS = \ $(gnuradio_swig_py_runtime_swiginclude_headers) gnuradio_swig_py_runtime_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_runtime.la + _gnuradio_swig_py_runtime_python.la -_gnuradio_swig_py_runtime_la_SOURCES = \ - gnuradio_swig_py_runtime-python.cc \ +_gnuradio_swig_py_runtime_python_la_SOURCES = \ + gnuradio_swig_py_runtime_python.cc \ $(gnuradio_swig_py_runtime_la_swig_sources) -_gnuradio_swig_py_runtime_la_LIBADD = \ +_gnuradio_swig_py_runtime_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_runtime_la_swig_libadd) -_gnuradio_swig_py_runtime_la_LDFLAGS = \ +_gnuradio_swig_py_runtime_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_runtime_la_swig_ldflags) -_gnuradio_swig_py_runtime_la_CXXFLAGS = \ +_gnuradio_swig_py_runtime_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_runtime_la_swig_cxxflags) @@ -105,9 +105,23 @@ gnuradio_swig_py_runtime_python_PYTHON = \ gnuradio_swig_py_runtime.py \ $(gnuradio_swig_py_runtime_python) +if GUILE +gnuradio_swig_py_runtime_pylib_LTLIBRARIES += _gnuradio_swig_py_runtime_guile.la + +_gnuradio_swig_py_runtime_guile_la_SOURCES = \ + gnuradio_swig_py_runtime_guile.cc \ + $(gnuradio_swig_py_runtime_la_swig_sources) + +# Guile can use the same flags as python does +_gnuradio_swig_py_runtime_guile_la_LIBADD = $(_gnuradio_swig_py_runtime_python_la_LIBADD) +_gnuradio_swig_py_runtime_guile_la_LDFLAGS = $(_gnuradio_swig_py_runtime_python_la_LDFLAGS) +_gnuradio_swig_py_runtime_guile_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime-python.cc: gnuradio_swig_py_runtime.i +gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc: gnuradio_swig_py_runtime.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime- fi; $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \ - -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime-guile.cc $(WHAT); then \ + -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp: $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp +endif $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \ - -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime-python.cc $(WHAT); then \ + -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \ @@ -348,7 +364,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_general.py gnuradio_swig_py_general-python.cc +swig_built_sources += gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -359,21 +375,21 @@ gnuradio_swig_py_general_swiginclude_HEADERS = \ $(gnuradio_swig_py_general_swiginclude_headers) gnuradio_swig_py_general_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_general.la + _gnuradio_swig_py_general_python.la -_gnuradio_swig_py_general_la_SOURCES = \ - gnuradio_swig_py_general-python.cc \ +_gnuradio_swig_py_general_python_la_SOURCES = \ + gnuradio_swig_py_general_python.cc \ $(gnuradio_swig_py_general_la_swig_sources) -_gnuradio_swig_py_general_la_LIBADD = \ +_gnuradio_swig_py_general_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_general_la_swig_libadd) -_gnuradio_swig_py_general_la_LDFLAGS = \ +_gnuradio_swig_py_general_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_general_la_swig_ldflags) -_gnuradio_swig_py_general_la_CXXFLAGS = \ +_gnuradio_swig_py_general_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_general_la_swig_cxxflags) @@ -381,9 +397,23 @@ gnuradio_swig_py_general_python_PYTHON = \ gnuradio_swig_py_general.py \ $(gnuradio_swig_py_general_python) +if GUILE +gnuradio_swig_py_general_pylib_LTLIBRARIES += _gnuradio_swig_py_general_guile.la + +_gnuradio_swig_py_general_guile_la_SOURCES = \ + gnuradio_swig_py_general_guile.cc \ + $(gnuradio_swig_py_general_la_swig_sources) + +# Guile can use the same flags as python does +_gnuradio_swig_py_general_guile_la_LIBADD = $(_gnuradio_swig_py_general_python_la_LIBADD) +_gnuradio_swig_py_general_guile_la_LDFLAGS = $(_gnuradio_swig_py_general_python_la_LDFLAGS) +_gnuradio_swig_py_general_guile_la_CXXFLAGS = $(_gnuradio_swig_py_general_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general-python.cc: gnuradio_swig_py_general.i +gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc: gnuradio_swig_py_general.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -469,9 +499,10 @@ gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general- fi; $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_general_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \ - -module gnuradio_swig_py_general -o gnuradio_swig_py_general-guile.cc $(WHAT); then \ + -module gnuradio_swig_py_general -o gnuradio_swig_py_general_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \ @@ -483,6 +514,7 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp: $(RM) $(DEPDIR)/gnuradio_swig_py_general.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp +endif $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -495,7 +527,7 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_general_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \ - -module gnuradio_swig_py_general -o gnuradio_swig_py_general-python.cc $(WHAT); then \ + -module gnuradio_swig_py_general -o gnuradio_swig_py_general_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \ @@ -624,7 +656,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen-python.cc +swig_built_sources += gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -635,21 +667,21 @@ gnuradio_swig_py_gengen_swiginclude_HEADERS = \ $(gnuradio_swig_py_gengen_swiginclude_headers) gnuradio_swig_py_gengen_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_gengen.la + _gnuradio_swig_py_gengen_python.la -_gnuradio_swig_py_gengen_la_SOURCES = \ - gnuradio_swig_py_gengen-python.cc \ +_gnuradio_swig_py_gengen_python_la_SOURCES = \ + gnuradio_swig_py_gengen_python.cc \ $(gnuradio_swig_py_gengen_la_swig_sources) -_gnuradio_swig_py_gengen_la_LIBADD = \ +_gnuradio_swig_py_gengen_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_gengen_la_swig_libadd) -_gnuradio_swig_py_gengen_la_LDFLAGS = \ +_gnuradio_swig_py_gengen_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_gengen_la_swig_ldflags) -_gnuradio_swig_py_gengen_la_CXXFLAGS = \ +_gnuradio_swig_py_gengen_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_gengen_la_swig_cxxflags) @@ -657,9 +689,23 @@ gnuradio_swig_py_gengen_python_PYTHON = \ gnuradio_swig_py_gengen.py \ $(gnuradio_swig_py_gengen_python) +if GUILE +gnuradio_swig_py_gengen_pylib_LTLIBRARIES += _gnuradio_swig_py_gengen_guile.la + +_gnuradio_swig_py_gengen_guile_la_SOURCES = \ + gnuradio_swig_py_gengen_guile.cc \ + $(gnuradio_swig_py_gengen_la_swig_sources) + +# Guile can use the same flags as python does +_gnuradio_swig_py_gengen_guile_la_LIBADD = $(_gnuradio_swig_py_gengen_python_la_LIBADD) +_gnuradio_swig_py_gengen_guile_la_LDFLAGS = $(_gnuradio_swig_py_gengen_python_la_LDFLAGS) +_gnuradio_swig_py_gengen_guile_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen-python.cc: gnuradio_swig_py_gengen.i +gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc: gnuradio_swig_py_gengen.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -745,9 +791,10 @@ gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen-pyt fi; $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \ - -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen-guile.cc $(WHAT); then \ + -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \ @@ -759,6 +806,7 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp: $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp +endif $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -771,7 +819,7 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \ - -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen-python.cc $(WHAT); then \ + -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \ @@ -900,7 +948,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_filter.py gnuradio_swig_py_filter-python.cc +swig_built_sources += gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -911,21 +959,21 @@ gnuradio_swig_py_filter_swiginclude_HEADERS = \ $(gnuradio_swig_py_filter_swiginclude_headers) gnuradio_swig_py_filter_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_filter.la + _gnuradio_swig_py_filter_python.la -_gnuradio_swig_py_filter_la_SOURCES = \ - gnuradio_swig_py_filter-python.cc \ +_gnuradio_swig_py_filter_python_la_SOURCES = \ + gnuradio_swig_py_filter_python.cc \ $(gnuradio_swig_py_filter_la_swig_sources) -_gnuradio_swig_py_filter_la_LIBADD = \ +_gnuradio_swig_py_filter_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_filter_la_swig_libadd) -_gnuradio_swig_py_filter_la_LDFLAGS = \ +_gnuradio_swig_py_filter_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_filter_la_swig_ldflags) -_gnuradio_swig_py_filter_la_CXXFLAGS = \ +_gnuradio_swig_py_filter_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_filter_la_swig_cxxflags) @@ -933,9 +981,23 @@ gnuradio_swig_py_filter_python_PYTHON = \ gnuradio_swig_py_filter.py \ $(gnuradio_swig_py_filter_python) +if GUILE +gnuradio_swig_py_filter_pylib_LTLIBRARIES += _gnuradio_swig_py_filter_guile.la + +_gnuradio_swig_py_filter_guile_la_SOURCES = \ + gnuradio_swig_py_filter_guile.cc \ + $(gnuradio_swig_py_filter_la_swig_sources) + +# Guile can use the same flags as python does +_gnuradio_swig_py_filter_guile_la_LIBADD = $(_gnuradio_swig_py_filter_python_la_LIBADD) +_gnuradio_swig_py_filter_guile_la_LDFLAGS = $(_gnuradio_swig_py_filter_python_la_LDFLAGS) +_gnuradio_swig_py_filter_guile_la_CXXFLAGS = $(_gnuradio_swig_py_filter_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter-python.cc: gnuradio_swig_py_filter.i +gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc: gnuradio_swig_py_filter.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1021,9 +1083,10 @@ gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter-pyt fi; $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_filter_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \ - -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter-guile.cc $(WHAT); then \ + -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \ @@ -1035,6 +1098,7 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp: $(RM) $(DEPDIR)/gnuradio_swig_py_filter.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp +endif $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -1047,7 +1111,7 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_filter_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \ - -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter-python.cc $(WHAT); then \ + -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \ @@ -1176,7 +1240,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_io.py gnuradio_swig_py_io-python.cc +swig_built_sources += gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -1187,21 +1251,21 @@ gnuradio_swig_py_io_swiginclude_HEADERS = \ $(gnuradio_swig_py_io_swiginclude_headers) gnuradio_swig_py_io_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_io.la + _gnuradio_swig_py_io_python.la -_gnuradio_swig_py_io_la_SOURCES = \ - gnuradio_swig_py_io-python.cc \ +_gnuradio_swig_py_io_python_la_SOURCES = \ + gnuradio_swig_py_io_python.cc \ $(gnuradio_swig_py_io_la_swig_sources) -_gnuradio_swig_py_io_la_LIBADD = \ +_gnuradio_swig_py_io_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_io_la_swig_libadd) -_gnuradio_swig_py_io_la_LDFLAGS = \ +_gnuradio_swig_py_io_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_io_la_swig_ldflags) -_gnuradio_swig_py_io_la_CXXFLAGS = \ +_gnuradio_swig_py_io_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_io_la_swig_cxxflags) @@ -1209,9 +1273,23 @@ gnuradio_swig_py_io_python_PYTHON = \ gnuradio_swig_py_io.py \ $(gnuradio_swig_py_io_python) +if GUILE +gnuradio_swig_py_io_pylib_LTLIBRARIES += _gnuradio_swig_py_io_guile.la + +_gnuradio_swig_py_io_guile_la_SOURCES = \ + gnuradio_swig_py_io_guile.cc \ + $(gnuradio_swig_py_io_la_swig_sources) + +# Guile can use the same flags as python does +_gnuradio_swig_py_io_guile_la_LIBADD = $(_gnuradio_swig_py_io_python_la_LIBADD) +_gnuradio_swig_py_io_guile_la_LDFLAGS = $(_gnuradio_swig_py_io_python_la_LDFLAGS) +_gnuradio_swig_py_io_guile_la_CXXFLAGS = $(_gnuradio_swig_py_io_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io-python.cc: gnuradio_swig_py_io.i +gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc: gnuradio_swig_py_io.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1297,9 +1375,10 @@ gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io-python.cc: gnur fi; $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_io_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \ - -module gnuradio_swig_py_io -o gnuradio_swig_py_io-guile.cc $(WHAT); then \ + -module gnuradio_swig_py_io -o gnuradio_swig_py_io_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \ @@ -1311,6 +1390,7 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp: $(RM) $(DEPDIR)/gnuradio_swig_py_io.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp +endif $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -1323,7 +1403,7 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_io_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \ - -module gnuradio_swig_py_io -o gnuradio_swig_py_io-python.cc $(WHAT); then \ + -module gnuradio_swig_py_io -o gnuradio_swig_py_io_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \ @@ -1452,7 +1532,7 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier-python.cc +swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -1463,21 +1543,21 @@ gnuradio_swig_py_hier_swiginclude_HEADERS = \ $(gnuradio_swig_py_hier_swiginclude_headers) gnuradio_swig_py_hier_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_hier.la + _gnuradio_swig_py_hier_python.la -_gnuradio_swig_py_hier_la_SOURCES = \ - gnuradio_swig_py_hier-python.cc \ +_gnuradio_swig_py_hier_python_la_SOURCES = \ + gnuradio_swig_py_hier_python.cc \ $(gnuradio_swig_py_hier_la_swig_sources) -_gnuradio_swig_py_hier_la_LIBADD = \ +_gnuradio_swig_py_hier_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_hier_la_swig_libadd) -_gnuradio_swig_py_hier_la_LDFLAGS = \ +_gnuradio_swig_py_hier_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_hier_la_swig_ldflags) -_gnuradio_swig_py_hier_la_CXXFLAGS = \ +_gnuradio_swig_py_hier_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_hier_la_swig_cxxflags) @@ -1485,9 +1565,23 @@ gnuradio_swig_py_hier_python_PYTHON = \ gnuradio_swig_py_hier.py \ $(gnuradio_swig_py_hier_python) +if GUILE +gnuradio_swig_py_hier_pylib_LTLIBRARIES += _gnuradio_swig_py_hier_guile.la + +_gnuradio_swig_py_hier_guile_la_SOURCES = \ + gnuradio_swig_py_hier_guile.cc \ + $(gnuradio_swig_py_hier_la_swig_sources) + +# Guile can use the same flags as python does +_gnuradio_swig_py_hier_guile_la_LIBADD = $(_gnuradio_swig_py_hier_python_la_LIBADD) +_gnuradio_swig_py_hier_guile_la_LDFLAGS = $(_gnuradio_swig_py_hier_python_la_LDFLAGS) +_gnuradio_swig_py_hier_guile_la_CXXFLAGS = $(_gnuradio_swig_py_hier_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier-python.cc: gnuradio_swig_py_hier.i +gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc: gnuradio_swig_py_hier.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1573,9 +1667,10 @@ gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier-python.cc fi; $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_hier_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \ - -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier-guile.cc $(WHAT); then \ + -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \ @@ -1587,6 +1682,7 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp: $(RM) $(DEPDIR)/gnuradio_swig_py_hier.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp +endif $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -1599,7 +1695,7 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_hier_swig_args) \ -MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \ - -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier-python.cc $(WHAT); then \ + -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \ -- cgit From 07272e97741fa028101e09b09ced24804f562852 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 14 Oct 2010 12:35:14 -0600 Subject: look for the python name in the dependency for gnuradio_swig_bug_workaround.h --- gnuradio-core/src/lib/swig/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index afd6ef268..3ae6a5386 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -42,8 +42,8 @@ ourpython_PYTHON = gnuradio_swig_python.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... -gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.cc $(srcdir)/gen-swig-bug-fix - $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@ +gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime_python.cc $(srcdir)/gen-swig-bug-fix + $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime_python.cc $@ # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ -- cgit From ae3875c7116fa910da0b4d407550265852d0c94f Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 14 Oct 2010 19:00:35 -0600 Subject: guile doesn't seem to need the header files --- gnuradio-core/src/lib/swig/Makefile.am | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 3ae6a5386..391182616 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -32,7 +32,6 @@ swiginclude_HEADERS = \ gnuradio.i \ gr_swig_block_magic.i \ gr_shared_ptr.i -# std_complex.i # special install for this top-level Python script which includes all # of the split Python libraries. @@ -42,8 +41,12 @@ ourpython_PYTHON = gnuradio_swig_python.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... -gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime_python.cc $(srcdir)/gen-swig-bug-fix - $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime_python.cc $@ +workarounds = gnuradio_swig_py_runtime_python.cc +# if GUILE +# workarounds += gnuradio_swig_py_runtime_guile.cc +# endif +gnuradio_swig_bug_workaround.h : $(workarounds) $(srcdir)/gen-swig-bug-fix + $(PYTHON) $(srcdir)/gen-swig-bug-fix $(workarounds) $@ # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -90,13 +93,13 @@ include $(top_srcdir)/Makefile.swig # include the SWIG-generated .h files in the BUILT SOURCES, since they # aren't by default when using Makefile.swig; order doesn't matter. PYTHON_GEN = \ - gnuradio_swig_py_runtime.h \ - gnuradio_swig_py_general.h \ - gnuradio_swig_py_gengen.h \ - gnuradio_swig_py_filter.h \ - gnuradio_swig_py_io.h \ - gnuradio_swig_py_hier.h \ - $(grinclude_HEADERS) \ + gnuradio_swig_py_runtime_python.h \ + gnuradio_swig_py_general_python.h \ + gnuradio_swig_py_gengen_python.h \ + gnuradio_swig_py_filter_python.h \ + gnuradio_swig_py_io_python.h \ + gnuradio_swig_py_hier_python.h \ + $(grinclude_HEADERS) \ $(swig_built_sources) BUILT_GUILE = \ @@ -104,9 +107,9 @@ BUILT_GUILE = \ $(swig_built_sources) BUILT_SOURCES = $(PYTHON_GEN) -if GUILE -BUILT_SOURCES += $(BUILT_GUILE) -endif +# if GUILE +# BUILT_SOURCES += $(BUILT_GUILE) +# endif # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) -- cgit From 826869b666094bba2349e725e90878cc7e0aad8b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 14 Oct 2010 20:15:42 -0600 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 318 ++++++++++++++++----------- 1 file changed, 186 insertions(+), 132 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 9d7112169..42c431204 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -121,7 +121,7 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc: gnuradio_swig_py_runtime.i +gnuradio_swig_py_runtime_python.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc gnuradio_swig_py_runtime_guile.cc gnuradio_swig_py_runtime_guile.h: gnuradio_swig_py_runtime.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -209,19 +209,28 @@ gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_ $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \ -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \ - > $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_runtime.Sd $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.d + cp $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std $(DEPDIR)/gnuradio_swig_py_runtime_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_guile.d@am__quote@ endif $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp: @@ -234,17 +243,17 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime_python.Std \ -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime.Std \ - > $(DEPDIR)/gnuradio_swig_py_runtime.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_runtime.Sd $(DEPDIR)/gnuradio_swig_py_runtime.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime_python.Std \ + > $(DEPDIR)/gnuradio_swig_py_runtime_python.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_runtime_python.Sd $(DEPDIR)/gnuradio_swig_py_runtime_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -256,27 +265,27 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.d + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/gnuradio_swig_py_runtime.Std $(DEPDIR)/gnuradio_swig_py_runtime.d + cp $(DEPDIR)/gnuradio_swig_py_runtime_python.Std $(DEPDIR)/gnuradio_swig_py_runtime_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime_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)/gnuradio_swig_py_runtime.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime.Std + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -288,7 +297,7 @@ $(DEPDIR)/gnuradio_swig_py_runtime-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)/gnuradio_swig_py_runtime.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_python.d@am__quote@ # -*- Makefile -*- # @@ -413,7 +422,7 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc: gnuradio_swig_py_general.i +gnuradio_swig_py_general_python.h gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc gnuradio_swig_py_general_guile.cc gnuradio_swig_py_general_guile.h: gnuradio_swig_py_general.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -501,19 +510,28 @@ gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general_ $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_general_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_general_guile.Std \ -module gnuradio_swig_py_general -o gnuradio_swig_py_general_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \ - > $(DEPDIR)/gnuradio_swig_py_general.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_general.Sd $(DEPDIR)/gnuradio_swig_py_general.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.d + cp $(DEPDIR)/gnuradio_swig_py_general_guile.Std $(DEPDIR)/gnuradio_swig_py_general_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_general_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_guile.d@am__quote@ endif $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp: @@ -526,17 +544,17 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_general_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_general.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_general_python.Std \ -module gnuradio_swig_py_general -o gnuradio_swig_py_general_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general.Std \ - > $(DEPDIR)/gnuradio_swig_py_general.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_general.Sd $(DEPDIR)/gnuradio_swig_py_general.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general_python.Std \ + > $(DEPDIR)/gnuradio_swig_py_general_python.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_general_python.Sd $(DEPDIR)/gnuradio_swig_py_general_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -548,27 +566,27 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_general.d + $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/gnuradio_swig_py_general.Std $(DEPDIR)/gnuradio_swig_py_general.d + cp $(DEPDIR)/gnuradio_swig_py_general_python.Std $(DEPDIR)/gnuradio_swig_py_general_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/gnuradio_swig_py_general.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_general_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)/gnuradio_swig_py_general.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_general.Std + $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -580,7 +598,7 @@ $(DEPDIR)/gnuradio_swig_py_general-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)/gnuradio_swig_py_general.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_python.d@am__quote@ # -*- Makefile -*- # @@ -705,7 +723,7 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc: gnuradio_swig_py_gengen.i +gnuradio_swig_py_gengen_python.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc gnuradio_swig_py_gengen_guile.cc gnuradio_swig_py_gengen_guile.h: gnuradio_swig_py_gengen.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -793,19 +811,28 @@ gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_pyt $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \ -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \ - > $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_gengen.Sd $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.d + cp $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std $(DEPDIR)/gnuradio_swig_py_gengen_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_guile.d@am__quote@ endif $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp: @@ -818,17 +845,17 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen_python.Std \ -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen.Std \ - > $(DEPDIR)/gnuradio_swig_py_gengen.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_gengen.Sd $(DEPDIR)/gnuradio_swig_py_gengen.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen_python.Std \ + > $(DEPDIR)/gnuradio_swig_py_gengen_python.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_gengen_python.Sd $(DEPDIR)/gnuradio_swig_py_gengen_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -840,27 +867,27 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.d + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/gnuradio_swig_py_gengen.Std $(DEPDIR)/gnuradio_swig_py_gengen.d + cp $(DEPDIR)/gnuradio_swig_py_gengen_python.Std $(DEPDIR)/gnuradio_swig_py_gengen_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen_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)/gnuradio_swig_py_gengen.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen.Std + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -872,7 +899,7 @@ $(DEPDIR)/gnuradio_swig_py_gengen-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)/gnuradio_swig_py_gengen.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_python.d@am__quote@ # -*- Makefile -*- # @@ -997,7 +1024,7 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc: gnuradio_swig_py_filter.i +gnuradio_swig_py_filter_python.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc gnuradio_swig_py_filter_guile.cc gnuradio_swig_py_filter_guile.h: gnuradio_swig_py_filter.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1085,19 +1112,28 @@ gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter_pyt $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_filter_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \ -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \ - > $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_filter.Sd $(DEPDIR)/gnuradio_swig_py_filter.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.d + cp $(DEPDIR)/gnuradio_swig_py_filter_guile.Std $(DEPDIR)/gnuradio_swig_py_filter_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_guile.d@am__quote@ endif $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp: @@ -1110,17 +1146,17 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_filter_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_filter.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_filter_python.Std \ -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter.Std \ - > $(DEPDIR)/gnuradio_swig_py_filter.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_filter.Sd $(DEPDIR)/gnuradio_swig_py_filter.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter_python.Std \ + > $(DEPDIR)/gnuradio_swig_py_filter_python.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_filter_python.Sd $(DEPDIR)/gnuradio_swig_py_filter_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -1132,27 +1168,27 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.d + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/gnuradio_swig_py_filter.Std $(DEPDIR)/gnuradio_swig_py_filter.d + cp $(DEPDIR)/gnuradio_swig_py_filter_python.Std $(DEPDIR)/gnuradio_swig_py_filter_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/gnuradio_swig_py_filter.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_filter_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)/gnuradio_swig_py_filter.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_filter.Std + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -1164,7 +1200,7 @@ $(DEPDIR)/gnuradio_swig_py_filter-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)/gnuradio_swig_py_filter.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_python.d@am__quote@ # -*- Makefile -*- # @@ -1289,7 +1325,7 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc: gnuradio_swig_py_io.i +gnuradio_swig_py_io_python.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc gnuradio_swig_py_io_guile.cc gnuradio_swig_py_io_guile.h: gnuradio_swig_py_io.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1377,19 +1413,28 @@ gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc: gnur $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_io_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_io_guile.Std \ -module gnuradio_swig_py_io -o gnuradio_swig_py_io_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \ - > $(DEPDIR)/gnuradio_swig_py_io.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_io.Sd $(DEPDIR)/gnuradio_swig_py_io.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.d + cp $(DEPDIR)/gnuradio_swig_py_io_guile.Std $(DEPDIR)/gnuradio_swig_py_io_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_io_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_guile.d@am__quote@ endif $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp: @@ -1402,17 +1447,17 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_io_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_io.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_io_python.Std \ -module gnuradio_swig_py_io -o gnuradio_swig_py_io_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io.Std \ - > $(DEPDIR)/gnuradio_swig_py_io.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_io.Sd $(DEPDIR)/gnuradio_swig_py_io.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io_python.Std \ + > $(DEPDIR)/gnuradio_swig_py_io_python.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_io_python.Sd $(DEPDIR)/gnuradio_swig_py_io_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -1424,27 +1469,27 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_io.d + $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/gnuradio_swig_py_io.Std $(DEPDIR)/gnuradio_swig_py_io.d + cp $(DEPDIR)/gnuradio_swig_py_io_python.Std $(DEPDIR)/gnuradio_swig_py_io_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/gnuradio_swig_py_io.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_io_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)/gnuradio_swig_py_io.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_io.Std + $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -1456,7 +1501,7 @@ $(DEPDIR)/gnuradio_swig_py_io-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)/gnuradio_swig_py_io.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_python.d@am__quote@ # -*- Makefile -*- # @@ -1581,7 +1626,7 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc: gnuradio_swig_py_hier.i +gnuradio_swig_py_hier_python.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc gnuradio_swig_py_hier_guile.cc gnuradio_swig_py_hier_guile.h: gnuradio_swig_py_hier.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1669,19 +1714,28 @@ gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp: if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_hier_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \ -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \ - > $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_hier.Sd $(DEPDIR)/gnuradio_swig_py_hier.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.S*; exit 1; \ fi; touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.d + cp $(DEPDIR)/gnuradio_swig_py_hier_guile.Std $(DEPDIR)/gnuradio_swig_py_hier_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_guile.d@am__quote@ endif $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp: @@ -1694,17 +1748,17 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp: ## post-processing on 'mingw32' host OS for the dependency file. ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_hier_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_hier.Std \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_hier_python.Std \ -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier.Std \ - > $(DEPDIR)/gnuradio_swig_py_hier.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_hier.Sd $(DEPDIR)/gnuradio_swig_py_hier.Std; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier_python.Std \ + > $(DEPDIR)/gnuradio_swig_py_hier_python.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_hier_python.Sd $(DEPDIR)/gnuradio_swig_py_hier_python.Std; \ fi; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.S*; exit 1; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.S*; exit 1; \ fi; ## ## Mess with the SWIG output .Std dependency file, to create a @@ -1716,27 +1770,27 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp: ## ## (1) remove the current dependency file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.d + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.d ## ## (2) Copy the whole SWIG file: ## - cp $(DEPDIR)/gnuradio_swig_py_hier.Std $(DEPDIR)/gnuradio_swig_py_hier.d + cp $(DEPDIR)/gnuradio_swig_py_hier_python.Std $(DEPDIR)/gnuradio_swig_py_hier_python.d ## ## (3) all a carriage return to the end of the dependency file. ## - echo "" >> $(DEPDIR)/gnuradio_swig_py_hier.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_hier_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)/gnuradio_swig_py_hier.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier_python.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier_python.d ## ## (5) remove the SWIG-generated file ## - $(RM) $(DEPDIR)/gnuradio_swig_py_hier.Std + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.Std ## ## Create the stamp for this filename generation, to signal success in ## executing this rule; allows other threads waiting on this process @@ -1748,5 +1802,5 @@ $(DEPDIR)/gnuradio_swig_py_hier-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)/gnuradio_swig_py_hier.d@am__quote@ +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_python.d@am__quote@ -- cgit From 1caa7d707377d093cf7d9b7e65176848a93bba5c Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 16 Oct 2010 08:51:47 -0600 Subject: wrap all %pythoncode in SWIGPYTHON so they don't get inserted into other languages --- gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i index 78e838012..e25afbdb5 100644 --- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i +++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i @@ -30,10 +30,15 @@ typedef boost::shared_ptr NAME ## _sptr; %template(NAME ## _sptr) boost::shared_ptr; %rename(BASE_NAME) PKG ## _make_ ## BASE_NAME; +#ifdef SWIGPYTHON %pythoncode %{ NAME ## _sptr.block = lambda self: NAME ## _block (self) NAME ## _sptr.__repr__ = lambda self: "" % (self.name(), self.unique_id ()) %} +#endif %ignore NAME; %enddef + +#ifdef SWIGGUILE +#endif -- cgit From b72fd746010bc724acfb6a7c5ae2be82e6b828c2 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 16 Oct 2010 08:54:32 -0600 Subject: include complex too for std::complex --- gnuradio-core/src/lib/swig/gnuradio.i | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index 7d0241f1c..ec0264107 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -32,6 +32,7 @@ #include "gnuradio_swig_bug_workaround.h" // mandatory bug fix #include #include // size_t +#include %} %feature("autodoc","1"); @@ -57,6 +58,7 @@ namespace std { %template() vector; %template() vector; %template() vector; + // %template() std::complex; %template() vector< std::complex >; %template() vector< std::vector< unsigned char > >; -- cgit From 54bfe42875fc8625b193b63dc8a4d7327e89edc2 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 16 Oct 2010 09:47:39 -0600 Subject: add #warning for missing guile support --- gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 1 + 1 file changed, 1 insertion(+) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i index e25afbdb5..99e01b0ef 100644 --- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i +++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i @@ -41,4 +41,5 @@ NAME ## _sptr.__repr__ = lambda self: "" % (self.name(), self. %enddef #ifdef SWIGGUILE +#warning "gr_block_sptr needs to be implemented!" #endif -- cgit From 1366ce59314bb24825715a1a041b63081b5181e2 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 12:48:54 -0600 Subject: add the load-extension command for guile --- gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i | 6 ++++++ gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i | 6 ++++++ gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i | 6 ++++++ gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i | 6 ++++++ gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i | 6 ++++++ gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i | 7 +++++++ 6 files changed, 37 insertions(+) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i index 6396a97d0..42e46d444 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i @@ -28,3 +28,9 @@ %include "gnuradio.i" // the common stuff %include "filter.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "_gnuradio_swig_py_filter_guile" "SWIG_init") +%} + #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i index 3ab1b056a..dcf284ab3 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i @@ -28,3 +28,9 @@ %include "gnuradio.i" // the common stuff %include "general.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "_gnuradio_swig_py_general_guile" "SWIG_init") +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i index 95e85cf6b..ee18abc18 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i @@ -28,3 +28,9 @@ %include "gnuradio.i" // the common stuff %include "gengen.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "_gnuradio_swig_py_gengen_guile" "SWIG_init") +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i index a82b5ae41..36ee3c40d 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i @@ -28,3 +28,9 @@ %include "gnuradio.i" // the common stuff %include "hier.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "_gnuradio_swig_py_heir_guile" "SWIG_init") +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i index 9318f5d86..cb8509b10 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i @@ -28,3 +28,9 @@ %include "gnuradio.i" // the common stuff %include "io.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "_gnuradio_swig_py_io_guile" "SWIG_init") +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i index 8f444f9c5..a3ab8d012 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i @@ -30,3 +30,10 @@ %include "gnuradio.i" // the common stuff %include "runtime.i" + + +#if SWIGGUILE +%scheme %{ +(load-extension "_gnuradio_swig_py_runtime_guile" "SWIG_init") +%} +#endif -- cgit From 2038e0981a95ac2093843cdc8c82e5fa0bdeadfa Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 12:52:26 -0600 Subject: use foreach...subst to make a list of generated files instead of cut & paste for BUILT_SOURCES --- gnuradio-core/src/lib/swig/Makefile.am | 45 ++++++++++++---------------------- 1 file changed, 16 insertions(+), 29 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 391182616..cbb2a80a5 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -20,6 +20,9 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + +BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources) if PYTHON AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ @@ -41,16 +44,11 @@ ourpython_PYTHON = gnuradio_swig_python.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... -workarounds = gnuradio_swig_py_runtime_python.cc -# if GUILE -# workarounds += gnuradio_swig_py_runtime_guile.cc -# endif -gnuradio_swig_bug_workaround.h : $(workarounds) $(srcdir)/gen-swig-bug-fix - $(PYTHON) $(srcdir)/gen-swig-bug-fix $(workarounds) $@ +gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime_python.cc $(srcdir)/gen-swig-bug-fix + $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime_python.cc $@ # C/C++ headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - gnuradio_swig_bug_workaround.h +grinclude_HEADERS = gnuradio_swig_bug_workaround.h # ---------------------------------------------------------------- # We've split the previously monstrous gnuradio_swig_python into 6 @@ -86,31 +84,20 @@ gnuradio_swig_py_filter_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_swig_py_io_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_swig_py_hier_la_swig_libadd = $(GNURADIO_CORE_LA) -include $(top_srcdir)/Makefile.swig - # add some of the variables generated inside the Makefile.swig # include the SWIG-generated .h files in the BUILT SOURCES, since they # aren't by default when using Makefile.swig; order doesn't matter. -PYTHON_GEN = \ - gnuradio_swig_py_runtime_python.h \ - gnuradio_swig_py_general_python.h \ - gnuradio_swig_py_gengen_python.h \ - gnuradio_swig_py_filter_python.h \ - gnuradio_swig_py_io_python.h \ - gnuradio_swig_py_hier_python.h \ - $(grinclude_HEADERS) \ - $(swig_built_sources) - -BUILT_GUILE = \ - $(grinclude_HEADERS) \ - $(swig_built_sources) - -BUILT_SOURCES = $(PYTHON_GEN) -# if GUILE -# BUILT_SOURCES += $(BUILT_GUILE) -# endif +PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,_python.h,$(HFILE))) +BUILT_SOURCES += $(PYTHON_GEN) + +endif # end of if python + +if GUILE +GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,_guile.h,$(HFILE))) +BUILT_SOURCES += $(GUILE_GEN) +endif # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) -endif # end of if python + -- cgit From c4f8aab885d6a188591cebc9683cc297b60b445c Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 17:26:04 -0600 Subject: add top level guile file --- gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm new file mode 100644 index 000000000..f57cd1982 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm @@ -0,0 +1,31 @@ +;;; +;;; Copyright 2006,2009 Free Software Foundation, Inc. +;;; +;;; This file is part of GNU Radio +;;; +;;; GNU Radio is free software; you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3, or (at your option) +;;; any later version. +;;; +;;; GNU Radio is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License along +;;; with this program; if not, write to the Free Software Foundation, Inc., +;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +;;; + +(set! %load-path (append %load-path '("/usr/lib/guile/gnuradio"))) + +;;; %load-path() +;;; (list (%site-dir) (%library-dir) (%package-data-dir) "."), + +;; (load "gnuradio/gnuradio_swig_py_filter.scm") +;; (load "gnuradio/gnuradio_swig_py_general.scm") +;; (load "gnuradio/gnuradio_swig_py_gengen.scm") +;; (load "gnuradio/gnuradio_swig_py_heir.scm") +(load "gnuradio/gnuradio_swig_py_io.scm") +(load "gnuradio/gnuradio_swig_py_runtime.scm") -- cgit From 2ecda7ddb8dc062caa2e87fa1a53c09ca483af4c Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 18:15:04 -0600 Subject: load what'll load for now --- gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm index f57cd1982..687f7f1f5 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm @@ -18,14 +18,17 @@ ;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ;;; -(set! %load-path (append %load-path '("/usr/lib/guile/gnuradio"))) +;; Only use these if load-* fails t find a .scm or .so. If you can't +;; find a .so. try running ldconfig. guile seems to only load modules +;; that are in the ldconfig paths. +;; (set! %load-path (append %load-path '("/usr/lib/guile/gnuradio"))) +;; (set! %load-path (append %load-path '("/usr/share/gnuradio"))) -;;; %load-path() -;;; (list (%site-dir) (%library-dir) (%package-data-dir) "."), +(load "gnuradio/gnuradio_swig_py_filter.scm") +(load "gnuradio/gnuradio_swig_py_io.scm") +(load "gnuradio/gnuradio_swig_py_runtime.scm") -;; (load "gnuradio/gnuradio_swig_py_filter.scm") +;; FIXME: these don't load for sme reason ;; (load "gnuradio/gnuradio_swig_py_general.scm") ;; (load "gnuradio/gnuradio_swig_py_gengen.scm") ;; (load "gnuradio/gnuradio_swig_py_heir.scm") -(load "gnuradio/gnuradio_swig_py_io.scm") -(load "gnuradio/gnuradio_swig_py_runtime.scm") -- cgit From 0876f100362f6275e9d16bfed0fc389d082f86b9 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 18:15:41 -0600 Subject: install the scm files for guile too --- gnuradio-core/src/lib/swig/Makefile.am | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index cbb2a80a5..73ba23b84 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -41,6 +41,12 @@ swiginclude_HEADERS = \ ourpythondir = $(grpythondir)/gr ourpython_PYTHON = gnuradio_swig_python.py +# This is the top level guile file, which loads all the other scm files +# for gnuradio. This has to be installed top level to be found in the +# default search path. +guiledir = @GUILE_PKDATADIR@ +guile_DATA = gnuradio_swig_guile.scm + # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... @@ -94,10 +100,17 @@ BUILT_SOURCES += $(PYTHON_GEN) endif # end of if python if GUILE -GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,_guile.h,$(HFILE))) +GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.scm,$(HFILE))) BUILT_SOURCES += $(GUILE_GEN) endif # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +#gnuradio_swig_py_runtime.scm: gnuradio_swig_py_runtime.i +# gnuradio_swig_py_runtime_python.cc: gnuradio_swig_py_runtime.i +# .cc..i: +# @echo "FIXME1: $(BUILT_SOURCES) $<" + +# .scm..i: +# @echo "FIXME2: $(BUILT_SOURCES) $<" -- cgit From 5ea1059c943a8a6dcb67c2a151f27b84b653f549 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 18:15:58 -0600 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 558 +++++++++++++++++++-------- 1 file changed, 390 insertions(+), 168 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 42c431204..091cdf82b 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -38,6 +38,16 @@ gnuradio_swig_py_runtime_pylibdir_category ?= $(gnuradio_swig_py_runtime_pythond gnuradio_swig_py_runtime_pythondir = $(pythondir)/$(gnuradio_swig_py_runtime_pythondir_category) gnuradio_swig_py_runtime_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_runtime_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. +gnuradio_swig_py_runtime_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/gnuradio_swig_py_runtime +# FIXME: determince whether these should be installed with gnuradio. +gnuradio_swig_py_runtime_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. gnuradio_swig_py_runtime_swigincludedir = $(swigincludedir) @@ -73,6 +83,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc +if GUILE +swig_built_sources += gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime_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 @@ gnuradio_swig_py_runtime_python_PYTHON = \ $(gnuradio_swig_py_runtime_python) if GUILE -gnuradio_swig_py_runtime_pylib_LTLIBRARIES += _gnuradio_swig_py_runtime_guile.la - +gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = _gnuradio_swig_py_runtime_guile.la _gnuradio_swig_py_runtime_guile_la_SOURCES = \ - gnuradio_swig_py_runtime_guile.cc \ + gnuradio_swig_py_runtime_guile.cc \ $(gnuradio_swig_py_runtime_la_swig_sources) +gnuradio_swig_py_runtime_scm_DATA = gnuradio_swig_py_runtime.scm # Guile can use the same flags as python does _gnuradio_swig_py_runtime_guile_la_LIBADD = $(_gnuradio_swig_py_runtime_python_la_LIBADD) @@ -121,7 +134,8 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_runtime_python.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc gnuradio_swig_py_runtime_guile.cc gnuradio_swig_py_runtime_guile.h: gnuradio_swig_py_runtime.i +# $(python_deps) $(guile_deps): gnuradio_swig_py_runtime.i +gnuradio_swig_py_runtime_python.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc: gnuradio_swig_py_runtime.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 @@ gnuradio_swig_py_runtime_python.h gnuradio_swig_py_runtime.py gnuradio_swig_py_r ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-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 @@ gnuradio_swig_py_runtime_python.h gnuradio_swig_py_runtime.py gnuradio_swig_py_r exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_runtime-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. +gnuradio_swig_py_runtime_guile.h gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime_guile.cc: gnuradio_swig_py_runtime.i if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \ - -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \ - fi; \ + trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_runtime-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.S*; exit 1; \ + while test -d $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp; \ + exit $$?; \ fi; - touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.d - cp $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std $(DEPDIR)/gnuradio_swig_py_runtime_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_guile.d@am__quote@ -endif +endif # end of GUILE $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -299,6 +303,39 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_python.d@am__quote@ +if GUILE +$(DEPDIR)/gnuradio_swig_py_runtime-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) $(gnuradio_swig_py_runtime_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \ + -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.d + cp $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std $(DEPDIR)/gnuradio_swig_py_runtime_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp +else + touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp +endif + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_guile.d@am__quote@ + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i + # -*- Makefile -*- # # Copyright 2009 Free Software Foundation, Inc. @@ -339,6 +376,16 @@ gnuradio_swig_py_general_pylibdir_category ?= $(gnuradio_swig_py_general_pythond gnuradio_swig_py_general_pythondir = $(pythondir)/$(gnuradio_swig_py_general_pythondir_category) gnuradio_swig_py_general_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_general_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. +gnuradio_swig_py_general_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/gnuradio_swig_py_general +# FIXME: determince whether these should be installed with gnuradio. +gnuradio_swig_py_general_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. gnuradio_swig_py_general_swigincludedir = $(swigincludedir) @@ -374,6 +421,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc +if GUILE +swig_built_sources += gnuradio_swig_py_general.scm gnuradio_swig_py_general_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 @@ gnuradio_swig_py_general_python_PYTHON = \ $(gnuradio_swig_py_general_python) if GUILE -gnuradio_swig_py_general_pylib_LTLIBRARIES += _gnuradio_swig_py_general_guile.la - +gnuradio_swig_py_general_scmlib_LTLIBRARIES = _gnuradio_swig_py_general_guile.la _gnuradio_swig_py_general_guile_la_SOURCES = \ - gnuradio_swig_py_general_guile.cc \ + gnuradio_swig_py_general_guile.cc \ $(gnuradio_swig_py_general_la_swig_sources) +gnuradio_swig_py_general_scm_DATA = gnuradio_swig_py_general.scm # Guile can use the same flags as python does _gnuradio_swig_py_general_guile_la_LIBADD = $(_gnuradio_swig_py_general_python_la_LIBADD) @@ -422,7 +472,8 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_general_python.h gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc gnuradio_swig_py_general_guile.cc gnuradio_swig_py_general_guile.h: gnuradio_swig_py_general.i +# $(python_deps) $(guile_deps): gnuradio_swig_py_general.i +gnuradio_swig_py_general_python.h gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc: gnuradio_swig_py_general.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 @@ gnuradio_swig_py_general_python.h gnuradio_swig_py_general.py gnuradio_swig_py_g ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-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,32 +557,23 @@ gnuradio_swig_py_general_python.h gnuradio_swig_py_general.py gnuradio_swig_py_g exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_general-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. +gnuradio_swig_py_general_guile.h gnuradio_swig_py_general.scm gnuradio_swig_py_general_guile.cc: gnuradio_swig_py_general.i if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_general_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_general_guile.Std \ - -module gnuradio_swig_py_general -o gnuradio_swig_py_general_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \ - fi; \ + trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_general-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.S*; exit 1; \ + while test -d $(DEPDIR)/gnuradio_swig_py_general-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp; \ + exit $$?; \ fi; - touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.d - cp $(DEPDIR)/gnuradio_swig_py_general_guile.Std $(DEPDIR)/gnuradio_swig_py_general_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_general_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_guile.d@am__quote@ -endif +endif # end of GUILE $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -600,6 +641,39 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_python.d@am__quote@ +if GUILE +$(DEPDIR)/gnuradio_swig_py_general-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) $(gnuradio_swig_py_general_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_general_guile.Std \ + -module gnuradio_swig_py_general -o gnuradio_swig_py_general_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.d + cp $(DEPDIR)/gnuradio_swig_py_general_guile.Std $(DEPDIR)/gnuradio_swig_py_general_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_general_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp +else + touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp +endif + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_guile.d@am__quote@ + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i + # -*- Makefile -*- # # Copyright 2009 Free Software Foundation, Inc. @@ -640,6 +714,16 @@ gnuradio_swig_py_gengen_pylibdir_category ?= $(gnuradio_swig_py_gengen_pythondir gnuradio_swig_py_gengen_pythondir = $(pythondir)/$(gnuradio_swig_py_gengen_pythondir_category) gnuradio_swig_py_gengen_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_gengen_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. +gnuradio_swig_py_gengen_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/gnuradio_swig_py_gengen +# FIXME: determince whether these should be installed with gnuradio. +gnuradio_swig_py_gengen_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. gnuradio_swig_py_gengen_swigincludedir = $(swigincludedir) @@ -675,6 +759,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc +if GUILE +swig_built_sources += gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen_guile.cc +endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -708,11 +795,11 @@ gnuradio_swig_py_gengen_python_PYTHON = \ $(gnuradio_swig_py_gengen_python) if GUILE -gnuradio_swig_py_gengen_pylib_LTLIBRARIES += _gnuradio_swig_py_gengen_guile.la - +gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = _gnuradio_swig_py_gengen_guile.la _gnuradio_swig_py_gengen_guile_la_SOURCES = \ - gnuradio_swig_py_gengen_guile.cc \ + gnuradio_swig_py_gengen_guile.cc \ $(gnuradio_swig_py_gengen_la_swig_sources) +gnuradio_swig_py_gengen_scm_DATA = gnuradio_swig_py_gengen.scm # Guile can use the same flags as python does _gnuradio_swig_py_gengen_guile_la_LIBADD = $(_gnuradio_swig_py_gengen_python_la_LIBADD) @@ -723,7 +810,8 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_gengen_python.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc gnuradio_swig_py_gengen_guile.cc gnuradio_swig_py_gengen_guile.h: gnuradio_swig_py_gengen.i +# $(python_deps) $(guile_deps): gnuradio_swig_py_gengen.i +gnuradio_swig_py_gengen_python.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc: gnuradio_swig_py_gengen.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -780,7 +868,6 @@ gnuradio_swig_py_gengen_python.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gen ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-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 @@ -808,32 +895,23 @@ gnuradio_swig_py_gengen_python.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gen exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_gengen-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. +gnuradio_swig_py_gengen_guile.h gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen_guile.cc: gnuradio_swig_py_gengen.i if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \ - -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \ - fi; \ + trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_gengen-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.S*; exit 1; \ + while test -d $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp; \ + exit $$?; \ fi; - touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.d - cp $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std $(DEPDIR)/gnuradio_swig_py_gengen_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_guile.d@am__quote@ -endif +endif # end of GUILE $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -901,6 +979,39 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_python.d@am__quote@ +if GUILE +$(DEPDIR)/gnuradio_swig_py_gengen-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) $(gnuradio_swig_py_gengen_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \ + -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.d + cp $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std $(DEPDIR)/gnuradio_swig_py_gengen_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp +else + touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp +endif + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_guile.d@am__quote@ + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i + # -*- Makefile -*- # # Copyright 2009 Free Software Foundation, Inc. @@ -941,6 +1052,16 @@ gnuradio_swig_py_filter_pylibdir_category ?= $(gnuradio_swig_py_filter_pythondir gnuradio_swig_py_filter_pythondir = $(pythondir)/$(gnuradio_swig_py_filter_pythondir_category) gnuradio_swig_py_filter_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_filter_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. +gnuradio_swig_py_filter_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/gnuradio_swig_py_filter +# FIXME: determince whether these should be installed with gnuradio. +gnuradio_swig_py_filter_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. gnuradio_swig_py_filter_swigincludedir = $(swigincludedir) @@ -976,6 +1097,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc +if GUILE +swig_built_sources += gnuradio_swig_py_filter.scm gnuradio_swig_py_filter_guile.cc +endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -1009,11 +1133,11 @@ gnuradio_swig_py_filter_python_PYTHON = \ $(gnuradio_swig_py_filter_python) if GUILE -gnuradio_swig_py_filter_pylib_LTLIBRARIES += _gnuradio_swig_py_filter_guile.la - +gnuradio_swig_py_filter_scmlib_LTLIBRARIES = _gnuradio_swig_py_filter_guile.la _gnuradio_swig_py_filter_guile_la_SOURCES = \ - gnuradio_swig_py_filter_guile.cc \ + gnuradio_swig_py_filter_guile.cc \ $(gnuradio_swig_py_filter_la_swig_sources) +gnuradio_swig_py_filter_scm_DATA = gnuradio_swig_py_filter.scm # Guile can use the same flags as python does _gnuradio_swig_py_filter_guile_la_LIBADD = $(_gnuradio_swig_py_filter_python_la_LIBADD) @@ -1024,7 +1148,8 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_filter_python.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc gnuradio_swig_py_filter_guile.cc gnuradio_swig_py_filter_guile.h: gnuradio_swig_py_filter.i +# $(python_deps) $(guile_deps): gnuradio_swig_py_filter.i +gnuradio_swig_py_filter_python.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc: gnuradio_swig_py_filter.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1081,7 +1206,6 @@ gnuradio_swig_py_filter_python.h gnuradio_swig_py_filter.py gnuradio_swig_py_fil ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-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 @@ -1109,32 +1233,23 @@ gnuradio_swig_py_filter_python.h gnuradio_swig_py_filter.py gnuradio_swig_py_fil exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_filter-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. +gnuradio_swig_py_filter_guile.h gnuradio_swig_py_filter.scm gnuradio_swig_py_filter_guile.cc: gnuradio_swig_py_filter.i if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_filter_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \ - -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \ - fi; \ + trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_filter-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.S*; exit 1; \ + while test -d $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp; \ + exit $$?; \ fi; - touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.d - cp $(DEPDIR)/gnuradio_swig_py_filter_guile.Std $(DEPDIR)/gnuradio_swig_py_filter_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_guile.d@am__quote@ -endif +endif # end of GUILE $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -1202,6 +1317,39 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_python.d@am__quote@ +if GUILE +$(DEPDIR)/gnuradio_swig_py_filter-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) $(gnuradio_swig_py_filter_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \ + -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.d + cp $(DEPDIR)/gnuradio_swig_py_filter_guile.Std $(DEPDIR)/gnuradio_swig_py_filter_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp +else + touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp +endif + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_guile.d@am__quote@ + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i + # -*- Makefile -*- # # Copyright 2009 Free Software Foundation, Inc. @@ -1242,6 +1390,16 @@ gnuradio_swig_py_io_pylibdir_category ?= $(gnuradio_swig_py_io_pythondir_categor gnuradio_swig_py_io_pythondir = $(pythondir)/$(gnuradio_swig_py_io_pythondir_category) gnuradio_swig_py_io_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_io_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. +gnuradio_swig_py_io_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/gnuradio_swig_py_io +# FIXME: determince whether these should be installed with gnuradio. +gnuradio_swig_py_io_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. gnuradio_swig_py_io_swigincludedir = $(swigincludedir) @@ -1277,6 +1435,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc +if GUILE +swig_built_sources += gnuradio_swig_py_io.scm gnuradio_swig_py_io_guile.cc +endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -1310,11 +1471,11 @@ gnuradio_swig_py_io_python_PYTHON = \ $(gnuradio_swig_py_io_python) if GUILE -gnuradio_swig_py_io_pylib_LTLIBRARIES += _gnuradio_swig_py_io_guile.la - +gnuradio_swig_py_io_scmlib_LTLIBRARIES = _gnuradio_swig_py_io_guile.la _gnuradio_swig_py_io_guile_la_SOURCES = \ - gnuradio_swig_py_io_guile.cc \ + gnuradio_swig_py_io_guile.cc \ $(gnuradio_swig_py_io_la_swig_sources) +gnuradio_swig_py_io_scm_DATA = gnuradio_swig_py_io.scm # Guile can use the same flags as python does _gnuradio_swig_py_io_guile_la_LIBADD = $(_gnuradio_swig_py_io_python_la_LIBADD) @@ -1325,7 +1486,8 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_io_python.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc gnuradio_swig_py_io_guile.cc gnuradio_swig_py_io_guile.h: gnuradio_swig_py_io.i +# $(python_deps) $(guile_deps): gnuradio_swig_py_io.i +gnuradio_swig_py_io_python.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc: gnuradio_swig_py_io.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1382,7 +1544,6 @@ gnuradio_swig_py_io_python.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.c ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-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 @@ -1410,32 +1571,23 @@ gnuradio_swig_py_io_python.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.c exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_io-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. +gnuradio_swig_py_io_guile.h gnuradio_swig_py_io.scm gnuradio_swig_py_io_guile.cc: gnuradio_swig_py_io.i if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_io_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_io_guile.Std \ - -module gnuradio_swig_py_io -o gnuradio_swig_py_io_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \ - fi; \ + trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_io-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.S*; exit 1; \ + while test -d $(DEPDIR)/gnuradio_swig_py_io-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp; \ + exit $$?; \ fi; - touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.d - cp $(DEPDIR)/gnuradio_swig_py_io_guile.Std $(DEPDIR)/gnuradio_swig_py_io_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_io_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_guile.d@am__quote@ -endif +endif # end of GUILE $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -1503,6 +1655,39 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_python.d@am__quote@ +if GUILE +$(DEPDIR)/gnuradio_swig_py_io-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) $(gnuradio_swig_py_io_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_io_guile.Std \ + -module gnuradio_swig_py_io -o gnuradio_swig_py_io_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.d + cp $(DEPDIR)/gnuradio_swig_py_io_guile.Std $(DEPDIR)/gnuradio_swig_py_io_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_io_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp +else + touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp +endif + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_guile.d@am__quote@ + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i + # -*- Makefile -*- # # Copyright 2009 Free Software Foundation, Inc. @@ -1543,6 +1728,16 @@ gnuradio_swig_py_hier_pylibdir_category ?= $(gnuradio_swig_py_hier_pythondir_cat gnuradio_swig_py_hier_pythondir = $(pythondir)/$(gnuradio_swig_py_hier_pythondir_category) gnuradio_swig_py_hier_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_hier_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. +gnuradio_swig_py_hier_scmlibdir = @GUILE_PKLIBDIR@/gnuradio + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/gnuradio_swig_py_hier +# FIXME: determince whether these should be installed with gnuradio. +gnuradio_swig_py_hier_scmdir = @GUILE_PKDATADIR@/gnuradio + ## SWIG headers are always installed into the same directory. gnuradio_swig_py_hier_swigincludedir = $(swigincludedir) @@ -1578,6 +1773,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## be added manually by the including Makefile.am . swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc +if GUILE +swig_built_sources += gnuradio_swig_py_hier.scm gnuradio_swig_py_hier_guile.cc +endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -1611,11 +1809,11 @@ gnuradio_swig_py_hier_python_PYTHON = \ $(gnuradio_swig_py_hier_python) if GUILE -gnuradio_swig_py_hier_pylib_LTLIBRARIES += _gnuradio_swig_py_hier_guile.la - +gnuradio_swig_py_hier_scmlib_LTLIBRARIES = _gnuradio_swig_py_hier_guile.la _gnuradio_swig_py_hier_guile_la_SOURCES = \ - gnuradio_swig_py_hier_guile.cc \ + gnuradio_swig_py_hier_guile.cc \ $(gnuradio_swig_py_hier_la_swig_sources) +gnuradio_swig_py_hier_scm_DATA = gnuradio_swig_py_hier.scm # Guile can use the same flags as python does _gnuradio_swig_py_hier_guile_la_LIBADD = $(_gnuradio_swig_py_hier_python_la_LIBADD) @@ -1626,7 +1824,8 @@ endif # end of GUILE ## Entry rule for running SWIG -gnuradio_swig_py_hier_python.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc gnuradio_swig_py_hier_guile.cc gnuradio_swig_py_hier_guile.h: gnuradio_swig_py_hier.i +# $(python_deps) $(guile_deps): gnuradio_swig_py_hier.i +gnuradio_swig_py_hier_python.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc: gnuradio_swig_py_hier.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -1683,7 +1882,6 @@ gnuradio_swig_py_hier_python.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_py ## Tell MAKE to run the rule for creating this stamp. ## $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp WHAT=$<; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-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 @@ -1711,32 +1909,23 @@ gnuradio_swig_py_hier_python.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_py exit $$?; \ fi; -$(DEPDIR)/gnuradio_swig_py_hier-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. +gnuradio_swig_py_hier_guile.h gnuradio_swig_py_hier.scm gnuradio_swig_py_hier_guile.cc: gnuradio_swig_py_hier.i if GUILE - if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gnuradio_swig_py_hier_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \ - -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \ - fi; \ + trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_hier-generate-*' 1 2 13 15; \ + if mkdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock 2>/dev/null; then \ + rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-*stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp WHAT=$<; \ + rmdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; \ else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.S*; exit 1; \ + while test -d $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; do \ + sleep 1; \ + done; \ + test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp; \ + exit $$?; \ fi; - touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.d - cp $(DEPDIR)/gnuradio_swig_py_hier_guile.Std $(DEPDIR)/gnuradio_swig_py_hier_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_guile.d@am__quote@ -endif +endif # end of GUILE $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -1804,3 +1993,36 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_python.d@am__quote@ +if GUILE +$(DEPDIR)/gnuradio_swig_py_hier-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) $(gnuradio_swig_py_hier_swig_args) \ + -MD -MF $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \ + -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \ + > $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \ + $(MV) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.S*; exit 1; \ + fi; + touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.d + cp $(DEPDIR)/gnuradio_swig_py_hier_guile.Std $(DEPDIR)/gnuradio_swig_py_hier_guile.d + echo "" >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d + $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std | \ + awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d + $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std + touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp +else + touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp +endif + +@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_guile.d@am__quote@ + +#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i + -- cgit From d3d187f1beb6525977079a6f9c822f971cced8da Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 18:21:09 -0600 Subject: improve comment --- gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm index 687f7f1f5..c653a04b0 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm @@ -18,8 +18,8 @@ ;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ;;; -;; Only use these if load-* fails t find a .scm or .so. If you can't -;; find a .so. try running ldconfig. guile seems to only load modules +;; Only use these if load-* fails to find a .scm or .so. If you can't +;; find a .so, try running ldconfig. guile seems to only load modules ;; that are in the ldconfig paths. ;; (set! %load-path (append %load-path '("/usr/lib/guile/gnuradio"))) ;; (set! %load-path (append %load-path '("/usr/share/gnuradio"))) @@ -28,7 +28,7 @@ (load "gnuradio/gnuradio_swig_py_io.scm") (load "gnuradio/gnuradio_swig_py_runtime.scm") -;; FIXME: these don't load for sme reason +;; FIXME: these don't load for sme reason cause of issues with the .so files ;; (load "gnuradio/gnuradio_swig_py_general.scm") ;; (load "gnuradio/gnuradio_swig_py_gengen.scm") ;; (load "gnuradio/gnuradio_swig_py_heir.scm") -- cgit From bb04443e9299a2eebf44a6aef5633091b0135f1f Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 18:43:33 -0600 Subject: correct copyright date --- gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm index c653a04b0..64f6f1415 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm @@ -1,5 +1,5 @@ ;;; -;;; Copyright 2006,2009 Free Software Foundation, Inc. +;;; Copyright 2010 Free Software Foundation, Inc. ;;; ;;; This file is part of GNU Radio ;;; -- cgit From f64af4b3b4221bbe9480791b3e863aa05c6aad06 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 18 Oct 2010 19:28:25 -0700 Subject: gitignore swig generated files --- gnuradio-core/src/lib/swig/.gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/.gitignore b/gnuradio-core/src/lib/swig/.gitignore index 9d7d01056..0f7b58d51 100644 --- a/gnuradio-core/src/lib/swig/.gitignore +++ b/gnuradio-core/src/lib/swig/.gitignore @@ -34,3 +34,15 @@ /gnuradio_swig_py_hier.cc /gnuradio_swig_py_hier.h /gnuradio_swig_py_hier.py +/gnuradio_swig_py_filter_python.cc +/gnuradio_swig_py_filter_python.h +/gnuradio_swig_py_general_python.cc +/gnuradio_swig_py_general_python.h +/gnuradio_swig_py_gengen_python.cc +/gnuradio_swig_py_gengen_python.h +/gnuradio_swig_py_hier_python.cc +/gnuradio_swig_py_hier_python.h +/gnuradio_swig_py_io_python.cc +/gnuradio_swig_py_io_python.h +/gnuradio_swig_py_runtime_python.cc +/gnuradio_swig_py_runtime_python.h -- cgit From 3e5e68383e0b1283ad1a40216ef11e777c245824 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 18 Oct 2010 19:56:02 -0700 Subject: gitignore more swig generated files --- gnuradio-core/src/lib/swig/.gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/.gitignore b/gnuradio-core/src/lib/swig/.gitignore index 0f7b58d51..5c514650d 100644 --- a/gnuradio-core/src/lib/swig/.gitignore +++ b/gnuradio-core/src/lib/swig/.gitignore @@ -46,3 +46,15 @@ /gnuradio_swig_py_io_python.h /gnuradio_swig_py_runtime_python.cc /gnuradio_swig_py_runtime_python.h +/gnuradio_swig_py_filter.scm +/gnuradio_swig_py_filter_guile.cc +/gnuradio_swig_py_general.scm +/gnuradio_swig_py_general_guile.cc +/gnuradio_swig_py_gengen.scm +/gnuradio_swig_py_gengen_guile.cc +/gnuradio_swig_py_hier.scm +/gnuradio_swig_py_hier_guile.cc +/gnuradio_swig_py_io.scm +/gnuradio_swig_py_io_guile.cc +/gnuradio_swig_py_runtime.scm +/gnuradio_swig_py_runtime_guile.cc -- cgit From 221ad7b19e370fab816fbfb8fae3b947f77151fc Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 21:58:28 -0600 Subject: put the ifdef in the right place --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 091cdf82b..f847e7b28 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -303,8 +303,8 @@ $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_python.d@am__quote@ -if GUILE $(DEPDIR)/gnuradio_swig_py_runtime-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) $(gnuradio_swig_py_runtime_swig_args) \ @@ -641,8 +641,8 @@ $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_python.d@am__quote@ -if GUILE $(DEPDIR)/gnuradio_swig_py_general-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) $(gnuradio_swig_py_general_swig_args) \ @@ -979,8 +979,8 @@ $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_python.d@am__quote@ -if GUILE $(DEPDIR)/gnuradio_swig_py_gengen-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) $(gnuradio_swig_py_gengen_swig_args) \ @@ -1317,8 +1317,8 @@ $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_python.d@am__quote@ -if GUILE $(DEPDIR)/gnuradio_swig_py_filter-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) $(gnuradio_swig_py_filter_swig_args) \ @@ -1655,8 +1655,8 @@ $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_python.d@am__quote@ -if GUILE $(DEPDIR)/gnuradio_swig_py_io-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) $(gnuradio_swig_py_io_swig_args) \ @@ -1993,8 +1993,8 @@ $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp: @am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_python.d@am__quote@ -if GUILE $(DEPDIR)/gnuradio_swig_py_hier-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) $(gnuradio_swig_py_hier_swig_args) \ -- cgit From 1812c93c7c282bd4b5ff7bd602f9f88d7f1dd97c Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 18 Oct 2010 22:30:05 -0600 Subject: load the general and gengen files, now that they compile. --- gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm index 64f6f1415..89c4a0e09 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm @@ -29,6 +29,6 @@ (load "gnuradio/gnuradio_swig_py_runtime.scm") ;; FIXME: these don't load for sme reason cause of issues with the .so files -;; (load "gnuradio/gnuradio_swig_py_general.scm") -;; (load "gnuradio/gnuradio_swig_py_gengen.scm") +(load "gnuradio/gnuradio_swig_py_general.scm") +(load "gnuradio/gnuradio_swig_py_gengen.scm") ;; (load "gnuradio/gnuradio_swig_py_heir.scm") -- cgit From 9cc65810f63623a7132656005495dfd3ebbc84ed Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 19 Oct 2010 10:56:04 -0600 Subject: correct which lines are under comment --- gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm index 89c4a0e09..d08840071 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm @@ -27,8 +27,8 @@ (load "gnuradio/gnuradio_swig_py_filter.scm") (load "gnuradio/gnuradio_swig_py_io.scm") (load "gnuradio/gnuradio_swig_py_runtime.scm") - -;; FIXME: these don't load for sme reason cause of issues with the .so files (load "gnuradio/gnuradio_swig_py_general.scm") (load "gnuradio/gnuradio_swig_py_gengen.scm") + +;; FIXME: this don't load for some reason cause of issues with the .so files ;; (load "gnuradio/gnuradio_swig_py_heir.scm") -- cgit From 05c1f489753af80453182243475110586eb0b242 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 19 Oct 2010 22:00:55 -0600 Subject: use suffixes to build scm and py files --- gnuradio-core/src/lib/swig/Makefile.am | 37 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 12 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 73ba23b84..5f55e63b5 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -22,7 +22,13 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig +# VPATH += python guile + BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources) +CLEANFILES = python/gnuradio* +if GUILE +CLEANFILES += guile/gnuradio* +endif if PYTHON AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ @@ -39,19 +45,19 @@ swiginclude_HEADERS = \ # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr -ourpython_PYTHON = gnuradio_swig_python.py +ourpython_PYTHON = gnuradio_swig.py # This is the top level guile file, which loads all the other scm files # for gnuradio. This has to be installed top level to be found in the # default search path. guiledir = @GUILE_PKDATADIR@ -guile_DATA = gnuradio_swig_guile.scm +guile_DATA = gnuradio_swig.scm # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... -gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime_python.cc $(srcdir)/gen-swig-bug-fix - $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime_python.cc $@ +gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.py $(srcdir)/gen-swig-bug-fix + $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_swig_py_runtime.cc $@ # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = gnuradio_swig_bug_workaround.h @@ -94,23 +100,30 @@ gnuradio_swig_py_hier_la_swig_libadd = $(GNURADIO_CORE_LA) # include the SWIG-generated .h files in the BUILT SOURCES, since they # aren't by default when using Makefile.swig; order doesn't matter. -PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,_python.h,$(HFILE))) +PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(HFILE))) +#BUILT_SOURCES += $(foreach HFILE,$(PYTHON_GEN), $(subst gnuradio,python/gnuradio,$(HFILE))) BUILT_SOURCES += $(PYTHON_GEN) - endif # end of if python if GUILE GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.scm,$(HFILE))) +# BUILT_SOURCES += $(foreach HFILE,$(GUILE_GEN), $(subst gnuradio,guile/gnuradio,$(HFILE))) BUILT_SOURCES += $(GUILE_GEN) endif # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) -#gnuradio_swig_py_runtime.scm: gnuradio_swig_py_runtime.i -# gnuradio_swig_py_runtime_python.cc: gnuradio_swig_py_runtime.i -# .cc..i: -# @echo "FIXME1: $(BUILT_SOURCES) $<" +# Compile a .i to what guile needs +.i.scm: + @test -d "guile" || $(mkinstalldirs) "guile" + $(SWIG) $(STD_SWIG_GUILE_ARGS) $($*_swig_args) \ + -module $* -o guile/$*.cc $< + +# Compile a .i file to what python needs +.i.py: + @test -d "python" || $(mkinstalldirs) "python" + $(SWIG) $(STD_SWIG_PYTHON_ARGS) $($*_swig_args) \ + -MD -MF python/$(DEPDIR)/$*.Std \ + -module $* -o python/$*.cc -oh python/$*.h $< -# .scm..i: -# @echo "FIXME2: $(BUILT_SOURCES) $<" -- cgit From 03418fed87089ce9ea3e354632d5f151a1b33ebd Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 19 Oct 2010 22:02:29 -0600 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 1386 +++----------------------- 1 file changed, 114 insertions(+), 1272 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index f847e7b28..77127e462 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -82,9 +82,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc +swig_built_sources += gnuradio_swig_py_runtime.py #gnuradio_swig_py_runtime.cc if GUILE -swig_built_sources += gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime_guile.cc +swig_built_sources += gnuradio_swig_py_runtime.scm #gnuradio_swig_py_runtime.cc endif ## Various SWIG variables. These can be overloaded in the including @@ -96,245 +96,52 @@ gnuradio_swig_py_runtime_swiginclude_HEADERS = \ $(gnuradio_swig_py_runtime_swiginclude_headers) gnuradio_swig_py_runtime_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_runtime_python.la + _gnuradio_swig_py_runtime.la -_gnuradio_swig_py_runtime_python_la_SOURCES = \ - gnuradio_swig_py_runtime_python.cc \ +_gnuradio_swig_py_runtime_la_SOURCES = \ + python/gnuradio_swig_py_runtime.cc \ $(gnuradio_swig_py_runtime_la_swig_sources) -_gnuradio_swig_py_runtime_python_la_LIBADD = \ +_gnuradio_swig_py_runtime_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_runtime_la_swig_libadd) -_gnuradio_swig_py_runtime_python_la_LDFLAGS = \ +_gnuradio_swig_py_runtime_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_runtime_la_swig_ldflags) -_gnuradio_swig_py_runtime_python_la_CXXFLAGS = \ +_gnuradio_swig_py_runtime_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_runtime_la_swig_cxxflags) gnuradio_swig_py_runtime_python_PYTHON = \ - gnuradio_swig_py_runtime.py \ - $(gnuradio_swig_py_runtime_python) + python/gnuradio_swig_py_runtime.py \ + $(gnuradio_swig_py_runtime) if GUILE -gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = _gnuradio_swig_py_runtime_guile.la -_gnuradio_swig_py_runtime_guile_la_SOURCES = \ - gnuradio_swig_py_runtime_guile.cc \ +gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = gnuradio_swig_py_runtime_guile.la +gnuradio_swig_py_runtime_guile_la_SOURCES = \ + guile/gnuradio_swig_py_runtime.cc \ $(gnuradio_swig_py_runtime_la_swig_sources) gnuradio_swig_py_runtime_scm_DATA = gnuradio_swig_py_runtime.scm # Guile can use the same flags as python does -_gnuradio_swig_py_runtime_guile_la_LIBADD = $(_gnuradio_swig_py_runtime_python_la_LIBADD) -_gnuradio_swig_py_runtime_guile_la_LDFLAGS = $(_gnuradio_swig_py_runtime_python_la_LDFLAGS) -_gnuradio_swig_py_runtime_guile_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_python_la_CXXFLAGS) +gnuradio_swig_py_runtime_guile_la_LIBADD = $(_gnuradio_swig_py_runtime_la_LIBADD) +gnuradio_swig_py_runtime_guile_la_LDFLAGS = $(_gnuradio_swig_py_runtime_la_LDFLAGS) +gnuradio_swig_py_runtime_guile_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_la_CXXFLAGS) endif # end of GUILE ## Entry rule for running SWIG # $(python_deps) $(guile_deps): gnuradio_swig_py_runtime.i -gnuradio_swig_py_runtime_python.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime_python.cc: gnuradio_swig_py_runtime.i -## This rule will get called only when MAKE decides that one of the -## targets needs to be created or re-created, because: -## -## * The .i file is newer than any or all of the generated files; -## -## * Any or all of the .cc, .h, or .py files does not exist and is -## needed (in the case this file is not needed, the rule for it is -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/gnuradio_swig_py_runtime-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_runtime-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-*stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-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 -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp; \ - 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. -gnuradio_swig_py_runtime_guile.h gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime_guile.cc: gnuradio_swig_py_runtime.i -if GUILE - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_runtime-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-*stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_runtime-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp; \ - exit $$?; \ - fi; -endif # end of GUILE +# gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.cc: gnuradio_swig_py_runtime.i +guile/gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime.scm: gnuradio_swig_py_runtime.i +python/gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.py: gnuradio_swig_py_runtime.i $(DEPDIR)/gnuradio_swig_py_runtime-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 -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_runtime_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime_python.Std \ - -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime_python.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime_python.Std \ - > $(DEPDIR)/gnuradio_swig_py_runtime_python.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_runtime_python.Sd $(DEPDIR)/gnuradio_swig_py_runtime_python.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/gnuradio_swig_py_runtime_python.Std $(DEPDIR)/gnuradio_swig_py_runtime_python.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime_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)/gnuradio_swig_py_runtime_python.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime_python.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_python.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp - -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# 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)/gnuradio_swig_py_runtime_python.d@am__quote@ $(DEPDIR)/gnuradio_swig_py_runtime-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) $(gnuradio_swig_py_runtime_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \ - -module gnuradio_swig_py_runtime -o gnuradio_swig_py_runtime_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Sd $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.d - cp $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std $(DEPDIR)/gnuradio_swig_py_runtime_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_runtime_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_runtime_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp -else - touch $(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp -endif - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_runtime_guile.d@am__quote@ - -#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i # -*- Makefile -*- # @@ -420,9 +227,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc +swig_built_sources += gnuradio_swig_py_general.py #gnuradio_swig_py_general.cc if GUILE -swig_built_sources += gnuradio_swig_py_general.scm gnuradio_swig_py_general_guile.cc +swig_built_sources += gnuradio_swig_py_general.scm #gnuradio_swig_py_general.cc endif ## Various SWIG variables. These can be overloaded in the including @@ -434,245 +241,52 @@ gnuradio_swig_py_general_swiginclude_HEADERS = \ $(gnuradio_swig_py_general_swiginclude_headers) gnuradio_swig_py_general_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_general_python.la + _gnuradio_swig_py_general.la -_gnuradio_swig_py_general_python_la_SOURCES = \ - gnuradio_swig_py_general_python.cc \ +_gnuradio_swig_py_general_la_SOURCES = \ + python/gnuradio_swig_py_general.cc \ $(gnuradio_swig_py_general_la_swig_sources) -_gnuradio_swig_py_general_python_la_LIBADD = \ +_gnuradio_swig_py_general_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_general_la_swig_libadd) -_gnuradio_swig_py_general_python_la_LDFLAGS = \ +_gnuradio_swig_py_general_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_general_la_swig_ldflags) -_gnuradio_swig_py_general_python_la_CXXFLAGS = \ +_gnuradio_swig_py_general_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_general_la_swig_cxxflags) gnuradio_swig_py_general_python_PYTHON = \ - gnuradio_swig_py_general.py \ - $(gnuradio_swig_py_general_python) + python/gnuradio_swig_py_general.py \ + $(gnuradio_swig_py_general) if GUILE -gnuradio_swig_py_general_scmlib_LTLIBRARIES = _gnuradio_swig_py_general_guile.la -_gnuradio_swig_py_general_guile_la_SOURCES = \ - gnuradio_swig_py_general_guile.cc \ +gnuradio_swig_py_general_scmlib_LTLIBRARIES = gnuradio_swig_py_general_guile.la +gnuradio_swig_py_general_guile_la_SOURCES = \ + guile/gnuradio_swig_py_general.cc \ $(gnuradio_swig_py_general_la_swig_sources) gnuradio_swig_py_general_scm_DATA = gnuradio_swig_py_general.scm # Guile can use the same flags as python does -_gnuradio_swig_py_general_guile_la_LIBADD = $(_gnuradio_swig_py_general_python_la_LIBADD) -_gnuradio_swig_py_general_guile_la_LDFLAGS = $(_gnuradio_swig_py_general_python_la_LDFLAGS) -_gnuradio_swig_py_general_guile_la_CXXFLAGS = $(_gnuradio_swig_py_general_python_la_CXXFLAGS) +gnuradio_swig_py_general_guile_la_LIBADD = $(_gnuradio_swig_py_general_la_LIBADD) +gnuradio_swig_py_general_guile_la_LDFLAGS = $(_gnuradio_swig_py_general_la_LDFLAGS) +gnuradio_swig_py_general_guile_la_CXXFLAGS = $(_gnuradio_swig_py_general_la_CXXFLAGS) endif # end of GUILE ## Entry rule for running SWIG # $(python_deps) $(guile_deps): gnuradio_swig_py_general.i -gnuradio_swig_py_general_python.h gnuradio_swig_py_general.py gnuradio_swig_py_general_python.cc: gnuradio_swig_py_general.i -## This rule will get called only when MAKE decides that one of the -## targets needs to be created or re-created, because: -## -## * The .i file is newer than any or all of the generated files; -## -## * Any or all of the .cc, .h, or .py files does not exist and is -## needed (in the case this file is not needed, the rule for it is -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/gnuradio_swig_py_general-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_general-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-*stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-python-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 -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/gnuradio_swig_py_general-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp; \ - 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. -gnuradio_swig_py_general_guile.h gnuradio_swig_py_general.scm gnuradio_swig_py_general_guile.cc: gnuradio_swig_py_general.i -if GUILE - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_general-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_general-generate-*stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_general-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_general-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp; \ - exit $$?; \ - fi; -endif # end of GUILE +# gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general.cc: gnuradio_swig_py_general.i +guile/gnuradio_swig_py_general.scm gnuradio_swig_py_general.scm: gnuradio_swig_py_general.i +python/gnuradio_swig_py_general.py gnuradio_swig_py_general.py: gnuradio_swig_py_general.i $(DEPDIR)/gnuradio_swig_py_general-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 -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_general_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_general_python.Std \ - -module gnuradio_swig_py_general -o gnuradio_swig_py_general_python.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general_python.Std \ - > $(DEPDIR)/gnuradio_swig_py_general_python.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_general_python.Sd $(DEPDIR)/gnuradio_swig_py_general_python.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/gnuradio_swig_py_general_python.Std $(DEPDIR)/gnuradio_swig_py_general_python.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/gnuradio_swig_py_general_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)/gnuradio_swig_py_general_python.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general_python.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_general_python.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp - -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# 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)/gnuradio_swig_py_general_python.d@am__quote@ $(DEPDIR)/gnuradio_swig_py_general-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) $(gnuradio_swig_py_general_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_general_guile.Std \ - -module gnuradio_swig_py_general -o gnuradio_swig_py_general_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_general_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_general_guile.Sd $(DEPDIR)/gnuradio_swig_py_general_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.d - cp $(DEPDIR)/gnuradio_swig_py_general_guile.Std $(DEPDIR)/gnuradio_swig_py_general_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_general_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_general_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_general_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_general_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp -else - touch $(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp -endif - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_general_guile.d@am__quote@ - -#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i # -*- Makefile -*- # @@ -758,9 +372,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc +swig_built_sources += gnuradio_swig_py_gengen.py #gnuradio_swig_py_gengen.cc if GUILE -swig_built_sources += gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen_guile.cc +swig_built_sources += gnuradio_swig_py_gengen.scm #gnuradio_swig_py_gengen.cc endif ## Various SWIG variables. These can be overloaded in the including @@ -772,245 +386,52 @@ gnuradio_swig_py_gengen_swiginclude_HEADERS = \ $(gnuradio_swig_py_gengen_swiginclude_headers) gnuradio_swig_py_gengen_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_gengen_python.la + _gnuradio_swig_py_gengen.la -_gnuradio_swig_py_gengen_python_la_SOURCES = \ - gnuradio_swig_py_gengen_python.cc \ +_gnuradio_swig_py_gengen_la_SOURCES = \ + python/gnuradio_swig_py_gengen.cc \ $(gnuradio_swig_py_gengen_la_swig_sources) -_gnuradio_swig_py_gengen_python_la_LIBADD = \ +_gnuradio_swig_py_gengen_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_gengen_la_swig_libadd) -_gnuradio_swig_py_gengen_python_la_LDFLAGS = \ +_gnuradio_swig_py_gengen_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_gengen_la_swig_ldflags) -_gnuradio_swig_py_gengen_python_la_CXXFLAGS = \ +_gnuradio_swig_py_gengen_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_gengen_la_swig_cxxflags) gnuradio_swig_py_gengen_python_PYTHON = \ - gnuradio_swig_py_gengen.py \ - $(gnuradio_swig_py_gengen_python) + python/gnuradio_swig_py_gengen.py \ + $(gnuradio_swig_py_gengen) if GUILE -gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = _gnuradio_swig_py_gengen_guile.la -_gnuradio_swig_py_gengen_guile_la_SOURCES = \ - gnuradio_swig_py_gengen_guile.cc \ +gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = gnuradio_swig_py_gengen_guile.la +gnuradio_swig_py_gengen_guile_la_SOURCES = \ + guile/gnuradio_swig_py_gengen.cc \ $(gnuradio_swig_py_gengen_la_swig_sources) gnuradio_swig_py_gengen_scm_DATA = gnuradio_swig_py_gengen.scm # Guile can use the same flags as python does -_gnuradio_swig_py_gengen_guile_la_LIBADD = $(_gnuradio_swig_py_gengen_python_la_LIBADD) -_gnuradio_swig_py_gengen_guile_la_LDFLAGS = $(_gnuradio_swig_py_gengen_python_la_LDFLAGS) -_gnuradio_swig_py_gengen_guile_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_python_la_CXXFLAGS) +gnuradio_swig_py_gengen_guile_la_LIBADD = $(_gnuradio_swig_py_gengen_la_LIBADD) +gnuradio_swig_py_gengen_guile_la_LDFLAGS = $(_gnuradio_swig_py_gengen_la_LDFLAGS) +gnuradio_swig_py_gengen_guile_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_la_CXXFLAGS) endif # end of GUILE ## Entry rule for running SWIG # $(python_deps) $(guile_deps): gnuradio_swig_py_gengen.i -gnuradio_swig_py_gengen_python.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen_python.cc: gnuradio_swig_py_gengen.i -## This rule will get called only when MAKE decides that one of the -## targets needs to be created or re-created, because: -## -## * The .i file is newer than any or all of the generated files; -## -## * Any or all of the .cc, .h, or .py files does not exist and is -## needed (in the case this file is not needed, the rule for it is -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/gnuradio_swig_py_gengen-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_gengen-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-*stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-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 -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp; \ - 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. -gnuradio_swig_py_gengen_guile.h gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen_guile.cc: gnuradio_swig_py_gengen.i -if GUILE - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_gengen-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-*stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_gengen-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp; \ - exit $$?; \ - fi; -endif # end of GUILE +# gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc: gnuradio_swig_py_gengen.i +guile/gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen.scm: gnuradio_swig_py_gengen.i +python/gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.py: gnuradio_swig_py_gengen.i $(DEPDIR)/gnuradio_swig_py_gengen-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 -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_gengen_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen_python.Std \ - -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen_python.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen_python.Std \ - > $(DEPDIR)/gnuradio_swig_py_gengen_python.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_gengen_python.Sd $(DEPDIR)/gnuradio_swig_py_gengen_python.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/gnuradio_swig_py_gengen_python.Std $(DEPDIR)/gnuradio_swig_py_gengen_python.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen_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)/gnuradio_swig_py_gengen_python.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen_python.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_python.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp - -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# 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)/gnuradio_swig_py_gengen_python.d@am__quote@ $(DEPDIR)/gnuradio_swig_py_gengen-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) $(gnuradio_swig_py_gengen_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \ - -module gnuradio_swig_py_gengen -o gnuradio_swig_py_gengen_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Sd $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.d - cp $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std $(DEPDIR)/gnuradio_swig_py_gengen_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_gengen_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_gengen_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp -else - touch $(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp -endif - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_gengen_guile.d@am__quote@ - -#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i # -*- Makefile -*- # @@ -1096,9 +517,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc +swig_built_sources += gnuradio_swig_py_filter.py #gnuradio_swig_py_filter.cc if GUILE -swig_built_sources += gnuradio_swig_py_filter.scm gnuradio_swig_py_filter_guile.cc +swig_built_sources += gnuradio_swig_py_filter.scm #gnuradio_swig_py_filter.cc endif ## Various SWIG variables. These can be overloaded in the including @@ -1110,245 +531,52 @@ gnuradio_swig_py_filter_swiginclude_HEADERS = \ $(gnuradio_swig_py_filter_swiginclude_headers) gnuradio_swig_py_filter_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_filter_python.la + _gnuradio_swig_py_filter.la -_gnuradio_swig_py_filter_python_la_SOURCES = \ - gnuradio_swig_py_filter_python.cc \ +_gnuradio_swig_py_filter_la_SOURCES = \ + python/gnuradio_swig_py_filter.cc \ $(gnuradio_swig_py_filter_la_swig_sources) -_gnuradio_swig_py_filter_python_la_LIBADD = \ +_gnuradio_swig_py_filter_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_filter_la_swig_libadd) -_gnuradio_swig_py_filter_python_la_LDFLAGS = \ +_gnuradio_swig_py_filter_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_filter_la_swig_ldflags) -_gnuradio_swig_py_filter_python_la_CXXFLAGS = \ +_gnuradio_swig_py_filter_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_filter_la_swig_cxxflags) gnuradio_swig_py_filter_python_PYTHON = \ - gnuradio_swig_py_filter.py \ - $(gnuradio_swig_py_filter_python) + python/gnuradio_swig_py_filter.py \ + $(gnuradio_swig_py_filter) if GUILE -gnuradio_swig_py_filter_scmlib_LTLIBRARIES = _gnuradio_swig_py_filter_guile.la -_gnuradio_swig_py_filter_guile_la_SOURCES = \ - gnuradio_swig_py_filter_guile.cc \ +gnuradio_swig_py_filter_scmlib_LTLIBRARIES = gnuradio_swig_py_filter_guile.la +gnuradio_swig_py_filter_guile_la_SOURCES = \ + guile/gnuradio_swig_py_filter.cc \ $(gnuradio_swig_py_filter_la_swig_sources) gnuradio_swig_py_filter_scm_DATA = gnuradio_swig_py_filter.scm # Guile can use the same flags as python does -_gnuradio_swig_py_filter_guile_la_LIBADD = $(_gnuradio_swig_py_filter_python_la_LIBADD) -_gnuradio_swig_py_filter_guile_la_LDFLAGS = $(_gnuradio_swig_py_filter_python_la_LDFLAGS) -_gnuradio_swig_py_filter_guile_la_CXXFLAGS = $(_gnuradio_swig_py_filter_python_la_CXXFLAGS) +gnuradio_swig_py_filter_guile_la_LIBADD = $(_gnuradio_swig_py_filter_la_LIBADD) +gnuradio_swig_py_filter_guile_la_LDFLAGS = $(_gnuradio_swig_py_filter_la_LDFLAGS) +gnuradio_swig_py_filter_guile_la_CXXFLAGS = $(_gnuradio_swig_py_filter_la_CXXFLAGS) endif # end of GUILE ## Entry rule for running SWIG # $(python_deps) $(guile_deps): gnuradio_swig_py_filter.i -gnuradio_swig_py_filter_python.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter_python.cc: gnuradio_swig_py_filter.i -## This rule will get called only when MAKE decides that one of the -## targets needs to be created or re-created, because: -## -## * The .i file is newer than any or all of the generated files; -## -## * Any or all of the .cc, .h, or .py files does not exist and is -## needed (in the case this file is not needed, the rule for it is -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/gnuradio_swig_py_filter-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_filter-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-*stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-python-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 -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp; \ - 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. -gnuradio_swig_py_filter_guile.h gnuradio_swig_py_filter.scm gnuradio_swig_py_filter_guile.cc: gnuradio_swig_py_filter.i -if GUILE - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_filter-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_filter-generate-*stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_filter-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp; \ - exit $$?; \ - fi; -endif # end of GUILE +# gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc: gnuradio_swig_py_filter.i +guile/gnuradio_swig_py_filter.scm gnuradio_swig_py_filter.scm: gnuradio_swig_py_filter.i +python/gnuradio_swig_py_filter.py gnuradio_swig_py_filter.py: gnuradio_swig_py_filter.i $(DEPDIR)/gnuradio_swig_py_filter-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 -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_filter_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_filter_python.Std \ - -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter_python.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter_python.Std \ - > $(DEPDIR)/gnuradio_swig_py_filter_python.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_filter_python.Sd $(DEPDIR)/gnuradio_swig_py_filter_python.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/gnuradio_swig_py_filter_python.Std $(DEPDIR)/gnuradio_swig_py_filter_python.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/gnuradio_swig_py_filter_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)/gnuradio_swig_py_filter_python.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter_python.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_python.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp - -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# 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)/gnuradio_swig_py_filter_python.d@am__quote@ $(DEPDIR)/gnuradio_swig_py_filter-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) $(gnuradio_swig_py_filter_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \ - -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_filter_guile.Sd $(DEPDIR)/gnuradio_swig_py_filter_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.d - cp $(DEPDIR)/gnuradio_swig_py_filter_guile.Std $(DEPDIR)/gnuradio_swig_py_filter_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_filter_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_filter_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_filter_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp -else - touch $(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp -endif - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_filter_guile.d@am__quote@ - -#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i # -*- Makefile -*- # @@ -1434,9 +662,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc +swig_built_sources += gnuradio_swig_py_io.py #gnuradio_swig_py_io.cc if GUILE -swig_built_sources += gnuradio_swig_py_io.scm gnuradio_swig_py_io_guile.cc +swig_built_sources += gnuradio_swig_py_io.scm #gnuradio_swig_py_io.cc endif ## Various SWIG variables. These can be overloaded in the including @@ -1448,245 +676,52 @@ gnuradio_swig_py_io_swiginclude_HEADERS = \ $(gnuradio_swig_py_io_swiginclude_headers) gnuradio_swig_py_io_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_io_python.la + _gnuradio_swig_py_io.la -_gnuradio_swig_py_io_python_la_SOURCES = \ - gnuradio_swig_py_io_python.cc \ +_gnuradio_swig_py_io_la_SOURCES = \ + python/gnuradio_swig_py_io.cc \ $(gnuradio_swig_py_io_la_swig_sources) -_gnuradio_swig_py_io_python_la_LIBADD = \ +_gnuradio_swig_py_io_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_io_la_swig_libadd) -_gnuradio_swig_py_io_python_la_LDFLAGS = \ +_gnuradio_swig_py_io_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_io_la_swig_ldflags) -_gnuradio_swig_py_io_python_la_CXXFLAGS = \ +_gnuradio_swig_py_io_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_io_la_swig_cxxflags) gnuradio_swig_py_io_python_PYTHON = \ - gnuradio_swig_py_io.py \ - $(gnuradio_swig_py_io_python) + python/gnuradio_swig_py_io.py \ + $(gnuradio_swig_py_io) if GUILE -gnuradio_swig_py_io_scmlib_LTLIBRARIES = _gnuradio_swig_py_io_guile.la -_gnuradio_swig_py_io_guile_la_SOURCES = \ - gnuradio_swig_py_io_guile.cc \ +gnuradio_swig_py_io_scmlib_LTLIBRARIES = gnuradio_swig_py_io_guile.la +gnuradio_swig_py_io_guile_la_SOURCES = \ + guile/gnuradio_swig_py_io.cc \ $(gnuradio_swig_py_io_la_swig_sources) gnuradio_swig_py_io_scm_DATA = gnuradio_swig_py_io.scm # Guile can use the same flags as python does -_gnuradio_swig_py_io_guile_la_LIBADD = $(_gnuradio_swig_py_io_python_la_LIBADD) -_gnuradio_swig_py_io_guile_la_LDFLAGS = $(_gnuradio_swig_py_io_python_la_LDFLAGS) -_gnuradio_swig_py_io_guile_la_CXXFLAGS = $(_gnuradio_swig_py_io_python_la_CXXFLAGS) +gnuradio_swig_py_io_guile_la_LIBADD = $(_gnuradio_swig_py_io_la_LIBADD) +gnuradio_swig_py_io_guile_la_LDFLAGS = $(_gnuradio_swig_py_io_la_LDFLAGS) +gnuradio_swig_py_io_guile_la_CXXFLAGS = $(_gnuradio_swig_py_io_la_CXXFLAGS) endif # end of GUILE ## Entry rule for running SWIG # $(python_deps) $(guile_deps): gnuradio_swig_py_io.i -gnuradio_swig_py_io_python.h gnuradio_swig_py_io.py gnuradio_swig_py_io_python.cc: gnuradio_swig_py_io.i -## This rule will get called only when MAKE decides that one of the -## targets needs to be created or re-created, because: -## -## * The .i file is newer than any or all of the generated files; -## -## * Any or all of the .cc, .h, or .py files does not exist and is -## needed (in the case this file is not needed, the rule for it is -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/gnuradio_swig_py_io-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_io-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-*stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-python-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 -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/gnuradio_swig_py_io-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp; \ - 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. -gnuradio_swig_py_io_guile.h gnuradio_swig_py_io.scm gnuradio_swig_py_io_guile.cc: gnuradio_swig_py_io.i -if GUILE - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_io-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_io-generate-*stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_io-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_io-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp; \ - exit $$?; \ - fi; -endif # end of GUILE +# gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_swig_py_io.i +guile/gnuradio_swig_py_io.scm gnuradio_swig_py_io.scm: gnuradio_swig_py_io.i +python/gnuradio_swig_py_io.py gnuradio_swig_py_io.py: gnuradio_swig_py_io.i $(DEPDIR)/gnuradio_swig_py_io-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 -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_io_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_io_python.Std \ - -module gnuradio_swig_py_io -o gnuradio_swig_py_io_python.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io_python.Std \ - > $(DEPDIR)/gnuradio_swig_py_io_python.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_io_python.Sd $(DEPDIR)/gnuradio_swig_py_io_python.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/gnuradio_swig_py_io_python.Std $(DEPDIR)/gnuradio_swig_py_io_python.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/gnuradio_swig_py_io_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)/gnuradio_swig_py_io_python.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io_python.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_io_python.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp - -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# 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)/gnuradio_swig_py_io_python.d@am__quote@ $(DEPDIR)/gnuradio_swig_py_io-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) $(gnuradio_swig_py_io_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_io_guile.Std \ - -module gnuradio_swig_py_io -o gnuradio_swig_py_io_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_io_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_io_guile.Sd $(DEPDIR)/gnuradio_swig_py_io_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.d - cp $(DEPDIR)/gnuradio_swig_py_io_guile.Std $(DEPDIR)/gnuradio_swig_py_io_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_io_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_io_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_io_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_io_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp -else - touch $(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp -endif - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_io_guile.d@am__quote@ - -#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i # -*- Makefile -*- # @@ -1772,9 +807,9 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc +swig_built_sources += gnuradio_swig_py_hier.py #gnuradio_swig_py_hier.cc if GUILE -swig_built_sources += gnuradio_swig_py_hier.scm gnuradio_swig_py_hier_guile.cc +swig_built_sources += gnuradio_swig_py_hier.scm #gnuradio_swig_py_hier.cc endif ## Various SWIG variables. These can be overloaded in the including @@ -1786,243 +821,50 @@ gnuradio_swig_py_hier_swiginclude_HEADERS = \ $(gnuradio_swig_py_hier_swiginclude_headers) gnuradio_swig_py_hier_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_hier_python.la + _gnuradio_swig_py_hier.la -_gnuradio_swig_py_hier_python_la_SOURCES = \ - gnuradio_swig_py_hier_python.cc \ +_gnuradio_swig_py_hier_la_SOURCES = \ + python/gnuradio_swig_py_hier.cc \ $(gnuradio_swig_py_hier_la_swig_sources) -_gnuradio_swig_py_hier_python_la_LIBADD = \ +_gnuradio_swig_py_hier_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_hier_la_swig_libadd) -_gnuradio_swig_py_hier_python_la_LDFLAGS = \ +_gnuradio_swig_py_hier_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_hier_la_swig_ldflags) -_gnuradio_swig_py_hier_python_la_CXXFLAGS = \ +_gnuradio_swig_py_hier_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gnuradio_swig_py_hier_la_swig_cxxflags) gnuradio_swig_py_hier_python_PYTHON = \ - gnuradio_swig_py_hier.py \ - $(gnuradio_swig_py_hier_python) + python/gnuradio_swig_py_hier.py \ + $(gnuradio_swig_py_hier) if GUILE -gnuradio_swig_py_hier_scmlib_LTLIBRARIES = _gnuradio_swig_py_hier_guile.la -_gnuradio_swig_py_hier_guile_la_SOURCES = \ - gnuradio_swig_py_hier_guile.cc \ +gnuradio_swig_py_hier_scmlib_LTLIBRARIES = gnuradio_swig_py_hier_guile.la +gnuradio_swig_py_hier_guile_la_SOURCES = \ + guile/gnuradio_swig_py_hier.cc \ $(gnuradio_swig_py_hier_la_swig_sources) gnuradio_swig_py_hier_scm_DATA = gnuradio_swig_py_hier.scm # Guile can use the same flags as python does -_gnuradio_swig_py_hier_guile_la_LIBADD = $(_gnuradio_swig_py_hier_python_la_LIBADD) -_gnuradio_swig_py_hier_guile_la_LDFLAGS = $(_gnuradio_swig_py_hier_python_la_LDFLAGS) -_gnuradio_swig_py_hier_guile_la_CXXFLAGS = $(_gnuradio_swig_py_hier_python_la_CXXFLAGS) +gnuradio_swig_py_hier_guile_la_LIBADD = $(_gnuradio_swig_py_hier_la_LIBADD) +gnuradio_swig_py_hier_guile_la_LDFLAGS = $(_gnuradio_swig_py_hier_la_LDFLAGS) +gnuradio_swig_py_hier_guile_la_CXXFLAGS = $(_gnuradio_swig_py_hier_la_CXXFLAGS) endif # end of GUILE ## Entry rule for running SWIG # $(python_deps) $(guile_deps): gnuradio_swig_py_hier.i -gnuradio_swig_py_hier_python.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier_python.cc: gnuradio_swig_py_hier.i -## This rule will get called only when MAKE decides that one of the -## targets needs to be created or re-created, because: -## -## * The .i file is newer than any or all of the generated files; -## -## * Any or all of the .cc, .h, or .py files does not exist and is -## needed (in the case this file is not needed, the rule for it is -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/gnuradio_swig_py_hier-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_hier-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-*stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-python-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 -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp; \ - 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. -gnuradio_swig_py_hier_guile.h gnuradio_swig_py_hier.scm gnuradio_swig_py_hier_guile.cc: gnuradio_swig_py_hier.i -if GUILE - trap 'rm -rf $(DEPDIR)/gnuradio_swig_py_hier-generate-*' 1 2 13 15; \ - if mkdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock 2>/dev/null; then \ - rm -f $(DEPDIR)/gnuradio_swig_py_hier-generate-*stamp; \ - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp WHAT=$<; \ - rmdir $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; \ - else \ - while test -d $(DEPDIR)/gnuradio_swig_py_hier-generate-lock; do \ - sleep 1; \ - done; \ - test -f $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp; \ - exit $$?; \ - fi; -endif # end of GUILE +# gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnuradio_swig_py_hier.i +guile/gnuradio_swig_py_hier.scm gnuradio_swig_py_hier.scm: gnuradio_swig_py_hier.i +python/gnuradio_swig_py_hier.py gnuradio_swig_py_hier.py: gnuradio_swig_py_hier.i $(DEPDIR)/gnuradio_swig_py_hier-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 -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gnuradio_swig_py_hier_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_hier_python.Std \ - -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier_python.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier_python.Std \ - > $(DEPDIR)/gnuradio_swig_py_hier_python.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_hier_python.Sd $(DEPDIR)/gnuradio_swig_py_hier_python.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/gnuradio_swig_py_hier_python.Std $(DEPDIR)/gnuradio_swig_py_hier_python.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/gnuradio_swig_py_hier_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)/gnuradio_swig_py_hier_python.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier_python.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_python.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp - -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# 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)/gnuradio_swig_py_hier_python.d@am__quote@ $(DEPDIR)/gnuradio_swig_py_hier-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) $(gnuradio_swig_py_hier_swig_args) \ - -MD -MF $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \ - -module gnuradio_swig_py_hier -o gnuradio_swig_py_hier_guile.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std \ - > $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd; \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \ - $(MV) $(DEPDIR)/gnuradio_swig_py_hier_guile.Sd $(DEPDIR)/gnuradio_swig_py_hier_guile.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.S*; exit 1; \ - fi; - touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.d - cp $(DEPDIR)/gnuradio_swig_py_hier_guile.Std $(DEPDIR)/gnuradio_swig_py_hier_guile.d - echo "" >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/gnuradio_swig_py_hier_guile.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/gnuradio_swig_py_hier_guile.d - $(RM) $(DEPDIR)/gnuradio_swig_py_hier_guile.Std - touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp -else - touch $(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp -endif - -@am__include@ @am__quote@./$(DEPDIR)/gnuradio_swig_py_hier_guile.d@am__quote@ - -#gnuradio_swig_py_runtime_python.h: gnuradio_swig_py_runtime.i -- cgit From 5650ee3c123dcd819542fbba1719e89a09ece399 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 21 Oct 2010 11:32:40 -0600 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 174 +++++++++++++++------------ 1 file changed, 96 insertions(+), 78 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 77127e462..54938187a 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -82,9 +82,11 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_runtime.py #gnuradio_swig_py_runtime.cc +# generating the py or scm file also generates the .cc or .h files, +# but dependencies work better without the .cc ort .h files listed. +swig_built_sources += gnuradio_swig_py_runtime.py if GUILE -swig_built_sources += gnuradio_swig_py_runtime.scm #gnuradio_swig_py_runtime.cc +swig_built_sources += gnuradio_swig_py_runtime.scm endif ## Various SWIG variables. These can be overloaded in the including @@ -106,22 +108,25 @@ _gnuradio_swig_py_runtime_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_runtime_la_swig_libadd) +# _gnuradio_swig_py_runtime_la_DEPENDENCIES = python/gnuradio_swig_py_runtime.lo + _gnuradio_swig_py_runtime_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_runtime_la_swig_ldflags) _gnuradio_swig_py_runtime_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(gnuradio_swig_py_runtime_la_swig_cxxflags) gnuradio_swig_py_runtime_python_PYTHON = \ - python/gnuradio_swig_py_runtime.py \ + gnuradio_swig_py_runtime.py \ $(gnuradio_swig_py_runtime) if GUILE gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = gnuradio_swig_py_runtime_guile.la gnuradio_swig_py_runtime_guile_la_SOURCES = \ - guile/gnuradio_swig_py_runtime.cc \ + guile/gnuradio_swig_py_runtime.cc \ $(gnuradio_swig_py_runtime_la_swig_sources) gnuradio_swig_py_runtime_scm_DATA = gnuradio_swig_py_runtime.scm @@ -130,18 +135,16 @@ gnuradio_swig_py_runtime_guile_la_LIBADD = $(_gnuradio_swig_py_runtime_la_LIBADD gnuradio_swig_py_runtime_guile_la_LDFLAGS = $(_gnuradio_swig_py_runtime_la_LDFLAGS) gnuradio_swig_py_runtime_guile_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_la_CXXFLAGS) -endif # end of GUILE - -## Entry rule for running SWIG +guile/gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.lo +#gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.scm +gnuradio_swig_py_runtime.scm: gnuradio_swig_py_runtime.i -# $(python_deps) $(guile_deps): gnuradio_swig_py_runtime.i -# gnuradio_swig_py_runtime.h gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.cc: gnuradio_swig_py_runtime.i -guile/gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime.scm: gnuradio_swig_py_runtime.i -python/gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.py: gnuradio_swig_py_runtime.i +endif # end of GUILE -$(DEPDIR)/gnuradio_swig_py_runtime-generate-python-stamp: +python/gnuradio_swig_py_runtime.lo: +gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.scm +gnuradio_swig_py_runtime.py: gnuradio_swig_py_runtime.i -$(DEPDIR)/gnuradio_swig_py_runtime-generate-guile-stamp: # -*- Makefile -*- # @@ -227,9 +230,11 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_general.py #gnuradio_swig_py_general.cc +# generating the py or scm file also generates the .cc or .h files, +# but dependencies work better without the .cc ort .h files listed. +swig_built_sources += gnuradio_swig_py_general.py if GUILE -swig_built_sources += gnuradio_swig_py_general.scm #gnuradio_swig_py_general.cc +swig_built_sources += gnuradio_swig_py_general.scm endif ## Various SWIG variables. These can be overloaded in the including @@ -251,22 +256,25 @@ _gnuradio_swig_py_general_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_general_la_swig_libadd) +# _gnuradio_swig_py_general_la_DEPENDENCIES = python/gnuradio_swig_py_general.lo + _gnuradio_swig_py_general_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_general_la_swig_ldflags) _gnuradio_swig_py_general_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(gnuradio_swig_py_general_la_swig_cxxflags) gnuradio_swig_py_general_python_PYTHON = \ - python/gnuradio_swig_py_general.py \ + gnuradio_swig_py_general.py \ $(gnuradio_swig_py_general) if GUILE gnuradio_swig_py_general_scmlib_LTLIBRARIES = gnuradio_swig_py_general_guile.la gnuradio_swig_py_general_guile_la_SOURCES = \ - guile/gnuradio_swig_py_general.cc \ + guile/gnuradio_swig_py_general.cc \ $(gnuradio_swig_py_general_la_swig_sources) gnuradio_swig_py_general_scm_DATA = gnuradio_swig_py_general.scm @@ -275,18 +283,16 @@ gnuradio_swig_py_general_guile_la_LIBADD = $(_gnuradio_swig_py_general_la_LIBADD gnuradio_swig_py_general_guile_la_LDFLAGS = $(_gnuradio_swig_py_general_la_LDFLAGS) gnuradio_swig_py_general_guile_la_CXXFLAGS = $(_gnuradio_swig_py_general_la_CXXFLAGS) -endif # end of GUILE - -## Entry rule for running SWIG +guile/gnuradio_swig_py_general.lo: gnuradio_swig_py_general.lo +#gnuradio_swig_py_general.lo: gnuradio_swig_py_general.scm +gnuradio_swig_py_general.scm: gnuradio_swig_py_general.i -# $(python_deps) $(guile_deps): gnuradio_swig_py_general.i -# gnuradio_swig_py_general.h gnuradio_swig_py_general.py gnuradio_swig_py_general.cc: gnuradio_swig_py_general.i -guile/gnuradio_swig_py_general.scm gnuradio_swig_py_general.scm: gnuradio_swig_py_general.i -python/gnuradio_swig_py_general.py gnuradio_swig_py_general.py: gnuradio_swig_py_general.i +endif # end of GUILE -$(DEPDIR)/gnuradio_swig_py_general-generate-python-stamp: +python/gnuradio_swig_py_general.lo: +gnuradio_swig_py_general.lo: gnuradio_swig_py_general.py gnuradio_swig_py_general.scm +gnuradio_swig_py_general.py: gnuradio_swig_py_general.i -$(DEPDIR)/gnuradio_swig_py_general-generate-guile-stamp: # -*- Makefile -*- # @@ -372,9 +378,11 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_gengen.py #gnuradio_swig_py_gengen.cc +# generating the py or scm file also generates the .cc or .h files, +# but dependencies work better without the .cc ort .h files listed. +swig_built_sources += gnuradio_swig_py_gengen.py if GUILE -swig_built_sources += gnuradio_swig_py_gengen.scm #gnuradio_swig_py_gengen.cc +swig_built_sources += gnuradio_swig_py_gengen.scm endif ## Various SWIG variables. These can be overloaded in the including @@ -396,22 +404,25 @@ _gnuradio_swig_py_gengen_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_gengen_la_swig_libadd) +# _gnuradio_swig_py_gengen_la_DEPENDENCIES = python/gnuradio_swig_py_gengen.lo + _gnuradio_swig_py_gengen_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_gengen_la_swig_ldflags) _gnuradio_swig_py_gengen_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(gnuradio_swig_py_gengen_la_swig_cxxflags) gnuradio_swig_py_gengen_python_PYTHON = \ - python/gnuradio_swig_py_gengen.py \ + gnuradio_swig_py_gengen.py \ $(gnuradio_swig_py_gengen) if GUILE gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = gnuradio_swig_py_gengen_guile.la gnuradio_swig_py_gengen_guile_la_SOURCES = \ - guile/gnuradio_swig_py_gengen.cc \ + guile/gnuradio_swig_py_gengen.cc \ $(gnuradio_swig_py_gengen_la_swig_sources) gnuradio_swig_py_gengen_scm_DATA = gnuradio_swig_py_gengen.scm @@ -420,18 +431,16 @@ gnuradio_swig_py_gengen_guile_la_LIBADD = $(_gnuradio_swig_py_gengen_la_LIBADD) gnuradio_swig_py_gengen_guile_la_LDFLAGS = $(_gnuradio_swig_py_gengen_la_LDFLAGS) gnuradio_swig_py_gengen_guile_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_la_CXXFLAGS) -endif # end of GUILE - -## Entry rule for running SWIG +guile/gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.lo +#gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.scm +gnuradio_swig_py_gengen.scm: gnuradio_swig_py_gengen.i -# $(python_deps) $(guile_deps): gnuradio_swig_py_gengen.i -# gnuradio_swig_py_gengen.h gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.cc: gnuradio_swig_py_gengen.i -guile/gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen.scm: gnuradio_swig_py_gengen.i -python/gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.py: gnuradio_swig_py_gengen.i +endif # end of GUILE -$(DEPDIR)/gnuradio_swig_py_gengen-generate-python-stamp: +python/gnuradio_swig_py_gengen.lo: +gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.scm +gnuradio_swig_py_gengen.py: gnuradio_swig_py_gengen.i -$(DEPDIR)/gnuradio_swig_py_gengen-generate-guile-stamp: # -*- Makefile -*- # @@ -517,9 +526,11 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_filter.py #gnuradio_swig_py_filter.cc +# generating the py or scm file also generates the .cc or .h files, +# but dependencies work better without the .cc ort .h files listed. +swig_built_sources += gnuradio_swig_py_filter.py if GUILE -swig_built_sources += gnuradio_swig_py_filter.scm #gnuradio_swig_py_filter.cc +swig_built_sources += gnuradio_swig_py_filter.scm endif ## Various SWIG variables. These can be overloaded in the including @@ -541,22 +552,25 @@ _gnuradio_swig_py_filter_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_filter_la_swig_libadd) +# _gnuradio_swig_py_filter_la_DEPENDENCIES = python/gnuradio_swig_py_filter.lo + _gnuradio_swig_py_filter_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_filter_la_swig_ldflags) _gnuradio_swig_py_filter_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(gnuradio_swig_py_filter_la_swig_cxxflags) gnuradio_swig_py_filter_python_PYTHON = \ - python/gnuradio_swig_py_filter.py \ + gnuradio_swig_py_filter.py \ $(gnuradio_swig_py_filter) if GUILE gnuradio_swig_py_filter_scmlib_LTLIBRARIES = gnuradio_swig_py_filter_guile.la gnuradio_swig_py_filter_guile_la_SOURCES = \ - guile/gnuradio_swig_py_filter.cc \ + guile/gnuradio_swig_py_filter.cc \ $(gnuradio_swig_py_filter_la_swig_sources) gnuradio_swig_py_filter_scm_DATA = gnuradio_swig_py_filter.scm @@ -565,18 +579,16 @@ gnuradio_swig_py_filter_guile_la_LIBADD = $(_gnuradio_swig_py_filter_la_LIBADD) gnuradio_swig_py_filter_guile_la_LDFLAGS = $(_gnuradio_swig_py_filter_la_LDFLAGS) gnuradio_swig_py_filter_guile_la_CXXFLAGS = $(_gnuradio_swig_py_filter_la_CXXFLAGS) -endif # end of GUILE - -## Entry rule for running SWIG +guile/gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.lo +#gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.scm +gnuradio_swig_py_filter.scm: gnuradio_swig_py_filter.i -# $(python_deps) $(guile_deps): gnuradio_swig_py_filter.i -# gnuradio_swig_py_filter.h gnuradio_swig_py_filter.py gnuradio_swig_py_filter.cc: gnuradio_swig_py_filter.i -guile/gnuradio_swig_py_filter.scm gnuradio_swig_py_filter.scm: gnuradio_swig_py_filter.i -python/gnuradio_swig_py_filter.py gnuradio_swig_py_filter.py: gnuradio_swig_py_filter.i +endif # end of GUILE -$(DEPDIR)/gnuradio_swig_py_filter-generate-python-stamp: +python/gnuradio_swig_py_filter.lo: +gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.py gnuradio_swig_py_filter.scm +gnuradio_swig_py_filter.py: gnuradio_swig_py_filter.i -$(DEPDIR)/gnuradio_swig_py_filter-generate-guile-stamp: # -*- Makefile -*- # @@ -662,9 +674,11 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_io.py #gnuradio_swig_py_io.cc +# generating the py or scm file also generates the .cc or .h files, +# but dependencies work better without the .cc ort .h files listed. +swig_built_sources += gnuradio_swig_py_io.py if GUILE -swig_built_sources += gnuradio_swig_py_io.scm #gnuradio_swig_py_io.cc +swig_built_sources += gnuradio_swig_py_io.scm endif ## Various SWIG variables. These can be overloaded in the including @@ -686,22 +700,25 @@ _gnuradio_swig_py_io_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_io_la_swig_libadd) +# _gnuradio_swig_py_io_la_DEPENDENCIES = python/gnuradio_swig_py_io.lo + _gnuradio_swig_py_io_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_io_la_swig_ldflags) _gnuradio_swig_py_io_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(gnuradio_swig_py_io_la_swig_cxxflags) gnuradio_swig_py_io_python_PYTHON = \ - python/gnuradio_swig_py_io.py \ + gnuradio_swig_py_io.py \ $(gnuradio_swig_py_io) if GUILE gnuradio_swig_py_io_scmlib_LTLIBRARIES = gnuradio_swig_py_io_guile.la gnuradio_swig_py_io_guile_la_SOURCES = \ - guile/gnuradio_swig_py_io.cc \ + guile/gnuradio_swig_py_io.cc \ $(gnuradio_swig_py_io_la_swig_sources) gnuradio_swig_py_io_scm_DATA = gnuradio_swig_py_io.scm @@ -710,18 +727,16 @@ gnuradio_swig_py_io_guile_la_LIBADD = $(_gnuradio_swig_py_io_la_LIBADD) gnuradio_swig_py_io_guile_la_LDFLAGS = $(_gnuradio_swig_py_io_la_LDFLAGS) gnuradio_swig_py_io_guile_la_CXXFLAGS = $(_gnuradio_swig_py_io_la_CXXFLAGS) -endif # end of GUILE - -## Entry rule for running SWIG +guile/gnuradio_swig_py_io.lo: gnuradio_swig_py_io.lo +#gnuradio_swig_py_io.lo: gnuradio_swig_py_io.scm +gnuradio_swig_py_io.scm: gnuradio_swig_py_io.i -# $(python_deps) $(guile_deps): gnuradio_swig_py_io.i -# gnuradio_swig_py_io.h gnuradio_swig_py_io.py gnuradio_swig_py_io.cc: gnuradio_swig_py_io.i -guile/gnuradio_swig_py_io.scm gnuradio_swig_py_io.scm: gnuradio_swig_py_io.i -python/gnuradio_swig_py_io.py gnuradio_swig_py_io.py: gnuradio_swig_py_io.i +endif # end of GUILE -$(DEPDIR)/gnuradio_swig_py_io-generate-python-stamp: +python/gnuradio_swig_py_io.lo: +gnuradio_swig_py_io.lo: gnuradio_swig_py_io.py gnuradio_swig_py_io.scm +gnuradio_swig_py_io.py: gnuradio_swig_py_io.i -$(DEPDIR)/gnuradio_swig_py_io-generate-guile-stamp: # -*- Makefile -*- # @@ -807,9 +822,11 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* ## .h file is sometimes built, but not always ... so that one has to ## be added manually by the including Makefile.am . -swig_built_sources += gnuradio_swig_py_hier.py #gnuradio_swig_py_hier.cc +# generating the py or scm file also generates the .cc or .h files, +# but dependencies work better without the .cc ort .h files listed. +swig_built_sources += gnuradio_swig_py_hier.py if GUILE -swig_built_sources += gnuradio_swig_py_hier.scm #gnuradio_swig_py_hier.cc +swig_built_sources += gnuradio_swig_py_hier.scm endif ## Various SWIG variables. These can be overloaded in the including @@ -831,22 +848,25 @@ _gnuradio_swig_py_hier_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_swig_py_hier_la_swig_libadd) +# _gnuradio_swig_py_hier_la_DEPENDENCIES = python/gnuradio_swig_py_hier.lo + _gnuradio_swig_py_hier_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_swig_py_hier_la_swig_ldflags) _gnuradio_swig_py_hier_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(gnuradio_swig_py_hier_la_swig_cxxflags) gnuradio_swig_py_hier_python_PYTHON = \ - python/gnuradio_swig_py_hier.py \ + gnuradio_swig_py_hier.py \ $(gnuradio_swig_py_hier) if GUILE gnuradio_swig_py_hier_scmlib_LTLIBRARIES = gnuradio_swig_py_hier_guile.la gnuradio_swig_py_hier_guile_la_SOURCES = \ - guile/gnuradio_swig_py_hier.cc \ + guile/gnuradio_swig_py_hier.cc \ $(gnuradio_swig_py_hier_la_swig_sources) gnuradio_swig_py_hier_scm_DATA = gnuradio_swig_py_hier.scm @@ -855,16 +875,14 @@ gnuradio_swig_py_hier_guile_la_LIBADD = $(_gnuradio_swig_py_hier_la_LIBADD) gnuradio_swig_py_hier_guile_la_LDFLAGS = $(_gnuradio_swig_py_hier_la_LDFLAGS) gnuradio_swig_py_hier_guile_la_CXXFLAGS = $(_gnuradio_swig_py_hier_la_CXXFLAGS) -endif # end of GUILE - -## Entry rule for running SWIG +guile/gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.lo +#gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.scm +gnuradio_swig_py_hier.scm: gnuradio_swig_py_hier.i -# $(python_deps) $(guile_deps): gnuradio_swig_py_hier.i -# gnuradio_swig_py_hier.h gnuradio_swig_py_hier.py gnuradio_swig_py_hier.cc: gnuradio_swig_py_hier.i -guile/gnuradio_swig_py_hier.scm gnuradio_swig_py_hier.scm: gnuradio_swig_py_hier.i -python/gnuradio_swig_py_hier.py gnuradio_swig_py_hier.py: gnuradio_swig_py_hier.i +endif # end of GUILE -$(DEPDIR)/gnuradio_swig_py_hier-generate-python-stamp: +python/gnuradio_swig_py_hier.lo: +gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.py gnuradio_swig_py_hier.scm +gnuradio_swig_py_hier.py: gnuradio_swig_py_hier.i -$(DEPDIR)/gnuradio_swig_py_hier-generate-guile-stamp: -- cgit From 75aed9281e0f918fe11a3c040e6b46387dd676c5 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 21 Oct 2010 11:33:04 -0600 Subject: add comments --- gnuradio-core/src/lib/swig/Makefile.am | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 5f55e63b5..21bfe6761 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -22,8 +22,6 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig -# VPATH += python guile - BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources) CLEANFILES = python/gnuradio* if GUILE @@ -114,16 +112,25 @@ endif # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) -# Compile a .i to what guile needs +# Compile a .i to what guile needs. We use -o to set the output file name, +# or even with -outdir guile in SWIG_GUILE_ARGS, swig keeps putting a +# gnuradio_swig_py_*_wrap.cxx in the source directory. + +## SWIG suffixes for automake to know about +SUFFIXES = .i .scm .pyvi + +if GUILE .i.scm: + @echo "Compile .i to .scm" @test -d "guile" || $(mkinstalldirs) "guile" $(SWIG) $(STD_SWIG_GUILE_ARGS) $($*_swig_args) \ -module $* -o guile/$*.cc $< +# -MD -MF guile/$(DEPDIR)/$*.Std +endif # Compile a .i file to what python needs .i.py: + @echo "Compile .i to .py" @test -d "python" || $(mkinstalldirs) "python" $(SWIG) $(STD_SWIG_PYTHON_ARGS) $($*_swig_args) \ - -MD -MF python/$(DEPDIR)/$*.Std \ -module $* -o python/$*.cc -oh python/$*.h $< - -- cgit From cf8f2a00c886b7c6980f7d1e3eac25eb37a12d3a Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 21 Oct 2010 12:13:48 -0600 Subject: move new suffix rules to common Makefile so everything can use them. --- gnuradio-core/src/lib/swig/Makefile.am | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 21bfe6761..5f5a12eb2 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -116,21 +116,3 @@ no_dist_files = $(swig_built_sources) # or even with -outdir guile in SWIG_GUILE_ARGS, swig keeps putting a # gnuradio_swig_py_*_wrap.cxx in the source directory. -## SWIG suffixes for automake to know about -SUFFIXES = .i .scm .pyvi - -if GUILE -.i.scm: - @echo "Compile .i to .scm" - @test -d "guile" || $(mkinstalldirs) "guile" - $(SWIG) $(STD_SWIG_GUILE_ARGS) $($*_swig_args) \ - -module $* -o guile/$*.cc $< -# -MD -MF guile/$(DEPDIR)/$*.Std -endif - -# Compile a .i file to what python needs -.i.py: - @echo "Compile .i to .py" - @test -d "python" || $(mkinstalldirs) "python" - $(SWIG) $(STD_SWIG_PYTHON_ARGS) $($*_swig_args) \ - -module $* -o python/$*.cc -oh python/$*.h $< -- cgit From aa162012cc25cf080ee744a2cb795a6154fcca86 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 21 Oct 2010 13:16:05 -0600 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 54938187a..5846134a9 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -136,7 +136,6 @@ gnuradio_swig_py_runtime_guile_la_LDFLAGS = $(_gnuradio_swig_py_runtime_la_LDFLA gnuradio_swig_py_runtime_guile_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_la_CXXFLAGS) guile/gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.lo -#gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime.scm: gnuradio_swig_py_runtime.i endif # end of GUILE @@ -284,7 +283,6 @@ gnuradio_swig_py_general_guile_la_LDFLAGS = $(_gnuradio_swig_py_general_la_LDFLA gnuradio_swig_py_general_guile_la_CXXFLAGS = $(_gnuradio_swig_py_general_la_CXXFLAGS) guile/gnuradio_swig_py_general.lo: gnuradio_swig_py_general.lo -#gnuradio_swig_py_general.lo: gnuradio_swig_py_general.scm gnuradio_swig_py_general.scm: gnuradio_swig_py_general.i endif # end of GUILE @@ -432,7 +430,6 @@ gnuradio_swig_py_gengen_guile_la_LDFLAGS = $(_gnuradio_swig_py_gengen_la_LDFLAGS gnuradio_swig_py_gengen_guile_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_la_CXXFLAGS) guile/gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.lo -#gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen.scm: gnuradio_swig_py_gengen.i endif # end of GUILE @@ -580,7 +577,6 @@ gnuradio_swig_py_filter_guile_la_LDFLAGS = $(_gnuradio_swig_py_filter_la_LDFLAGS gnuradio_swig_py_filter_guile_la_CXXFLAGS = $(_gnuradio_swig_py_filter_la_CXXFLAGS) guile/gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.lo -#gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.scm gnuradio_swig_py_filter.scm: gnuradio_swig_py_filter.i endif # end of GUILE @@ -728,7 +724,6 @@ gnuradio_swig_py_io_guile_la_LDFLAGS = $(_gnuradio_swig_py_io_la_LDFLAGS) gnuradio_swig_py_io_guile_la_CXXFLAGS = $(_gnuradio_swig_py_io_la_CXXFLAGS) guile/gnuradio_swig_py_io.lo: gnuradio_swig_py_io.lo -#gnuradio_swig_py_io.lo: gnuradio_swig_py_io.scm gnuradio_swig_py_io.scm: gnuradio_swig_py_io.i endif # end of GUILE @@ -876,7 +871,6 @@ gnuradio_swig_py_hier_guile_la_LDFLAGS = $(_gnuradio_swig_py_hier_la_LDFLAGS) gnuradio_swig_py_hier_guile_la_CXXFLAGS = $(_gnuradio_swig_py_hier_la_CXXFLAGS) guile/gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.lo -#gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.scm gnuradio_swig_py_hier.scm: gnuradio_swig_py_hier.i endif # end of GUILE -- cgit From cba092c9daa285236cc2b5c4f61898f15ef0a589 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 21 Oct 2010 16:14:58 -0600 Subject: correct typo in script name --- gnuradio-core/src/lib/swig/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 5f5a12eb2..83d733f3e 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -43,7 +43,7 @@ swiginclude_HEADERS = \ # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr -ourpython_PYTHON = gnuradio_swig.py +ourpython_PYTHON = gnuradio_swig_python.py # This is the top level guile file, which loads all the other scm files # for gnuradio. This has to be installed top level to be found in the -- cgit From 827f95ce49fadfaeec1ee09185d1502074eb0bbb Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 13:56:05 -0700 Subject: Add stub for gnuradio_swig.scm to get make to work --- gnuradio-core/src/lib/swig/gnuradio_swig.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig.scm (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig.scm b/gnuradio-core/src/lib/swig/gnuradio_swig.scm new file mode 100644 index 000000000..961564d68 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_swig.scm @@ -0,0 +1,13 @@ +;;; +;;; Not sure that we need this for guile or not. +;;; We'll need to assemble the (gnuradio gr) module somewhere... +;;; + +;; # This file implements the old gnuradio_swig_python namespace +;; +;; from gnuradio_swig_py_runtime import * +;; from gnuradio_swig_py_general import * +;; from gnuradio_swig_py_gengen import * +;; from gnuradio_swig_py_filter import * +;; from gnuradio_swig_py_io import * +;; from gnuradio_swig_py_hier import * -- cgit From e3ea18ee8732f17151bb00896f982f7859c0e228 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 14:01:49 -0700 Subject: Move TOP_SWIG_IFILES outside of if PYTHON --- gnuradio-core/src/lib/swig/Makefile.am | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 83d733f3e..4c15b7e61 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -28,6 +28,22 @@ if GUILE CLEANFILES += guile/gnuradio* endif +# ---------------------------------------------------------------- +# We've split the previously monstrous gnuradio_swig_python into 6 +# smaller pieces. This reduces compile time coupling and creates +# smaller pieces for the compiler to digest. prior to this change, on +# X86_64, g++'s resident set size was 650MB! +# ---------------------------------------------------------------- + +TOP_SWIG_IFILES = \ + gnuradio_swig_py_runtime.i \ + gnuradio_swig_py_general.i \ + gnuradio_swig_py_gengen.i \ + gnuradio_swig_py_filter.i \ + gnuradio_swig_py_io.i \ + gnuradio_swig_py_hier.i + + if PYTHON AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) @@ -60,21 +76,6 @@ gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.py $(srcdir)/gen-swig- # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = gnuradio_swig_bug_workaround.h -# ---------------------------------------------------------------- -# We've split the previously monstrous gnuradio_swig_python into 6 -# smaller pieces. This reduces compile time coupling and creates -# smaller pieces for the compiler to digest. prior to this change, on -# X86_64, g++'s resident set size was 650MB! -# ---------------------------------------------------------------- - -TOP_SWIG_IFILES = \ - gnuradio_swig_py_runtime.i \ - gnuradio_swig_py_general.i \ - gnuradio_swig_py_gengen.i \ - gnuradio_swig_py_filter.i \ - gnuradio_swig_py_io.i \ - gnuradio_swig_py_hier.i - # Install so that they end up available as: # import gnuradio.gr # This ends up at: -- cgit From b61a156d4d3125882bfa3563ebd4a992ba00a6f7 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 15:14:44 -0700 Subject: Move common stuff outside of if PYTHON --- gnuradio-core/src/lib/swig/Makefile.am | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 4c15b7e61..f96352d1a 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -44,28 +44,32 @@ TOP_SWIG_IFILES = \ gnuradio_swig_py_hier.i -if PYTHON -AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ - $(WITH_INCLUDES) - -EXTRA_DIST = gen-swig-bug-fix - # SWIG headers get installed in ${prefix}/include/gnuradio/swig swiginclude_HEADERS = \ gnuradio.i \ gr_swig_block_magic.i \ gr_shared_ptr.i -# special install for this top-level Python script which includes all -# of the split Python libraries. -ourpythondir = $(grpythondir)/gr -ourpython_PYTHON = gnuradio_swig_python.py +if GUILE # This is the top level guile file, which loads all the other scm files # for gnuradio. This has to be installed top level to be found in the # default search path. guiledir = @GUILE_PKDATADIR@ guile_DATA = gnuradio_swig.scm +endif + + +if PYTHON +AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(WITH_INCLUDES) + +EXTRA_DIST = gen-swig-bug-fix + +# special install for this top-level Python script which includes all +# of the split Python libraries. +ourpythondir = $(grpythondir)/gr +ourpython_PYTHON = gnuradio_swig_python.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... -- cgit From 00ba420478fb0e328fa93e795ea0c80e7de63534 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 15:14:57 -0700 Subject: Move #ifdef SWIGPYTHON outside of %define There's apparently a time-of-evaluation issue here. The docs say they reevaluate the contents of %define at expansion time. Apparently SWIGPYTHON et al. aren't defined in whatever scope that may be. --- gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i index 99e01b0ef..e2ddaeedd 100644 --- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i +++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i @@ -24,22 +24,27 @@ _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, PKG ## _ ## BASE_NAME, BASE_NAME) %enddef -%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, NAME, BASE_NAME) +%define _GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, NAME, BASE_NAME) class NAME; typedef boost::shared_ptr NAME ## _sptr; %template(NAME ## _sptr) boost::shared_ptr; %rename(BASE_NAME) PKG ## _make_ ## BASE_NAME; +%ignore NAME; +%enddef #ifdef SWIGPYTHON +%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, NAME, BASE_NAME) +_GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, NAME, BASE_NAME) %pythoncode %{ NAME ## _sptr.block = lambda self: NAME ## _block (self) NAME ## _sptr.__repr__ = lambda self: "" % (self.name(), self.unique_id ()) %} -#endif - -%ignore NAME; %enddef +#endif #ifdef SWIGGUILE +%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, NAME, BASE_NAME) +_GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, NAME, BASE_NAME) #warning "gr_block_sptr needs to be implemented!" +%enddef #endif -- cgit From 0b80f3a41fa4ef358d0294f4b9fcae411611ec12 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 15:16:46 -0700 Subject: Remove dead and broken code from GR_SWIG_BLOCK_MAGIC. Looks like this hasn't been used since we converted the hier_block stuff to C++, and it's been broken since then. --- gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 1 - 1 file changed, 1 deletion(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i index e2ddaeedd..7adccf28a 100644 --- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i +++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i @@ -36,7 +36,6 @@ typedef boost::shared_ptr NAME ## _sptr; %define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, NAME, BASE_NAME) _GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, NAME, BASE_NAME) %pythoncode %{ -NAME ## _sptr.block = lambda self: NAME ## _block (self) NAME ## _sptr.__repr__ = lambda self: "" % (self.name(), self.unique_id ()) %} %enddef -- cgit From 1b95d66c179048b086ee8aa6a75a23d1edc006dc Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 21:56:51 -0700 Subject: Set new install locations for guile scm code and libraries. I think we may want to rename the guile .so's and install them into libdir instead... --- gnuradio-core/src/lib/swig/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index f96352d1a..67d188957 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -55,8 +55,7 @@ if GUILE # This is the top level guile file, which loads all the other scm files # for gnuradio. This has to be installed top level to be found in the # default search path. -guiledir = @GUILE_PKDATADIR@ -guile_DATA = gnuradio_swig.scm +grguile_DATA = gnuradio_swig.scm endif -- cgit From 98c246e264092c306c276b639d8c839b83fd64ec Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 21:59:45 -0700 Subject: Remove leading _ from guile library names coded into .i files --- gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i index 42e46d444..cb9eb35a7 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "_gnuradio_swig_py_filter_guile" "SWIG_init") +(load-extension "gnuradio_swig_py_filter_guile" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i index dcf284ab3..05ed69d31 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "_gnuradio_swig_py_general_guile" "SWIG_init") +(load-extension "gnuradio_swig_py_general_guile" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i index ee18abc18..64b9c804d 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "_gnuradio_swig_py_gengen_guile" "SWIG_init") +(load-extension "gnuradio_swig_py_gengen_guile" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i index 36ee3c40d..c3bf32d6a 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "_gnuradio_swig_py_heir_guile" "SWIG_init") +(load-extension "gnuradio_swig_py_heir_guile" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i index cb8509b10..c3ed7c6ba 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "_gnuradio_swig_py_io_guile" "SWIG_init") +(load-extension "gnuradio_swig_py_io_guile" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i index a3ab8d012..f8eff1189 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i @@ -34,6 +34,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "_gnuradio_swig_py_runtime_guile" "SWIG_init") +(load-extension "gnuradio_swig_py_runtime_guile" "SWIG_init") %} #endif -- cgit From 1e34972f4433cbfef3500fc73a285c7c436cfd6b Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 22:00:09 -0700 Subject: Rengenerate Makefile.swig.gen's --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 30 +++++++++++++++++----------- 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 5846134a9..032d13857 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -41,12 +41,12 @@ gnuradio_swig_py_runtime_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_runtime_pyli # 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. -gnuradio_swig_py_runtime_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +gnuradio_swig_py_runtime_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_runtime # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_runtime_scmdir = @GUILE_PKDATADIR@/gnuradio +gnuradio_swig_py_runtime_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. @@ -144,6 +144,7 @@ python/gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.scm gnuradio_swig_py_runtime.py: gnuradio_swig_py_runtime.i +-include python/gnuradio_swig_py_runtime.d # -*- Makefile -*- # @@ -188,12 +189,12 @@ gnuradio_swig_py_general_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_general_pyli # 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. -gnuradio_swig_py_general_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +gnuradio_swig_py_general_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_general # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_general_scmdir = @GUILE_PKDATADIR@/gnuradio +gnuradio_swig_py_general_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. @@ -291,6 +292,7 @@ python/gnuradio_swig_py_general.lo: gnuradio_swig_py_general.lo: gnuradio_swig_py_general.py gnuradio_swig_py_general.scm gnuradio_swig_py_general.py: gnuradio_swig_py_general.i +-include python/gnuradio_swig_py_general.d # -*- Makefile -*- # @@ -335,12 +337,12 @@ gnuradio_swig_py_gengen_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_gengen_pylibd # 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. -gnuradio_swig_py_gengen_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +gnuradio_swig_py_gengen_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_gengen # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_gengen_scmdir = @GUILE_PKDATADIR@/gnuradio +gnuradio_swig_py_gengen_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. @@ -438,6 +440,7 @@ python/gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.scm gnuradio_swig_py_gengen.py: gnuradio_swig_py_gengen.i +-include python/gnuradio_swig_py_gengen.d # -*- Makefile -*- # @@ -482,12 +485,12 @@ gnuradio_swig_py_filter_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_filter_pylibd # 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. -gnuradio_swig_py_filter_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +gnuradio_swig_py_filter_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_filter # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_filter_scmdir = @GUILE_PKDATADIR@/gnuradio +gnuradio_swig_py_filter_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. @@ -585,6 +588,7 @@ python/gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.py gnuradio_swig_py_filter.scm gnuradio_swig_py_filter.py: gnuradio_swig_py_filter.i +-include python/gnuradio_swig_py_filter.d # -*- Makefile -*- # @@ -629,12 +633,12 @@ gnuradio_swig_py_io_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_io_pylibdir_categ # 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. -gnuradio_swig_py_io_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +gnuradio_swig_py_io_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_io # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_io_scmdir = @GUILE_PKDATADIR@/gnuradio +gnuradio_swig_py_io_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. @@ -732,6 +736,7 @@ python/gnuradio_swig_py_io.lo: gnuradio_swig_py_io.lo: gnuradio_swig_py_io.py gnuradio_swig_py_io.scm gnuradio_swig_py_io.py: gnuradio_swig_py_io.i +-include python/gnuradio_swig_py_io.d # -*- Makefile -*- # @@ -776,12 +781,12 @@ gnuradio_swig_py_hier_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_hier_pylibdir_c # 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. -gnuradio_swig_py_hier_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +gnuradio_swig_py_hier_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_hier # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_hier_scmdir = @GUILE_PKDATADIR@/gnuradio +gnuradio_swig_py_hier_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. @@ -879,4 +884,5 @@ python/gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.py gnuradio_swig_py_hier.scm gnuradio_swig_py_hier.py: gnuradio_swig_py_hier.i +-include python/gnuradio_swig_py_hier.d -- cgit From 6b5c73eb36bb45fc214616104c0a6c675dbce538 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 22:20:26 -0700 Subject: Remove #warning from gr_swig_block_magic.i --- gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i index 7adccf28a..ea6368fd4 100644 --- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i +++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i @@ -44,6 +44,6 @@ NAME ## _sptr.__repr__ = lambda self: "" % (self.name(), self. #ifdef SWIGGUILE %define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, NAME, BASE_NAME) _GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, NAME, BASE_NAME) -#warning "gr_block_sptr needs to be implemented!" +/* FIXME May want to add something here to get a friendlier printed representation */ %enddef #endif -- cgit From fba8a45e81a718280e9364d30d4224d589ff171d Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 23:25:21 -0700 Subject: Rename guile libs to libguile-* and install them in $(libdir). This follows the Guile recommendations and should remove the need for adding an additional directory to LD_LIBRARY_PATH. --- gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i index cb9eb35a7..e40af08ca 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "gnuradio_swig_py_filter_guile" "SWIG_init") +(load-extension "libguile-gnuradio_swig_py_filter" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i index 05ed69d31..c4e9c070d 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "gnuradio_swig_py_general_guile" "SWIG_init") +(load-extension "libguile-gnuradio_swig_py_general" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i index 64b9c804d..54e1b0944 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "gnuradio_swig_py_gengen_guile" "SWIG_init") +(load-extension "libguile-gnuradio_swig_py_gengen" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i index c3bf32d6a..61029b120 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "gnuradio_swig_py_heir_guile" "SWIG_init") +(load-extension "libguile-gnuradio_swig_py_heir" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i index c3ed7c6ba..d7d206ef8 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "gnuradio_swig_py_io_guile" "SWIG_init") +(load-extension "libguile-gnuradio_swig_py_io" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i index f8eff1189..088ae4cf8 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i @@ -34,6 +34,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "gnuradio_swig_py_runtime_guile" "SWIG_init") +(load-extension "libguile-gnuradio_swig_py_runtime" "SWIG_init") %} #endif -- cgit From 6421d47062f4bf5abbdf26142616a5965f1edfa0 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 22 Oct 2010 23:28:06 -0700 Subject: regenerate --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 72 ++++++++++++++-------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 032d13857..39afc8973 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -41,7 +41,7 @@ gnuradio_swig_py_runtime_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_runtime_pyli # 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. -gnuradio_swig_py_runtime_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_runtime_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_runtime @@ -124,16 +124,16 @@ gnuradio_swig_py_runtime_python_PYTHON = \ $(gnuradio_swig_py_runtime) if GUILE -gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = gnuradio_swig_py_runtime_guile.la -gnuradio_swig_py_runtime_guile_la_SOURCES = \ +gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_runtime.la +libguile_gnuradio_swig_py_runtime_la_SOURCES = \ guile/gnuradio_swig_py_runtime.cc \ $(gnuradio_swig_py_runtime_la_swig_sources) gnuradio_swig_py_runtime_scm_DATA = gnuradio_swig_py_runtime.scm # Guile can use the same flags as python does -gnuradio_swig_py_runtime_guile_la_LIBADD = $(_gnuradio_swig_py_runtime_la_LIBADD) -gnuradio_swig_py_runtime_guile_la_LDFLAGS = $(_gnuradio_swig_py_runtime_la_LDFLAGS) -gnuradio_swig_py_runtime_guile_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_la_CXXFLAGS) +libguile_gnuradio_swig_py_runtime_la_LIBADD = $(_gnuradio_swig_py_runtime_la_LIBADD) +libguile_gnuradio_swig_py_runtime_la_LDFLAGS = $(_gnuradio_swig_py_runtime_la_LDFLAGS) +libguile_gnuradio_swig_py_runtime_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_la_CXXFLAGS) guile/gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.lo gnuradio_swig_py_runtime.scm: gnuradio_swig_py_runtime.i @@ -189,7 +189,7 @@ gnuradio_swig_py_general_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_general_pyli # 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. -gnuradio_swig_py_general_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_general_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_general @@ -272,16 +272,16 @@ gnuradio_swig_py_general_python_PYTHON = \ $(gnuradio_swig_py_general) if GUILE -gnuradio_swig_py_general_scmlib_LTLIBRARIES = gnuradio_swig_py_general_guile.la -gnuradio_swig_py_general_guile_la_SOURCES = \ +gnuradio_swig_py_general_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_general.la +libguile_gnuradio_swig_py_general_la_SOURCES = \ guile/gnuradio_swig_py_general.cc \ $(gnuradio_swig_py_general_la_swig_sources) gnuradio_swig_py_general_scm_DATA = gnuradio_swig_py_general.scm # Guile can use the same flags as python does -gnuradio_swig_py_general_guile_la_LIBADD = $(_gnuradio_swig_py_general_la_LIBADD) -gnuradio_swig_py_general_guile_la_LDFLAGS = $(_gnuradio_swig_py_general_la_LDFLAGS) -gnuradio_swig_py_general_guile_la_CXXFLAGS = $(_gnuradio_swig_py_general_la_CXXFLAGS) +libguile_gnuradio_swig_py_general_la_LIBADD = $(_gnuradio_swig_py_general_la_LIBADD) +libguile_gnuradio_swig_py_general_la_LDFLAGS = $(_gnuradio_swig_py_general_la_LDFLAGS) +libguile_gnuradio_swig_py_general_la_CXXFLAGS = $(_gnuradio_swig_py_general_la_CXXFLAGS) guile/gnuradio_swig_py_general.lo: gnuradio_swig_py_general.lo gnuradio_swig_py_general.scm: gnuradio_swig_py_general.i @@ -337,7 +337,7 @@ gnuradio_swig_py_gengen_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_gengen_pylibd # 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. -gnuradio_swig_py_gengen_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_gengen_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_gengen @@ -420,16 +420,16 @@ gnuradio_swig_py_gengen_python_PYTHON = \ $(gnuradio_swig_py_gengen) if GUILE -gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = gnuradio_swig_py_gengen_guile.la -gnuradio_swig_py_gengen_guile_la_SOURCES = \ +gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_gengen.la +libguile_gnuradio_swig_py_gengen_la_SOURCES = \ guile/gnuradio_swig_py_gengen.cc \ $(gnuradio_swig_py_gengen_la_swig_sources) gnuradio_swig_py_gengen_scm_DATA = gnuradio_swig_py_gengen.scm # Guile can use the same flags as python does -gnuradio_swig_py_gengen_guile_la_LIBADD = $(_gnuradio_swig_py_gengen_la_LIBADD) -gnuradio_swig_py_gengen_guile_la_LDFLAGS = $(_gnuradio_swig_py_gengen_la_LDFLAGS) -gnuradio_swig_py_gengen_guile_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_la_CXXFLAGS) +libguile_gnuradio_swig_py_gengen_la_LIBADD = $(_gnuradio_swig_py_gengen_la_LIBADD) +libguile_gnuradio_swig_py_gengen_la_LDFLAGS = $(_gnuradio_swig_py_gengen_la_LDFLAGS) +libguile_gnuradio_swig_py_gengen_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_la_CXXFLAGS) guile/gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.lo gnuradio_swig_py_gengen.scm: gnuradio_swig_py_gengen.i @@ -485,7 +485,7 @@ gnuradio_swig_py_filter_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_filter_pylibd # 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. -gnuradio_swig_py_filter_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_filter_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_filter @@ -568,16 +568,16 @@ gnuradio_swig_py_filter_python_PYTHON = \ $(gnuradio_swig_py_filter) if GUILE -gnuradio_swig_py_filter_scmlib_LTLIBRARIES = gnuradio_swig_py_filter_guile.la -gnuradio_swig_py_filter_guile_la_SOURCES = \ +gnuradio_swig_py_filter_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_filter.la +libguile_gnuradio_swig_py_filter_la_SOURCES = \ guile/gnuradio_swig_py_filter.cc \ $(gnuradio_swig_py_filter_la_swig_sources) gnuradio_swig_py_filter_scm_DATA = gnuradio_swig_py_filter.scm # Guile can use the same flags as python does -gnuradio_swig_py_filter_guile_la_LIBADD = $(_gnuradio_swig_py_filter_la_LIBADD) -gnuradio_swig_py_filter_guile_la_LDFLAGS = $(_gnuradio_swig_py_filter_la_LDFLAGS) -gnuradio_swig_py_filter_guile_la_CXXFLAGS = $(_gnuradio_swig_py_filter_la_CXXFLAGS) +libguile_gnuradio_swig_py_filter_la_LIBADD = $(_gnuradio_swig_py_filter_la_LIBADD) +libguile_gnuradio_swig_py_filter_la_LDFLAGS = $(_gnuradio_swig_py_filter_la_LDFLAGS) +libguile_gnuradio_swig_py_filter_la_CXXFLAGS = $(_gnuradio_swig_py_filter_la_CXXFLAGS) guile/gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.lo gnuradio_swig_py_filter.scm: gnuradio_swig_py_filter.i @@ -633,7 +633,7 @@ gnuradio_swig_py_io_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_io_pylibdir_categ # 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. -gnuradio_swig_py_io_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_io_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_io @@ -716,16 +716,16 @@ gnuradio_swig_py_io_python_PYTHON = \ $(gnuradio_swig_py_io) if GUILE -gnuradio_swig_py_io_scmlib_LTLIBRARIES = gnuradio_swig_py_io_guile.la -gnuradio_swig_py_io_guile_la_SOURCES = \ +gnuradio_swig_py_io_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_io.la +libguile_gnuradio_swig_py_io_la_SOURCES = \ guile/gnuradio_swig_py_io.cc \ $(gnuradio_swig_py_io_la_swig_sources) gnuradio_swig_py_io_scm_DATA = gnuradio_swig_py_io.scm # Guile can use the same flags as python does -gnuradio_swig_py_io_guile_la_LIBADD = $(_gnuradio_swig_py_io_la_LIBADD) -gnuradio_swig_py_io_guile_la_LDFLAGS = $(_gnuradio_swig_py_io_la_LDFLAGS) -gnuradio_swig_py_io_guile_la_CXXFLAGS = $(_gnuradio_swig_py_io_la_CXXFLAGS) +libguile_gnuradio_swig_py_io_la_LIBADD = $(_gnuradio_swig_py_io_la_LIBADD) +libguile_gnuradio_swig_py_io_la_LDFLAGS = $(_gnuradio_swig_py_io_la_LDFLAGS) +libguile_gnuradio_swig_py_io_la_CXXFLAGS = $(_gnuradio_swig_py_io_la_CXXFLAGS) guile/gnuradio_swig_py_io.lo: gnuradio_swig_py_io.lo gnuradio_swig_py_io.scm: gnuradio_swig_py_io.i @@ -781,7 +781,7 @@ gnuradio_swig_py_hier_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_hier_pylibdir_c # 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. -gnuradio_swig_py_hier_scmlibdir = $(libdir)/guile/gnuradio +gnuradio_swig_py_hier_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_swig_py_hier @@ -864,16 +864,16 @@ gnuradio_swig_py_hier_python_PYTHON = \ $(gnuradio_swig_py_hier) if GUILE -gnuradio_swig_py_hier_scmlib_LTLIBRARIES = gnuradio_swig_py_hier_guile.la -gnuradio_swig_py_hier_guile_la_SOURCES = \ +gnuradio_swig_py_hier_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_hier.la +libguile_gnuradio_swig_py_hier_la_SOURCES = \ guile/gnuradio_swig_py_hier.cc \ $(gnuradio_swig_py_hier_la_swig_sources) gnuradio_swig_py_hier_scm_DATA = gnuradio_swig_py_hier.scm # Guile can use the same flags as python does -gnuradio_swig_py_hier_guile_la_LIBADD = $(_gnuradio_swig_py_hier_la_LIBADD) -gnuradio_swig_py_hier_guile_la_LDFLAGS = $(_gnuradio_swig_py_hier_la_LDFLAGS) -gnuradio_swig_py_hier_guile_la_CXXFLAGS = $(_gnuradio_swig_py_hier_la_CXXFLAGS) +libguile_gnuradio_swig_py_hier_la_LIBADD = $(_gnuradio_swig_py_hier_la_LIBADD) +libguile_gnuradio_swig_py_hier_la_LDFLAGS = $(_gnuradio_swig_py_hier_la_LDFLAGS) +libguile_gnuradio_swig_py_hier_la_CXXFLAGS = $(_gnuradio_swig_py_hier_la_CXXFLAGS) guile/gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.lo gnuradio_swig_py_hier.scm: gnuradio_swig_py_hier.i -- cgit From c8e09b545e84194867e971163c899ab0992430fb Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 23 Oct 2010 11:02:01 -0700 Subject: s/_swig_py_/_core_/g --- gnuradio-core/src/lib/swig/.gitignore | 94 +++++++++++----------- gnuradio-core/src/lib/swig/Makefile.am | 44 +++++----- gnuradio-core/src/lib/swig/gnuradio_core_filter.i | 36 +++++++++ gnuradio-core/src/lib/swig/gnuradio_core_general.i | 36 +++++++++ gnuradio-core/src/lib/swig/gnuradio_core_gengen.i | 36 +++++++++ gnuradio-core/src/lib/swig/gnuradio_core_hier.i | 36 +++++++++ gnuradio-core/src/lib/swig/gnuradio_core_io.i | 36 +++++++++ gnuradio-core/src/lib/swig/gnuradio_core_runtime.i | 39 +++++++++ .../src/lib/swig/gnuradio_swig_py_filter.i | 36 --------- .../src/lib/swig/gnuradio_swig_py_general.i | 36 --------- .../src/lib/swig/gnuradio_swig_py_gengen.i | 36 --------- gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i | 36 --------- gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i | 36 --------- .../src/lib/swig/gnuradio_swig_py_runtime.i | 39 --------- gnuradio-core/src/lib/swig/gnuradio_swig_python.py | 14 ++-- 15 files changed, 295 insertions(+), 295 deletions(-) create mode 100644 gnuradio-core/src/lib/swig/gnuradio_core_filter.i create mode 100644 gnuradio-core/src/lib/swig/gnuradio_core_general.i create mode 100644 gnuradio-core/src/lib/swig/gnuradio_core_gengen.i create mode 100644 gnuradio-core/src/lib/swig/gnuradio_core_hier.i create mode 100644 gnuradio-core/src/lib/swig/gnuradio_core_io.i create mode 100644 gnuradio-core/src/lib/swig/gnuradio_core_runtime.i delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/.gitignore b/gnuradio-core/src/lib/swig/.gitignore index 5c514650d..0018a2a54 100644 --- a/gnuradio-core/src/lib/swig/.gitignore +++ b/gnuradio-core/src/lib/swig/.gitignore @@ -10,51 +10,51 @@ /swigrun.py /swigrun_wrap.c /Makefile.swigdeps.new -/gnuradio_swig_py_runtime.d -/gnuradio_swig_py_general.d -/gnuradio_swig_py_gengen.d -/gnuradio_swig_py_filter.d -/gnuradio_swig_py_io.d +/gnuradio_core_runtime.d +/gnuradio_core_general.d +/gnuradio_core_gengen.d +/gnuradio_core_filter.d +/gnuradio_core_io.d /gnuradio_swig_bug_workaround.h -/gnuradio_swig_py_runtime.cc -/gnuradio_swig_py_runtime.h -/gnuradio_swig_py_runtime.py -/gnuradio_swig_py_general.cc -/gnuradio_swig_py_general.h -/gnuradio_swig_py_general.py -/gnuradio_swig_py_gengen.cc -/gnuradio_swig_py_gengen.h -/gnuradio_swig_py_gengen.py -/gnuradio_swig_py_filter.cc -/gnuradio_swig_py_filter.h -/gnuradio_swig_py_filter.py -/gnuradio_swig_py_io.cc -/gnuradio_swig_py_io.h -/gnuradio_swig_py_io.py -/gnuradio_swig_py_hier.cc -/gnuradio_swig_py_hier.h -/gnuradio_swig_py_hier.py -/gnuradio_swig_py_filter_python.cc -/gnuradio_swig_py_filter_python.h -/gnuradio_swig_py_general_python.cc -/gnuradio_swig_py_general_python.h -/gnuradio_swig_py_gengen_python.cc -/gnuradio_swig_py_gengen_python.h -/gnuradio_swig_py_hier_python.cc -/gnuradio_swig_py_hier_python.h -/gnuradio_swig_py_io_python.cc -/gnuradio_swig_py_io_python.h -/gnuradio_swig_py_runtime_python.cc -/gnuradio_swig_py_runtime_python.h -/gnuradio_swig_py_filter.scm -/gnuradio_swig_py_filter_guile.cc -/gnuradio_swig_py_general.scm -/gnuradio_swig_py_general_guile.cc -/gnuradio_swig_py_gengen.scm -/gnuradio_swig_py_gengen_guile.cc -/gnuradio_swig_py_hier.scm -/gnuradio_swig_py_hier_guile.cc -/gnuradio_swig_py_io.scm -/gnuradio_swig_py_io_guile.cc -/gnuradio_swig_py_runtime.scm -/gnuradio_swig_py_runtime_guile.cc +/gnuradio_core_runtime.cc +/gnuradio_core_runtime.h +/gnuradio_core_runtime.py +/gnuradio_core_general.cc +/gnuradio_core_general.h +/gnuradio_core_general.py +/gnuradio_core_gengen.cc +/gnuradio_core_gengen.h +/gnuradio_core_gengen.py +/gnuradio_core_filter.cc +/gnuradio_core_filter.h +/gnuradio_core_filter.py +/gnuradio_core_io.cc +/gnuradio_core_io.h +/gnuradio_core_io.py +/gnuradio_core_hier.cc +/gnuradio_core_hier.h +/gnuradio_core_hier.py +/gnuradio_core_filter_python.cc +/gnuradio_core_filter_python.h +/gnuradio_core_general_python.cc +/gnuradio_core_general_python.h +/gnuradio_core_gengen_python.cc +/gnuradio_core_gengen_python.h +/gnuradio_core_hier_python.cc +/gnuradio_core_hier_python.h +/gnuradio_core_io_python.cc +/gnuradio_core_io_python.h +/gnuradio_core_runtime_python.cc +/gnuradio_core_runtime_python.h +/gnuradio_core_filter.scm +/gnuradio_core_filter_guile.cc +/gnuradio_core_general.scm +/gnuradio_core_general_guile.cc +/gnuradio_core_gengen.scm +/gnuradio_core_gengen_guile.cc +/gnuradio_core_hier.scm +/gnuradio_core_hier_guile.cc +/gnuradio_core_io.scm +/gnuradio_core_io_guile.cc +/gnuradio_core_runtime.scm +/gnuradio_core_runtime_guile.cc diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 67d188957..f354efe0b 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -35,13 +35,13 @@ endif # X86_64, g++'s resident set size was 650MB! # ---------------------------------------------------------------- -TOP_SWIG_IFILES = \ - gnuradio_swig_py_runtime.i \ - gnuradio_swig_py_general.i \ - gnuradio_swig_py_gengen.i \ - gnuradio_swig_py_filter.i \ - gnuradio_swig_py_io.i \ - gnuradio_swig_py_hier.i +TOP_SWIG_IFILES = \ + gnuradio_core_runtime.i \ + gnuradio_core_general.i \ + gnuradio_core_gengen.i \ + gnuradio_core_filter.i \ + gnuradio_core_io.i \ + gnuradio_core_hier.i # SWIG headers get installed in ${prefix}/include/gnuradio/swig @@ -73,8 +73,8 @@ ourpython_PYTHON = gnuradio_swig_python.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... -gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.py $(srcdir)/gen-swig-bug-fix - $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_swig_py_runtime.cc $@ +gnuradio_swig_bug_workaround.h : gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix + $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@ # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = gnuradio_swig_bug_workaround.h @@ -83,20 +83,20 @@ grinclude_HEADERS = gnuradio_swig_bug_workaround.h # import gnuradio.gr # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio/gr -gnuradio_swig_py_runtime_pythondir_category = gnuradio/gr -gnuradio_swig_py_general_pythondir_category = gnuradio/gr -gnuradio_swig_py_gengen_pythondir_category = gnuradio/gr -gnuradio_swig_py_filter_pythondir_category = gnuradio/gr -gnuradio_swig_py_io_pythondir_category = gnuradio/gr -gnuradio_swig_py_hier_pythondir_category = gnuradio/gr +gnuradio_core_runtime_pythondir_category = gnuradio/gr +gnuradio_core_general_pythondir_category = gnuradio/gr +gnuradio_core_gengen_pythondir_category = gnuradio/gr +gnuradio_core_filter_pythondir_category = gnuradio/gr +gnuradio_core_io_pythondir_category = gnuradio/gr +gnuradio_core_hier_pythondir_category = gnuradio/gr # additional libraries for linking with each SWIG-generated library -gnuradio_swig_py_runtime_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_general_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_gengen_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_filter_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_io_la_swig_libadd = $(GNURADIO_CORE_LA) -gnuradio_swig_py_hier_la_swig_libadd = $(GNURADIO_CORE_LA) +gnuradio_core_runtime_la_swig_libadd = $(GNURADIO_CORE_LA) +gnuradio_core_general_la_swig_libadd = $(GNURADIO_CORE_LA) +gnuradio_core_gengen_la_swig_libadd = $(GNURADIO_CORE_LA) +gnuradio_core_filter_la_swig_libadd = $(GNURADIO_CORE_LA) +gnuradio_core_io_la_swig_libadd = $(GNURADIO_CORE_LA) +gnuradio_core_hier_la_swig_libadd = $(GNURADIO_CORE_LA) # add some of the variables generated inside the Makefile.swig @@ -118,5 +118,5 @@ no_dist_files = $(swig_built_sources) # Compile a .i to what guile needs. We use -o to set the output file name, # or even with -outdir guile in SWIG_GUILE_ARGS, swig keeps putting a -# gnuradio_swig_py_*_wrap.cxx in the source directory. +# gnuradio_core_*_wrap.cxx in the source directory. diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i new file mode 100644 index 000000000..d9751d0f1 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i @@ -0,0 +1,36 @@ +/* -*- c++ -*- */ +/* + * Copyright 2006,2009,2010 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef SWIGIMPORTED +%module(directors="1") gnuradio_swig_py_filter +#endif + + //%feature("autodoc", "1"); // generate python docstrings + +%include "gnuradio.i" // the common stuff + +%include "filter.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "libguile-gnuradio_core_filter" "SWIG_init") +%} + #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i new file mode 100644 index 000000000..07ef90e34 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i @@ -0,0 +1,36 @@ +/* -*- c++ -*- */ +/* + * Copyright 2006,2009,2010 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef SWIGIMPORTED +%module(directors="1") gnuradio_swig_py_general +#endif + + //%feature("autodoc", "1"); // generate python docstrings + +%include "gnuradio.i" // the common stuff + +%include "general.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "libguile-gnuradio_core_general" "SWIG_init") +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i new file mode 100644 index 000000000..ea78d8af6 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i @@ -0,0 +1,36 @@ +/* -*- c++ -*- */ +/* + * Copyright 2006,2009,2010 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef SWIGIMPORTED +%module(directors="1") gnuradio_swig_py_gengen +#endif + + //%feature("autodoc", "1"); // generate python docstrings + +%include "gnuradio.i" // the common stuff + +%include "gengen.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "libguile-gnuradio_core_gengen" "SWIG_init") +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i new file mode 100644 index 000000000..f69b80334 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i @@ -0,0 +1,36 @@ +/* -*- c++ -*- */ +/* + * Copyright 2009,2010 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef SWIGIMPORTED +%module(directors="1") gnuradio_swig_py_hier +#endif + + //%feature("autodoc", "1"); // generate python docstrings + +%include "gnuradio.i" // the common stuff + +%include "hier.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "libguile-gnuradio_core_heir" "SWIG_init") +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i new file mode 100644 index 000000000..82acae747 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i @@ -0,0 +1,36 @@ +/* -*- c++ -*- */ +/* + * Copyright 2006,2009,2010 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef SWIGIMPORTED +%module(directors="1") gnuradio_swig_py_io +#endif + + //%feature("autodoc", "1"); // generate python docstrings + +%include "gnuradio.i" // the common stuff + +%include "io.i" + +#if SWIGGUILE +%scheme %{ +(load-extension "libguile-gnuradio_core_io" "SWIG_init") +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i new file mode 100644 index 000000000..3cc0a053d --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i @@ -0,0 +1,39 @@ +/* -*- c++ -*- */ +/* + * Copyright 2009,2010 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef SWIGIMPORTED +%module(directors="1") gnuradio_swig_py_runtime +#endif + + //%feature("autodoc", "1"); // generate python docstrings + +#define SW_RUNTIME +%include "gnuradio.i" // the common stuff + +%include "runtime.i" + + +#if SWIGGUILE +%scheme %{ +(load-extension "libguile-gnuradio_core_runtime" "SWIG_init") +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i deleted file mode 100644 index e40af08ca..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006,2009 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_filter -#endif - - //%feature("autodoc", "1"); // generate python docstrings - -%include "gnuradio.i" // the common stuff - -%include "filter.i" - -#if SWIGGUILE -%scheme %{ -(load-extension "libguile-gnuradio_swig_py_filter" "SWIG_init") -%} - #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i deleted file mode 100644 index c4e9c070d..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_general.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006,2009 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_general -#endif - - //%feature("autodoc", "1"); // generate python docstrings - -%include "gnuradio.i" // the common stuff - -%include "general.i" - -#if SWIGGUILE -%scheme %{ -(load-extension "libguile-gnuradio_swig_py_general" "SWIG_init") -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i deleted file mode 100644 index 54e1b0944..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006,2009 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_gengen -#endif - - //%feature("autodoc", "1"); // generate python docstrings - -%include "gnuradio.i" // the common stuff - -%include "gengen.i" - -#if SWIGGUILE -%scheme %{ -(load-extension "libguile-gnuradio_swig_py_gengen" "SWIG_init") -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i deleted file mode 100644 index 61029b120..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_hier.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_hier -#endif - - //%feature("autodoc", "1"); // generate python docstrings - -%include "gnuradio.i" // the common stuff - -%include "hier.i" - -#if SWIGGUILE -%scheme %{ -(load-extension "libguile-gnuradio_swig_py_heir" "SWIG_init") -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i deleted file mode 100644 index d7d206ef8..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_io.i +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006,2009 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_io -#endif - - //%feature("autodoc", "1"); // generate python docstrings - -%include "gnuradio.i" // the common stuff - -%include "io.i" - -#if SWIGGUILE -%scheme %{ -(load-extension "libguile-gnuradio_swig_py_io" "SWIG_init") -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i deleted file mode 100644 index 088ae4cf8..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.i +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2009 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_runtime -#endif - - //%feature("autodoc", "1"); // generate python docstrings - -#define SW_RUNTIME -%include "gnuradio.i" // the common stuff - -%include "runtime.i" - - -#if SWIGGUILE -%scheme %{ -(load-extension "libguile-gnuradio_swig_py_runtime" "SWIG_init") -%} -#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py b/gnuradio-core/src/lib/swig/gnuradio_swig_python.py index 5324b2309..8f9fffd5c 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_python.py @@ -1,5 +1,5 @@ # -# Copyright 2006,2009 Free Software Foundation, Inc. +# Copyright 2006,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,9 +20,9 @@ # This file implements the old gnuradio_swig_python namespace -from gnuradio_swig_py_runtime import * -from gnuradio_swig_py_general import * -from gnuradio_swig_py_gengen import * -from gnuradio_swig_py_filter import * -from gnuradio_swig_py_io import * -from gnuradio_swig_py_hier import * +from gnuradio_core_runtime import * +from gnuradio_core_general import * +from gnuradio_core_gengen import * +from gnuradio_core_filter import * +from gnuradio_core_io import * +from gnuradio_core_hier import * -- cgit From 412a00434139ffa53469545bd878e24eec5bb61d Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 23 Oct 2010 11:02:13 -0700 Subject: regenerate --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 552 +++++++++++++-------------- 1 file changed, 276 insertions(+), 276 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 39afc8973..f6e3fa1b1 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -20,37 +20,37 @@ # Boston, MA 02110-1301, USA. # -# Makefile.swig.gen for gnuradio_swig_py_runtime.i +# Makefile.swig.gen for gnuradio_core_runtime.i ## Default install locations for these files: ## ## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_runtime +## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_runtime ## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_runtime +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_runtime ## ## The following can be overloaded to change the install location, but ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -gnuradio_swig_py_runtime_pythondir_category ?= gnuradio/gnuradio_swig_py_runtime -gnuradio_swig_py_runtime_pylibdir_category ?= $(gnuradio_swig_py_runtime_pythondir_category) -gnuradio_swig_py_runtime_pythondir = $(pythondir)/$(gnuradio_swig_py_runtime_pythondir_category) -gnuradio_swig_py_runtime_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_runtime_pylibdir_category) +gnuradio_core_runtime_pythondir_category ?= gnuradio/gnuradio_core_runtime +gnuradio_core_runtime_pylibdir_category ?= $(gnuradio_core_runtime_pythondir_category) +gnuradio_core_runtime_pythondir = $(pythondir)/$(gnuradio_core_runtime_pythondir_category) +gnuradio_core_runtime_pylibdir = $(pyexecdir)/$(gnuradio_core_runtime_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. -gnuradio_swig_py_runtime_scmlibdir = $(libdir) +gnuradio_core_runtime_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/gnuradio_swig_py_runtime +# is installed, usually /usr/share/guile/site/gnuradio_core_runtime # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_runtime_scmdir = $(guiledir)/gnuradio +gnuradio_core_runtime_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. -gnuradio_swig_py_runtime_swigincludedir = $(swigincludedir) +gnuradio_core_runtime_swigincludedir = $(swigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level @@ -72,7 +72,7 @@ gnuradio_swig_py_runtime_swigincludedir = $(swigincludedir) ## parallel built. These will not be included in a tarball, because ## the SWIG-generated files will be removed from the distribution. -STAMPS += $(DEPDIR)/gnuradio_swig_py_runtime-generate-* +STAMPS += $(DEPDIR)/gnuradio_core_runtime-generate-* ## Other cleaned files: dependency files generated by SWIG or this Makefile @@ -84,67 +84,67 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_swig_py_runtime.py +swig_built_sources += gnuradio_core_runtime.py if GUILE -swig_built_sources += gnuradio_swig_py_runtime.scm +swig_built_sources += gnuradio_core_runtime.scm endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . -gnuradio_swig_py_runtime_swiginclude_HEADERS = \ - gnuradio_swig_py_runtime.i \ - $(gnuradio_swig_py_runtime_swiginclude_headers) +gnuradio_core_runtime_swiginclude_HEADERS = \ + gnuradio_core_runtime.i \ + $(gnuradio_core_runtime_swiginclude_headers) -gnuradio_swig_py_runtime_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_runtime.la +gnuradio_core_runtime_pylib_LTLIBRARIES = \ + _gnuradio_core_runtime.la -_gnuradio_swig_py_runtime_la_SOURCES = \ - python/gnuradio_swig_py_runtime.cc \ - $(gnuradio_swig_py_runtime_la_swig_sources) +_gnuradio_core_runtime_la_SOURCES = \ + python/gnuradio_core_runtime.cc \ + $(gnuradio_core_runtime_la_swig_sources) -_gnuradio_swig_py_runtime_la_LIBADD = \ +_gnuradio_core_runtime_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_runtime_la_swig_libadd) + $(gnuradio_core_runtime_la_swig_libadd) -# _gnuradio_swig_py_runtime_la_DEPENDENCIES = python/gnuradio_swig_py_runtime.lo +# _gnuradio_core_runtime_la_DEPENDENCIES = python/gnuradio_core_runtime.lo -_gnuradio_swig_py_runtime_la_LDFLAGS = \ +_gnuradio_core_runtime_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_runtime_la_swig_ldflags) + $(gnuradio_core_runtime_la_swig_ldflags) -_gnuradio_swig_py_runtime_la_CXXFLAGS = \ +_gnuradio_core_runtime_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ - $(gnuradio_swig_py_runtime_la_swig_cxxflags) + $(gnuradio_core_runtime_la_swig_cxxflags) -gnuradio_swig_py_runtime_python_PYTHON = \ - gnuradio_swig_py_runtime.py \ - $(gnuradio_swig_py_runtime) +gnuradio_core_runtime_python_PYTHON = \ + gnuradio_core_runtime.py \ + $(gnuradio_core_runtime) if GUILE -gnuradio_swig_py_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_runtime.la -libguile_gnuradio_swig_py_runtime_la_SOURCES = \ - guile/gnuradio_swig_py_runtime.cc \ - $(gnuradio_swig_py_runtime_la_swig_sources) -gnuradio_swig_py_runtime_scm_DATA = gnuradio_swig_py_runtime.scm +gnuradio_core_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_core_runtime.la +libguile_gnuradio_core_runtime_la_SOURCES = \ + guile/gnuradio_core_runtime.cc \ + $(gnuradio_core_runtime_la_swig_sources) +gnuradio_core_runtime_scm_DATA = gnuradio_core_runtime.scm # Guile can use the same flags as python does -libguile_gnuradio_swig_py_runtime_la_LIBADD = $(_gnuradio_swig_py_runtime_la_LIBADD) -libguile_gnuradio_swig_py_runtime_la_LDFLAGS = $(_gnuradio_swig_py_runtime_la_LDFLAGS) -libguile_gnuradio_swig_py_runtime_la_CXXFLAGS = $(_gnuradio_swig_py_runtime_la_CXXFLAGS) +libguile_gnuradio_core_runtime_la_LIBADD = $(_gnuradio_core_runtime_la_LIBADD) +libguile_gnuradio_core_runtime_la_LDFLAGS = $(_gnuradio_core_runtime_la_LDFLAGS) +libguile_gnuradio_core_runtime_la_CXXFLAGS = $(_gnuradio_core_runtime_la_CXXFLAGS) -guile/gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.lo -gnuradio_swig_py_runtime.scm: gnuradio_swig_py_runtime.i +guile/gnuradio_core_runtime.lo: gnuradio_core_runtime.lo +gnuradio_core_runtime.scm: gnuradio_core_runtime.i endif # end of GUILE -python/gnuradio_swig_py_runtime.lo: -gnuradio_swig_py_runtime.lo: gnuradio_swig_py_runtime.py gnuradio_swig_py_runtime.scm -gnuradio_swig_py_runtime.py: gnuradio_swig_py_runtime.i +python/gnuradio_core_runtime.lo: +gnuradio_core_runtime.lo: gnuradio_core_runtime.py gnuradio_core_runtime.scm +gnuradio_core_runtime.py: gnuradio_core_runtime.i --include python/gnuradio_swig_py_runtime.d +-include python/gnuradio_core_runtime.d # -*- Makefile -*- # @@ -168,37 +168,37 @@ gnuradio_swig_py_runtime.py: gnuradio_swig_py_runtime.i # Boston, MA 02110-1301, USA. # -# Makefile.swig.gen for gnuradio_swig_py_general.i +# Makefile.swig.gen for gnuradio_core_general.i ## Default install locations for these files: ## ## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_general +## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_general ## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_general +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_general ## ## The following can be overloaded to change the install location, but ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -gnuradio_swig_py_general_pythondir_category ?= gnuradio/gnuradio_swig_py_general -gnuradio_swig_py_general_pylibdir_category ?= $(gnuradio_swig_py_general_pythondir_category) -gnuradio_swig_py_general_pythondir = $(pythondir)/$(gnuradio_swig_py_general_pythondir_category) -gnuradio_swig_py_general_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_general_pylibdir_category) +gnuradio_core_general_pythondir_category ?= gnuradio/gnuradio_core_general +gnuradio_core_general_pylibdir_category ?= $(gnuradio_core_general_pythondir_category) +gnuradio_core_general_pythondir = $(pythondir)/$(gnuradio_core_general_pythondir_category) +gnuradio_core_general_pylibdir = $(pyexecdir)/$(gnuradio_core_general_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. -gnuradio_swig_py_general_scmlibdir = $(libdir) +gnuradio_core_general_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/gnuradio_swig_py_general +# is installed, usually /usr/share/guile/site/gnuradio_core_general # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_general_scmdir = $(guiledir)/gnuradio +gnuradio_core_general_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. -gnuradio_swig_py_general_swigincludedir = $(swigincludedir) +gnuradio_core_general_swigincludedir = $(swigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level @@ -220,7 +220,7 @@ gnuradio_swig_py_general_swigincludedir = $(swigincludedir) ## parallel built. These will not be included in a tarball, because ## the SWIG-generated files will be removed from the distribution. -STAMPS += $(DEPDIR)/gnuradio_swig_py_general-generate-* +STAMPS += $(DEPDIR)/gnuradio_core_general-generate-* ## Other cleaned files: dependency files generated by SWIG or this Makefile @@ -232,67 +232,67 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_swig_py_general.py +swig_built_sources += gnuradio_core_general.py if GUILE -swig_built_sources += gnuradio_swig_py_general.scm +swig_built_sources += gnuradio_core_general.scm endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . -gnuradio_swig_py_general_swiginclude_HEADERS = \ - gnuradio_swig_py_general.i \ - $(gnuradio_swig_py_general_swiginclude_headers) +gnuradio_core_general_swiginclude_HEADERS = \ + gnuradio_core_general.i \ + $(gnuradio_core_general_swiginclude_headers) -gnuradio_swig_py_general_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_general.la +gnuradio_core_general_pylib_LTLIBRARIES = \ + _gnuradio_core_general.la -_gnuradio_swig_py_general_la_SOURCES = \ - python/gnuradio_swig_py_general.cc \ - $(gnuradio_swig_py_general_la_swig_sources) +_gnuradio_core_general_la_SOURCES = \ + python/gnuradio_core_general.cc \ + $(gnuradio_core_general_la_swig_sources) -_gnuradio_swig_py_general_la_LIBADD = \ +_gnuradio_core_general_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_general_la_swig_libadd) + $(gnuradio_core_general_la_swig_libadd) -# _gnuradio_swig_py_general_la_DEPENDENCIES = python/gnuradio_swig_py_general.lo +# _gnuradio_core_general_la_DEPENDENCIES = python/gnuradio_core_general.lo -_gnuradio_swig_py_general_la_LDFLAGS = \ +_gnuradio_core_general_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_general_la_swig_ldflags) + $(gnuradio_core_general_la_swig_ldflags) -_gnuradio_swig_py_general_la_CXXFLAGS = \ +_gnuradio_core_general_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ - $(gnuradio_swig_py_general_la_swig_cxxflags) + $(gnuradio_core_general_la_swig_cxxflags) -gnuradio_swig_py_general_python_PYTHON = \ - gnuradio_swig_py_general.py \ - $(gnuradio_swig_py_general) +gnuradio_core_general_python_PYTHON = \ + gnuradio_core_general.py \ + $(gnuradio_core_general) if GUILE -gnuradio_swig_py_general_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_general.la -libguile_gnuradio_swig_py_general_la_SOURCES = \ - guile/gnuradio_swig_py_general.cc \ - $(gnuradio_swig_py_general_la_swig_sources) -gnuradio_swig_py_general_scm_DATA = gnuradio_swig_py_general.scm +gnuradio_core_general_scmlib_LTLIBRARIES = libguile-gnuradio_core_general.la +libguile_gnuradio_core_general_la_SOURCES = \ + guile/gnuradio_core_general.cc \ + $(gnuradio_core_general_la_swig_sources) +gnuradio_core_general_scm_DATA = gnuradio_core_general.scm # Guile can use the same flags as python does -libguile_gnuradio_swig_py_general_la_LIBADD = $(_gnuradio_swig_py_general_la_LIBADD) -libguile_gnuradio_swig_py_general_la_LDFLAGS = $(_gnuradio_swig_py_general_la_LDFLAGS) -libguile_gnuradio_swig_py_general_la_CXXFLAGS = $(_gnuradio_swig_py_general_la_CXXFLAGS) +libguile_gnuradio_core_general_la_LIBADD = $(_gnuradio_core_general_la_LIBADD) +libguile_gnuradio_core_general_la_LDFLAGS = $(_gnuradio_core_general_la_LDFLAGS) +libguile_gnuradio_core_general_la_CXXFLAGS = $(_gnuradio_core_general_la_CXXFLAGS) -guile/gnuradio_swig_py_general.lo: gnuradio_swig_py_general.lo -gnuradio_swig_py_general.scm: gnuradio_swig_py_general.i +guile/gnuradio_core_general.lo: gnuradio_core_general.lo +gnuradio_core_general.scm: gnuradio_core_general.i endif # end of GUILE -python/gnuradio_swig_py_general.lo: -gnuradio_swig_py_general.lo: gnuradio_swig_py_general.py gnuradio_swig_py_general.scm -gnuradio_swig_py_general.py: gnuradio_swig_py_general.i +python/gnuradio_core_general.lo: +gnuradio_core_general.lo: gnuradio_core_general.py gnuradio_core_general.scm +gnuradio_core_general.py: gnuradio_core_general.i --include python/gnuradio_swig_py_general.d +-include python/gnuradio_core_general.d # -*- Makefile -*- # @@ -316,37 +316,37 @@ gnuradio_swig_py_general.py: gnuradio_swig_py_general.i # Boston, MA 02110-1301, USA. # -# Makefile.swig.gen for gnuradio_swig_py_gengen.i +# Makefile.swig.gen for gnuradio_core_gengen.i ## Default install locations for these files: ## ## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_gengen +## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_gengen ## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_gengen +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_gengen ## ## The following can be overloaded to change the install location, but ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -gnuradio_swig_py_gengen_pythondir_category ?= gnuradio/gnuradio_swig_py_gengen -gnuradio_swig_py_gengen_pylibdir_category ?= $(gnuradio_swig_py_gengen_pythondir_category) -gnuradio_swig_py_gengen_pythondir = $(pythondir)/$(gnuradio_swig_py_gengen_pythondir_category) -gnuradio_swig_py_gengen_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_gengen_pylibdir_category) +gnuradio_core_gengen_pythondir_category ?= gnuradio/gnuradio_core_gengen +gnuradio_core_gengen_pylibdir_category ?= $(gnuradio_core_gengen_pythondir_category) +gnuradio_core_gengen_pythondir = $(pythondir)/$(gnuradio_core_gengen_pythondir_category) +gnuradio_core_gengen_pylibdir = $(pyexecdir)/$(gnuradio_core_gengen_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. -gnuradio_swig_py_gengen_scmlibdir = $(libdir) +gnuradio_core_gengen_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/gnuradio_swig_py_gengen +# is installed, usually /usr/share/guile/site/gnuradio_core_gengen # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_gengen_scmdir = $(guiledir)/gnuradio +gnuradio_core_gengen_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. -gnuradio_swig_py_gengen_swigincludedir = $(swigincludedir) +gnuradio_core_gengen_swigincludedir = $(swigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level @@ -368,7 +368,7 @@ gnuradio_swig_py_gengen_swigincludedir = $(swigincludedir) ## parallel built. These will not be included in a tarball, because ## the SWIG-generated files will be removed from the distribution. -STAMPS += $(DEPDIR)/gnuradio_swig_py_gengen-generate-* +STAMPS += $(DEPDIR)/gnuradio_core_gengen-generate-* ## Other cleaned files: dependency files generated by SWIG or this Makefile @@ -380,67 +380,67 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_swig_py_gengen.py +swig_built_sources += gnuradio_core_gengen.py if GUILE -swig_built_sources += gnuradio_swig_py_gengen.scm +swig_built_sources += gnuradio_core_gengen.scm endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . -gnuradio_swig_py_gengen_swiginclude_HEADERS = \ - gnuradio_swig_py_gengen.i \ - $(gnuradio_swig_py_gengen_swiginclude_headers) +gnuradio_core_gengen_swiginclude_HEADERS = \ + gnuradio_core_gengen.i \ + $(gnuradio_core_gengen_swiginclude_headers) -gnuradio_swig_py_gengen_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_gengen.la +gnuradio_core_gengen_pylib_LTLIBRARIES = \ + _gnuradio_core_gengen.la -_gnuradio_swig_py_gengen_la_SOURCES = \ - python/gnuradio_swig_py_gengen.cc \ - $(gnuradio_swig_py_gengen_la_swig_sources) +_gnuradio_core_gengen_la_SOURCES = \ + python/gnuradio_core_gengen.cc \ + $(gnuradio_core_gengen_la_swig_sources) -_gnuradio_swig_py_gengen_la_LIBADD = \ +_gnuradio_core_gengen_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_gengen_la_swig_libadd) + $(gnuradio_core_gengen_la_swig_libadd) -# _gnuradio_swig_py_gengen_la_DEPENDENCIES = python/gnuradio_swig_py_gengen.lo +# _gnuradio_core_gengen_la_DEPENDENCIES = python/gnuradio_core_gengen.lo -_gnuradio_swig_py_gengen_la_LDFLAGS = \ +_gnuradio_core_gengen_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_gengen_la_swig_ldflags) + $(gnuradio_core_gengen_la_swig_ldflags) -_gnuradio_swig_py_gengen_la_CXXFLAGS = \ +_gnuradio_core_gengen_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ - $(gnuradio_swig_py_gengen_la_swig_cxxflags) + $(gnuradio_core_gengen_la_swig_cxxflags) -gnuradio_swig_py_gengen_python_PYTHON = \ - gnuradio_swig_py_gengen.py \ - $(gnuradio_swig_py_gengen) +gnuradio_core_gengen_python_PYTHON = \ + gnuradio_core_gengen.py \ + $(gnuradio_core_gengen) if GUILE -gnuradio_swig_py_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_gengen.la -libguile_gnuradio_swig_py_gengen_la_SOURCES = \ - guile/gnuradio_swig_py_gengen.cc \ - $(gnuradio_swig_py_gengen_la_swig_sources) -gnuradio_swig_py_gengen_scm_DATA = gnuradio_swig_py_gengen.scm +gnuradio_core_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_core_gengen.la +libguile_gnuradio_core_gengen_la_SOURCES = \ + guile/gnuradio_core_gengen.cc \ + $(gnuradio_core_gengen_la_swig_sources) +gnuradio_core_gengen_scm_DATA = gnuradio_core_gengen.scm # Guile can use the same flags as python does -libguile_gnuradio_swig_py_gengen_la_LIBADD = $(_gnuradio_swig_py_gengen_la_LIBADD) -libguile_gnuradio_swig_py_gengen_la_LDFLAGS = $(_gnuradio_swig_py_gengen_la_LDFLAGS) -libguile_gnuradio_swig_py_gengen_la_CXXFLAGS = $(_gnuradio_swig_py_gengen_la_CXXFLAGS) +libguile_gnuradio_core_gengen_la_LIBADD = $(_gnuradio_core_gengen_la_LIBADD) +libguile_gnuradio_core_gengen_la_LDFLAGS = $(_gnuradio_core_gengen_la_LDFLAGS) +libguile_gnuradio_core_gengen_la_CXXFLAGS = $(_gnuradio_core_gengen_la_CXXFLAGS) -guile/gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.lo -gnuradio_swig_py_gengen.scm: gnuradio_swig_py_gengen.i +guile/gnuradio_core_gengen.lo: gnuradio_core_gengen.lo +gnuradio_core_gengen.scm: gnuradio_core_gengen.i endif # end of GUILE -python/gnuradio_swig_py_gengen.lo: -gnuradio_swig_py_gengen.lo: gnuradio_swig_py_gengen.py gnuradio_swig_py_gengen.scm -gnuradio_swig_py_gengen.py: gnuradio_swig_py_gengen.i +python/gnuradio_core_gengen.lo: +gnuradio_core_gengen.lo: gnuradio_core_gengen.py gnuradio_core_gengen.scm +gnuradio_core_gengen.py: gnuradio_core_gengen.i --include python/gnuradio_swig_py_gengen.d +-include python/gnuradio_core_gengen.d # -*- Makefile -*- # @@ -464,37 +464,37 @@ gnuradio_swig_py_gengen.py: gnuradio_swig_py_gengen.i # Boston, MA 02110-1301, USA. # -# Makefile.swig.gen for gnuradio_swig_py_filter.i +# Makefile.swig.gen for gnuradio_core_filter.i ## Default install locations for these files: ## ## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_filter +## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_filter ## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_filter +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_filter ## ## The following can be overloaded to change the install location, but ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -gnuradio_swig_py_filter_pythondir_category ?= gnuradio/gnuradio_swig_py_filter -gnuradio_swig_py_filter_pylibdir_category ?= $(gnuradio_swig_py_filter_pythondir_category) -gnuradio_swig_py_filter_pythondir = $(pythondir)/$(gnuradio_swig_py_filter_pythondir_category) -gnuradio_swig_py_filter_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_filter_pylibdir_category) +gnuradio_core_filter_pythondir_category ?= gnuradio/gnuradio_core_filter +gnuradio_core_filter_pylibdir_category ?= $(gnuradio_core_filter_pythondir_category) +gnuradio_core_filter_pythondir = $(pythondir)/$(gnuradio_core_filter_pythondir_category) +gnuradio_core_filter_pylibdir = $(pyexecdir)/$(gnuradio_core_filter_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. -gnuradio_swig_py_filter_scmlibdir = $(libdir) +gnuradio_core_filter_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/gnuradio_swig_py_filter +# is installed, usually /usr/share/guile/site/gnuradio_core_filter # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_filter_scmdir = $(guiledir)/gnuradio +gnuradio_core_filter_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. -gnuradio_swig_py_filter_swigincludedir = $(swigincludedir) +gnuradio_core_filter_swigincludedir = $(swigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level @@ -516,7 +516,7 @@ gnuradio_swig_py_filter_swigincludedir = $(swigincludedir) ## parallel built. These will not be included in a tarball, because ## the SWIG-generated files will be removed from the distribution. -STAMPS += $(DEPDIR)/gnuradio_swig_py_filter-generate-* +STAMPS += $(DEPDIR)/gnuradio_core_filter-generate-* ## Other cleaned files: dependency files generated by SWIG or this Makefile @@ -528,67 +528,67 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_swig_py_filter.py +swig_built_sources += gnuradio_core_filter.py if GUILE -swig_built_sources += gnuradio_swig_py_filter.scm +swig_built_sources += gnuradio_core_filter.scm endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . -gnuradio_swig_py_filter_swiginclude_HEADERS = \ - gnuradio_swig_py_filter.i \ - $(gnuradio_swig_py_filter_swiginclude_headers) +gnuradio_core_filter_swiginclude_HEADERS = \ + gnuradio_core_filter.i \ + $(gnuradio_core_filter_swiginclude_headers) -gnuradio_swig_py_filter_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_filter.la +gnuradio_core_filter_pylib_LTLIBRARIES = \ + _gnuradio_core_filter.la -_gnuradio_swig_py_filter_la_SOURCES = \ - python/gnuradio_swig_py_filter.cc \ - $(gnuradio_swig_py_filter_la_swig_sources) +_gnuradio_core_filter_la_SOURCES = \ + python/gnuradio_core_filter.cc \ + $(gnuradio_core_filter_la_swig_sources) -_gnuradio_swig_py_filter_la_LIBADD = \ +_gnuradio_core_filter_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_filter_la_swig_libadd) + $(gnuradio_core_filter_la_swig_libadd) -# _gnuradio_swig_py_filter_la_DEPENDENCIES = python/gnuradio_swig_py_filter.lo +# _gnuradio_core_filter_la_DEPENDENCIES = python/gnuradio_core_filter.lo -_gnuradio_swig_py_filter_la_LDFLAGS = \ +_gnuradio_core_filter_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_filter_la_swig_ldflags) + $(gnuradio_core_filter_la_swig_ldflags) -_gnuradio_swig_py_filter_la_CXXFLAGS = \ +_gnuradio_core_filter_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ - $(gnuradio_swig_py_filter_la_swig_cxxflags) + $(gnuradio_core_filter_la_swig_cxxflags) -gnuradio_swig_py_filter_python_PYTHON = \ - gnuradio_swig_py_filter.py \ - $(gnuradio_swig_py_filter) +gnuradio_core_filter_python_PYTHON = \ + gnuradio_core_filter.py \ + $(gnuradio_core_filter) if GUILE -gnuradio_swig_py_filter_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_filter.la -libguile_gnuradio_swig_py_filter_la_SOURCES = \ - guile/gnuradio_swig_py_filter.cc \ - $(gnuradio_swig_py_filter_la_swig_sources) -gnuradio_swig_py_filter_scm_DATA = gnuradio_swig_py_filter.scm +gnuradio_core_filter_scmlib_LTLIBRARIES = libguile-gnuradio_core_filter.la +libguile_gnuradio_core_filter_la_SOURCES = \ + guile/gnuradio_core_filter.cc \ + $(gnuradio_core_filter_la_swig_sources) +gnuradio_core_filter_scm_DATA = gnuradio_core_filter.scm # Guile can use the same flags as python does -libguile_gnuradio_swig_py_filter_la_LIBADD = $(_gnuradio_swig_py_filter_la_LIBADD) -libguile_gnuradio_swig_py_filter_la_LDFLAGS = $(_gnuradio_swig_py_filter_la_LDFLAGS) -libguile_gnuradio_swig_py_filter_la_CXXFLAGS = $(_gnuradio_swig_py_filter_la_CXXFLAGS) +libguile_gnuradio_core_filter_la_LIBADD = $(_gnuradio_core_filter_la_LIBADD) +libguile_gnuradio_core_filter_la_LDFLAGS = $(_gnuradio_core_filter_la_LDFLAGS) +libguile_gnuradio_core_filter_la_CXXFLAGS = $(_gnuradio_core_filter_la_CXXFLAGS) -guile/gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.lo -gnuradio_swig_py_filter.scm: gnuradio_swig_py_filter.i +guile/gnuradio_core_filter.lo: gnuradio_core_filter.lo +gnuradio_core_filter.scm: gnuradio_core_filter.i endif # end of GUILE -python/gnuradio_swig_py_filter.lo: -gnuradio_swig_py_filter.lo: gnuradio_swig_py_filter.py gnuradio_swig_py_filter.scm -gnuradio_swig_py_filter.py: gnuradio_swig_py_filter.i +python/gnuradio_core_filter.lo: +gnuradio_core_filter.lo: gnuradio_core_filter.py gnuradio_core_filter.scm +gnuradio_core_filter.py: gnuradio_core_filter.i --include python/gnuradio_swig_py_filter.d +-include python/gnuradio_core_filter.d # -*- Makefile -*- # @@ -612,37 +612,37 @@ gnuradio_swig_py_filter.py: gnuradio_swig_py_filter.i # Boston, MA 02110-1301, USA. # -# Makefile.swig.gen for gnuradio_swig_py_io.i +# Makefile.swig.gen for gnuradio_core_io.i ## Default install locations for these files: ## ## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_io +## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_io ## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_io +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_io ## ## The following can be overloaded to change the install location, but ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -gnuradio_swig_py_io_pythondir_category ?= gnuradio/gnuradio_swig_py_io -gnuradio_swig_py_io_pylibdir_category ?= $(gnuradio_swig_py_io_pythondir_category) -gnuradio_swig_py_io_pythondir = $(pythondir)/$(gnuradio_swig_py_io_pythondir_category) -gnuradio_swig_py_io_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_io_pylibdir_category) +gnuradio_core_io_pythondir_category ?= gnuradio/gnuradio_core_io +gnuradio_core_io_pylibdir_category ?= $(gnuradio_core_io_pythondir_category) +gnuradio_core_io_pythondir = $(pythondir)/$(gnuradio_core_io_pythondir_category) +gnuradio_core_io_pylibdir = $(pyexecdir)/$(gnuradio_core_io_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. -gnuradio_swig_py_io_scmlibdir = $(libdir) +gnuradio_core_io_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/gnuradio_swig_py_io +# is installed, usually /usr/share/guile/site/gnuradio_core_io # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_io_scmdir = $(guiledir)/gnuradio +gnuradio_core_io_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. -gnuradio_swig_py_io_swigincludedir = $(swigincludedir) +gnuradio_core_io_swigincludedir = $(swigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level @@ -664,7 +664,7 @@ gnuradio_swig_py_io_swigincludedir = $(swigincludedir) ## parallel built. These will not be included in a tarball, because ## the SWIG-generated files will be removed from the distribution. -STAMPS += $(DEPDIR)/gnuradio_swig_py_io-generate-* +STAMPS += $(DEPDIR)/gnuradio_core_io-generate-* ## Other cleaned files: dependency files generated by SWIG or this Makefile @@ -676,67 +676,67 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_swig_py_io.py +swig_built_sources += gnuradio_core_io.py if GUILE -swig_built_sources += gnuradio_swig_py_io.scm +swig_built_sources += gnuradio_core_io.scm endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . -gnuradio_swig_py_io_swiginclude_HEADERS = \ - gnuradio_swig_py_io.i \ - $(gnuradio_swig_py_io_swiginclude_headers) +gnuradio_core_io_swiginclude_HEADERS = \ + gnuradio_core_io.i \ + $(gnuradio_core_io_swiginclude_headers) -gnuradio_swig_py_io_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_io.la +gnuradio_core_io_pylib_LTLIBRARIES = \ + _gnuradio_core_io.la -_gnuradio_swig_py_io_la_SOURCES = \ - python/gnuradio_swig_py_io.cc \ - $(gnuradio_swig_py_io_la_swig_sources) +_gnuradio_core_io_la_SOURCES = \ + python/gnuradio_core_io.cc \ + $(gnuradio_core_io_la_swig_sources) -_gnuradio_swig_py_io_la_LIBADD = \ +_gnuradio_core_io_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_io_la_swig_libadd) + $(gnuradio_core_io_la_swig_libadd) -# _gnuradio_swig_py_io_la_DEPENDENCIES = python/gnuradio_swig_py_io.lo +# _gnuradio_core_io_la_DEPENDENCIES = python/gnuradio_core_io.lo -_gnuradio_swig_py_io_la_LDFLAGS = \ +_gnuradio_core_io_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_io_la_swig_ldflags) + $(gnuradio_core_io_la_swig_ldflags) -_gnuradio_swig_py_io_la_CXXFLAGS = \ +_gnuradio_core_io_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ - $(gnuradio_swig_py_io_la_swig_cxxflags) + $(gnuradio_core_io_la_swig_cxxflags) -gnuradio_swig_py_io_python_PYTHON = \ - gnuradio_swig_py_io.py \ - $(gnuradio_swig_py_io) +gnuradio_core_io_python_PYTHON = \ + gnuradio_core_io.py \ + $(gnuradio_core_io) if GUILE -gnuradio_swig_py_io_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_io.la -libguile_gnuradio_swig_py_io_la_SOURCES = \ - guile/gnuradio_swig_py_io.cc \ - $(gnuradio_swig_py_io_la_swig_sources) -gnuradio_swig_py_io_scm_DATA = gnuradio_swig_py_io.scm +gnuradio_core_io_scmlib_LTLIBRARIES = libguile-gnuradio_core_io.la +libguile_gnuradio_core_io_la_SOURCES = \ + guile/gnuradio_core_io.cc \ + $(gnuradio_core_io_la_swig_sources) +gnuradio_core_io_scm_DATA = gnuradio_core_io.scm # Guile can use the same flags as python does -libguile_gnuradio_swig_py_io_la_LIBADD = $(_gnuradio_swig_py_io_la_LIBADD) -libguile_gnuradio_swig_py_io_la_LDFLAGS = $(_gnuradio_swig_py_io_la_LDFLAGS) -libguile_gnuradio_swig_py_io_la_CXXFLAGS = $(_gnuradio_swig_py_io_la_CXXFLAGS) +libguile_gnuradio_core_io_la_LIBADD = $(_gnuradio_core_io_la_LIBADD) +libguile_gnuradio_core_io_la_LDFLAGS = $(_gnuradio_core_io_la_LDFLAGS) +libguile_gnuradio_core_io_la_CXXFLAGS = $(_gnuradio_core_io_la_CXXFLAGS) -guile/gnuradio_swig_py_io.lo: gnuradio_swig_py_io.lo -gnuradio_swig_py_io.scm: gnuradio_swig_py_io.i +guile/gnuradio_core_io.lo: gnuradio_core_io.lo +gnuradio_core_io.scm: gnuradio_core_io.i endif # end of GUILE -python/gnuradio_swig_py_io.lo: -gnuradio_swig_py_io.lo: gnuradio_swig_py_io.py gnuradio_swig_py_io.scm -gnuradio_swig_py_io.py: gnuradio_swig_py_io.i +python/gnuradio_core_io.lo: +gnuradio_core_io.lo: gnuradio_core_io.py gnuradio_core_io.scm +gnuradio_core_io.py: gnuradio_core_io.i --include python/gnuradio_swig_py_io.d +-include python/gnuradio_core_io.d # -*- Makefile -*- # @@ -760,37 +760,37 @@ gnuradio_swig_py_io.py: gnuradio_swig_py_io.i # Boston, MA 02110-1301, USA. # -# Makefile.swig.gen for gnuradio_swig_py_hier.i +# Makefile.swig.gen for gnuradio_core_hier.i ## Default install locations for these files: ## ## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_hier +## ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_hier ## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_swig_py_hier +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_hier ## ## The following can be overloaded to change the install location, but ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -gnuradio_swig_py_hier_pythondir_category ?= gnuradio/gnuradio_swig_py_hier -gnuradio_swig_py_hier_pylibdir_category ?= $(gnuradio_swig_py_hier_pythondir_category) -gnuradio_swig_py_hier_pythondir = $(pythondir)/$(gnuradio_swig_py_hier_pythondir_category) -gnuradio_swig_py_hier_pylibdir = $(pyexecdir)/$(gnuradio_swig_py_hier_pylibdir_category) +gnuradio_core_hier_pythondir_category ?= gnuradio/gnuradio_core_hier +gnuradio_core_hier_pylibdir_category ?= $(gnuradio_core_hier_pythondir_category) +gnuradio_core_hier_pythondir = $(pythondir)/$(gnuradio_core_hier_pythondir_category) +gnuradio_core_hier_pylibdir = $(pyexecdir)/$(gnuradio_core_hier_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. -gnuradio_swig_py_hier_scmlibdir = $(libdir) +gnuradio_core_hier_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/gnuradio_swig_py_hier +# is installed, usually /usr/share/guile/site/gnuradio_core_hier # FIXME: determince whether these should be installed with gnuradio. -gnuradio_swig_py_hier_scmdir = $(guiledir)/gnuradio +gnuradio_core_hier_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. -gnuradio_swig_py_hier_swigincludedir = $(swigincludedir) +gnuradio_core_hier_swigincludedir = $(swigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level @@ -812,7 +812,7 @@ gnuradio_swig_py_hier_swigincludedir = $(swigincludedir) ## parallel built. These will not be included in a tarball, because ## the SWIG-generated files will be removed from the distribution. -STAMPS += $(DEPDIR)/gnuradio_swig_py_hier-generate-* +STAMPS += $(DEPDIR)/gnuradio_core_hier-generate-* ## Other cleaned files: dependency files generated by SWIG or this Makefile @@ -824,65 +824,65 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_swig_py_hier.py +swig_built_sources += gnuradio_core_hier.py if GUILE -swig_built_sources += gnuradio_swig_py_hier.scm +swig_built_sources += gnuradio_core_hier.scm endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . -gnuradio_swig_py_hier_swiginclude_HEADERS = \ - gnuradio_swig_py_hier.i \ - $(gnuradio_swig_py_hier_swiginclude_headers) +gnuradio_core_hier_swiginclude_HEADERS = \ + gnuradio_core_hier.i \ + $(gnuradio_core_hier_swiginclude_headers) -gnuradio_swig_py_hier_pylib_LTLIBRARIES = \ - _gnuradio_swig_py_hier.la +gnuradio_core_hier_pylib_LTLIBRARIES = \ + _gnuradio_core_hier.la -_gnuradio_swig_py_hier_la_SOURCES = \ - python/gnuradio_swig_py_hier.cc \ - $(gnuradio_swig_py_hier_la_swig_sources) +_gnuradio_core_hier_la_SOURCES = \ + python/gnuradio_core_hier.cc \ + $(gnuradio_core_hier_la_swig_sources) -_gnuradio_swig_py_hier_la_LIBADD = \ +_gnuradio_core_hier_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ - $(gnuradio_swig_py_hier_la_swig_libadd) + $(gnuradio_core_hier_la_swig_libadd) -# _gnuradio_swig_py_hier_la_DEPENDENCIES = python/gnuradio_swig_py_hier.lo +# _gnuradio_core_hier_la_DEPENDENCIES = python/gnuradio_core_hier.lo -_gnuradio_swig_py_hier_la_LDFLAGS = \ +_gnuradio_core_hier_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ - $(gnuradio_swig_py_hier_la_swig_ldflags) + $(gnuradio_core_hier_la_swig_ldflags) -_gnuradio_swig_py_hier_la_CXXFLAGS = \ +_gnuradio_core_hier_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ - $(gnuradio_swig_py_hier_la_swig_cxxflags) + $(gnuradio_core_hier_la_swig_cxxflags) -gnuradio_swig_py_hier_python_PYTHON = \ - gnuradio_swig_py_hier.py \ - $(gnuradio_swig_py_hier) +gnuradio_core_hier_python_PYTHON = \ + gnuradio_core_hier.py \ + $(gnuradio_core_hier) if GUILE -gnuradio_swig_py_hier_scmlib_LTLIBRARIES = libguile-gnuradio_swig_py_hier.la -libguile_gnuradio_swig_py_hier_la_SOURCES = \ - guile/gnuradio_swig_py_hier.cc \ - $(gnuradio_swig_py_hier_la_swig_sources) -gnuradio_swig_py_hier_scm_DATA = gnuradio_swig_py_hier.scm +gnuradio_core_hier_scmlib_LTLIBRARIES = libguile-gnuradio_core_hier.la +libguile_gnuradio_core_hier_la_SOURCES = \ + guile/gnuradio_core_hier.cc \ + $(gnuradio_core_hier_la_swig_sources) +gnuradio_core_hier_scm_DATA = gnuradio_core_hier.scm # Guile can use the same flags as python does -libguile_gnuradio_swig_py_hier_la_LIBADD = $(_gnuradio_swig_py_hier_la_LIBADD) -libguile_gnuradio_swig_py_hier_la_LDFLAGS = $(_gnuradio_swig_py_hier_la_LDFLAGS) -libguile_gnuradio_swig_py_hier_la_CXXFLAGS = $(_gnuradio_swig_py_hier_la_CXXFLAGS) +libguile_gnuradio_core_hier_la_LIBADD = $(_gnuradio_core_hier_la_LIBADD) +libguile_gnuradio_core_hier_la_LDFLAGS = $(_gnuradio_core_hier_la_LDFLAGS) +libguile_gnuradio_core_hier_la_CXXFLAGS = $(_gnuradio_core_hier_la_CXXFLAGS) -guile/gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.lo -gnuradio_swig_py_hier.scm: gnuradio_swig_py_hier.i +guile/gnuradio_core_hier.lo: gnuradio_core_hier.lo +gnuradio_core_hier.scm: gnuradio_core_hier.i endif # end of GUILE -python/gnuradio_swig_py_hier.lo: -gnuradio_swig_py_hier.lo: gnuradio_swig_py_hier.py gnuradio_swig_py_hier.scm -gnuradio_swig_py_hier.py: gnuradio_swig_py_hier.i +python/gnuradio_core_hier.lo: +gnuradio_core_hier.lo: gnuradio_core_hier.py gnuradio_core_hier.scm +gnuradio_core_hier.py: gnuradio_core_hier.i --include python/gnuradio_swig_py_hier.d +-include python/gnuradio_core_hier.d -- cgit From 70dd1dc6610135a1967de554189be38af8f3b080 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 23 Oct 2010 11:20:09 -0700 Subject: rename s/gnuradio_swig_python/gnuradio_core/g --- gnuradio-core/src/lib/swig/Makefile.am | 4 ++-- gnuradio-core/src/lib/swig/gnuradio_core.py | 28 ++++++++++++++++++++++ gnuradio-core/src/lib/swig/gnuradio_swig.scm | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_python.py | 28 ---------------------- 4 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 gnuradio-core/src/lib/swig/gnuradio_core.py delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_python.py (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index f354efe0b..9e0d2f69e 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -29,7 +29,7 @@ CLEANFILES += guile/gnuradio* endif # ---------------------------------------------------------------- -# We've split the previously monstrous gnuradio_swig_python into 6 +# We've split the previously monstrous gnuradio_core into 6 # smaller pieces. This reduces compile time coupling and creates # smaller pieces for the compiler to digest. prior to this change, on # X86_64, g++'s resident set size was 650MB! @@ -68,7 +68,7 @@ EXTRA_DIST = gen-swig-bug-fix # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr -ourpython_PYTHON = gnuradio_swig_python.py +ourpython_PYTHON = gnuradio_core.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... diff --git a/gnuradio-core/src/lib/swig/gnuradio_core.py b/gnuradio-core/src/lib/swig/gnuradio_core.py new file mode 100644 index 000000000..172051013 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_core.py @@ -0,0 +1,28 @@ +# +# Copyright 2006,2009,2010 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +# This file implements the old gnuradio_core namespace + +from gnuradio_core_runtime import * +from gnuradio_core_general import * +from gnuradio_core_gengen import * +from gnuradio_core_filter import * +from gnuradio_core_io import * +from gnuradio_core_hier import * diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig.scm b/gnuradio-core/src/lib/swig/gnuradio_swig.scm index 961564d68..c07d46a64 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_swig.scm +++ b/gnuradio-core/src/lib/swig/gnuradio_swig.scm @@ -3,7 +3,7 @@ ;;; We'll need to assemble the (gnuradio gr) module somewhere... ;;; -;; # This file implements the old gnuradio_swig_python namespace +;; # This file implements the old gnuradio_core namespace ;; ;; from gnuradio_swig_py_runtime import * ;; from gnuradio_swig_py_general import * diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py b/gnuradio-core/src/lib/swig/gnuradio_swig_python.py deleted file mode 100644 index 8f9fffd5c..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2006,2009,2010 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -# This file implements the old gnuradio_swig_python namespace - -from gnuradio_core_runtime import * -from gnuradio_core_general import * -from gnuradio_core_gengen import * -from gnuradio_core_filter import * -from gnuradio_core_io import * -from gnuradio_core_hier import * -- cgit From d1685679788103a280f4c7b373051b9e1779571f Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 23 Oct 2010 11:49:35 -0700 Subject: Missed a few: s/_swig_py_/_/ --- gnuradio-core/src/lib/swig/Makefile.am | 2 +- gnuradio-core/src/lib/swig/gnuradio_core.scm | 32 ++++++++++++++++++++ gnuradio-core/src/lib/swig/gnuradio_core_filter.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_general.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_gengen.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_hier.i | 4 +-- gnuradio-core/src/lib/swig/gnuradio_core_io.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_runtime.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm | 34 ---------------------- 9 files changed, 40 insertions(+), 42 deletions(-) create mode 100644 gnuradio-core/src/lib/swig/gnuradio_core.scm delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 9e0d2f69e..fb8577f72 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -55,7 +55,7 @@ if GUILE # This is the top level guile file, which loads all the other scm files # for gnuradio. This has to be installed top level to be found in the # default search path. -grguile_DATA = gnuradio_swig.scm +grguile_DATA = gnuradio_core.scm endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core.scm b/gnuradio-core/src/lib/swig/gnuradio_core.scm new file mode 100644 index 000000000..2aae2d1d8 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_core.scm @@ -0,0 +1,32 @@ +;;; +;;; Copyright 2010 Free Software Foundation, Inc. +;;; +;;; This file is part of GNU Radio +;;; +;;; GNU Radio is free software; you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3, or (at your option) +;;; any later version. +;;; +;;; GNU Radio is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License along +;;; with this program; if not, write to the Free Software Foundation, Inc., +;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +;;; + +;; Only use these if load-* fails to find a .scm or .so. If you can't +;; find a .so, try running ldconfig. guile seems to only load modules +;; that are in the ldconfig paths. +;; (set! %load-path (append %load-path '("/usr/lib/guile/gnuradio"))) +;; (set! %load-path (append %load-path '("/usr/share/gnuradio"))) + +(load "gnuradio/gnuradio_core_filter.scm") +(load "gnuradio/gnuradio_core_io.scm") +(load "gnuradio/gnuradio_core_runtime.scm") +(load "gnuradio/gnuradio_core_general.scm") +(load "gnuradio/gnuradio_core_gengen.scm") +(load "gnuradio/gnuradio_core_hier.scm") diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i index d9751d0f1..b03996b76 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i @@ -20,7 +20,7 @@ */ #ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_filter +%module(directors="1") gnuradio_core_filter #endif //%feature("autodoc", "1"); // generate python docstrings diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i index 07ef90e34..a82f1f5b3 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i @@ -20,7 +20,7 @@ */ #ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_general +%module(directors="1") gnuradio_core_general #endif //%feature("autodoc", "1"); // generate python docstrings diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i index ea78d8af6..e6f9ebcf4 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i @@ -20,7 +20,7 @@ */ #ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_gengen +%module(directors="1") gnuradio_core_gengen #endif //%feature("autodoc", "1"); // generate python docstrings diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i index f69b80334..0da432ce0 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i @@ -20,7 +20,7 @@ */ #ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_hier +%module(directors="1") gnuradio_hier_hier #endif //%feature("autodoc", "1"); // generate python docstrings @@ -31,6 +31,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_heir" "SWIG_init") +(load-extension "libguile-gnuradio_core_hier" "SWIG_init") %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i index 82acae747..b1dcfaf21 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_io.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i @@ -20,7 +20,7 @@ */ #ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_io +%module(directors="1") gnuradio_core_io #endif //%feature("autodoc", "1"); // generate python docstrings diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i index 3cc0a053d..4372b993d 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i @@ -21,7 +21,7 @@ */ #ifndef SWIGIMPORTED -%module(directors="1") gnuradio_swig_py_runtime +%module(directors="1") gnuradio_core_runtime #endif //%feature("autodoc", "1"); // generate python docstrings diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm b/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm deleted file mode 100644 index d08840071..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig_guile.scm +++ /dev/null @@ -1,34 +0,0 @@ -;;; -;;; Copyright 2010 Free Software Foundation, Inc. -;;; -;;; This file is part of GNU Radio -;;; -;;; GNU Radio is free software; you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3, or (at your option) -;;; any later version. -;;; -;;; GNU Radio is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License along -;;; with this program; if not, write to the Free Software Foundation, Inc., -;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -;;; - -;; Only use these if load-* fails to find a .scm or .so. If you can't -;; find a .so, try running ldconfig. guile seems to only load modules -;; that are in the ldconfig paths. -;; (set! %load-path (append %load-path '("/usr/lib/guile/gnuradio"))) -;; (set! %load-path (append %load-path '("/usr/share/gnuradio"))) - -(load "gnuradio/gnuradio_swig_py_filter.scm") -(load "gnuradio/gnuradio_swig_py_io.scm") -(load "gnuradio/gnuradio_swig_py_runtime.scm") -(load "gnuradio/gnuradio_swig_py_general.scm") -(load "gnuradio/gnuradio_swig_py_gengen.scm") - -;; FIXME: this don't load for some reason cause of issues with the .so files -;; (load "gnuradio/gnuradio_swig_py_heir.scm") -- cgit From 0a81b7d48de58cd83f7076fb9bd45cf30595c9ec Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 23 Oct 2010 12:04:42 -0700 Subject: rm gnuradio_swig.scm. Got turned into gnuradio_core.scm --- gnuradio-core/src/lib/swig/gnuradio_swig.scm | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig.scm (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig.scm b/gnuradio-core/src/lib/swig/gnuradio_swig.scm deleted file mode 100644 index c07d46a64..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_swig.scm +++ /dev/null @@ -1,13 +0,0 @@ -;;; -;;; Not sure that we need this for guile or not. -;;; We'll need to assemble the (gnuradio gr) module somewhere... -;;; - -;; # This file implements the old gnuradio_core namespace -;; -;; from gnuradio_swig_py_runtime import * -;; from gnuradio_swig_py_general import * -;; from gnuradio_swig_py_gengen import * -;; from gnuradio_swig_py_filter import * -;; from gnuradio_swig_py_io import * -;; from gnuradio_swig_py_hier import * -- cgit From 5939ce6971607b83b33c2ac0ede627a83670113a Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 23 Oct 2010 19:53:03 -0700 Subject: Move std_complex.i to gnuradio-core/src/lib/swig/guile. Seems to basically work. There's some simple test code inline in gnuradio_core_general.i. --- gnuradio-core/src/lib/swig/.gitignore | 77 +++++++++------------- gnuradio-core/src/lib/swig/Makefile.am | 4 ++ gnuradio-core/src/lib/swig/gnuradio.i | 6 +- gnuradio-core/src/lib/swig/gnuradio_core_general.i | 20 ++++++ gnuradio-core/src/lib/swig/guile/std_complex.i | 30 +++++++++ 5 files changed, 89 insertions(+), 48 deletions(-) create mode 100644 gnuradio-core/src/lib/swig/guile/std_complex.i (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/.gitignore b/gnuradio-core/src/lib/swig/.gitignore index 0018a2a54..75d6ce5b7 100644 --- a/gnuradio-core/src/lib/swig/.gitignore +++ b/gnuradio-core/src/lib/swig/.gitignore @@ -10,51 +10,34 @@ /swigrun.py /swigrun_wrap.c /Makefile.swigdeps.new -/gnuradio_core_runtime.d -/gnuradio_core_general.d -/gnuradio_core_gengen.d -/gnuradio_core_filter.d -/gnuradio_core_io.d /gnuradio_swig_bug_workaround.h -/gnuradio_core_runtime.cc -/gnuradio_core_runtime.h -/gnuradio_core_runtime.py -/gnuradio_core_general.cc -/gnuradio_core_general.h -/gnuradio_core_general.py -/gnuradio_core_gengen.cc -/gnuradio_core_gengen.h -/gnuradio_core_gengen.py -/gnuradio_core_filter.cc -/gnuradio_core_filter.h -/gnuradio_core_filter.py -/gnuradio_core_io.cc -/gnuradio_core_io.h -/gnuradio_core_io.py -/gnuradio_core_hier.cc -/gnuradio_core_hier.h -/gnuradio_core_hier.py -/gnuradio_core_filter_python.cc -/gnuradio_core_filter_python.h -/gnuradio_core_general_python.cc -/gnuradio_core_general_python.h -/gnuradio_core_gengen_python.cc -/gnuradio_core_gengen_python.h -/gnuradio_core_hier_python.cc -/gnuradio_core_hier_python.h -/gnuradio_core_io_python.cc -/gnuradio_core_io_python.h -/gnuradio_core_runtime_python.cc -/gnuradio_core_runtime_python.h -/gnuradio_core_filter.scm -/gnuradio_core_filter_guile.cc -/gnuradio_core_general.scm -/gnuradio_core_general_guile.cc -/gnuradio_core_gengen.scm -/gnuradio_core_gengen_guile.cc -/gnuradio_core_hier.scm -/gnuradio_core_hier_guile.cc -/gnuradio_core_io.scm -/gnuradio_core_io_guile.cc -/gnuradio_core_runtime.scm -/gnuradio_core_runtime_guile.cc +gnuradio_core_filter.cc +gnuradio_core_filter.d +gnuradio_core_filter.h +gnuradio_core_filter.py +gnuradio_core_filter.scm +gnuradio_core_general.cc +gnuradio_core_general.d +gnuradio_core_general.h +gnuradio_core_general.py +gnuradio_core_general.scm +gnuradio_core_gengen.cc +gnuradio_core_gengen.d +gnuradio_core_gengen.h +gnuradio_core_gengen.py +gnuradio_core_gengen.scm +gnuradio_core_hier.cc +gnuradio_core_hier.d +gnuradio_core_hier.h +gnuradio_core_hier.py +gnuradio_core_hier.scm +gnuradio_core_io.cc +gnuradio_core_io.d +gnuradio_core_io.h +gnuradio_core_io.py +gnuradio_core_io.scm +gnuradio_core_runtime.cc +gnuradio_core_runtime.d +gnuradio_core_runtime.h +gnuradio_core_runtime.py +gnuradio_core_runtime.scm diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index fb8577f72..f30b877a1 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -50,6 +50,10 @@ swiginclude_HEADERS = \ gr_swig_block_magic.i \ gr_shared_ptr.i +# SWIG headers that get installed in ${prefix}/include/gnuradio/swig/... +nobase_swiginclude_HEADERS = \ + guile/std_complex.i + if GUILE # This is the top level guile file, which loads all the other scm files diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index ec0264107..a30655f45 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -42,8 +42,12 @@ // non-local SWIG files %include -%include %include +#ifdef SWIGGUILE +%include +#else +%include +#endif typedef std::complex gr_complex; typedef std::complex gr_complexd; diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i index a82f1f5b3..3edca69ef 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i @@ -29,6 +29,26 @@ %include "general.i" + // Simple test case for complex input and output +%inline +%{ + std::complex complexf_add_2j(std::complex x) + { + return std::complex(x.real(), x.imag() + 2); + } + + std::complex complexd_add_2j(std::complex x) + { + return std::complex(x.real(), x.imag() + 2); + } + + std::complex complexf_add_x_2j(float x, std::complex y) + { + return std::complex(x + y.real(), y.imag() + 2); + } + +%} + #if SWIGGUILE %scheme %{ (load-extension "libguile-gnuradio_core_general" "SWIG_init") diff --git a/gnuradio-core/src/lib/swig/guile/std_complex.i b/gnuradio-core/src/lib/swig/guile/std_complex.i new file mode 100644 index 000000000..cafcfeae3 --- /dev/null +++ b/gnuradio-core/src/lib/swig/guile/std_complex.i @@ -0,0 +1,30 @@ +%{ +#include +%} + +// To the target language, complex number conversion +%typemap(out) complex, complex, std::complex { + $result = scm_make_rectangular( gh_double2scm ($1.real ()), + gh_double2scm ($1.imag ()) ); +} + +// To the target language, complex number conversion +%typemap(out) complex, complex, std::complex { + $result = scm_make_rectangular( gh_double2scm ($1.real ()), + gh_double2scm ($1.imag ()) ); +} + +// From the target language, complex number conversion +%typemap(in) complex, complex, std::complex { + $1 = std::complex( gh_scm2double (scm_real_part ($input)), + gh_scm2double (scm_imag_part ($input)) ); +} + +// From the target language, complex number conversion +%typemap(in) complex, complex, std::complex { + $1 = std::complex( gh_scm2double (scm_real_part ($input)), + gh_scm2double (scm_imag_part ($input)) ); +} + +%typemaps_primitive(%checkcode(CPLXDBL), std::complex); +%typemaps_primitive(%checkcode(CPLXFLT), std::complex); -- cgit From 27d1af7c7511addac638856bc2ffd3cda5e7ab0c Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 23 Oct 2010 20:59:54 -0700 Subject: Add %typecheck for complex. Fixes problem with moving-average-cc. --- gnuradio-core/src/lib/swig/guile/std_complex.i | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/guile/std_complex.i b/gnuradio-core/src/lib/swig/guile/std_complex.i index cafcfeae3..2a5c72aa2 100644 --- a/gnuradio-core/src/lib/swig/guile/std_complex.i +++ b/gnuradio-core/src/lib/swig/guile/std_complex.i @@ -28,3 +28,10 @@ %typemaps_primitive(%checkcode(CPLXDBL), std::complex); %typemaps_primitive(%checkcode(CPLXFLT), std::complex); + +%typecheck(SWIG_TYPECHECK_COMPLEX) + std::complex, std::complex, + const std::complex &, const std::complex & +{ + $1 = scm_is_complex($input) ? 1 : 0; +} -- cgit From 299aba578b76e1f07cb3e4e5ff59ee6b306afb5a Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 28 Oct 2010 15:05:52 -0700 Subject: Version that builds guile goops bindings, but dependencies are hosed. Doesn't compile cleanly, but does enough to allow experimentation with goops wrappers. We're currently seeing the nasty interaction between the package system, the "export" syntax, and generic-functions. See thread here: http://lists.gnu.org/archive/html/guile-user/2006-05/msg00007.html for background. --- gnuradio-core/src/lib/swig/Makefile.am | 7 +- gnuradio-core/src/lib/swig/Makefile.swig.gen | 24 +++---- gnuradio-core/src/lib/swig/Swig/common.scm | 76 ++++++++++++++++++++++ gnuradio-core/src/lib/swig/gnuradio/.gitignore | 12 ++++ gnuradio-core/src/lib/swig/gnuradio/core.scm | 11 ++++ gnuradio-core/src/lib/swig/gnuradio_core.scm | 32 --------- gnuradio-core/src/lib/swig/gnuradio_core_filter.i | 8 ++- gnuradio-core/src/lib/swig/gnuradio_core_general.i | 6 +- gnuradio-core/src/lib/swig/gnuradio_core_gengen.i | 6 +- gnuradio-core/src/lib/swig/gnuradio_core_hier.i | 6 +- gnuradio-core/src/lib/swig/gnuradio_core_io.i | 6 +- gnuradio-core/src/lib/swig/gnuradio_core_runtime.i | 2 +- 12 files changed, 143 insertions(+), 53 deletions(-) create mode 100644 gnuradio-core/src/lib/swig/Swig/common.scm create mode 100644 gnuradio-core/src/lib/swig/gnuradio/.gitignore create mode 100644 gnuradio-core/src/lib/swig/gnuradio/core.scm delete mode 100644 gnuradio-core/src/lib/swig/gnuradio_core.scm (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index f30b877a1..60a1d952e 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -59,7 +59,9 @@ if GUILE # This is the top level guile file, which loads all the other scm files # for gnuradio. This has to be installed top level to be found in the # default search path. -grguile_DATA = gnuradio_core.scm +nobase_guile_DATA = \ + gnuradio/core.scm \ + Swig/common.scm endif @@ -112,7 +114,8 @@ BUILT_SOURCES += $(PYTHON_GEN) endif # end of if python if GUILE -GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.scm,$(HFILE))) +GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,%.scm,$(HFILE))) +#GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) # BUILT_SOURCES += $(foreach HFILE,$(GUILE_GEN), $(subst gnuradio,guile/gnuradio,$(HFILE))) BUILT_SOURCES += $(GUILE_GEN) endif diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index f6e3fa1b1..67cefe7d0 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -46,7 +46,7 @@ gnuradio_core_runtime_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_core_runtime # FIXME: determince whether these should be installed with gnuradio. -gnuradio_core_runtime_scmdir = $(guiledir)/gnuradio +gnuradio_core_runtime_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. @@ -128,7 +128,7 @@ gnuradio_core_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_core_runtime.la libguile_gnuradio_core_runtime_la_SOURCES = \ guile/gnuradio_core_runtime.cc \ $(gnuradio_core_runtime_la_swig_sources) -gnuradio_core_runtime_scm_DATA = gnuradio_core_runtime.scm +nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primtive.scm # Guile can use the same flags as python does libguile_gnuradio_core_runtime_la_LIBADD = $(_gnuradio_core_runtime_la_LIBADD) @@ -194,7 +194,7 @@ gnuradio_core_general_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_core_general # FIXME: determince whether these should be installed with gnuradio. -gnuradio_core_general_scmdir = $(guiledir)/gnuradio +gnuradio_core_general_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. @@ -276,7 +276,7 @@ gnuradio_core_general_scmlib_LTLIBRARIES = libguile-gnuradio_core_general.la libguile_gnuradio_core_general_la_SOURCES = \ guile/gnuradio_core_general.cc \ $(gnuradio_core_general_la_swig_sources) -gnuradio_core_general_scm_DATA = gnuradio_core_general.scm +nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primtive.scm # Guile can use the same flags as python does libguile_gnuradio_core_general_la_LIBADD = $(_gnuradio_core_general_la_LIBADD) @@ -342,7 +342,7 @@ gnuradio_core_gengen_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_core_gengen # FIXME: determince whether these should be installed with gnuradio. -gnuradio_core_gengen_scmdir = $(guiledir)/gnuradio +gnuradio_core_gengen_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. @@ -424,7 +424,7 @@ gnuradio_core_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_core_gengen.la libguile_gnuradio_core_gengen_la_SOURCES = \ guile/gnuradio_core_gengen.cc \ $(gnuradio_core_gengen_la_swig_sources) -gnuradio_core_gengen_scm_DATA = gnuradio_core_gengen.scm +nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primtive.scm # Guile can use the same flags as python does libguile_gnuradio_core_gengen_la_LIBADD = $(_gnuradio_core_gengen_la_LIBADD) @@ -490,7 +490,7 @@ gnuradio_core_filter_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_core_filter # FIXME: determince whether these should be installed with gnuradio. -gnuradio_core_filter_scmdir = $(guiledir)/gnuradio +gnuradio_core_filter_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. @@ -572,7 +572,7 @@ gnuradio_core_filter_scmlib_LTLIBRARIES = libguile-gnuradio_core_filter.la libguile_gnuradio_core_filter_la_SOURCES = \ guile/gnuradio_core_filter.cc \ $(gnuradio_core_filter_la_swig_sources) -gnuradio_core_filter_scm_DATA = gnuradio_core_filter.scm +nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primtive.scm # Guile can use the same flags as python does libguile_gnuradio_core_filter_la_LIBADD = $(_gnuradio_core_filter_la_LIBADD) @@ -638,7 +638,7 @@ gnuradio_core_io_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_core_io # FIXME: determince whether these should be installed with gnuradio. -gnuradio_core_io_scmdir = $(guiledir)/gnuradio +gnuradio_core_io_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. @@ -720,7 +720,7 @@ gnuradio_core_io_scmlib_LTLIBRARIES = libguile-gnuradio_core_io.la libguile_gnuradio_core_io_la_SOURCES = \ guile/gnuradio_core_io.cc \ $(gnuradio_core_io_la_swig_sources) -gnuradio_core_io_scm_DATA = gnuradio_core_io.scm +nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primtive.scm # Guile can use the same flags as python does libguile_gnuradio_core_io_la_LIBADD = $(_gnuradio_core_io_la_LIBADD) @@ -786,7 +786,7 @@ gnuradio_core_hier_scmlibdir = $(libdir) # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/gnuradio_core_hier # FIXME: determince whether these should be installed with gnuradio. -gnuradio_core_hier_scmdir = $(guiledir)/gnuradio +gnuradio_core_hier_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. @@ -868,7 +868,7 @@ gnuradio_core_hier_scmlib_LTLIBRARIES = libguile-gnuradio_core_hier.la libguile_gnuradio_core_hier_la_SOURCES = \ guile/gnuradio_core_hier.cc \ $(gnuradio_core_hier_la_swig_sources) -gnuradio_core_hier_scm_DATA = gnuradio_core_hier.scm +nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primtive.scm # Guile can use the same flags as python does libguile_gnuradio_core_hier_la_LIBADD = $(_gnuradio_core_hier_la_LIBADD) diff --git a/gnuradio-core/src/lib/swig/Swig/common.scm b/gnuradio-core/src/lib/swig/Swig/common.scm new file mode 100644 index 000000000..a51d3a71d --- /dev/null +++ b/gnuradio-core/src/lib/swig/Swig/common.scm @@ -0,0 +1,76 @@ +;;;************************************************************************ +;;;*common.scm +;;;* +;;;* This file contains generic SWIG GOOPS classes for generated +;;;* GOOPS file support +;;;* +;;;* Copyright (C) 2003 John Lenz (jelenz@wisc.edu) +;;;* Copyright (C) 2004 Matthias Koeppe (mkoeppe@mail.math.uni-magdeburg.de) +;;;* +;;;* This file may be freely redistributed without license or fee provided +;;;* this copyright message remains intact. +;;;************************************************************************ + +(define-module (Swig swigrun)) + +(define-module (Swig common) + #:use-module (oop goops) + #:use-module (Swig swigrun)) + +(define-class () + (new-function #:init-value #f)) + +(define-method (initialize (class ) initargs) + (slot-set! class 'new-function (get-keyword #:new-function initargs #f)) + (next-method)) + +(define-class () + (swig-smob #:init-value #f) + #:metaclass +) + +(define-method (initialize (obj ) initargs) + (next-method) + (slot-set! obj 'swig-smob + (let ((arg (get-keyword #:init-smob initargs #f))) + (if arg + arg + (let ((ret (apply (slot-ref (class-of obj) 'new-function) (get-keyword #:args initargs '())))) + ;; if the class is registered with runtime environment, + ;; new-Function will return a goops class. In that case, extract the smob + ;; from that goops class and set it as the current smob. + (if (slot-exists? ret 'swig-smob) + (slot-ref ret 'swig-smob) + ret)))))) + +(define (display-address o file) + (display (number->string (object-address o) 16) file)) + +(define (display-pointer-address o file) + ;; Don't fail if the function SWIG-PointerAddress is not present. + (let ((address (false-if-exception (SWIG-PointerAddress o)))) + (if address + (begin + (display " @ " file) + (display (number->string address 16) file))))) + +(define-method (write (o ) file) + ;; We display _two_ addresses to show the object's identity: + ;; * first the address of the GOOPS proxy object, + ;; * second the pointer address. + ;; The reason is that proxy objects are created and discarded on the + ;; fly, so different proxy objects for the same C object will appear. + (let ((class (class-of o))) + (if (slot-bound? class 'name) + (begin + (display "#<" file) + (display (class-name class) file) + (display #\space file) + (display-address o file) + (display-pointer-address o file) + (display ">" file)) + (next-method)))) + +(export ) + +;;; common.scm ends here diff --git a/gnuradio-core/src/lib/swig/gnuradio/.gitignore b/gnuradio-core/src/lib/swig/gnuradio/.gitignore new file mode 100644 index 000000000..20ce65795 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio/.gitignore @@ -0,0 +1,12 @@ +/gnuradio_core_filter.scm +/gnuradio_core_filter-primitive.scm +/gnuradio_core_general.scm +/gnuradio_core_general-primitive.scm +/gnuradio_core_gengen.scm +/gnuradio_core_gengen-primitive.scm +/gnuradio_core_hier.scm +/gnuradio_core_hier-primitive.scm +/gnuradio_core_io.scm +/gnuradio_core_io-primitive.scm +/gnuradio_core_runtime.scm +/gnuradio_core_runtime-primitive.scm diff --git a/gnuradio-core/src/lib/swig/gnuradio/core.scm b/gnuradio-core/src/lib/swig/gnuradio/core.scm new file mode 100644 index 000000000..3b12d4025 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio/core.scm @@ -0,0 +1,11 @@ +(define-module (gnuradio core) + #:use-module (gnuradio gnuradio_core_runtime) + #:use-module (gnuradio gnuradio_core_filter) + #:use-module (gnuradio gnuradio_core_io) + #:use-module (gnuradio gnuradio_core_general) + #:use-module (gnuradio gnuradio_core_gengen) + #:use-module (gnuradio gnuradio_core_hier) + #:duplicates (merge-generics replace warn-override-core warn last)) + +;; re-export everything... + diff --git a/gnuradio-core/src/lib/swig/gnuradio_core.scm b/gnuradio-core/src/lib/swig/gnuradio_core.scm deleted file mode 100644 index 2aae2d1d8..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio_core.scm +++ /dev/null @@ -1,32 +0,0 @@ -;;; -;;; Copyright 2010 Free Software Foundation, Inc. -;;; -;;; This file is part of GNU Radio -;;; -;;; GNU Radio is free software; you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3, or (at your option) -;;; any later version. -;;; -;;; GNU Radio is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License along -;;; with this program; if not, write to the Free Software Foundation, Inc., -;;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -;;; - -;; Only use these if load-* fails to find a .scm or .so. If you can't -;; find a .so, try running ldconfig. guile seems to only load modules -;; that are in the ldconfig paths. -;; (set! %load-path (append %load-path '("/usr/lib/guile/gnuradio"))) -;; (set! %load-path (append %load-path '("/usr/share/gnuradio"))) - -(load "gnuradio/gnuradio_core_filter.scm") -(load "gnuradio/gnuradio_core_io.scm") -(load "gnuradio/gnuradio_core_runtime.scm") -(load "gnuradio/gnuradio_core_general.scm") -(load "gnuradio/gnuradio_core_gengen.scm") -(load "gnuradio/gnuradio_core_hier.scm") diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i index b03996b76..0acbfa3a6 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i @@ -31,6 +31,10 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_filter" "SWIG_init") +(load-extension "libguile-gnuradio_core_filter" "scm_init_gnuradio_gnuradio_core_filter_module") %} - #endif + +%goops %{ + (use-modules (gnuradio gnuradio_core_runtime)) +%} +#endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i index 3edca69ef..8b3bf971b 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i @@ -51,6 +51,10 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_general" "SWIG_init") +(load-extension "libguile-gnuradio_core_general" "scm_init_gnuradio_gnuradio_core_general_module") +%} + +%goops %{ + (use-modules (gnuradio gnuradio_core_runtime)) %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i index e6f9ebcf4..c08109173 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i @@ -31,6 +31,10 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_gengen" "SWIG_init") +(load-extension "libguile-gnuradio_core_gengen" "scm_init_gnuradio_gnuradio_core_gengen_module") +%} + +%goops %{ + (use-modules (gnuradio gnuradio_core_runtime)) %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i index 0da432ce0..6d7a38321 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i @@ -31,6 +31,10 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_hier" "SWIG_init") +(load-extension "libguile-gnuradio_core_hier" "scm_init_gnuradio_gnuradio_core_hier_module") +%} + +%goops %{ + (use-modules (gnuradio gnuradio_core_runtime)) %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i index b1dcfaf21..936522ada 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_io.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i @@ -31,6 +31,10 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_io" "SWIG_init") +(load-extension "libguile-gnuradio_core_io" "scm_init_gnuradio_gnuradio_core_io_module") +%} + +%goops %{ + (use-modules (gnuradio gnuradio_core_runtime)) %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i index 4372b993d..2f6ca8227 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i @@ -34,6 +34,6 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_runtime" "SWIG_init") +(load-extension "libguile-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module") %} #endif -- cgit From cbfffe4100daff91746db0b6ea66cec9f7b2ceed Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 29 Oct 2010 02:20:32 -0700 Subject: Move sizeof_* from gnuradio.i to runtime.i to avoid multiple definitions --- gnuradio-core/src/lib/swig/gnuradio.i | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index a30655f45..6eb44cbe9 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -76,15 +76,6 @@ namespace std { //////////////////////////////////////////////////////////////////////// -%constant int sizeof_char = sizeof(char); -%constant int sizeof_short = sizeof(short); -%constant int sizeof_int = sizeof(int); -%constant int sizeof_float = sizeof(float); -%constant int sizeof_double = sizeof(double); -%constant int sizeof_gr_complex = sizeof(gr_complex); - -//////////////////////////////////////////////////////////////////////// - #ifndef SW_RUNTIME // import runtime.i for all but sw_runtime, since it needs to %include %import -- cgit From da69e1c1f910cf6ab4fd54dea25255e266b2918e Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 29 Oct 2010 03:54:07 -0700 Subject: gnuradio-core modules are almost loading cleanly. --- gnuradio-core/src/lib/swig/Makefile.am | 1 + gnuradio-core/src/lib/swig/gnuradio/core.scm | 6 ++- .../src/lib/swig/gnuradio/export-safely.scm | 45 ++++++++++++++++++++++ gnuradio-core/src/lib/swig/gnuradio_core_general.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_runtime.i | 7 ++++ 5 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 gnuradio-core/src/lib/swig/gnuradio/export-safely.scm (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 60a1d952e..b9bc75348 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -60,6 +60,7 @@ if GUILE # for gnuradio. This has to be installed top level to be found in the # default search path. nobase_guile_DATA = \ + gnuradio/export-safely.scm \ gnuradio/core.scm \ Swig/common.scm endif diff --git a/gnuradio-core/src/lib/swig/gnuradio/core.scm b/gnuradio-core/src/lib/swig/gnuradio/core.scm index 3b12d4025..294881146 100644 --- a/gnuradio-core/src/lib/swig/gnuradio/core.scm +++ b/gnuradio-core/src/lib/swig/gnuradio/core.scm @@ -1,3 +1,5 @@ +;;; Glue the separate pieces of gnuradio-core into a single module + (define-module (gnuradio core) #:use-module (gnuradio gnuradio_core_runtime) #:use-module (gnuradio gnuradio_core_filter) @@ -5,7 +7,7 @@ #:use-module (gnuradio gnuradio_core_general) #:use-module (gnuradio gnuradio_core_gengen) #:use-module (gnuradio gnuradio_core_hier) - #:duplicates (merge-generics replace warn-override-core warn last)) + #:duplicates (merge-generics check)) ;; re-export everything... - +(re-export-all (current-module)) diff --git a/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm b/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm new file mode 100644 index 000000000..52530abc9 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm @@ -0,0 +1,45 @@ +(define-module (gnuradio export-safely) + #:use-module (oop goops) + #:use-module (srfi srfi-1) + #:export-syntax (export-safely)) + +(define-public (generics-in-module module) + (let ((lst '())) + (module-for-each (lambda (sym var) + (if (variable-bound? var) + (let ((v (variable-ref var))) + (cond ((is-a? v ) + (set! lst (cons v lst))))))) + module) + lst)) + +(define-public (generic-function-names-in-module module) + (map generic-function-name (generics-in-module module))) + +(define-public (generic-function-names-in-imported-modules module) + (concatenate (map generic-function-names-in-module (module-uses module)))) + +(define-public (export-syms-if-not-imported-gf list-of-syms) + (let ((gf-names (generic-function-names-in-imported-modules (current-module)))) + (let ((to-export (filter (lambda (sym) + (not (memq sym gf-names))) + list-of-syms))) + (module-export! (current-module) to-export)))) + +(defmacro export-safely names + `(export-syms-if-not-imported-gf ',names)) + + +(define-public (names-in-module module) + (let ((lst '())) + (module-for-each (lambda (sym var) + (if (variable-bound? var) + (set! lst (cons sym lst)))) + module) + lst)) + +(define-public (names-in-imported-modules module) + (concatenate (map names-in-module (module-uses module)))) + +(define-public (re-export-all module) + (module-re-export! module (names-in-imported-modules module))) diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i index 8b3bf971b..759a65459 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i @@ -55,6 +55,6 @@ %} %goops %{ - (use-modules (gnuradio gnuradio_core_runtime)) +(use-modules (gnuradio gnuradio_core_runtime)) %} #endif diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i index 2f6ca8227..bb10b36b2 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i @@ -36,4 +36,11 @@ %scheme %{ (load-extension "libguile-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module") %} + +%goops %{ +(use-modules (gnuradio export-safely)) +(re-export export-syms-if-not-imported-gf) +(re-export-syntax export-safely) +(re-export re-export-all) +%} #endif -- cgit From 589f7bfacff26a373c88a11b507d9d58ce2cf55b Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 29 Oct 2010 04:50:13 -0700 Subject: Modules now load cleanly! --- .../src/lib/swig/gnuradio/export-safely.scm | 48 ++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm b/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm index 52530abc9..2da7e633e 100644 --- a/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm +++ b/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm @@ -1,3 +1,37 @@ +;;; +;;; Copyright 2010 Free Software Foundation, Inc. +;;; +;;; This file is part of GNU Radio +;;; +;;; GNU Radio is free software; you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3, or (at your option) +;;; any later version. +;;; +;;; GNU Radio is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program. If not, see . +;;; + +;;; This module implements a macro, export-safely, that avoids +;;; exporting symbols that are actually generic-functions imported +;;; (explicity or implicitly) from elsewhere. +;;; +;;; This hackery is required so that the swig generated goops wrappers +;;; don't stomp on each other. For background on what this is about +;;; see this thread: +;;; +;;; http://lists.gnu.org/archive/html/guile-user/2006-05/msg00007.html +;;; +;;; Don't expect to understand what's going on here without looking at +;;; the guts of the module system (implemented in ice-9/boot-9.scm) and +;;; having a pretty good understanding of goops and generic-functions. + + (define-module (gnuradio export-safely) #:use-module (oop goops) #:use-module (srfi srfi-1) @@ -23,7 +57,7 @@ (let ((gf-names (generic-function-names-in-imported-modules (current-module)))) (let ((to-export (filter (lambda (sym) (not (memq sym gf-names))) - list-of-syms))) + (delete-duplicates list-of-syms)))) (module-export! (current-module) to-export)))) (defmacro export-safely names @@ -39,7 +73,15 @@ lst)) (define-public (names-in-imported-modules module) - (concatenate (map names-in-module (module-uses module)))) + (delete-duplicates (concatenate (map names-in-module (module-uses module))))) (define-public (re-export-all module) - (module-re-export! module (names-in-imported-modules module))) + (define (ok-to-re-export? name) + (let ((var (module-variable module name))) + (cond ((not var) #f) ; Undefined var + ((eq? var (module-local-variable module name)) #f) ; local var + (else #t)))) ; OK + + (module-re-export! module + (filter ok-to-re-export? + (names-in-imported-modules module)))) -- cgit From 40fac3c4a2f5f1f6dde79e96be8f40535e11343b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 30 Oct 2010 12:14:16 -0600 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 30 ++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 67cefe7d0..69042f84e 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -128,7 +128,7 @@ gnuradio_core_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_core_runtime.la libguile_gnuradio_core_runtime_la_SOURCES = \ guile/gnuradio_core_runtime.cc \ $(gnuradio_core_runtime_la_swig_sources) -nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primtive.scm +nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primitive.scm # Guile can use the same flags as python does libguile_gnuradio_core_runtime_la_LIBADD = $(_gnuradio_core_runtime_la_LIBADD) @@ -137,6 +137,9 @@ libguile_gnuradio_core_runtime_la_CXXFLAGS = $(_gnuradio_core_runtime_la_CXXFLAG guile/gnuradio_core_runtime.lo: gnuradio_core_runtime.lo gnuradio_core_runtime.scm: gnuradio_core_runtime.i +gnuradio/gnuradio_core_runtime-primitive.scm: gnuradio_core_runtime.scm + +-include guile/gnuradio_core_runtime.d endif # end of GUILE @@ -276,7 +279,7 @@ gnuradio_core_general_scmlib_LTLIBRARIES = libguile-gnuradio_core_general.la libguile_gnuradio_core_general_la_SOURCES = \ guile/gnuradio_core_general.cc \ $(gnuradio_core_general_la_swig_sources) -nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primtive.scm +nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primitive.scm # Guile can use the same flags as python does libguile_gnuradio_core_general_la_LIBADD = $(_gnuradio_core_general_la_LIBADD) @@ -285,6 +288,9 @@ libguile_gnuradio_core_general_la_CXXFLAGS = $(_gnuradio_core_general_la_CXXFLAG guile/gnuradio_core_general.lo: gnuradio_core_general.lo gnuradio_core_general.scm: gnuradio_core_general.i +gnuradio/gnuradio_core_general-primitive.scm: gnuradio_core_general.scm + +-include guile/gnuradio_core_general.d endif # end of GUILE @@ -424,7 +430,7 @@ gnuradio_core_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_core_gengen.la libguile_gnuradio_core_gengen_la_SOURCES = \ guile/gnuradio_core_gengen.cc \ $(gnuradio_core_gengen_la_swig_sources) -nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primtive.scm +nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primitive.scm # Guile can use the same flags as python does libguile_gnuradio_core_gengen_la_LIBADD = $(_gnuradio_core_gengen_la_LIBADD) @@ -433,6 +439,9 @@ libguile_gnuradio_core_gengen_la_CXXFLAGS = $(_gnuradio_core_gengen_la_CXXFLAGS) guile/gnuradio_core_gengen.lo: gnuradio_core_gengen.lo gnuradio_core_gengen.scm: gnuradio_core_gengen.i +gnuradio/gnuradio_core_gengen-primitive.scm: gnuradio_core_gengen.scm + +-include guile/gnuradio_core_gengen.d endif # end of GUILE @@ -572,7 +581,7 @@ gnuradio_core_filter_scmlib_LTLIBRARIES = libguile-gnuradio_core_filter.la libguile_gnuradio_core_filter_la_SOURCES = \ guile/gnuradio_core_filter.cc \ $(gnuradio_core_filter_la_swig_sources) -nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primtive.scm +nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primitive.scm # Guile can use the same flags as python does libguile_gnuradio_core_filter_la_LIBADD = $(_gnuradio_core_filter_la_LIBADD) @@ -581,6 +590,9 @@ libguile_gnuradio_core_filter_la_CXXFLAGS = $(_gnuradio_core_filter_la_CXXFLAGS) guile/gnuradio_core_filter.lo: gnuradio_core_filter.lo gnuradio_core_filter.scm: gnuradio_core_filter.i +gnuradio/gnuradio_core_filter-primitive.scm: gnuradio_core_filter.scm + +-include guile/gnuradio_core_filter.d endif # end of GUILE @@ -720,7 +732,7 @@ gnuradio_core_io_scmlib_LTLIBRARIES = libguile-gnuradio_core_io.la libguile_gnuradio_core_io_la_SOURCES = \ guile/gnuradio_core_io.cc \ $(gnuradio_core_io_la_swig_sources) -nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primtive.scm +nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primitive.scm # Guile can use the same flags as python does libguile_gnuradio_core_io_la_LIBADD = $(_gnuradio_core_io_la_LIBADD) @@ -729,6 +741,9 @@ libguile_gnuradio_core_io_la_CXXFLAGS = $(_gnuradio_core_io_la_CXXFLAGS) guile/gnuradio_core_io.lo: gnuradio_core_io.lo gnuradio_core_io.scm: gnuradio_core_io.i +gnuradio/gnuradio_core_io-primitive.scm: gnuradio_core_io.scm + +-include guile/gnuradio_core_io.d endif # end of GUILE @@ -868,7 +883,7 @@ gnuradio_core_hier_scmlib_LTLIBRARIES = libguile-gnuradio_core_hier.la libguile_gnuradio_core_hier_la_SOURCES = \ guile/gnuradio_core_hier.cc \ $(gnuradio_core_hier_la_swig_sources) -nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primtive.scm +nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primitive.scm # Guile can use the same flags as python does libguile_gnuradio_core_hier_la_LIBADD = $(_gnuradio_core_hier_la_LIBADD) @@ -877,6 +892,9 @@ libguile_gnuradio_core_hier_la_CXXFLAGS = $(_gnuradio_core_hier_la_CXXFLAGS) guile/gnuradio_core_hier.lo: gnuradio_core_hier.lo gnuradio_core_hier.scm: gnuradio_core_hier.i +gnuradio/gnuradio_core_hier-primitive.scm: gnuradio_core_hier.scm + +-include guile/gnuradio_core_hier.d endif # end of GUILE -- cgit From f7d9be06a59c30e3e964456d2f6c95e64d8ec05f Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 30 Oct 2010 12:15:49 -0600 Subject: move good comment to here where it belongs --- gnuradio-core/src/lib/swig/Makefile.am | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index b9bc75348..2b763d94c 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -124,7 +124,3 @@ endif # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) -# Compile a .i to what guile needs. We use -o to set the output file name, -# or even with -outdir guile in SWIG_GUILE_ARGS, swig keeps putting a -# gnuradio_core_*_wrap.cxx in the source directory. - -- cgit From df6f365b6b703971efc9f29471e0cf1660938fbf Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 30 Oct 2010 20:22:54 -0700 Subject: Routines to coerce blocks and connect them --- gnuradio-core/src/lib/swig/gnuradio/coerce.scm | 88 ++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 gnuradio-core/src/lib/swig/gnuradio/coerce.scm (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio/coerce.scm b/gnuradio-core/src/lib/swig/gnuradio/coerce.scm new file mode 100644 index 000000000..2c508c6a4 --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio/coerce.scm @@ -0,0 +1,88 @@ +;;; +;;; Copyright 2010 Free Software Foundation, Inc. +;;; +;;; This file is part of GNU Radio +;;; +;;; GNU Radio is free software; you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3, or (at your option) +;;; any later version. +;;; +;;; GNU Radio is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program. If not, see . +;;; + +(define-class () + (block #:accessor block #:init-keyword #:block) + (port #:init-value 0 #:accessor port #:init-keyword #:port)) + +(define (gr:ep block port) + (make + #:block (coerce-to-basic-block block) #:port port)) + +(define (coerce-to-endpoint ep) + (cond ((is-a? ep ) ep) + ((false-if-exception (gr:to-basic-block ep)) + => (lambda (x) (gr:ep x 0))) + ((and (pair? ep) (= 2 (length ep)) + (false-if-exception (gr:to-basic-block (car ep)))) + => (lambda (x) (gr:ep x (cadr ep)))) + (else (error "Cannot coerce to an endpoint: " ep)))) + +(define (coerce-to-basic-block block) + (cond ((is-a? block ) block) + ((false-if-exception (gr:to-basic-block block)) => (lambda (x) x)) + (else (error "Cannot coerce to a gr_basic_block: " block)))) + +(define (coerce-to-top-block block) + (cond ((is-a? block ) block) + ((false-if-exception (gr:to-top-block block)) => (lambda (x) x)) + (else (error "Cannot coerce to a gr_top_block: " block)))) + +(define (coerce-to-hier-block2 block) + (cond ((is-a? block ) block) + ((false-if-exception (gr:to-hier-block2 block)) => (lambda (x) x)) + (else (error "Cannot coerce to a gr_hier_block2: " block)))) + +;;; The gr:connect variants +;;; These work for anything derived from gr_hier_block2 +(define-method (gr:connect hb block) + (let ((hb (coerce-to-hier-block2 hb)) + (bb (coerce-to-basic-block block))) + (gr:connect hb bb))) + +(define-method (gr:connect hb (src ) (dst )) + (let ((hb (coerce-to-hier-block2 hb))) + (gr:connect hb (block src) (port src) (block dst) (port dst)))) + +(define-method (gr:connect hb src dst) + (let ((hb (coerce-to-hier-block2 hb)) + (src (coerce-to-endpoint src)) + (dst (coerce-to-endpoint dst))) + (gr:connect hb src dst))) + +;;; The gr:disconnect variants +;;; These work for anything derived from gr_hier_block2 +(define-method (gr:disconnect-all hb) + (let ((hb (coerce-to-hier-block2 hb))) + (gr:disconnect-all hb))) + +(define-method (gr:disconnect hb block) + (let ((hb (coerce-to-hier-block2 hb)) + (bb (coerce-to-basic-block block))) + (gr:disconnect hb bb))) + +(define-method (gr:disconnect hb (src ) (dst )) + (let ((hb (coerce-to-hier-block2 hb))) + (gr:disconnect hb (block src) (port src) (block dst) (port dst)))) + +(define-method (gr:disconnect hb src dst) + (let ((hb (coerce-to-hier-block2 hb)) + (src (coerce-to-endpoint src)) + (dst (coerce-to-endpoint dst))) + (gr:disconnect hb src dst))) -- cgit From 8fe7f0fe5fe89f6ec32732dd802608060e973f0d Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 31 Oct 2010 20:03:35 -0700 Subject: Cleanup gr:connect and gr:disconnect for Guile. Rename {dis,}connect to {dis,}primitive_connect in .i file. Update python code to reflect change. --- gnuradio-core/src/lib/swig/gnuradio/coerce.scm | 56 ++++++++++++-------------- 1 file changed, 26 insertions(+), 30 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio/coerce.scm b/gnuradio-core/src/lib/swig/gnuradio/coerce.scm index 2c508c6a4..81bc187a6 100644 --- a/gnuradio-core/src/lib/swig/gnuradio/coerce.scm +++ b/gnuradio-core/src/lib/swig/gnuradio/coerce.scm @@ -49,40 +49,36 @@ ((false-if-exception (gr:to-hier-block2 block)) => (lambda (x) x)) (else (error "Cannot coerce to a gr_hier_block2: " block)))) -;;; The gr:connect variants -;;; These work for anything derived from gr_hier_block2 -(define-method (gr:connect hb block) - (let ((hb (coerce-to-hier-block2 hb)) - (bb (coerce-to-basic-block block))) - (gr:connect hb bb))) -(define-method (gr:connect hb (src ) (dst )) - (let ((hb (coerce-to-hier-block2 hb))) - (gr:connect hb (block src) (port src) (block dst) (port dst)))) +;;; Connect one or more block endpoints. An endpoint is either a , +;;; a 2-list (block port), or a block instance. In the latter case, the port number +;;; is assumed to be zero. +;;; +;;; If multiple arguments are provided, connect will attempt to wire them in series, +;;; interpreting the endpoints as inputs or outputs as appropriate. +(define-method (gr:connect hb . points) + (dis/connect "connect" gr:primitive-connect hb points)) + +;;; Disconnect one or more block endpoints... +(define-method (gr:disconnect hb . points) + (dis/connect "disconnect" gr:primitive-disconnect hb points)) -(define-method (gr:connect hb src dst) +(define (dis/connect name gf hb points) (let ((hb (coerce-to-hier-block2 hb)) - (src (coerce-to-endpoint src)) - (dst (coerce-to-endpoint dst))) - (gr:connect hb src dst))) + (points (list->vector (map coerce-to-endpoint points)))) -;;; The gr:disconnect variants -;;; These work for anything derived from gr_hier_block2 -(define-method (gr:disconnect-all hb) - (let ((hb (coerce-to-hier-block2 hb))) - (gr:disconnect-all hb))) + (define (op2 p0 p1) + (gf hb (block p0) (port p0) (block p1) (port p1))) -(define-method (gr:disconnect hb block) - (let ((hb (coerce-to-hier-block2 hb)) - (bb (coerce-to-basic-block block))) - (gr:disconnect hb bb))) + (let ((len (vector-length points))) + (case len + ((0) (error (string-append name " requires at least 1 endpoint; None provided."))) + ((1) (gf hb (vector-ref points 0))) + (else + (let loop ((n 1)) + (cond ((< n len) + (op2 (vector-ref points (1- n)) (vector-ref points n)) + (loop (1+ n)))))))))) -(define-method (gr:disconnect hb (src ) (dst )) - (let ((hb (coerce-to-hier-block2 hb))) - (gr:disconnect hb (block src) (port src) (block dst) (port dst)))) -(define-method (gr:disconnect hb src dst) - (let ((hb (coerce-to-hier-block2 hb)) - (src (coerce-to-endpoint src)) - (dst (coerce-to-endpoint dst))) - (gr:disconnect hb src dst))) +(export-safely gr:connect gr:disconnect) -- cgit From 76c90f91c5bf06f61f927e002053e397b8f4a706 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 31 Oct 2010 20:06:52 -0700 Subject: Export a few more items --- gnuradio-core/src/lib/swig/gnuradio/coerce.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio/coerce.scm b/gnuradio-core/src/lib/swig/gnuradio/coerce.scm index 81bc187a6..4654ad6f8 100644 --- a/gnuradio-core/src/lib/swig/gnuradio/coerce.scm +++ b/gnuradio-core/src/lib/swig/gnuradio/coerce.scm @@ -81,4 +81,4 @@ (loop (1+ n)))))))))) -(export-safely gr:connect gr:disconnect) +(export-safely gr:ep gr:connect gr:disconnect) -- cgit From f2f013ecb94c5e5781952c67496fec09aff7da2c Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 31 Oct 2010 20:51:24 -0700 Subject: Rename coerce.scm to runtime-shim.scm. Modify core.scm to use runtime-shim. --- gnuradio-core/src/lib/swig/Makefile.am | 3 +- gnuradio-core/src/lib/swig/gnuradio/coerce.scm | 84 -------------------- gnuradio-core/src/lib/swig/gnuradio/core.scm | 1 + .../src/lib/swig/gnuradio/runtime-shim.scm | 89 ++++++++++++++++++++++ 4 files changed, 92 insertions(+), 85 deletions(-) delete mode 100644 gnuradio-core/src/lib/swig/gnuradio/coerce.scm create mode 100644 gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 2b763d94c..01a5318ec 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -60,8 +60,9 @@ if GUILE # for gnuradio. This has to be installed top level to be found in the # default search path. nobase_guile_DATA = \ - gnuradio/export-safely.scm \ gnuradio/core.scm \ + gnuradio/export-safely.scm \ + gnuradio/runtime-shim.scm \ Swig/common.scm endif diff --git a/gnuradio-core/src/lib/swig/gnuradio/coerce.scm b/gnuradio-core/src/lib/swig/gnuradio/coerce.scm deleted file mode 100644 index 4654ad6f8..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio/coerce.scm +++ /dev/null @@ -1,84 +0,0 @@ -;;; -;;; Copyright 2010 Free Software Foundation, Inc. -;;; -;;; This file is part of GNU Radio -;;; -;;; GNU Radio is free software; you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3, or (at your option) -;;; any later version. -;;; -;;; GNU Radio is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see . -;;; - -(define-class () - (block #:accessor block #:init-keyword #:block) - (port #:init-value 0 #:accessor port #:init-keyword #:port)) - -(define (gr:ep block port) - (make - #:block (coerce-to-basic-block block) #:port port)) - -(define (coerce-to-endpoint ep) - (cond ((is-a? ep ) ep) - ((false-if-exception (gr:to-basic-block ep)) - => (lambda (x) (gr:ep x 0))) - ((and (pair? ep) (= 2 (length ep)) - (false-if-exception (gr:to-basic-block (car ep)))) - => (lambda (x) (gr:ep x (cadr ep)))) - (else (error "Cannot coerce to an endpoint: " ep)))) - -(define (coerce-to-basic-block block) - (cond ((is-a? block ) block) - ((false-if-exception (gr:to-basic-block block)) => (lambda (x) x)) - (else (error "Cannot coerce to a gr_basic_block: " block)))) - -(define (coerce-to-top-block block) - (cond ((is-a? block ) block) - ((false-if-exception (gr:to-top-block block)) => (lambda (x) x)) - (else (error "Cannot coerce to a gr_top_block: " block)))) - -(define (coerce-to-hier-block2 block) - (cond ((is-a? block ) block) - ((false-if-exception (gr:to-hier-block2 block)) => (lambda (x) x)) - (else (error "Cannot coerce to a gr_hier_block2: " block)))) - - -;;; Connect one or more block endpoints. An endpoint is either a , -;;; a 2-list (block port), or a block instance. In the latter case, the port number -;;; is assumed to be zero. -;;; -;;; If multiple arguments are provided, connect will attempt to wire them in series, -;;; interpreting the endpoints as inputs or outputs as appropriate. -(define-method (gr:connect hb . points) - (dis/connect "connect" gr:primitive-connect hb points)) - -;;; Disconnect one or more block endpoints... -(define-method (gr:disconnect hb . points) - (dis/connect "disconnect" gr:primitive-disconnect hb points)) - -(define (dis/connect name gf hb points) - (let ((hb (coerce-to-hier-block2 hb)) - (points (list->vector (map coerce-to-endpoint points)))) - - (define (op2 p0 p1) - (gf hb (block p0) (port p0) (block p1) (port p1))) - - (let ((len (vector-length points))) - (case len - ((0) (error (string-append name " requires at least 1 endpoint; None provided."))) - ((1) (gf hb (vector-ref points 0))) - (else - (let loop ((n 1)) - (cond ((< n len) - (op2 (vector-ref points (1- n)) (vector-ref points n)) - (loop (1+ n)))))))))) - - -(export-safely gr:ep gr:connect gr:disconnect) diff --git a/gnuradio-core/src/lib/swig/gnuradio/core.scm b/gnuradio-core/src/lib/swig/gnuradio/core.scm index 294881146..08daeeb34 100644 --- a/gnuradio-core/src/lib/swig/gnuradio/core.scm +++ b/gnuradio-core/src/lib/swig/gnuradio/core.scm @@ -2,6 +2,7 @@ (define-module (gnuradio core) #:use-module (gnuradio gnuradio_core_runtime) + #:use-module (gnuradio runtime-shim) #:use-module (gnuradio gnuradio_core_filter) #:use-module (gnuradio gnuradio_core_io) #:use-module (gnuradio gnuradio_core_general) diff --git a/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm b/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm new file mode 100644 index 000000000..c08d3947c --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm @@ -0,0 +1,89 @@ +;;; +;;; Copyright 2010 Free Software Foundation, Inc. +;;; +;;; This file is part of GNU Radio +;;; +;;; GNU Radio is free software; you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3, or (at your option) +;;; any later version. +;;; +;;; GNU Radio is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program. If not, see . +;;; + +(define-module (gnuradio runtime-shim) + #:use-module (oop goops) + #:use-module (gnuradio gnuradio_core_runtime) + #:duplicates (merge-generics replace check)) + +(define-class () + (block #:accessor block #:init-keyword #:block) + (port #:init-value 0 #:accessor port #:init-keyword #:port)) + +(define (gr:ep block port) + (make + #:block (coerce-to-basic-block block) #:port port)) + +(define (coerce-to-endpoint ep) + (cond ((is-a? ep ) ep) + ((false-if-exception (gr:to-basic-block ep)) + => (lambda (x) (gr:ep x 0))) + ((and (pair? ep) (= 2 (length ep)) + (false-if-exception (gr:to-basic-block (car ep)))) + => (lambda (x) (gr:ep x (cadr ep)))) + (else (error "Cannot coerce to an endpoint: " ep)))) + +(define (coerce-to-basic-block block) + (cond ((is-a? block ) block) + ((false-if-exception (gr:to-basic-block block)) => (lambda (x) x)) + (else (error "Cannot coerce to a gr_basic_block: " block)))) + +(define (coerce-to-top-block block) + (cond ((is-a? block ) block) + ((false-if-exception (gr:to-top-block block)) => (lambda (x) x)) + (else (error "Cannot coerce to a gr_top_block: " block)))) + +(define (coerce-to-hier-block2 block) + (cond ((is-a? block ) block) + ((false-if-exception (gr:to-hier-block2 block)) => (lambda (x) x)) + (else (error "Cannot coerce to a gr_hier_block2: " block)))) + + +;;; Connect one or more block endpoints. An endpoint is either a , +;;; a 2-list (block port), or a block instance. In the latter case, the port number +;;; is assumed to be zero. +;;; +;;; If multiple arguments are provided, connect will attempt to wire them in series, +;;; interpreting the endpoints as inputs or outputs as appropriate. +(define-method (gr:connect hb . points) + (dis/connect "connect" gr:primitive-connect hb points)) + +;;; Disconnect one or more block endpoints... +(define-method (gr:disconnect hb . points) + (dis/connect "disconnect" gr:primitive-disconnect hb points)) + +(define (dis/connect name gf hb points) + (let ((hb (coerce-to-hier-block2 hb)) + (points (list->vector (map coerce-to-endpoint points)))) + + (define (op2 p0 p1) + (gf hb (block p0) (port p0) (block p1) (port p1))) + + (let ((len (vector-length points))) + (case len + ((0) (error (string-append name " requires at least 1 endpoint; None provided."))) + ((1) (gf hb (vector-ref points 0))) + (else + (let loop ((n 1)) + (cond ((< n len) + (op2 (vector-ref points (1- n)) (vector-ref points n)) + (loop (1+ n)))))))))) + + +(export-safely gr:ep gr:connect gr:disconnect) -- cgit From f81c5677a40cc538ee7631d02aa24602d571ffb8 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 1 Nov 2010 16:05:08 -0600 Subject: add script names to swig_built_sources, not BUILT_SOURCES. Clean the generated files than now live in subdirectories. --- gnuradio-core/src/lib/swig/Makefile.am | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 01a5318ec..54cbebeb1 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -23,9 +23,10 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources) -CLEANFILES = python/gnuradio* + +CLEANFILES = python/*.cc python/*.h if GUILE -CLEANFILES += guile/gnuradio* +CLEANFILES += guile/*.cc gnuradio/*.scm endif # ---------------------------------------------------------------- @@ -111,15 +112,14 @@ gnuradio_core_hier_la_swig_libadd = $(GNURADIO_CORE_LA) # include the SWIG-generated .h files in the BUILT SOURCES, since they # aren't by default when using Makefile.swig; order doesn't matter. PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(HFILE))) -#BUILT_SOURCES += $(foreach HFILE,$(PYTHON_GEN), $(subst gnuradio,python/gnuradio,$(HFILE))) -BUILT_SOURCES += $(PYTHON_GEN) +swig_built_sources += $(PYTHON_GEN) endif # end of if python if GUILE -GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,%.scm,$(HFILE))) -#GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) -# BUILT_SOURCES += $(foreach HFILE,$(GUILE_GEN), $(subst gnuradio,guile/gnuradio,$(HFILE))) -BUILT_SOURCES += $(GUILE_GEN) +#GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,%.scm,$(HFILE))) +GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) +# GUILE_GEN_STAMPS = $(filter %.scm,$(TOP_SWIG_IFILES)) +swig_built_sources += $(GUILE_GEN) endif # Do not distribute the output of SWIG -- cgit From 2b11c904da6799b6a7240d64d2ba37ddcaf1e479 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 1 Nov 2010 16:06:37 -0600 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 90 +++++++++++++--------------- 1 file changed, 42 insertions(+), 48 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 69042f84e..a92ff2231 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -84,10 +84,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_core_runtime.py -if GUILE -swig_built_sources += gnuradio_core_runtime.scm -endif +# swig_built_sources += gnuradio_core_runtime.py +# if GUILE +# swig_built_sources += gnuradio/gnuradio_core_runtime.scm +# endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -135,15 +135,14 @@ libguile_gnuradio_core_runtime_la_LIBADD = $(_gnuradio_core_runtime_la_LIBADD) libguile_gnuradio_core_runtime_la_LDFLAGS = $(_gnuradio_core_runtime_la_LDFLAGS) libguile_gnuradio_core_runtime_la_CXXFLAGS = $(_gnuradio_core_runtime_la_CXXFLAGS) -guile/gnuradio_core_runtime.lo: gnuradio_core_runtime.lo -gnuradio_core_runtime.scm: gnuradio_core_runtime.i -gnuradio/gnuradio_core_runtime-primitive.scm: gnuradio_core_runtime.scm +guile/gnuradio_core_runtime.cc: gnuradio/gnuradio_core_runtime.scm +gnuradio/gnuradio_core_runtime.scm: gnuradio_core_runtime.i +gnuradio/gnuradio_core_runtime-primitive.scm: gnuradio/gnuradio_core_runtime.scm -include guile/gnuradio_core_runtime.d endif # end of GUILE -python/gnuradio_core_runtime.lo: gnuradio_core_runtime.lo: gnuradio_core_runtime.py gnuradio_core_runtime.scm gnuradio_core_runtime.py: gnuradio_core_runtime.i @@ -235,10 +234,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_core_general.py -if GUILE -swig_built_sources += gnuradio_core_general.scm -endif +# swig_built_sources += gnuradio_core_general.py +# if GUILE +# swig_built_sources += gnuradio/gnuradio_core_general.scm +# endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -286,15 +285,14 @@ libguile_gnuradio_core_general_la_LIBADD = $(_gnuradio_core_general_la_LIBADD) libguile_gnuradio_core_general_la_LDFLAGS = $(_gnuradio_core_general_la_LDFLAGS) libguile_gnuradio_core_general_la_CXXFLAGS = $(_gnuradio_core_general_la_CXXFLAGS) -guile/gnuradio_core_general.lo: gnuradio_core_general.lo -gnuradio_core_general.scm: gnuradio_core_general.i -gnuradio/gnuradio_core_general-primitive.scm: gnuradio_core_general.scm +guile/gnuradio_core_general.cc: gnuradio/gnuradio_core_general.scm +gnuradio/gnuradio_core_general.scm: gnuradio_core_general.i +gnuradio/gnuradio_core_general-primitive.scm: gnuradio/gnuradio_core_general.scm -include guile/gnuradio_core_general.d endif # end of GUILE -python/gnuradio_core_general.lo: gnuradio_core_general.lo: gnuradio_core_general.py gnuradio_core_general.scm gnuradio_core_general.py: gnuradio_core_general.i @@ -386,10 +384,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_core_gengen.py -if GUILE -swig_built_sources += gnuradio_core_gengen.scm -endif +# swig_built_sources += gnuradio_core_gengen.py +# if GUILE +# swig_built_sources += gnuradio/gnuradio_core_gengen.scm +# endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -437,15 +435,14 @@ libguile_gnuradio_core_gengen_la_LIBADD = $(_gnuradio_core_gengen_la_LIBADD) libguile_gnuradio_core_gengen_la_LDFLAGS = $(_gnuradio_core_gengen_la_LDFLAGS) libguile_gnuradio_core_gengen_la_CXXFLAGS = $(_gnuradio_core_gengen_la_CXXFLAGS) -guile/gnuradio_core_gengen.lo: gnuradio_core_gengen.lo -gnuradio_core_gengen.scm: gnuradio_core_gengen.i -gnuradio/gnuradio_core_gengen-primitive.scm: gnuradio_core_gengen.scm +guile/gnuradio_core_gengen.cc: gnuradio/gnuradio_core_gengen.scm +gnuradio/gnuradio_core_gengen.scm: gnuradio_core_gengen.i +gnuradio/gnuradio_core_gengen-primitive.scm: gnuradio/gnuradio_core_gengen.scm -include guile/gnuradio_core_gengen.d endif # end of GUILE -python/gnuradio_core_gengen.lo: gnuradio_core_gengen.lo: gnuradio_core_gengen.py gnuradio_core_gengen.scm gnuradio_core_gengen.py: gnuradio_core_gengen.i @@ -537,10 +534,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_core_filter.py -if GUILE -swig_built_sources += gnuradio_core_filter.scm -endif +# swig_built_sources += gnuradio_core_filter.py +# if GUILE +# swig_built_sources += gnuradio/gnuradio_core_filter.scm +# endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -588,15 +585,14 @@ libguile_gnuradio_core_filter_la_LIBADD = $(_gnuradio_core_filter_la_LIBADD) libguile_gnuradio_core_filter_la_LDFLAGS = $(_gnuradio_core_filter_la_LDFLAGS) libguile_gnuradio_core_filter_la_CXXFLAGS = $(_gnuradio_core_filter_la_CXXFLAGS) -guile/gnuradio_core_filter.lo: gnuradio_core_filter.lo -gnuradio_core_filter.scm: gnuradio_core_filter.i -gnuradio/gnuradio_core_filter-primitive.scm: gnuradio_core_filter.scm +guile/gnuradio_core_filter.cc: gnuradio/gnuradio_core_filter.scm +gnuradio/gnuradio_core_filter.scm: gnuradio_core_filter.i +gnuradio/gnuradio_core_filter-primitive.scm: gnuradio/gnuradio_core_filter.scm -include guile/gnuradio_core_filter.d endif # end of GUILE -python/gnuradio_core_filter.lo: gnuradio_core_filter.lo: gnuradio_core_filter.py gnuradio_core_filter.scm gnuradio_core_filter.py: gnuradio_core_filter.i @@ -688,10 +684,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_core_io.py -if GUILE -swig_built_sources += gnuradio_core_io.scm -endif +# swig_built_sources += gnuradio_core_io.py +# if GUILE +# swig_built_sources += gnuradio/gnuradio_core_io.scm +# endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -739,15 +735,14 @@ libguile_gnuradio_core_io_la_LIBADD = $(_gnuradio_core_io_la_LIBADD) libguile_gnuradio_core_io_la_LDFLAGS = $(_gnuradio_core_io_la_LDFLAGS) libguile_gnuradio_core_io_la_CXXFLAGS = $(_gnuradio_core_io_la_CXXFLAGS) -guile/gnuradio_core_io.lo: gnuradio_core_io.lo -gnuradio_core_io.scm: gnuradio_core_io.i -gnuradio/gnuradio_core_io-primitive.scm: gnuradio_core_io.scm +guile/gnuradio_core_io.cc: gnuradio/gnuradio_core_io.scm +gnuradio/gnuradio_core_io.scm: gnuradio_core_io.i +gnuradio/gnuradio_core_io-primitive.scm: gnuradio/gnuradio_core_io.scm -include guile/gnuradio_core_io.d endif # end of GUILE -python/gnuradio_core_io.lo: gnuradio_core_io.lo: gnuradio_core_io.py gnuradio_core_io.scm gnuradio_core_io.py: gnuradio_core_io.i @@ -839,10 +834,10 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S* # generating the py or scm file also generates the .cc or .h files, # but dependencies work better without the .cc ort .h files listed. -swig_built_sources += gnuradio_core_hier.py -if GUILE -swig_built_sources += gnuradio_core_hier.scm -endif +# swig_built_sources += gnuradio_core_hier.py +# if GUILE +# swig_built_sources += gnuradio/gnuradio_core_hier.scm +# endif ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including @@ -890,15 +885,14 @@ libguile_gnuradio_core_hier_la_LIBADD = $(_gnuradio_core_hier_la_LIBADD) libguile_gnuradio_core_hier_la_LDFLAGS = $(_gnuradio_core_hier_la_LDFLAGS) libguile_gnuradio_core_hier_la_CXXFLAGS = $(_gnuradio_core_hier_la_CXXFLAGS) -guile/gnuradio_core_hier.lo: gnuradio_core_hier.lo -gnuradio_core_hier.scm: gnuradio_core_hier.i -gnuradio/gnuradio_core_hier-primitive.scm: gnuradio_core_hier.scm +guile/gnuradio_core_hier.cc: gnuradio/gnuradio_core_hier.scm +gnuradio/gnuradio_core_hier.scm: gnuradio_core_hier.i +gnuradio/gnuradio_core_hier-primitive.scm: gnuradio/gnuradio_core_hier.scm -include guile/gnuradio_core_hier.d endif # end of GUILE -python/gnuradio_core_hier.lo: gnuradio_core_hier.lo: gnuradio_core_hier.py gnuradio_core_hier.scm gnuradio_core_hier.py: gnuradio_core_hier.i -- cgit From 0939607d0b4a3ae047ceff60fab300000c7d2069 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 1 Nov 2010 19:02:55 -0600 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 222 ++++++++------------------- 1 file changed, 60 insertions(+), 162 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index a92ff2231..0803cbfee 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -67,28 +67,10 @@ gnuradio_core_runtime_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/gnuradio_core_runtime-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += gnuradio_core_runtime.py -# if GUILE -# swig_built_sources += gnuradio/gnuradio_core_runtime.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _gnuradio_core_runtime_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_runtime_la_swig_libadd) -# _gnuradio_core_runtime_la_DEPENDENCIES = python/gnuradio_core_runtime.lo - _gnuradio_core_runtime_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_runtime_la_swig_ldflags) @@ -123,14 +103,20 @@ gnuradio_core_runtime_python_PYTHON = \ gnuradio_core_runtime.py \ $(gnuradio_core_runtime) +python/gnuradio_core_runtime.cc: gnuradio_core_runtime.py +gnuradio_core_runtime.py: gnuradio_core_runtime.i + +# Include the python dependencies for this file +-include python/gnuradio_core_runtime.d +# end of PYTHON + if GUILE gnuradio_core_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_core_runtime.la -libguile_gnuradio_core_runtime_la_SOURCES = \ - guile/gnuradio_core_runtime.cc \ +libguile_gnuradio_core_runtime_la_SOURCES = \ + guile/gnuradio_core_runtime.cc \ $(gnuradio_core_runtime_la_swig_sources) nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primitive.scm -# Guile can use the same flags as python does libguile_gnuradio_core_runtime_la_LIBADD = $(_gnuradio_core_runtime_la_LIBADD) libguile_gnuradio_core_runtime_la_LDFLAGS = $(_gnuradio_core_runtime_la_LDFLAGS) libguile_gnuradio_core_runtime_la_CXXFLAGS = $(_gnuradio_core_runtime_la_CXXFLAGS) @@ -139,14 +125,11 @@ guile/gnuradio_core_runtime.cc: gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime.scm: gnuradio_core_runtime.i gnuradio/gnuradio_core_runtime-primitive.scm: gnuradio/gnuradio_core_runtime.scm +# Include the guile dependencies for this file -include guile/gnuradio_core_runtime.d endif # end of GUILE -gnuradio_core_runtime.lo: gnuradio_core_runtime.py gnuradio_core_runtime.scm -gnuradio_core_runtime.py: gnuradio_core_runtime.i - --include python/gnuradio_core_runtime.d # -*- Makefile -*- # @@ -217,28 +200,10 @@ gnuradio_core_general_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/gnuradio_core_general-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += gnuradio_core_general.py -# if GUILE -# swig_built_sources += gnuradio/gnuradio_core_general.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -258,8 +223,6 @@ _gnuradio_core_general_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_general_la_swig_libadd) -# _gnuradio_core_general_la_DEPENDENCIES = python/gnuradio_core_general.lo - _gnuradio_core_general_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_general_la_swig_ldflags) @@ -273,14 +236,20 @@ gnuradio_core_general_python_PYTHON = \ gnuradio_core_general.py \ $(gnuradio_core_general) +python/gnuradio_core_general.cc: gnuradio_core_general.py +gnuradio_core_general.py: gnuradio_core_general.i + +# Include the python dependencies for this file +-include python/gnuradio_core_general.d +# end of PYTHON + if GUILE gnuradio_core_general_scmlib_LTLIBRARIES = libguile-gnuradio_core_general.la -libguile_gnuradio_core_general_la_SOURCES = \ - guile/gnuradio_core_general.cc \ +libguile_gnuradio_core_general_la_SOURCES = \ + guile/gnuradio_core_general.cc \ $(gnuradio_core_general_la_swig_sources) nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primitive.scm -# Guile can use the same flags as python does libguile_gnuradio_core_general_la_LIBADD = $(_gnuradio_core_general_la_LIBADD) libguile_gnuradio_core_general_la_LDFLAGS = $(_gnuradio_core_general_la_LDFLAGS) libguile_gnuradio_core_general_la_CXXFLAGS = $(_gnuradio_core_general_la_CXXFLAGS) @@ -289,14 +258,11 @@ guile/gnuradio_core_general.cc: gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general.scm: gnuradio_core_general.i gnuradio/gnuradio_core_general-primitive.scm: gnuradio/gnuradio_core_general.scm +# Include the guile dependencies for this file -include guile/gnuradio_core_general.d endif # end of GUILE -gnuradio_core_general.lo: gnuradio_core_general.py gnuradio_core_general.scm -gnuradio_core_general.py: gnuradio_core_general.i - --include python/gnuradio_core_general.d # -*- Makefile -*- # @@ -367,28 +333,10 @@ gnuradio_core_gengen_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/gnuradio_core_gengen-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += gnuradio_core_gengen.py -# if GUILE -# swig_built_sources += gnuradio/gnuradio_core_gengen.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -408,8 +356,6 @@ _gnuradio_core_gengen_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_gengen_la_swig_libadd) -# _gnuradio_core_gengen_la_DEPENDENCIES = python/gnuradio_core_gengen.lo - _gnuradio_core_gengen_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_gengen_la_swig_ldflags) @@ -423,14 +369,20 @@ gnuradio_core_gengen_python_PYTHON = \ gnuradio_core_gengen.py \ $(gnuradio_core_gengen) +python/gnuradio_core_gengen.cc: gnuradio_core_gengen.py +gnuradio_core_gengen.py: gnuradio_core_gengen.i + +# Include the python dependencies for this file +-include python/gnuradio_core_gengen.d +# end of PYTHON + if GUILE gnuradio_core_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_core_gengen.la -libguile_gnuradio_core_gengen_la_SOURCES = \ - guile/gnuradio_core_gengen.cc \ +libguile_gnuradio_core_gengen_la_SOURCES = \ + guile/gnuradio_core_gengen.cc \ $(gnuradio_core_gengen_la_swig_sources) nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primitive.scm -# Guile can use the same flags as python does libguile_gnuradio_core_gengen_la_LIBADD = $(_gnuradio_core_gengen_la_LIBADD) libguile_gnuradio_core_gengen_la_LDFLAGS = $(_gnuradio_core_gengen_la_LDFLAGS) libguile_gnuradio_core_gengen_la_CXXFLAGS = $(_gnuradio_core_gengen_la_CXXFLAGS) @@ -439,14 +391,11 @@ guile/gnuradio_core_gengen.cc: gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen.scm: gnuradio_core_gengen.i gnuradio/gnuradio_core_gengen-primitive.scm: gnuradio/gnuradio_core_gengen.scm +# Include the guile dependencies for this file -include guile/gnuradio_core_gengen.d endif # end of GUILE -gnuradio_core_gengen.lo: gnuradio_core_gengen.py gnuradio_core_gengen.scm -gnuradio_core_gengen.py: gnuradio_core_gengen.i - --include python/gnuradio_core_gengen.d # -*- Makefile -*- # @@ -517,28 +466,10 @@ gnuradio_core_filter_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/gnuradio_core_filter-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += gnuradio_core_filter.py -# if GUILE -# swig_built_sources += gnuradio/gnuradio_core_filter.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -558,8 +489,6 @@ _gnuradio_core_filter_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_filter_la_swig_libadd) -# _gnuradio_core_filter_la_DEPENDENCIES = python/gnuradio_core_filter.lo - _gnuradio_core_filter_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_filter_la_swig_ldflags) @@ -573,14 +502,20 @@ gnuradio_core_filter_python_PYTHON = \ gnuradio_core_filter.py \ $(gnuradio_core_filter) +python/gnuradio_core_filter.cc: gnuradio_core_filter.py +gnuradio_core_filter.py: gnuradio_core_filter.i + +# Include the python dependencies for this file +-include python/gnuradio_core_filter.d +# end of PYTHON + if GUILE gnuradio_core_filter_scmlib_LTLIBRARIES = libguile-gnuradio_core_filter.la -libguile_gnuradio_core_filter_la_SOURCES = \ - guile/gnuradio_core_filter.cc \ +libguile_gnuradio_core_filter_la_SOURCES = \ + guile/gnuradio_core_filter.cc \ $(gnuradio_core_filter_la_swig_sources) nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primitive.scm -# Guile can use the same flags as python does libguile_gnuradio_core_filter_la_LIBADD = $(_gnuradio_core_filter_la_LIBADD) libguile_gnuradio_core_filter_la_LDFLAGS = $(_gnuradio_core_filter_la_LDFLAGS) libguile_gnuradio_core_filter_la_CXXFLAGS = $(_gnuradio_core_filter_la_CXXFLAGS) @@ -589,14 +524,11 @@ guile/gnuradio_core_filter.cc: gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter.scm: gnuradio_core_filter.i gnuradio/gnuradio_core_filter-primitive.scm: gnuradio/gnuradio_core_filter.scm +# Include the guile dependencies for this file -include guile/gnuradio_core_filter.d endif # end of GUILE -gnuradio_core_filter.lo: gnuradio_core_filter.py gnuradio_core_filter.scm -gnuradio_core_filter.py: gnuradio_core_filter.i - --include python/gnuradio_core_filter.d # -*- Makefile -*- # @@ -667,28 +599,10 @@ gnuradio_core_io_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/gnuradio_core_io-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += gnuradio_core_io.py -# if GUILE -# swig_built_sources += gnuradio/gnuradio_core_io.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -708,8 +622,6 @@ _gnuradio_core_io_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_io_la_swig_libadd) -# _gnuradio_core_io_la_DEPENDENCIES = python/gnuradio_core_io.lo - _gnuradio_core_io_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_io_la_swig_ldflags) @@ -723,14 +635,20 @@ gnuradio_core_io_python_PYTHON = \ gnuradio_core_io.py \ $(gnuradio_core_io) +python/gnuradio_core_io.cc: gnuradio_core_io.py +gnuradio_core_io.py: gnuradio_core_io.i + +# Include the python dependencies for this file +-include python/gnuradio_core_io.d +# end of PYTHON + if GUILE gnuradio_core_io_scmlib_LTLIBRARIES = libguile-gnuradio_core_io.la -libguile_gnuradio_core_io_la_SOURCES = \ - guile/gnuradio_core_io.cc \ +libguile_gnuradio_core_io_la_SOURCES = \ + guile/gnuradio_core_io.cc \ $(gnuradio_core_io_la_swig_sources) nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primitive.scm -# Guile can use the same flags as python does libguile_gnuradio_core_io_la_LIBADD = $(_gnuradio_core_io_la_LIBADD) libguile_gnuradio_core_io_la_LDFLAGS = $(_gnuradio_core_io_la_LDFLAGS) libguile_gnuradio_core_io_la_CXXFLAGS = $(_gnuradio_core_io_la_CXXFLAGS) @@ -739,14 +657,11 @@ guile/gnuradio_core_io.cc: gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io.scm: gnuradio_core_io.i gnuradio/gnuradio_core_io-primitive.scm: gnuradio/gnuradio_core_io.scm +# Include the guile dependencies for this file -include guile/gnuradio_core_io.d endif # end of GUILE -gnuradio_core_io.lo: gnuradio_core_io.py gnuradio_core_io.scm -gnuradio_core_io.py: gnuradio_core_io.i - --include python/gnuradio_core_io.d # -*- Makefile -*- # @@ -817,28 +732,10 @@ gnuradio_core_hier_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/gnuradio_core_hier-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += gnuradio_core_hier.py -# if GUILE -# swig_built_sources += gnuradio/gnuradio_core_hier.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -858,8 +755,6 @@ _gnuradio_core_hier_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_hier_la_swig_libadd) -# _gnuradio_core_hier_la_DEPENDENCIES = python/gnuradio_core_hier.lo - _gnuradio_core_hier_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_hier_la_swig_ldflags) @@ -873,14 +768,20 @@ gnuradio_core_hier_python_PYTHON = \ gnuradio_core_hier.py \ $(gnuradio_core_hier) +python/gnuradio_core_hier.cc: gnuradio_core_hier.py +gnuradio_core_hier.py: gnuradio_core_hier.i + +# Include the python dependencies for this file +-include python/gnuradio_core_hier.d +# end of PYTHON + if GUILE gnuradio_core_hier_scmlib_LTLIBRARIES = libguile-gnuradio_core_hier.la -libguile_gnuradio_core_hier_la_SOURCES = \ - guile/gnuradio_core_hier.cc \ +libguile_gnuradio_core_hier_la_SOURCES = \ + guile/gnuradio_core_hier.cc \ $(gnuradio_core_hier_la_swig_sources) nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primitive.scm -# Guile can use the same flags as python does libguile_gnuradio_core_hier_la_LIBADD = $(_gnuradio_core_hier_la_LIBADD) libguile_gnuradio_core_hier_la_LDFLAGS = $(_gnuradio_core_hier_la_LDFLAGS) libguile_gnuradio_core_hier_la_CXXFLAGS = $(_gnuradio_core_hier_la_CXXFLAGS) @@ -889,12 +790,9 @@ guile/gnuradio_core_hier.cc: gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier.scm: gnuradio_core_hier.i gnuradio/gnuradio_core_hier-primitive.scm: gnuradio/gnuradio_core_hier.scm +# Include the guile dependencies for this file -include guile/gnuradio_core_hier.d endif # end of GUILE -gnuradio_core_hier.lo: gnuradio_core_hier.py gnuradio_core_hier.scm -gnuradio_core_hier.py: gnuradio_core_hier.i - --include python/gnuradio_core_hier.d -- cgit From 406bd9d6725b58736959eb705235bb50fe48d48d Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 1 Nov 2010 21:20:05 -0700 Subject: Reduce guile load time from 4.5 to 1.2 seconds. Rewrite re-export-all to only export symbols from the module name supplied. --- gnuradio-core/src/lib/swig/gnuradio/core.scm | 9 +++++++-- .../src/lib/swig/gnuradio/export-safely.scm | 21 ++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio/core.scm b/gnuradio-core/src/lib/swig/gnuradio/core.scm index 08daeeb34..f13a8fb60 100644 --- a/gnuradio-core/src/lib/swig/gnuradio/core.scm +++ b/gnuradio-core/src/lib/swig/gnuradio/core.scm @@ -10,5 +10,10 @@ #:use-module (gnuradio gnuradio_core_hier) #:duplicates (merge-generics check)) -;; re-export everything... -(re-export-all (current-module)) +(re-export-all '(gnuradio gnuradio_core_runtime)) +(re-export-all '(gnuradio runtime-shim)) +(re-export-all '(gnuradio gnuradio_core_filter)) +(re-export-all '(gnuradio gnuradio_core_io)) +(re-export-all '(gnuradio gnuradio_core_general)) +(re-export-all '(gnuradio gnuradio_core_gengen)) +(re-export-all '(gnuradio gnuradio_core_hier)) diff --git a/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm b/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm index 2da7e633e..664292d2b 100644 --- a/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm +++ b/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm @@ -75,13 +75,16 @@ (define-public (names-in-imported-modules module) (delete-duplicates (concatenate (map names-in-module (module-uses module))))) -(define-public (re-export-all module) - (define (ok-to-re-export? name) - (let ((var (module-variable module name))) - (cond ((not var) #f) ; Undefined var - ((eq? var (module-local-variable module name)) #f) ; local var - (else #t)))) ; OK +(define-public (re-export-all src-module-name) + (let ((current (current-module)) + (src-module (resolve-interface src-module-name))) - (module-re-export! module - (filter ok-to-re-export? - (names-in-imported-modules module)))) + (define (ok-to-re-export? name) + (let ((var (module-variable current name))) + (cond ((not var) #f) ; Undefined var + ((eq? var (module-local-variable current name)) #f) ; local var + (else #t)))) ; OK + + (module-re-export! current + (filter ok-to-re-export? + (names-in-module src-module))))) -- cgit From 81867e5dfd939d8afdacbe22c6e2d41d4bc4b37e Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 5 Nov 2010 19:43:33 -0700 Subject: Create guile QA framework. Also moves hand coded files out of gnuradio-core/src/lib/swig/gnuradio that were getting nuked by make clean. --- gnuradio-core/src/lib/swig/Makefile.am | 12 --- gnuradio-core/src/lib/swig/Swig/common.scm | 76 ------------------ gnuradio-core/src/lib/swig/gnuradio/core.scm | 19 ----- .../src/lib/swig/gnuradio/export-safely.scm | 90 ---------------------- .../src/lib/swig/gnuradio/runtime-shim.scm | 89 --------------------- 5 files changed, 286 deletions(-) delete mode 100644 gnuradio-core/src/lib/swig/Swig/common.scm delete mode 100644 gnuradio-core/src/lib/swig/gnuradio/core.scm delete mode 100644 gnuradio-core/src/lib/swig/gnuradio/export-safely.scm delete mode 100644 gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 54cbebeb1..5e003bdf2 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -56,18 +56,6 @@ nobase_swiginclude_HEADERS = \ guile/std_complex.i -if GUILE -# This is the top level guile file, which loads all the other scm files -# for gnuradio. This has to be installed top level to be found in the -# default search path. -nobase_guile_DATA = \ - gnuradio/core.scm \ - gnuradio/export-safely.scm \ - gnuradio/runtime-shim.scm \ - Swig/common.scm -endif - - if PYTHON AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) diff --git a/gnuradio-core/src/lib/swig/Swig/common.scm b/gnuradio-core/src/lib/swig/Swig/common.scm deleted file mode 100644 index a51d3a71d..000000000 --- a/gnuradio-core/src/lib/swig/Swig/common.scm +++ /dev/null @@ -1,76 +0,0 @@ -;;;************************************************************************ -;;;*common.scm -;;;* -;;;* This file contains generic SWIG GOOPS classes for generated -;;;* GOOPS file support -;;;* -;;;* Copyright (C) 2003 John Lenz (jelenz@wisc.edu) -;;;* Copyright (C) 2004 Matthias Koeppe (mkoeppe@mail.math.uni-magdeburg.de) -;;;* -;;;* This file may be freely redistributed without license or fee provided -;;;* this copyright message remains intact. -;;;************************************************************************ - -(define-module (Swig swigrun)) - -(define-module (Swig common) - #:use-module (oop goops) - #:use-module (Swig swigrun)) - -(define-class () - (new-function #:init-value #f)) - -(define-method (initialize (class ) initargs) - (slot-set! class 'new-function (get-keyword #:new-function initargs #f)) - (next-method)) - -(define-class () - (swig-smob #:init-value #f) - #:metaclass -) - -(define-method (initialize (obj ) initargs) - (next-method) - (slot-set! obj 'swig-smob - (let ((arg (get-keyword #:init-smob initargs #f))) - (if arg - arg - (let ((ret (apply (slot-ref (class-of obj) 'new-function) (get-keyword #:args initargs '())))) - ;; if the class is registered with runtime environment, - ;; new-Function will return a goops class. In that case, extract the smob - ;; from that goops class and set it as the current smob. - (if (slot-exists? ret 'swig-smob) - (slot-ref ret 'swig-smob) - ret)))))) - -(define (display-address o file) - (display (number->string (object-address o) 16) file)) - -(define (display-pointer-address o file) - ;; Don't fail if the function SWIG-PointerAddress is not present. - (let ((address (false-if-exception (SWIG-PointerAddress o)))) - (if address - (begin - (display " @ " file) - (display (number->string address 16) file))))) - -(define-method (write (o ) file) - ;; We display _two_ addresses to show the object's identity: - ;; * first the address of the GOOPS proxy object, - ;; * second the pointer address. - ;; The reason is that proxy objects are created and discarded on the - ;; fly, so different proxy objects for the same C object will appear. - (let ((class (class-of o))) - (if (slot-bound? class 'name) - (begin - (display "#<" file) - (display (class-name class) file) - (display #\space file) - (display-address o file) - (display-pointer-address o file) - (display ">" file)) - (next-method)))) - -(export ) - -;;; common.scm ends here diff --git a/gnuradio-core/src/lib/swig/gnuradio/core.scm b/gnuradio-core/src/lib/swig/gnuradio/core.scm deleted file mode 100644 index f13a8fb60..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio/core.scm +++ /dev/null @@ -1,19 +0,0 @@ -;;; Glue the separate pieces of gnuradio-core into a single module - -(define-module (gnuradio core) - #:use-module (gnuradio gnuradio_core_runtime) - #:use-module (gnuradio runtime-shim) - #:use-module (gnuradio gnuradio_core_filter) - #:use-module (gnuradio gnuradio_core_io) - #:use-module (gnuradio gnuradio_core_general) - #:use-module (gnuradio gnuradio_core_gengen) - #:use-module (gnuradio gnuradio_core_hier) - #:duplicates (merge-generics check)) - -(re-export-all '(gnuradio gnuradio_core_runtime)) -(re-export-all '(gnuradio runtime-shim)) -(re-export-all '(gnuradio gnuradio_core_filter)) -(re-export-all '(gnuradio gnuradio_core_io)) -(re-export-all '(gnuradio gnuradio_core_general)) -(re-export-all '(gnuradio gnuradio_core_gengen)) -(re-export-all '(gnuradio gnuradio_core_hier)) diff --git a/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm b/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm deleted file mode 100644 index 664292d2b..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio/export-safely.scm +++ /dev/null @@ -1,90 +0,0 @@ -;;; -;;; Copyright 2010 Free Software Foundation, Inc. -;;; -;;; This file is part of GNU Radio -;;; -;;; GNU Radio is free software; you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3, or (at your option) -;;; any later version. -;;; -;;; GNU Radio is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see . -;;; - -;;; This module implements a macro, export-safely, that avoids -;;; exporting symbols that are actually generic-functions imported -;;; (explicity or implicitly) from elsewhere. -;;; -;;; This hackery is required so that the swig generated goops wrappers -;;; don't stomp on each other. For background on what this is about -;;; see this thread: -;;; -;;; http://lists.gnu.org/archive/html/guile-user/2006-05/msg00007.html -;;; -;;; Don't expect to understand what's going on here without looking at -;;; the guts of the module system (implemented in ice-9/boot-9.scm) and -;;; having a pretty good understanding of goops and generic-functions. - - -(define-module (gnuradio export-safely) - #:use-module (oop goops) - #:use-module (srfi srfi-1) - #:export-syntax (export-safely)) - -(define-public (generics-in-module module) - (let ((lst '())) - (module-for-each (lambda (sym var) - (if (variable-bound? var) - (let ((v (variable-ref var))) - (cond ((is-a? v ) - (set! lst (cons v lst))))))) - module) - lst)) - -(define-public (generic-function-names-in-module module) - (map generic-function-name (generics-in-module module))) - -(define-public (generic-function-names-in-imported-modules module) - (concatenate (map generic-function-names-in-module (module-uses module)))) - -(define-public (export-syms-if-not-imported-gf list-of-syms) - (let ((gf-names (generic-function-names-in-imported-modules (current-module)))) - (let ((to-export (filter (lambda (sym) - (not (memq sym gf-names))) - (delete-duplicates list-of-syms)))) - (module-export! (current-module) to-export)))) - -(defmacro export-safely names - `(export-syms-if-not-imported-gf ',names)) - - -(define-public (names-in-module module) - (let ((lst '())) - (module-for-each (lambda (sym var) - (if (variable-bound? var) - (set! lst (cons sym lst)))) - module) - lst)) - -(define-public (names-in-imported-modules module) - (delete-duplicates (concatenate (map names-in-module (module-uses module))))) - -(define-public (re-export-all src-module-name) - (let ((current (current-module)) - (src-module (resolve-interface src-module-name))) - - (define (ok-to-re-export? name) - (let ((var (module-variable current name))) - (cond ((not var) #f) ; Undefined var - ((eq? var (module-local-variable current name)) #f) ; local var - (else #t)))) ; OK - - (module-re-export! current - (filter ok-to-re-export? - (names-in-module src-module))))) diff --git a/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm b/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm deleted file mode 100644 index c08d3947c..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio/runtime-shim.scm +++ /dev/null @@ -1,89 +0,0 @@ -;;; -;;; Copyright 2010 Free Software Foundation, Inc. -;;; -;;; This file is part of GNU Radio -;;; -;;; GNU Radio is free software; you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3, or (at your option) -;;; any later version. -;;; -;;; GNU Radio is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see . -;;; - -(define-module (gnuradio runtime-shim) - #:use-module (oop goops) - #:use-module (gnuradio gnuradio_core_runtime) - #:duplicates (merge-generics replace check)) - -(define-class () - (block #:accessor block #:init-keyword #:block) - (port #:init-value 0 #:accessor port #:init-keyword #:port)) - -(define (gr:ep block port) - (make - #:block (coerce-to-basic-block block) #:port port)) - -(define (coerce-to-endpoint ep) - (cond ((is-a? ep ) ep) - ((false-if-exception (gr:to-basic-block ep)) - => (lambda (x) (gr:ep x 0))) - ((and (pair? ep) (= 2 (length ep)) - (false-if-exception (gr:to-basic-block (car ep)))) - => (lambda (x) (gr:ep x (cadr ep)))) - (else (error "Cannot coerce to an endpoint: " ep)))) - -(define (coerce-to-basic-block block) - (cond ((is-a? block ) block) - ((false-if-exception (gr:to-basic-block block)) => (lambda (x) x)) - (else (error "Cannot coerce to a gr_basic_block: " block)))) - -(define (coerce-to-top-block block) - (cond ((is-a? block ) block) - ((false-if-exception (gr:to-top-block block)) => (lambda (x) x)) - (else (error "Cannot coerce to a gr_top_block: " block)))) - -(define (coerce-to-hier-block2 block) - (cond ((is-a? block ) block) - ((false-if-exception (gr:to-hier-block2 block)) => (lambda (x) x)) - (else (error "Cannot coerce to a gr_hier_block2: " block)))) - - -;;; Connect one or more block endpoints. An endpoint is either a , -;;; a 2-list (block port), or a block instance. In the latter case, the port number -;;; is assumed to be zero. -;;; -;;; If multiple arguments are provided, connect will attempt to wire them in series, -;;; interpreting the endpoints as inputs or outputs as appropriate. -(define-method (gr:connect hb . points) - (dis/connect "connect" gr:primitive-connect hb points)) - -;;; Disconnect one or more block endpoints... -(define-method (gr:disconnect hb . points) - (dis/connect "disconnect" gr:primitive-disconnect hb points)) - -(define (dis/connect name gf hb points) - (let ((hb (coerce-to-hier-block2 hb)) - (points (list->vector (map coerce-to-endpoint points)))) - - (define (op2 p0 p1) - (gf hb (block p0) (port p0) (block p1) (port p1))) - - (let ((len (vector-length points))) - (case len - ((0) (error (string-append name " requires at least 1 endpoint; None provided."))) - ((1) (gf hb (vector-ref points 0))) - (else - (let loop ((n 1)) - (cond ((< n len) - (op2 (vector-ref points (1- n)) (vector-ref points n)) - (loop (1+ n)))))))))) - - -(export-safely gr:ep gr:connect gr:disconnect) -- cgit From 5c81f275a32f969cefd20287a44bdeb1aeef436f Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 5 Nov 2010 19:48:27 -0700 Subject: Remove .gitignore from empty directory --- gnuradio-core/src/lib/swig/gnuradio/.gitignore | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 gnuradio-core/src/lib/swig/gnuradio/.gitignore (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio/.gitignore b/gnuradio-core/src/lib/swig/gnuradio/.gitignore deleted file mode 100644 index 20ce65795..000000000 --- a/gnuradio-core/src/lib/swig/gnuradio/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -/gnuradio_core_filter.scm -/gnuradio_core_filter-primitive.scm -/gnuradio_core_general.scm -/gnuradio_core_general-primitive.scm -/gnuradio_core_gengen.scm -/gnuradio_core_gengen-primitive.scm -/gnuradio_core_hier.scm -/gnuradio_core_hier-primitive.scm -/gnuradio_core_io.scm -/gnuradio_core_io-primitive.scm -/gnuradio_core_runtime.scm -/gnuradio_core_runtime-primitive.scm -- cgit From 53c6be5b6bdca4fe93b9034cb0b34eaa274af9d9 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 5 Nov 2010 19:57:18 -0700 Subject: update .gitignore --- gnuradio-core/src/lib/swig/.gitignore | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/.gitignore b/gnuradio-core/src/lib/swig/.gitignore index 75d6ce5b7..35e974948 100644 --- a/gnuradio-core/src/lib/swig/.gitignore +++ b/gnuradio-core/src/lib/swig/.gitignore @@ -16,28 +16,35 @@ gnuradio_core_filter.d gnuradio_core_filter.h gnuradio_core_filter.py gnuradio_core_filter.scm +gnuradio_core_filter-primitive.scm gnuradio_core_general.cc gnuradio_core_general.d gnuradio_core_general.h gnuradio_core_general.py gnuradio_core_general.scm +gnuradio_core_general-primitive.scm gnuradio_core_gengen.cc gnuradio_core_gengen.d gnuradio_core_gengen.h gnuradio_core_gengen.py gnuradio_core_gengen.scm +gnuradio_core_gengen-primitive.scm gnuradio_core_hier.cc gnuradio_core_hier.d gnuradio_core_hier.h gnuradio_core_hier.py gnuradio_core_hier.scm +gnuradio_core_hier-primitive.scm gnuradio_core_io.cc gnuradio_core_io.d gnuradio_core_io.h gnuradio_core_io.py gnuradio_core_io.scm +gnuradio_core_io-primitive.scm gnuradio_core_runtime.cc gnuradio_core_runtime.d gnuradio_core_runtime.h gnuradio_core_runtime.py gnuradio_core_runtime.scm +gnuradio_core_runtime-primitive.scm + -- cgit From df92b7c6315c567e58e0d9c293d7c9c2699023d3 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 10 Nov 2010 13:01:38 -0800 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 0803cbfee..7da681a26 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -112,8 +112,8 @@ gnuradio_core_runtime.py: gnuradio_core_runtime.i if GUILE gnuradio_core_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_core_runtime.la -libguile_gnuradio_core_runtime_la_SOURCES = \ - guile/gnuradio_core_runtime.cc \ +libguile_gnuradio_core_runtime_la_SOURCES = \ + guile/gnuradio_core_runtime.cc \ $(gnuradio_core_runtime_la_swig_sources) nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primitive.scm @@ -245,8 +245,8 @@ gnuradio_core_general.py: gnuradio_core_general.i if GUILE gnuradio_core_general_scmlib_LTLIBRARIES = libguile-gnuradio_core_general.la -libguile_gnuradio_core_general_la_SOURCES = \ - guile/gnuradio_core_general.cc \ +libguile_gnuradio_core_general_la_SOURCES = \ + guile/gnuradio_core_general.cc \ $(gnuradio_core_general_la_swig_sources) nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primitive.scm @@ -378,8 +378,8 @@ gnuradio_core_gengen.py: gnuradio_core_gengen.i if GUILE gnuradio_core_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_core_gengen.la -libguile_gnuradio_core_gengen_la_SOURCES = \ - guile/gnuradio_core_gengen.cc \ +libguile_gnuradio_core_gengen_la_SOURCES = \ + guile/gnuradio_core_gengen.cc \ $(gnuradio_core_gengen_la_swig_sources) nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primitive.scm @@ -511,8 +511,8 @@ gnuradio_core_filter.py: gnuradio_core_filter.i if GUILE gnuradio_core_filter_scmlib_LTLIBRARIES = libguile-gnuradio_core_filter.la -libguile_gnuradio_core_filter_la_SOURCES = \ - guile/gnuradio_core_filter.cc \ +libguile_gnuradio_core_filter_la_SOURCES = \ + guile/gnuradio_core_filter.cc \ $(gnuradio_core_filter_la_swig_sources) nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primitive.scm @@ -644,8 +644,8 @@ gnuradio_core_io.py: gnuradio_core_io.i if GUILE gnuradio_core_io_scmlib_LTLIBRARIES = libguile-gnuradio_core_io.la -libguile_gnuradio_core_io_la_SOURCES = \ - guile/gnuradio_core_io.cc \ +libguile_gnuradio_core_io_la_SOURCES = \ + guile/gnuradio_core_io.cc \ $(gnuradio_core_io_la_swig_sources) nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primitive.scm @@ -777,8 +777,8 @@ gnuradio_core_hier.py: gnuradio_core_hier.i if GUILE gnuradio_core_hier_scmlib_LTLIBRARIES = libguile-gnuradio_core_hier.la -libguile_gnuradio_core_hier_la_SOURCES = \ - guile/gnuradio_core_hier.cc \ +libguile_gnuradio_core_hier_la_SOURCES = \ + guile/gnuradio_core_hier.cc \ $(gnuradio_core_hier_la_swig_sources) nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primitive.scm -- cgit From c80fdf2897624d10123a35b1a19d150f3a5645c8 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Mon, 15 Nov 2010 23:49:35 -0800 Subject: Modify GR_SWIG_BLOCK_MAGIC to not strip package prefix when using GUILE outside of gnuradio-core. This avoids the problem with the guile bindings where multiple blocks end up with the name gr:sink (e.g., audio_alsa_sink). With this change, it ends us as gr:audio-alsa-sink. Blocks in gnuradio-core continue to have the leading gr_ removed from their class names. --- gnuradio-core/src/lib/swig/Makefile.am | 1 + gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 35 ++++++++++++++++-------- 2 files changed, 24 insertions(+), 12 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 5e003bdf2..8e356bea8 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -104,6 +104,7 @@ swig_built_sources += $(PYTHON_GEN) endif # end of if python if GUILE +SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE #GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,%.scm,$(HFILE))) GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) # GUILE_GEN_STAMPS = $(filter %.scm,$(TOP_SWIG_IFILES)) diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i index ea6368fd4..a080c2b27 100644 --- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i +++ b/gnuradio-core/src/lib/swig/gr_swig_block_magic.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004 Free Software Foundation, Inc. + * Copyright 2004,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,29 +21,40 @@ */ %define GR_SWIG_BLOCK_MAGIC(PKG, BASE_NAME) -_GR_SWIG_BLOCK_MAGIC_HELPER(PKG, PKG ## _ ## BASE_NAME, BASE_NAME) +_GR_SWIG_BLOCK_MAGIC_HELPER(PKG, BASE_NAME, PKG ## _ ## BASE_NAME) %enddef -%define _GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, NAME, BASE_NAME) -class NAME; -typedef boost::shared_ptr NAME ## _sptr; -%template(NAME ## _sptr) boost::shared_ptr; +%define _GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, BASE_NAME, FULL_NAME) +class FULL_NAME; +typedef boost::shared_ptr FULL_NAME ## _sptr; +%template(FULL_NAME ## _sptr) boost::shared_ptr; %rename(BASE_NAME) PKG ## _make_ ## BASE_NAME; -%ignore NAME; +%ignore FULL_NAME; %enddef #ifdef SWIGPYTHON -%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, NAME, BASE_NAME) -_GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, NAME, BASE_NAME) +%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, BASE_NAME, FULL_NAME) +_GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, BASE_NAME, FULL_NAME) %pythoncode %{ -NAME ## _sptr.__repr__ = lambda self: "" % (self.name(), self.unique_id ()) +FULL_NAME ## _sptr.__repr__ = lambda self: "" % (self.name(), self.unique_id ()) %} %enddef #endif #ifdef SWIGGUILE -%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, NAME, BASE_NAME) -_GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, NAME, BASE_NAME) +#ifdef IN_GNURADIO_CORE // normal behavior +%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, BASE_NAME, FULL_NAME) +_GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, BASE_NAME, FULL_NAME) /* FIXME May want to add something here to get a friendlier printed representation */ %enddef +#else // Don't strip PKG from name +%define _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, BASE_NAME, FULL_NAME) +class FULL_NAME; +typedef boost::shared_ptr FULL_NAME ## _sptr; +%template(FULL_NAME ## _sptr) boost::shared_ptr; +%ignore FULL_NAME; +%rename(FULL_NAME) PKG ## _make_ ## BASE_NAME; +/* FIXME May want to add something here to get a friendlier printed representation */ +%enddef +#endif #endif -- cgit From 8180bb1d7020e07c9b0a217820c68d07f0d98a74 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Tue, 16 Nov 2010 21:33:50 -0800 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 7da681a26..dc7a7b3bb 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -101,7 +101,7 @@ _gnuradio_core_runtime_la_CXXFLAGS = \ gnuradio_core_runtime_python_PYTHON = \ gnuradio_core_runtime.py \ - $(gnuradio_core_runtime) + $(gnuradio_core_runtime_python) python/gnuradio_core_runtime.cc: gnuradio_core_runtime.py gnuradio_core_runtime.py: gnuradio_core_runtime.i @@ -234,7 +234,7 @@ _gnuradio_core_general_la_CXXFLAGS = \ gnuradio_core_general_python_PYTHON = \ gnuradio_core_general.py \ - $(gnuradio_core_general) + $(gnuradio_core_general_python) python/gnuradio_core_general.cc: gnuradio_core_general.py gnuradio_core_general.py: gnuradio_core_general.i @@ -367,7 +367,7 @@ _gnuradio_core_gengen_la_CXXFLAGS = \ gnuradio_core_gengen_python_PYTHON = \ gnuradio_core_gengen.py \ - $(gnuradio_core_gengen) + $(gnuradio_core_gengen_python) python/gnuradio_core_gengen.cc: gnuradio_core_gengen.py gnuradio_core_gengen.py: gnuradio_core_gengen.i @@ -500,7 +500,7 @@ _gnuradio_core_filter_la_CXXFLAGS = \ gnuradio_core_filter_python_PYTHON = \ gnuradio_core_filter.py \ - $(gnuradio_core_filter) + $(gnuradio_core_filter_python) python/gnuradio_core_filter.cc: gnuradio_core_filter.py gnuradio_core_filter.py: gnuradio_core_filter.i @@ -633,7 +633,7 @@ _gnuradio_core_io_la_CXXFLAGS = \ gnuradio_core_io_python_PYTHON = \ gnuradio_core_io.py \ - $(gnuradio_core_io) + $(gnuradio_core_io_python) python/gnuradio_core_io.cc: gnuradio_core_io.py gnuradio_core_io.py: gnuradio_core_io.i @@ -766,7 +766,7 @@ _gnuradio_core_hier_la_CXXFLAGS = \ gnuradio_core_hier_python_PYTHON = \ gnuradio_core_hier.py \ - $(gnuradio_core_hier) + $(gnuradio_core_hier_python) python/gnuradio_core_hier.cc: gnuradio_core_hier.py gnuradio_core_hier.py: gnuradio_core_hier.i -- cgit From 4eadee57c588940347027c7e7f99ac7e993874fd Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 17 Nov 2010 13:54:04 -0800 Subject: Add support for guile std::vector< std::complex >. --- gnuradio-core/src/lib/swig/Makefile.am | 3 +- gnuradio-core/src/lib/swig/gnuradio.i | 15 +- gnuradio-core/src/lib/swig/guile/std_vector.i | 437 ++++++++++++++++++++++++++ 3 files changed, 451 insertions(+), 4 deletions(-) create mode 100644 gnuradio-core/src/lib/swig/guile/std_vector.i (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 8e356bea8..16b5d677e 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -53,7 +53,8 @@ swiginclude_HEADERS = \ # SWIG headers that get installed in ${prefix}/include/gnuradio/swig/... nobase_swiginclude_HEADERS = \ - guile/std_complex.i + guile/std_complex.i \ + guile/std_vector.i if PYTHON diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index 6eb44cbe9..47fd4e330 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -41,13 +41,22 @@ %include // non-local SWIG files -%include -%include -#ifdef SWIGGUILE +#ifdef SWIGGUILE // Local overrides to support complex +// It's kind of screwy, but the target language subdir isn't +// searched automatically except for under ./swig_lib which +// doesn't really help us since we run swig in many directories %include +%include +%include +%include +%include +%include #else %include +%include +%include #endif +%include typedef std::complex gr_complex; typedef std::complex gr_complexd; diff --git a/gnuradio-core/src/lib/swig/guile/std_vector.i b/gnuradio-core/src/lib/swig/guile/std_vector.i new file mode 100644 index 000000000..ef1f20667 --- /dev/null +++ b/gnuradio-core/src/lib/swig/guile/std_vector.i @@ -0,0 +1,437 @@ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * std_vector.i + * + * SWIG typemaps for std::vector + * ----------------------------------------------------------------------------- */ + +%include + +// ------------------------------------------------------------------------ +// std::vector +// +// The aim of all that follows would be to integrate std::vector with +// Guile as much as possible, namely, to allow the user to pass and +// be returned Guile vectors or lists. +// const declarations are used to guess the intent of the function being +// exported; therefore, the following rationale is applied: +// +// -- f(std::vector), f(const std::vector&), f(const std::vector*): +// the parameter being read-only, either a Guile sequence or a +// previously wrapped std::vector can be passed. +// -- f(std::vector&), f(std::vector*): +// the parameter must be modified; therefore, only a wrapped std::vector +// can be passed. +// -- std::vector f(): +// the vector is returned by copy; therefore, a Guile vector of T:s +// is returned which is most easily used in other Guile functions +// -- std::vector& f(), std::vector* f(), const std::vector& f(), +// const std::vector* f(): +// the vector is returned by reference; therefore, a wrapped std::vector +// is returned +// ------------------------------------------------------------------------ + +%{ +#include +#include +#include +#include +%} + +%{ + inline std::complex SWIG_scm2cmplxfloat(SCM x){ + return std::complex(scm_c_real_part(x), scm_c_imag_part(x)); + } + + inline std::complex SWIG_scm2cmplxdouble(SCM x){ + return std::complex(scm_c_real_part(x), scm_c_imag_part(x)); + } + + inline SCM SWIG_cmplxfloat2scm(std::complex x){ + return scm_c_make_rectangular(x.real(), x.imag()); + } + + inline SCM SWIG_cmplxdouble2scm(std::complex x){ + return scm_c_make_rectangular(x.real(), x.imag()); + } +%} + +// exported class + +namespace std { + + template class vector { + %typemap(in) vector { + if (gh_vector_p($input)) { + unsigned long size = gh_vector_length($input); + $1 = std::vector(size); + for (unsigned long i=0; i(); + } else if (gh_pair_p($input)) { + SCM head, tail; + $1 = std::vector(); + tail = $input; + while (!gh_null_p(tail)) { + head = gh_car(tail); + tail = gh_cdr(tail); + $1.push_back(*((T*)SWIG_MustGetPtr(head, + $descriptor(T *), + $argnum, 0))); + } + } else { + $1 = *(($&1_type) + SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0)); + } + } + %typemap(in) const vector& (std::vector temp), + const vector* (std::vector temp) { + if (gh_vector_p($input)) { + unsigned long size = gh_vector_length($input); + temp = std::vector(size); + $1 = &temp; + for (unsigned long i=0; i(); + $1 = &temp; + } else if (gh_pair_p($input)) { + temp = std::vector(); + $1 = &temp; + SCM head, tail; + tail = $input; + while (!gh_null_p(tail)) { + head = gh_car(tail); + tail = gh_cdr(tail); + temp.push_back(*((T*) SWIG_MustGetPtr(head, + $descriptor(T *), + $argnum, 0))); + } + } else { + $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); + } + } + %typemap(out) vector { + $result = gh_make_vector(gh_long2scm($1.size()),SCM_UNSPECIFIED); + for (unsigned int i=0; i<$1.size(); i++) { + T* x = new T((($1_type &)$1)[i]); + gh_vector_set_x($result,gh_long2scm(i), + SWIG_NewPointerObj(x, $descriptor(T *), 1)); + } + } + %typecheck(SWIG_TYPECHECK_VECTOR) vector { + /* native sequence? */ + if (gh_vector_p($input)) { + unsigned int size = gh_vector_length($input); + if (size == 0) { + /* an empty sequence can be of any type */ + $1 = 1; + } else { + /* check the first element only */ + SCM o = gh_vector_ref($input,gh_ulong2scm(0)); + T* x; + if (SWIG_ConvertPtr(o,(void**) &x, + $descriptor(T *), 0) != -1) + $1 = 1; + else + $1 = 0; + } + } else if (gh_null_p($input)) { + /* again, an empty sequence can be of any type */ + $1 = 1; + } else if (gh_pair_p($input)) { + /* check the first element only */ + T* x; + SCM head = gh_car($input); + if (SWIG_ConvertPtr(head,(void**) &x, + $descriptor(T *), 0) != -1) + $1 = 1; + else + $1 = 0; + } else { + /* wrapped vector? */ + std::vector* v; + if (SWIG_ConvertPtr($input,(void **) &v, + $&1_descriptor, 0) != -1) + $1 = 1; + else + $1 = 0; + } + } + %typecheck(SWIG_TYPECHECK_VECTOR) const vector&, + const vector* { + /* native sequence? */ + if (gh_vector_p($input)) { + unsigned int size = gh_vector_length($input); + if (size == 0) { + /* an empty sequence can be of any type */ + $1 = 1; + } else { + /* check the first element only */ + T* x; + SCM o = gh_vector_ref($input,gh_ulong2scm(0)); + if (SWIG_ConvertPtr(o,(void**) &x, + $descriptor(T *), 0) != -1) + $1 = 1; + else + $1 = 0; + } + } else if (gh_null_p($input)) { + /* again, an empty sequence can be of any type */ + $1 = 1; + } else if (gh_pair_p($input)) { + /* check the first element only */ + T* x; + SCM head = gh_car($input); + if (SWIG_ConvertPtr(head,(void**) &x, + $descriptor(T *), 0) != -1) + $1 = 1; + else + $1 = 0; + } else { + /* wrapped vector? */ + std::vector* v; + if (SWIG_ConvertPtr($input,(void **) &v, + $1_descriptor, 0) != -1) + $1 = 1; + else + $1 = 0; + } + } + public: + vector(unsigned int size = 0); + vector(unsigned int size, const T& value); + vector(const vector&); + %rename(length) size; + unsigned int size() const; + %rename("empty?") empty; + bool empty() const; + %rename("clear!") clear; + void clear(); + %rename("set!") set; + %rename("pop!") pop; + %rename("push!") push_back; + void push_back(const T& x); + %extend { + T pop() throw (std::out_of_range) { + if (self->size() == 0) + throw std::out_of_range("pop from empty vector"); + T x = self->back(); + self->pop_back(); + return x; + } + T& ref(int i) throw (std::out_of_range) { + int size = int(self->size()); + if (i>=0 && isize()); + if (i>=0 && i class vector { + %typemap(in) vector { + if (gh_vector_p($input)) { + unsigned long size = gh_vector_length($input); + $1 = std::vector(size); + for (unsigned long i=0; i(); + } else if (gh_pair_p($input)) { + SCM v = gh_list_to_vector($input); + unsigned long size = gh_vector_length(v); + $1 = std::vector(size); + for (unsigned long i=0; i& (std::vector temp), + const vector* (std::vector temp) { + if (gh_vector_p($input)) { + unsigned long size = gh_vector_length($input); + temp = std::vector(size); + $1 = &temp; + for (unsigned long i=0; i(); + $1 = &temp; + } else if (gh_pair_p($input)) { + SCM v = gh_list_to_vector($input); + unsigned long size = gh_vector_length(v); + temp = std::vector(size); + $1 = &temp; + for (unsigned long i=0; i { + $result = gh_make_vector(gh_long2scm($1.size()),SCM_UNSPECIFIED); + for (unsigned int i=0; i<$1.size(); i++) { + SCM x = CONVERT_TO((($1_type &)$1)[i]); + gh_vector_set_x($result,gh_long2scm(i),x); + } + } + %typecheck(SWIG_TYPECHECK_VECTOR) vector { + /* native sequence? */ + if (gh_vector_p($input)) { + unsigned int size = gh_vector_length($input); + if (size == 0) { + /* an empty sequence can be of any type */ + $1 = 1; + } else { + /* check the first element only */ + T* x; + SCM o = gh_vector_ref($input,gh_ulong2scm(0)); + $1 = CHECK(o) ? 1 : 0; + } + } else if (gh_null_p($input)) { + /* again, an empty sequence can be of any type */ + $1 = 1; + } else if (gh_pair_p($input)) { + /* check the first element only */ + T* x; + SCM head = gh_car($input); + $1 = CHECK(head) ? 1 : 0; + } else { + /* wrapped vector? */ + std::vector* v; + $1 = (SWIG_ConvertPtr($input,(void **) &v, + $&1_descriptor, 0) != -1) ? 1 : 0; + } + } + %typecheck(SWIG_TYPECHECK_VECTOR) const vector&, + const vector* { + /* native sequence? */ + if (gh_vector_p($input)) { + unsigned int size = gh_vector_length($input); + if (size == 0) { + /* an empty sequence can be of any type */ + $1 = 1; + } else { + /* check the first element only */ + T* x; + SCM o = gh_vector_ref($input,gh_ulong2scm(0)); + $1 = CHECK(o) ? 1 : 0; + } + } else if (gh_null_p($input)) { + /* again, an empty sequence can be of any type */ + $1 = 1; + } else if (gh_pair_p($input)) { + /* check the first element only */ + T* x; + SCM head = gh_car($input); + $1 = CHECK(head) ? 1 : 0; + } else { + /* wrapped vector? */ + std::vector* v; + $1 = (SWIG_ConvertPtr($input,(void **) &v, + $1_descriptor, 0) != -1) ? 1 : 0; + } + } + public: + vector(unsigned int size = 0); + vector(unsigned int size, const T& value); + vector(const vector&); + %rename(length) size; + unsigned int size() const; + %rename("empty?") empty; + bool empty() const; + %rename("clear!") clear; + void clear(); + %rename("set!") set; + %rename("pop!") pop; + %rename("push!") push_back; + void push_back(T x); + %extend { + T pop() throw (std::out_of_range) { + if (self->size() == 0) + throw std::out_of_range("pop from empty vector"); + T x = self->back(); + self->pop_back(); + return x; + } + T ref(int i) throw (std::out_of_range) { + int size = int(self->size()); + if (i>=0 && isize()); + if (i>=0 && i, scm_is_complex, + SWIG_scm2cmplxfloat, SWIG_cmplxfloat2scm); + specialize_stl_vector(std::complex, scm_is_complex, + SWIG_scm2cmplxdouble,SWIG_cmplxdouble2scm); + +} + -- cgit From 9631c1fa5f67379218459030d4697ab56720fbfa Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 18 Nov 2010 18:39:14 -0700 Subject: don't generate the list of scripts here, use the version in Makefile.swig --- gnuradio-core/src/lib/swig/Makefile.am | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 16b5d677e..e990d998e 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -56,8 +56,6 @@ nobase_swiginclude_HEADERS = \ guile/std_complex.i \ guile/std_vector.i - -if PYTHON AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) @@ -70,8 +68,8 @@ ourpython_PYTHON = gnuradio_core.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... - -gnuradio_swig_bug_workaround.h : gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix +if PYTHON +gnuradio_swig_bug_workaround.h: gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@ # C/C++ headers get installed in ${prefix}/include/gnuradio @@ -98,19 +96,13 @@ gnuradio_core_hier_la_swig_libadd = $(GNURADIO_CORE_LA) # add some of the variables generated inside the Makefile.swig -# include the SWIG-generated .h files in the BUILT SOURCES, since they -# aren't by default when using Makefile.swig; order doesn't matter. -PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(HFILE))) -swig_built_sources += $(PYTHON_GEN) -endif # end of if python +endif # end of python -if GUILE -SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE -#GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,%.scm,$(HFILE))) -GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) -# GUILE_GEN_STAMPS = $(filter %.scm,$(TOP_SWIG_IFILES)) -swig_built_sources += $(GUILE_GEN) -endif +if PYTHON +else +gnuradio_swig_bug_workaround.h: + @touch gnuradio_swig_bug_workaround.h +endif # end of guile # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) -- cgit From f2e0c5b9a703afb919fdcd9a49381bc2160a149e Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 18 Nov 2010 18:39:34 -0700 Subject: regenerated --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 204 ++++++++++++++++++--------- 1 file changed, 138 insertions(+), 66 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index dc7a7b3bb..160fc8fd8 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -79,6 +79,7 @@ gnuradio_core_runtime_swiginclude_HEADERS = \ gnuradio_core_runtime.i \ $(gnuradio_core_runtime_swiginclude_headers) +if PYTHON gnuradio_core_runtime_pylib_LTLIBRARIES = \ _gnuradio_core_runtime.la @@ -86,6 +87,10 @@ _gnuradio_core_runtime_la_SOURCES = \ python/gnuradio_core_runtime.cc \ $(gnuradio_core_runtime_la_swig_sources) +gnuradio_core_runtime_python_PYTHON = \ + gnuradio_core_runtime.py \ + $(gnuradio_core_runtime_python) + _gnuradio_core_runtime_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_runtime_la_swig_libadd) @@ -99,27 +104,34 @@ _gnuradio_core_runtime_la_CXXFLAGS = \ -I$(top_builddir) \ $(gnuradio_core_runtime_la_swig_cxxflags) -gnuradio_core_runtime_python_PYTHON = \ - gnuradio_core_runtime.py \ - $(gnuradio_core_runtime_python) - python/gnuradio_core_runtime.cc: gnuradio_core_runtime.py gnuradio_core_runtime.py: gnuradio_core_runtime.i # Include the python dependencies for this file -include python/gnuradio_core_runtime.d -# end of PYTHON + +endif # end of if python if GUILE -gnuradio_core_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_core_runtime.la + +gnuradio_core_runtime_scmlib_LTLIBRARIES = \ + libguile-gnuradio_core_runtime.la libguile_gnuradio_core_runtime_la_SOURCES = \ guile/gnuradio_core_runtime.cc \ $(gnuradio_core_runtime_la_swig_sources) -nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primitive.scm - -libguile_gnuradio_core_runtime_la_LIBADD = $(_gnuradio_core_runtime_la_LIBADD) -libguile_gnuradio_core_runtime_la_LDFLAGS = $(_gnuradio_core_runtime_la_LDFLAGS) -libguile_gnuradio_core_runtime_la_CXXFLAGS = $(_gnuradio_core_runtime_la_CXXFLAGS) +nobase_gnuradio_core_runtime_scm_DATA = \ + gnuradio/gnuradio_core_runtime.scm \ + gnuradio/gnuradio_core_runtime-primitive.scm +libguile_gnuradio_core_runtime_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(gnuradio_core_runtime_la_swig_libadd) +libguile_gnuradio_core_runtime_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(gnuradio_core_runtime_la_swig_ldflags) +libguile_gnuradio_core_runtime_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(gnuradio_core_runtime_la_swig_cxxflags) guile/gnuradio_core_runtime.cc: gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime.scm: gnuradio_core_runtime.i @@ -212,6 +224,7 @@ gnuradio_core_general_swiginclude_HEADERS = \ gnuradio_core_general.i \ $(gnuradio_core_general_swiginclude_headers) +if PYTHON gnuradio_core_general_pylib_LTLIBRARIES = \ _gnuradio_core_general.la @@ -219,6 +232,10 @@ _gnuradio_core_general_la_SOURCES = \ python/gnuradio_core_general.cc \ $(gnuradio_core_general_la_swig_sources) +gnuradio_core_general_python_PYTHON = \ + gnuradio_core_general.py \ + $(gnuradio_core_general_python) + _gnuradio_core_general_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_general_la_swig_libadd) @@ -232,27 +249,34 @@ _gnuradio_core_general_la_CXXFLAGS = \ -I$(top_builddir) \ $(gnuradio_core_general_la_swig_cxxflags) -gnuradio_core_general_python_PYTHON = \ - gnuradio_core_general.py \ - $(gnuradio_core_general_python) - python/gnuradio_core_general.cc: gnuradio_core_general.py gnuradio_core_general.py: gnuradio_core_general.i # Include the python dependencies for this file -include python/gnuradio_core_general.d -# end of PYTHON + +endif # end of if python if GUILE -gnuradio_core_general_scmlib_LTLIBRARIES = libguile-gnuradio_core_general.la + +gnuradio_core_general_scmlib_LTLIBRARIES = \ + libguile-gnuradio_core_general.la libguile_gnuradio_core_general_la_SOURCES = \ guile/gnuradio_core_general.cc \ $(gnuradio_core_general_la_swig_sources) -nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primitive.scm - -libguile_gnuradio_core_general_la_LIBADD = $(_gnuradio_core_general_la_LIBADD) -libguile_gnuradio_core_general_la_LDFLAGS = $(_gnuradio_core_general_la_LDFLAGS) -libguile_gnuradio_core_general_la_CXXFLAGS = $(_gnuradio_core_general_la_CXXFLAGS) +nobase_gnuradio_core_general_scm_DATA = \ + gnuradio/gnuradio_core_general.scm \ + gnuradio/gnuradio_core_general-primitive.scm +libguile_gnuradio_core_general_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(gnuradio_core_general_la_swig_libadd) +libguile_gnuradio_core_general_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(gnuradio_core_general_la_swig_ldflags) +libguile_gnuradio_core_general_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(gnuradio_core_general_la_swig_cxxflags) guile/gnuradio_core_general.cc: gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general.scm: gnuradio_core_general.i @@ -345,6 +369,7 @@ gnuradio_core_gengen_swiginclude_HEADERS = \ gnuradio_core_gengen.i \ $(gnuradio_core_gengen_swiginclude_headers) +if PYTHON gnuradio_core_gengen_pylib_LTLIBRARIES = \ _gnuradio_core_gengen.la @@ -352,6 +377,10 @@ _gnuradio_core_gengen_la_SOURCES = \ python/gnuradio_core_gengen.cc \ $(gnuradio_core_gengen_la_swig_sources) +gnuradio_core_gengen_python_PYTHON = \ + gnuradio_core_gengen.py \ + $(gnuradio_core_gengen_python) + _gnuradio_core_gengen_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_gengen_la_swig_libadd) @@ -365,27 +394,34 @@ _gnuradio_core_gengen_la_CXXFLAGS = \ -I$(top_builddir) \ $(gnuradio_core_gengen_la_swig_cxxflags) -gnuradio_core_gengen_python_PYTHON = \ - gnuradio_core_gengen.py \ - $(gnuradio_core_gengen_python) - python/gnuradio_core_gengen.cc: gnuradio_core_gengen.py gnuradio_core_gengen.py: gnuradio_core_gengen.i # Include the python dependencies for this file -include python/gnuradio_core_gengen.d -# end of PYTHON + +endif # end of if python if GUILE -gnuradio_core_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_core_gengen.la + +gnuradio_core_gengen_scmlib_LTLIBRARIES = \ + libguile-gnuradio_core_gengen.la libguile_gnuradio_core_gengen_la_SOURCES = \ guile/gnuradio_core_gengen.cc \ $(gnuradio_core_gengen_la_swig_sources) -nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primitive.scm - -libguile_gnuradio_core_gengen_la_LIBADD = $(_gnuradio_core_gengen_la_LIBADD) -libguile_gnuradio_core_gengen_la_LDFLAGS = $(_gnuradio_core_gengen_la_LDFLAGS) -libguile_gnuradio_core_gengen_la_CXXFLAGS = $(_gnuradio_core_gengen_la_CXXFLAGS) +nobase_gnuradio_core_gengen_scm_DATA = \ + gnuradio/gnuradio_core_gengen.scm \ + gnuradio/gnuradio_core_gengen-primitive.scm +libguile_gnuradio_core_gengen_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(gnuradio_core_gengen_la_swig_libadd) +libguile_gnuradio_core_gengen_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(gnuradio_core_gengen_la_swig_ldflags) +libguile_gnuradio_core_gengen_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(gnuradio_core_gengen_la_swig_cxxflags) guile/gnuradio_core_gengen.cc: gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen.scm: gnuradio_core_gengen.i @@ -478,6 +514,7 @@ gnuradio_core_filter_swiginclude_HEADERS = \ gnuradio_core_filter.i \ $(gnuradio_core_filter_swiginclude_headers) +if PYTHON gnuradio_core_filter_pylib_LTLIBRARIES = \ _gnuradio_core_filter.la @@ -485,6 +522,10 @@ _gnuradio_core_filter_la_SOURCES = \ python/gnuradio_core_filter.cc \ $(gnuradio_core_filter_la_swig_sources) +gnuradio_core_filter_python_PYTHON = \ + gnuradio_core_filter.py \ + $(gnuradio_core_filter_python) + _gnuradio_core_filter_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_filter_la_swig_libadd) @@ -498,27 +539,34 @@ _gnuradio_core_filter_la_CXXFLAGS = \ -I$(top_builddir) \ $(gnuradio_core_filter_la_swig_cxxflags) -gnuradio_core_filter_python_PYTHON = \ - gnuradio_core_filter.py \ - $(gnuradio_core_filter_python) - python/gnuradio_core_filter.cc: gnuradio_core_filter.py gnuradio_core_filter.py: gnuradio_core_filter.i # Include the python dependencies for this file -include python/gnuradio_core_filter.d -# end of PYTHON + +endif # end of if python if GUILE -gnuradio_core_filter_scmlib_LTLIBRARIES = libguile-gnuradio_core_filter.la + +gnuradio_core_filter_scmlib_LTLIBRARIES = \ + libguile-gnuradio_core_filter.la libguile_gnuradio_core_filter_la_SOURCES = \ guile/gnuradio_core_filter.cc \ $(gnuradio_core_filter_la_swig_sources) -nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primitive.scm - -libguile_gnuradio_core_filter_la_LIBADD = $(_gnuradio_core_filter_la_LIBADD) -libguile_gnuradio_core_filter_la_LDFLAGS = $(_gnuradio_core_filter_la_LDFLAGS) -libguile_gnuradio_core_filter_la_CXXFLAGS = $(_gnuradio_core_filter_la_CXXFLAGS) +nobase_gnuradio_core_filter_scm_DATA = \ + gnuradio/gnuradio_core_filter.scm \ + gnuradio/gnuradio_core_filter-primitive.scm +libguile_gnuradio_core_filter_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(gnuradio_core_filter_la_swig_libadd) +libguile_gnuradio_core_filter_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(gnuradio_core_filter_la_swig_ldflags) +libguile_gnuradio_core_filter_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(gnuradio_core_filter_la_swig_cxxflags) guile/gnuradio_core_filter.cc: gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter.scm: gnuradio_core_filter.i @@ -611,6 +659,7 @@ gnuradio_core_io_swiginclude_HEADERS = \ gnuradio_core_io.i \ $(gnuradio_core_io_swiginclude_headers) +if PYTHON gnuradio_core_io_pylib_LTLIBRARIES = \ _gnuradio_core_io.la @@ -618,6 +667,10 @@ _gnuradio_core_io_la_SOURCES = \ python/gnuradio_core_io.cc \ $(gnuradio_core_io_la_swig_sources) +gnuradio_core_io_python_PYTHON = \ + gnuradio_core_io.py \ + $(gnuradio_core_io_python) + _gnuradio_core_io_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_io_la_swig_libadd) @@ -631,27 +684,34 @@ _gnuradio_core_io_la_CXXFLAGS = \ -I$(top_builddir) \ $(gnuradio_core_io_la_swig_cxxflags) -gnuradio_core_io_python_PYTHON = \ - gnuradio_core_io.py \ - $(gnuradio_core_io_python) - python/gnuradio_core_io.cc: gnuradio_core_io.py gnuradio_core_io.py: gnuradio_core_io.i # Include the python dependencies for this file -include python/gnuradio_core_io.d -# end of PYTHON + +endif # end of if python if GUILE -gnuradio_core_io_scmlib_LTLIBRARIES = libguile-gnuradio_core_io.la + +gnuradio_core_io_scmlib_LTLIBRARIES = \ + libguile-gnuradio_core_io.la libguile_gnuradio_core_io_la_SOURCES = \ guile/gnuradio_core_io.cc \ $(gnuradio_core_io_la_swig_sources) -nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primitive.scm - -libguile_gnuradio_core_io_la_LIBADD = $(_gnuradio_core_io_la_LIBADD) -libguile_gnuradio_core_io_la_LDFLAGS = $(_gnuradio_core_io_la_LDFLAGS) -libguile_gnuradio_core_io_la_CXXFLAGS = $(_gnuradio_core_io_la_CXXFLAGS) +nobase_gnuradio_core_io_scm_DATA = \ + gnuradio/gnuradio_core_io.scm \ + gnuradio/gnuradio_core_io-primitive.scm +libguile_gnuradio_core_io_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(gnuradio_core_io_la_swig_libadd) +libguile_gnuradio_core_io_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(gnuradio_core_io_la_swig_ldflags) +libguile_gnuradio_core_io_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(gnuradio_core_io_la_swig_cxxflags) guile/gnuradio_core_io.cc: gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io.scm: gnuradio_core_io.i @@ -744,6 +804,7 @@ gnuradio_core_hier_swiginclude_HEADERS = \ gnuradio_core_hier.i \ $(gnuradio_core_hier_swiginclude_headers) +if PYTHON gnuradio_core_hier_pylib_LTLIBRARIES = \ _gnuradio_core_hier.la @@ -751,6 +812,10 @@ _gnuradio_core_hier_la_SOURCES = \ python/gnuradio_core_hier.cc \ $(gnuradio_core_hier_la_swig_sources) +gnuradio_core_hier_python_PYTHON = \ + gnuradio_core_hier.py \ + $(gnuradio_core_hier_python) + _gnuradio_core_hier_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_hier_la_swig_libadd) @@ -764,27 +829,34 @@ _gnuradio_core_hier_la_CXXFLAGS = \ -I$(top_builddir) \ $(gnuradio_core_hier_la_swig_cxxflags) -gnuradio_core_hier_python_PYTHON = \ - gnuradio_core_hier.py \ - $(gnuradio_core_hier_python) - python/gnuradio_core_hier.cc: gnuradio_core_hier.py gnuradio_core_hier.py: gnuradio_core_hier.i # Include the python dependencies for this file -include python/gnuradio_core_hier.d -# end of PYTHON + +endif # end of if python if GUILE -gnuradio_core_hier_scmlib_LTLIBRARIES = libguile-gnuradio_core_hier.la + +gnuradio_core_hier_scmlib_LTLIBRARIES = \ + libguile-gnuradio_core_hier.la libguile_gnuradio_core_hier_la_SOURCES = \ guile/gnuradio_core_hier.cc \ $(gnuradio_core_hier_la_swig_sources) -nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primitive.scm - -libguile_gnuradio_core_hier_la_LIBADD = $(_gnuradio_core_hier_la_LIBADD) -libguile_gnuradio_core_hier_la_LDFLAGS = $(_gnuradio_core_hier_la_LDFLAGS) -libguile_gnuradio_core_hier_la_CXXFLAGS = $(_gnuradio_core_hier_la_CXXFLAGS) +nobase_gnuradio_core_hier_scm_DATA = \ + gnuradio/gnuradio_core_hier.scm \ + gnuradio/gnuradio_core_hier-primitive.scm +libguile_gnuradio_core_hier_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(gnuradio_core_hier_la_swig_libadd) +libguile_gnuradio_core_hier_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(gnuradio_core_hier_la_swig_ldflags) +libguile_gnuradio_core_hier_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(gnuradio_core_hier_la_swig_cxxflags) guile/gnuradio_core_hier.cc: gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier.scm: gnuradio_core_hier.i -- cgit From 734791dfe5489166ac561c6916051fde6241f2f4 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sun, 21 Nov 2010 17:43:58 -0700 Subject: don't generate this file anymore --- .../src/lib/swig/gnuradio_swig_bug_workaround.h | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h b/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h new file mode 100644 index 000000000..8f7eea0bf --- /dev/null +++ b/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h @@ -0,0 +1,45 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_GNURADIO_SWIG_BUG_WORKAROUND_H +#define INCLUDED_GNURADIO_SWIG_BUG_WORKAROUND_H + +/* + * This include files works around a bug in SWIG 1.3.21 and 22 + * where it fails to emit these declarations when doing + * %import "gnuradio.i" + */ + +class gr_base_error_handler; +class gr_basic_block; +class gr_block; +class gr_error_handler; +class gr_file_error_handler; +class gr_hier_block2; +class gr_msg_handler; +class gr_msg_queue; +class gr_sync_block; +class gr_sync_decimator; +class gr_sync_interpolator; +class gr_top_block; + +#endif /* INCLUDED_GNURADIO_SWIG_BUG_WORKAROUND_H */ -- cgit From ac2fcdb905d616c4aa902479ed44d6ea90947c39 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sun, 21 Nov 2010 17:44:29 -0700 Subject: remove -/gnuradio_swig_bug_workaround.h, it's not generated anymore. --- gnuradio-core/src/lib/swig/.gitignore | 1 - 1 file changed, 1 deletion(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/.gitignore b/gnuradio-core/src/lib/swig/.gitignore index 35e974948..a6f145618 100644 --- a/gnuradio-core/src/lib/swig/.gitignore +++ b/gnuradio-core/src/lib/swig/.gitignore @@ -10,7 +10,6 @@ /swigrun.py /swigrun_wrap.c /Makefile.swigdeps.new -/gnuradio_swig_bug_workaround.h gnuradio_core_filter.cc gnuradio_core_filter.d gnuradio_core_filter.h -- cgit From d4ed4d96470c91bcb7fb45da5e07641b24331cba Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sun, 21 Nov 2010 18:07:59 -0700 Subject: go back to the generating the lists here, so make check works again --- gnuradio-core/src/lib/swig/Makefile.am | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index e990d998e..95edf5181 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -56,11 +56,13 @@ nobase_swiginclude_HEADERS = \ guile/std_complex.i \ guile/std_vector.i + AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) EXTRA_DIST = gen-swig-bug-fix +if PYTHON # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr @@ -68,9 +70,8 @@ ourpython_PYTHON = gnuradio_core.py # ---------------------------------------------------------------- # FIXME As of swig 1.3.31, this still seems to be required... -if PYTHON -gnuradio_swig_bug_workaround.h: gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix - $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@ +# gnuradio_swig_bug_workaround.h : gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix +# $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@ # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = gnuradio_swig_bug_workaround.h @@ -96,13 +97,17 @@ gnuradio_core_hier_la_swig_libadd = $(GNURADIO_CORE_LA) # add some of the variables generated inside the Makefile.swig -endif # end of python +# include the SWIG-generated .h files in the BUILT SOURCES, since they +# aren't by default when using Makefile.swig; order doesn't matter. +PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(HFILE))) +swig_built_sources += $(PYTHON_GEN) +endif # end of if python -if PYTHON -else -gnuradio_swig_bug_workaround.h: - @touch gnuradio_swig_bug_workaround.h -endif # end of guile +if GUILE +SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE +GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) +swig_built_sources += $(GUILE_GEN) +endif # end of if guile # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) -- cgit From e4eb47f0dd55485693e70ec2f45f79912fa899c4 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 21 Nov 2010 19:43:39 -0800 Subject: Clean up lib/swig/Makefile.am, Makefile.common and Makefile.swig Confirmed that it builds and make checks on all four combintations of --{enable,disable}-{python,guile}. Have not tested make dist, but expect that there may be some problems with it. I'm pretty sure that not all files that need to be removed from the distribution are removed, and make clean may still be leaving some files around. --- gnuradio-core/src/lib/swig/Makefile.am | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 95edf5181..a97bb6ea0 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -24,11 +24,6 @@ include $(top_srcdir)/Makefile.swig BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources) -CLEANFILES = python/*.cc python/*.h -if GUILE -CLEANFILES += guile/*.cc gnuradio/*.scm -endif - # ---------------------------------------------------------------- # We've split the previously monstrous gnuradio_core into 6 # smaller pieces. This reduces compile time coupling and creates @@ -62,7 +57,6 @@ AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ EXTRA_DIST = gen-swig-bug-fix -if PYTHON # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr @@ -95,20 +89,5 @@ gnuradio_core_filter_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_core_io_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_core_hier_la_swig_libadd = $(GNURADIO_CORE_LA) -# add some of the variables generated inside the Makefile.swig - -# include the SWIG-generated .h files in the BUILT SOURCES, since they -# aren't by default when using Makefile.swig; order doesn't matter. -PYTHON_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(subst .i,.py,$(HFILE))) -swig_built_sources += $(PYTHON_GEN) -endif # end of if python -if GUILE SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE -GUILE_GEN = $(foreach HFILE,$(TOP_SWIG_IFILES), $(patsubst %.i,gnuradio/%.scm,$(HFILE))) -swig_built_sources += $(GUILE_GEN) -endif # end of if guile - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) - -- cgit From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 17:29:11 -0800 Subject: Major Makefile.am housecleaning. Passes distcheck. Move all occurrences of swig_built_sources out of Makefile.am's. Move all SWIG related use of BUILT_SOURCES out of Makefile.am's. Clean up 'if PYTHON' conditionalization in gr-* Still left to do: fix Makefile.swig CLEANFILES and no_dist_files such that they remove exactly the generated files. --- gnuradio-core/src/lib/swig/Makefile.am | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index a97bb6ea0..f8e7640ae 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -22,7 +22,8 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig -BUILT_SOURCES = $(grinclude_HEADERS) $(swig_built_sources) +AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(WITH_INCLUDES) # ---------------------------------------------------------------- # We've split the previously monstrous gnuradio_core into 6 @@ -52,11 +53,6 @@ nobase_swiginclude_HEADERS = \ guile/std_vector.i -AM_CPPFLAGS = -I$(srcdir) $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ - $(WITH_INCLUDES) - -EXTRA_DIST = gen-swig-bug-fix - # special install for this top-level Python script which includes all # of the split Python libraries. ourpythondir = $(grpythondir)/gr @@ -67,9 +63,12 @@ ourpython_PYTHON = gnuradio_core.py # gnuradio_swig_bug_workaround.h : gnuradio_core_runtime.py $(srcdir)/gen-swig-bug-fix # $(PYTHON) $(srcdir)/gen-swig-bug-fix python/gnuradio_core_runtime.cc $@ +EXTRA_DIST += gen-swig-bug-fix + # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = gnuradio_swig_bug_workaround.h + # Install so that they end up available as: # import gnuradio.gr # This ends up at: @@ -89,5 +88,4 @@ gnuradio_core_filter_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_core_io_la_swig_libadd = $(GNURADIO_CORE_LA) gnuradio_core_hier_la_swig_libadd = $(GNURADIO_CORE_LA) - SWIG_GUILE_FLAGS += -DIN_GNURADIO_CORE -- cgit From 0b5f66113f43d2ba94a1ca741b5ce65e1f9f2c02 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 23:30:54 -0800 Subject: Rename libguile- to libguile-gnuradio- to match guile library naming convention. The stuff in gnuradio-core ends up with funky names, but that could be fixed by renaming gnuradio_core_filter.i -> core_filter.i etc. --- gnuradio-core/src/lib/swig/gnuradio_core_filter.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_general.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_gengen.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_hier.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_io.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_runtime.i | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i index 0acbfa3a6..d7262f140 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_filter" "scm_init_gnuradio_gnuradio_core_filter_module") +(load-extension "libguile-gnuradio-gnuradio_core_filter" "scm_init_gnuradio_gnuradio_core_filter_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i index 759a65459..e381f3509 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i @@ -51,7 +51,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_general" "scm_init_gnuradio_gnuradio_core_general_module") +(load-extension "libguile-gnuradio-gnuradio_core_general" "scm_init_gnuradio_gnuradio_core_general_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i index c08109173..d9fe6672a 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_gengen" "scm_init_gnuradio_gnuradio_core_gengen_module") +(load-extension "libguile-gnuradio-gnuradio_core_gengen" "scm_init_gnuradio_gnuradio_core_gengen_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i index 6d7a38321..2869fd56b 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_hier" "scm_init_gnuradio_gnuradio_core_hier_module") +(load-extension "libguile-gnuradio-gnuradio_core_hier" "scm_init_gnuradio_gnuradio_core_hier_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i index 936522ada..c8d818660 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_io.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_io" "scm_init_gnuradio_gnuradio_core_io_module") +(load-extension "libguile-gnuradio-gnuradio_core_io" "scm_init_gnuradio_gnuradio_core_io_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i index bb10b36b2..78b717d22 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i @@ -34,7 +34,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module") +(load-extension "libguile-gnuradio-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module") %} %goops %{ -- cgit From 6df0423fe1880f5c33daa333604552ea68ac9593 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 23:34:24 -0800 Subject: Regenerated Makefile.swig.gen's --- gnuradio-core/src/lib/swig/Makefile.swig.gen | 60 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 160fc8fd8..0c3247565 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -115,20 +115,20 @@ endif # end of if python if GUILE gnuradio_core_runtime_scmlib_LTLIBRARIES = \ - libguile-gnuradio_core_runtime.la -libguile_gnuradio_core_runtime_la_SOURCES = \ + libguile-gnuradio-gnuradio_core_runtime.la +libguile_gnuradio_gnuradio_core_runtime_la_SOURCES = \ guile/gnuradio_core_runtime.cc \ $(gnuradio_core_runtime_la_swig_sources) nobase_gnuradio_core_runtime_scm_DATA = \ gnuradio/gnuradio_core_runtime.scm \ gnuradio/gnuradio_core_runtime-primitive.scm -libguile_gnuradio_core_runtime_la_LIBADD = \ +libguile_gnuradio_gnuradio_core_runtime_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_runtime_la_swig_libadd) -libguile_gnuradio_core_runtime_la_LDFLAGS = \ +libguile_gnuradio_gnuradio_core_runtime_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_runtime_la_swig_ldflags) -libguile_gnuradio_core_runtime_la_CXXFLAGS = \ +libguile_gnuradio_gnuradio_core_runtime_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(gnuradio_core_runtime_la_swig_cxxflags) @@ -260,20 +260,20 @@ endif # end of if python if GUILE gnuradio_core_general_scmlib_LTLIBRARIES = \ - libguile-gnuradio_core_general.la -libguile_gnuradio_core_general_la_SOURCES = \ + libguile-gnuradio-gnuradio_core_general.la +libguile_gnuradio_gnuradio_core_general_la_SOURCES = \ guile/gnuradio_core_general.cc \ $(gnuradio_core_general_la_swig_sources) nobase_gnuradio_core_general_scm_DATA = \ gnuradio/gnuradio_core_general.scm \ gnuradio/gnuradio_core_general-primitive.scm -libguile_gnuradio_core_general_la_LIBADD = \ +libguile_gnuradio_gnuradio_core_general_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_general_la_swig_libadd) -libguile_gnuradio_core_general_la_LDFLAGS = \ +libguile_gnuradio_gnuradio_core_general_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_general_la_swig_ldflags) -libguile_gnuradio_core_general_la_CXXFLAGS = \ +libguile_gnuradio_gnuradio_core_general_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(gnuradio_core_general_la_swig_cxxflags) @@ -405,20 +405,20 @@ endif # end of if python if GUILE gnuradio_core_gengen_scmlib_LTLIBRARIES = \ - libguile-gnuradio_core_gengen.la -libguile_gnuradio_core_gengen_la_SOURCES = \ + libguile-gnuradio-gnuradio_core_gengen.la +libguile_gnuradio_gnuradio_core_gengen_la_SOURCES = \ guile/gnuradio_core_gengen.cc \ $(gnuradio_core_gengen_la_swig_sources) nobase_gnuradio_core_gengen_scm_DATA = \ gnuradio/gnuradio_core_gengen.scm \ gnuradio/gnuradio_core_gengen-primitive.scm -libguile_gnuradio_core_gengen_la_LIBADD = \ +libguile_gnuradio_gnuradio_core_gengen_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_gengen_la_swig_libadd) -libguile_gnuradio_core_gengen_la_LDFLAGS = \ +libguile_gnuradio_gnuradio_core_gengen_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_gengen_la_swig_ldflags) -libguile_gnuradio_core_gengen_la_CXXFLAGS = \ +libguile_gnuradio_gnuradio_core_gengen_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(gnuradio_core_gengen_la_swig_cxxflags) @@ -550,20 +550,20 @@ endif # end of if python if GUILE gnuradio_core_filter_scmlib_LTLIBRARIES = \ - libguile-gnuradio_core_filter.la -libguile_gnuradio_core_filter_la_SOURCES = \ + libguile-gnuradio-gnuradio_core_filter.la +libguile_gnuradio_gnuradio_core_filter_la_SOURCES = \ guile/gnuradio_core_filter.cc \ $(gnuradio_core_filter_la_swig_sources) nobase_gnuradio_core_filter_scm_DATA = \ gnuradio/gnuradio_core_filter.scm \ gnuradio/gnuradio_core_filter-primitive.scm -libguile_gnuradio_core_filter_la_LIBADD = \ +libguile_gnuradio_gnuradio_core_filter_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_filter_la_swig_libadd) -libguile_gnuradio_core_filter_la_LDFLAGS = \ +libguile_gnuradio_gnuradio_core_filter_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_filter_la_swig_ldflags) -libguile_gnuradio_core_filter_la_CXXFLAGS = \ +libguile_gnuradio_gnuradio_core_filter_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(gnuradio_core_filter_la_swig_cxxflags) @@ -695,20 +695,20 @@ endif # end of if python if GUILE gnuradio_core_io_scmlib_LTLIBRARIES = \ - libguile-gnuradio_core_io.la -libguile_gnuradio_core_io_la_SOURCES = \ + libguile-gnuradio-gnuradio_core_io.la +libguile_gnuradio_gnuradio_core_io_la_SOURCES = \ guile/gnuradio_core_io.cc \ $(gnuradio_core_io_la_swig_sources) nobase_gnuradio_core_io_scm_DATA = \ gnuradio/gnuradio_core_io.scm \ gnuradio/gnuradio_core_io-primitive.scm -libguile_gnuradio_core_io_la_LIBADD = \ +libguile_gnuradio_gnuradio_core_io_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_io_la_swig_libadd) -libguile_gnuradio_core_io_la_LDFLAGS = \ +libguile_gnuradio_gnuradio_core_io_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_io_la_swig_ldflags) -libguile_gnuradio_core_io_la_CXXFLAGS = \ +libguile_gnuradio_gnuradio_core_io_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(gnuradio_core_io_la_swig_cxxflags) @@ -840,20 +840,20 @@ endif # end of if python if GUILE gnuradio_core_hier_scmlib_LTLIBRARIES = \ - libguile-gnuradio_core_hier.la -libguile_gnuradio_core_hier_la_SOURCES = \ + libguile-gnuradio-gnuradio_core_hier.la +libguile_gnuradio_gnuradio_core_hier_la_SOURCES = \ guile/gnuradio_core_hier.cc \ $(gnuradio_core_hier_la_swig_sources) nobase_gnuradio_core_hier_scm_DATA = \ gnuradio/gnuradio_core_hier.scm \ gnuradio/gnuradio_core_hier-primitive.scm -libguile_gnuradio_core_hier_la_LIBADD = \ +libguile_gnuradio_gnuradio_core_hier_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gnuradio_core_hier_la_swig_libadd) -libguile_gnuradio_core_hier_la_LDFLAGS = \ +libguile_gnuradio_gnuradio_core_hier_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gnuradio_core_hier_la_swig_ldflags) -libguile_gnuradio_core_hier_la_CXXFLAGS = \ +libguile_gnuradio_gnuradio_core_hier_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ -I$(top_builddir) \ $(gnuradio_core_hier_la_swig_cxxflags) -- cgit From 08907ee94fb6c34531d57b988324c67c26c8b747 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 10 Dec 2010 16:15:40 -0800 Subject: Use load-extension-global instead of load-extension --- gnuradio-core/src/lib/swig/gnuradio_core_filter.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_general.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_gengen.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_hier.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_io.i | 2 +- gnuradio-core/src/lib/swig/gnuradio_core_runtime.i | 13 ++++++++++++- 6 files changed, 17 insertions(+), 6 deletions(-) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i index d7262f140..e825467db 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_filter.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_filter.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio-gnuradio_core_filter" "scm_init_gnuradio_gnuradio_core_filter_module") +(load-extension-global "libguile-gnuradio-gnuradio_core_filter" "scm_init_gnuradio_gnuradio_core_filter_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i index e381f3509..adf6b469a 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i @@ -51,7 +51,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio-gnuradio_core_general" "scm_init_gnuradio_gnuradio_core_general_module") +(load-extension-global "libguile-gnuradio-gnuradio_core_general" "scm_init_gnuradio_gnuradio_core_general_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i index d9fe6672a..496ced077 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_gengen.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio-gnuradio_core_gengen" "scm_init_gnuradio_gnuradio_core_gengen_module") +(load-extension-global "libguile-gnuradio-gnuradio_core_gengen" "scm_init_gnuradio_gnuradio_core_gengen_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i index 2869fd56b..0b8161c5d 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio-gnuradio_core_hier" "scm_init_gnuradio_gnuradio_core_hier_module") +(load-extension-global "libguile-gnuradio-gnuradio_core_hier" "scm_init_gnuradio_gnuradio_core_hier_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_io.i b/gnuradio-core/src/lib/swig/gnuradio_core_io.i index c8d818660..0d989ea87 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_io.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_io.i @@ -31,7 +31,7 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio-gnuradio_core_io" "scm_init_gnuradio_gnuradio_core_io_module") +(load-extension-global "libguile-gnuradio-gnuradio_core_io" "scm_init_gnuradio_gnuradio_core_io_module") %} %goops %{ diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i index 78b717d22..579c51ce5 100644 --- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i +++ b/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i @@ -34,7 +34,18 @@ #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module") + +;; Load our gsubr that loads libraries using the RTLD_GLOBAL option +(load-extension "libguile-gnuradio-dynl-global" "scm_init_gnuradio_dynl_global_module") + +;; Define load-extension-global in module '(guile) +(module-define! (resolve-module '(guile)) + 'load-extension-global + (lambda (lib init) + (dynamic-call init (dynamic-link-global lib)))) + +;; Use load-extension-global to load our swig modules +(load-extension-global "libguile-gnuradio-gnuradio_core_runtime" "scm_init_gnuradio_gnuradio_core_runtime_module") %} %goops %{ -- cgit From dad65db9c2046a113e704394beac01852ac2b35c Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 5 Jan 2011 19:56:00 -0800 Subject: Have swig/guile wrap enums and constants as scheme variables, not functions. --- gnuradio-core/src/lib/swig/gnuradio.i | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnuradio-core/src/lib/swig') diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index 1601cca12..1856d5007 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -37,6 +37,11 @@ %feature("autodoc","1"); +#ifdef SWIGGUILE +// Export constants and enums as scheme variables, not functions. +%feature("constasvar"); +#endif + // local file %include -- cgit