diff options
23 files changed, 925 insertions, 326 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index fab8afd624..9d7112169e 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 \ diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen index 0fc085b604..4ecd70cf2f 100644 --- a/gr-atsc/src/lib/Makefile.swig.gen +++ b/gr-atsc/src/lib/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 += atsc.py atsc-python.cc +swig_built_sources += atsc.py atsc_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 @@ atsc_swiginclude_HEADERS = \ $(atsc_swiginclude_headers) atsc_pylib_LTLIBRARIES = \ - _atsc.la + _atsc_python.la -_atsc_la_SOURCES = \ - atsc-python.cc \ +_atsc_python_la_SOURCES = \ + atsc_python.cc \ $(atsc_la_swig_sources) -_atsc_la_LIBADD = \ +_atsc_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(atsc_la_swig_libadd) -_atsc_la_LDFLAGS = \ +_atsc_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(atsc_la_swig_ldflags) -_atsc_la_CXXFLAGS = \ +_atsc_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(atsc_la_swig_cxxflags) @@ -105,9 +105,23 @@ atsc_python_PYTHON = \ atsc.py \ $(atsc_python) +if GUILE +atsc_pylib_LTLIBRARIES += _atsc_guile.la + +_atsc_guile_la_SOURCES = \ + atsc_guile.cc \ + $(atsc_la_swig_sources) + +# Guile can use the same flags as python does +_atsc_guile_la_LIBADD = $(_atsc_python_la_LIBADD) +_atsc_guile_la_LDFLAGS = $(_atsc_python_la_LDFLAGS) +_atsc_guile_la_CXXFLAGS = $(_atsc_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -atsc.h atsc.py atsc-python.cc: atsc.i +atsc.h atsc.py atsc_python.cc: atsc.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ atsc.h atsc.py atsc-python.cc: atsc.i fi; $(DEPDIR)/atsc-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(atsc_swig_args) \ -MD -MF $(DEPDIR)/atsc.Std \ - -module atsc -o atsc-guile.cc $(WHAT); then \ + -module atsc -o atsc_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/atsc.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/atsc-generate-guile-stamp: $(RM) $(DEPDIR)/atsc.S*; exit 1; \ fi; touch $(DEPDIR)/atsc-generate-guile-stamp +endif $(DEPDIR)/atsc-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/atsc-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(atsc_swig_args) \ -MD -MF $(DEPDIR)/atsc.Std \ - -module atsc -o atsc-python.cc $(WHAT); then \ + -module atsc -o atsc_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/atsc.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \ diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen index 16342ac279..cede38fd01 100644 --- a/gr-audio-alsa/src/Makefile.swig.gen +++ b/gr-audio-alsa/src/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 += audio_alsa.py audio_alsa-python.cc +swig_built_sources += audio_alsa.py audio_alsa_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 @@ audio_alsa_swiginclude_HEADERS = \ $(audio_alsa_swiginclude_headers) audio_alsa_pylib_LTLIBRARIES = \ - _audio_alsa.la + _audio_alsa_python.la -_audio_alsa_la_SOURCES = \ - audio_alsa-python.cc \ +_audio_alsa_python_la_SOURCES = \ + audio_alsa_python.cc \ $(audio_alsa_la_swig_sources) -_audio_alsa_la_LIBADD = \ +_audio_alsa_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_alsa_la_swig_libadd) -_audio_alsa_la_LDFLAGS = \ +_audio_alsa_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_alsa_la_swig_ldflags) -_audio_alsa_la_CXXFLAGS = \ +_audio_alsa_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(audio_alsa_la_swig_cxxflags) @@ -105,9 +105,23 @@ audio_alsa_python_PYTHON = \ audio_alsa.py \ $(audio_alsa_python) +if GUILE +audio_alsa_pylib_LTLIBRARIES += _audio_alsa_guile.la + +_audio_alsa_guile_la_SOURCES = \ + audio_alsa_guile.cc \ + $(audio_alsa_la_swig_sources) + +# Guile can use the same flags as python does +_audio_alsa_guile_la_LIBADD = $(_audio_alsa_python_la_LIBADD) +_audio_alsa_guile_la_LDFLAGS = $(_audio_alsa_python_la_LDFLAGS) +_audio_alsa_guile_la_CXXFLAGS = $(_audio_alsa_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -audio_alsa.h audio_alsa.py audio_alsa-python.cc: audio_alsa.i +audio_alsa.h audio_alsa.py audio_alsa_python.cc: audio_alsa.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ audio_alsa.h audio_alsa.py audio_alsa-python.cc: audio_alsa.i fi; $(DEPDIR)/audio_alsa-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_alsa_swig_args) \ -MD -MF $(DEPDIR)/audio_alsa.Std \ - -module audio_alsa -o audio_alsa-guile.cc $(WHAT); then \ + -module audio_alsa -o audio_alsa_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/audio_alsa.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/audio_alsa-generate-guile-stamp: $(RM) $(DEPDIR)/audio_alsa.S*; exit 1; \ fi; touch $(DEPDIR)/audio_alsa-generate-guile-stamp +endif $(DEPDIR)/audio_alsa-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/audio_alsa-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_alsa_swig_args) \ -MD -MF $(DEPDIR)/audio_alsa.Std \ - -module audio_alsa -o audio_alsa-python.cc $(WHAT); then \ + -module audio_alsa -o audio_alsa_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/audio_alsa.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_alsa.Std \ diff --git a/gr-audio-jack/src/Makefile.swig.gen b/gr-audio-jack/src/Makefile.swig.gen index 9b1f158c4e..7ace81ffda 100644 --- a/gr-audio-jack/src/Makefile.swig.gen +++ b/gr-audio-jack/src/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 += audio_jack.py audio_jack.cc +swig_built_sources += audio_jack.py audio_jack_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 @@ audio_jack_swiginclude_HEADERS = \ $(audio_jack_swiginclude_headers) audio_jack_pylib_LTLIBRARIES = \ - _audio_jack.la + _audio_jack_python.la -_audio_jack_la_SOURCES = \ - audio_jack.cc \ +_audio_jack_python_la_SOURCES = \ + audio_jack_python.cc \ $(audio_jack_la_swig_sources) -_audio_jack_la_LIBADD = \ +_audio_jack_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_jack_la_swig_libadd) -_audio_jack_la_LDFLAGS = \ +_audio_jack_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_jack_la_swig_ldflags) -_audio_jack_la_CXXFLAGS = \ +_audio_jack_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(audio_jack_la_swig_cxxflags) @@ -105,9 +105,23 @@ audio_jack_python_PYTHON = \ audio_jack.py \ $(audio_jack_python) +if GUILE +audio_jack_pylib_LTLIBRARIES += _audio_jack_guile.la + +_audio_jack_guile_la_SOURCES = \ + audio_jack_guile.cc \ + $(audio_jack_la_swig_sources) + +# Guile can use the same flags as python does +_audio_jack_guile_la_LIBADD = $(_audio_jack_python_la_LIBADD) +_audio_jack_guile_la_LDFLAGS = $(_audio_jack_python_la_LDFLAGS) +_audio_jack_guile_la_CXXFLAGS = $(_audio_jack_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -audio_jack.h audio_jack.py audio_jack.cc: audio_jack.i +audio_jack.h audio_jack.py audio_jack_python.cc: audio_jack.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 +173,12 @@ audio_jack.h audio_jack.py audio_jack.cc: audio_jack.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/audio_jack-generate-stamp; \ + rm -f $(DEPDIR)/audio_jack-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_jack-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_jack-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_jack-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 +202,27 @@ audio_jack.h audio_jack.py audio_jack.cc: audio_jack.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/audio_jack-generate-stamp; \ + test -f $(DEPDIR)/audio_jack-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/audio_jack-generate-stamp: +$(DEPDIR)/audio_jack-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_jack_swig_args) \ + -MD -MF $(DEPDIR)/audio_jack.Std \ + -module audio_jack -o audio_jack_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/audio_jack.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_jack.Std \ + > $(DEPDIR)/audio_jack.Sd; \ + $(RM) $(DEPDIR)/audio_jack.Std; \ + $(MV) $(DEPDIR)/audio_jack.Sd $(DEPDIR)/audio_jack.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/audio_jack.S*; exit 1; \ + fi; + touch $(DEPDIR)/audio_jack-generate-guile-stamp + +$(DEPDIR)/audio_jack-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 +233,7 @@ $(DEPDIR)/audio_jack-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_jack_swig_args) \ -MD -MF $(DEPDIR)/audio_jack.Std \ - -module audio_jack -o audio_jack.cc $(WHAT); then \ + -module audio_jack -o audio_jack_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/audio_jack.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_jack.Std \ @@ -249,7 +280,7 @@ $(DEPDIR)/audio_jack-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/audio_jack-generate-stamp + touch $(DEPDIR)/audio_jack-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, diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen index 1919832621..23c8a4618d 100644 --- a/gr-audio-oss/src/Makefile.swig.gen +++ b/gr-audio-oss/src/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 += audio_oss.py audio_oss-python.cc +swig_built_sources += audio_oss.py audio_oss_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 @@ audio_oss_swiginclude_HEADERS = \ $(audio_oss_swiginclude_headers) audio_oss_pylib_LTLIBRARIES = \ - _audio_oss.la + _audio_oss_python.la -_audio_oss_la_SOURCES = \ - audio_oss-python.cc \ +_audio_oss_python_la_SOURCES = \ + audio_oss_python.cc \ $(audio_oss_la_swig_sources) -_audio_oss_la_LIBADD = \ +_audio_oss_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_oss_la_swig_libadd) -_audio_oss_la_LDFLAGS = \ +_audio_oss_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_oss_la_swig_ldflags) -_audio_oss_la_CXXFLAGS = \ +_audio_oss_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(audio_oss_la_swig_cxxflags) @@ -105,9 +105,23 @@ audio_oss_python_PYTHON = \ audio_oss.py \ $(audio_oss_python) +if GUILE +audio_oss_pylib_LTLIBRARIES += _audio_oss_guile.la + +_audio_oss_guile_la_SOURCES = \ + audio_oss_guile.cc \ + $(audio_oss_la_swig_sources) + +# Guile can use the same flags as python does +_audio_oss_guile_la_LIBADD = $(_audio_oss_python_la_LIBADD) +_audio_oss_guile_la_LDFLAGS = $(_audio_oss_python_la_LDFLAGS) +_audio_oss_guile_la_CXXFLAGS = $(_audio_oss_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -audio_oss.h audio_oss.py audio_oss-python.cc: audio_oss.i +audio_oss.h audio_oss.py audio_oss_python.cc: audio_oss.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ audio_oss.h audio_oss.py audio_oss-python.cc: audio_oss.i fi; $(DEPDIR)/audio_oss-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_oss_swig_args) \ -MD -MF $(DEPDIR)/audio_oss.Std \ - -module audio_oss -o audio_oss-guile.cc $(WHAT); then \ + -module audio_oss -o audio_oss_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/audio_oss.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/audio_oss-generate-guile-stamp: $(RM) $(DEPDIR)/audio_oss.S*; exit 1; \ fi; touch $(DEPDIR)/audio_oss-generate-guile-stamp +endif $(DEPDIR)/audio_oss-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/audio_oss-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_oss_swig_args) \ -MD -MF $(DEPDIR)/audio_oss.Std \ - -module audio_oss -o audio_oss-python.cc $(WHAT); then \ + -module audio_oss -o audio_oss_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/audio_oss.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_oss.Std \ diff --git a/gr-audio-osx/src/Makefile.swig.gen b/gr-audio-osx/src/Makefile.swig.gen index b4fd71357e..448fa77e0d 100644 --- a/gr-audio-osx/src/Makefile.swig.gen +++ b/gr-audio-osx/src/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 += audio_osx.py audio_osx.cc +swig_built_sources += audio_osx.py audio_osx_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 @@ audio_osx_swiginclude_HEADERS = \ $(audio_osx_swiginclude_headers) audio_osx_pylib_LTLIBRARIES = \ - _audio_osx.la + _audio_osx_python.la -_audio_osx_la_SOURCES = \ - audio_osx.cc \ +_audio_osx_python_la_SOURCES = \ + audio_osx_python.cc \ $(audio_osx_la_swig_sources) -_audio_osx_la_LIBADD = \ +_audio_osx_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_osx_la_swig_libadd) -_audio_osx_la_LDFLAGS = \ +_audio_osx_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_osx_la_swig_ldflags) -_audio_osx_la_CXXFLAGS = \ +_audio_osx_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(audio_osx_la_swig_cxxflags) @@ -105,9 +105,23 @@ audio_osx_python_PYTHON = \ audio_osx.py \ $(audio_osx_python) +if GUILE +audio_osx_pylib_LTLIBRARIES += _audio_osx_guile.la + +_audio_osx_guile_la_SOURCES = \ + audio_osx_guile.cc \ + $(audio_osx_la_swig_sources) + +# Guile can use the same flags as python does +_audio_osx_guile_la_LIBADD = $(_audio_osx_python_la_LIBADD) +_audio_osx_guile_la_LDFLAGS = $(_audio_osx_python_la_LDFLAGS) +_audio_osx_guile_la_CXXFLAGS = $(_audio_osx_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -audio_osx.h audio_osx.py audio_osx.cc: audio_osx.i +audio_osx.h audio_osx.py audio_osx_python.cc: audio_osx.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 +173,12 @@ audio_osx.h audio_osx.py audio_osx.cc: audio_osx.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/audio_osx-generate-stamp; \ + rm -f $(DEPDIR)/audio_osx-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_osx-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_osx-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_osx-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 +202,27 @@ audio_osx.h audio_osx.py audio_osx.cc: audio_osx.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/audio_osx-generate-stamp; \ + test -f $(DEPDIR)/audio_osx-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/audio_osx-generate-stamp: +$(DEPDIR)/audio_osx-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_osx_swig_args) \ + -MD -MF $(DEPDIR)/audio_osx.Std \ + -module audio_osx -o audio_osx_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/audio_osx.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_osx.Std \ + > $(DEPDIR)/audio_osx.Sd; \ + $(RM) $(DEPDIR)/audio_osx.Std; \ + $(MV) $(DEPDIR)/audio_osx.Sd $(DEPDIR)/audio_osx.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/audio_osx.S*; exit 1; \ + fi; + touch $(DEPDIR)/audio_osx-generate-guile-stamp + +$(DEPDIR)/audio_osx-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 +233,7 @@ $(DEPDIR)/audio_osx-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_osx_swig_args) \ -MD -MF $(DEPDIR)/audio_osx.Std \ - -module audio_osx -o audio_osx.cc $(WHAT); then \ + -module audio_osx -o audio_osx_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/audio_osx.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_osx.Std \ @@ -249,7 +280,7 @@ $(DEPDIR)/audio_osx-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/audio_osx-generate-stamp + touch $(DEPDIR)/audio_osx-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, diff --git a/gr-audio-portaudio/src/Makefile.swig.gen b/gr-audio-portaudio/src/Makefile.swig.gen index 368f2e3283..59e317a5e4 100644 --- a/gr-audio-portaudio/src/Makefile.swig.gen +++ b/gr-audio-portaudio/src/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 += audio_portaudio.py audio_portaudio.cc +swig_built_sources += audio_portaudio.py audio_portaudio_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 @@ audio_portaudio_swiginclude_HEADERS = \ $(audio_portaudio_swiginclude_headers) audio_portaudio_pylib_LTLIBRARIES = \ - _audio_portaudio.la + _audio_portaudio_python.la -_audio_portaudio_la_SOURCES = \ - audio_portaudio.cc \ +_audio_portaudio_python_la_SOURCES = \ + audio_portaudio_python.cc \ $(audio_portaudio_la_swig_sources) -_audio_portaudio_la_LIBADD = \ +_audio_portaudio_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_portaudio_la_swig_libadd) -_audio_portaudio_la_LDFLAGS = \ +_audio_portaudio_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_portaudio_la_swig_ldflags) -_audio_portaudio_la_CXXFLAGS = \ +_audio_portaudio_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(audio_portaudio_la_swig_cxxflags) @@ -105,9 +105,23 @@ audio_portaudio_python_PYTHON = \ audio_portaudio.py \ $(audio_portaudio_python) +if GUILE +audio_portaudio_pylib_LTLIBRARIES += _audio_portaudio_guile.la + +_audio_portaudio_guile_la_SOURCES = \ + audio_portaudio_guile.cc \ + $(audio_portaudio_la_swig_sources) + +# Guile can use the same flags as python does +_audio_portaudio_guile_la_LIBADD = $(_audio_portaudio_python_la_LIBADD) +_audio_portaudio_guile_la_LDFLAGS = $(_audio_portaudio_python_la_LDFLAGS) +_audio_portaudio_guile_la_CXXFLAGS = $(_audio_portaudio_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -audio_portaudio.h audio_portaudio.py audio_portaudio.cc: audio_portaudio.i +audio_portaudio.h audio_portaudio.py audio_portaudio_python.cc: audio_portaudio.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 +173,12 @@ audio_portaudio.h audio_portaudio.py audio_portaudio.cc: audio_portaudio.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/audio_portaudio-generate-stamp; \ + rm -f $(DEPDIR)/audio_portaudio-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_portaudio-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_portaudio-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_portaudio-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 +202,27 @@ audio_portaudio.h audio_portaudio.py audio_portaudio.cc: audio_portaudio.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/audio_portaudio-generate-stamp; \ + test -f $(DEPDIR)/audio_portaudio-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/audio_portaudio-generate-stamp: +$(DEPDIR)/audio_portaudio-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_portaudio_swig_args) \ + -MD -MF $(DEPDIR)/audio_portaudio.Std \ + -module audio_portaudio -o audio_portaudio_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/audio_portaudio.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_portaudio.Std \ + > $(DEPDIR)/audio_portaudio.Sd; \ + $(RM) $(DEPDIR)/audio_portaudio.Std; \ + $(MV) $(DEPDIR)/audio_portaudio.Sd $(DEPDIR)/audio_portaudio.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/audio_portaudio.S*; exit 1; \ + fi; + touch $(DEPDIR)/audio_portaudio-generate-guile-stamp + +$(DEPDIR)/audio_portaudio-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 +233,7 @@ $(DEPDIR)/audio_portaudio-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_portaudio_swig_args) \ -MD -MF $(DEPDIR)/audio_portaudio.Std \ - -module audio_portaudio -o audio_portaudio.cc $(WHAT); then \ + -module audio_portaudio -o audio_portaudio_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/audio_portaudio.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_portaudio.Std \ @@ -249,7 +280,7 @@ $(DEPDIR)/audio_portaudio-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/audio_portaudio-generate-stamp + touch $(DEPDIR)/audio_portaudio-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, diff --git a/gr-audio-windows/src/Makefile.swig.gen b/gr-audio-windows/src/Makefile.swig.gen index 61215b89b6..cf550682ef 100644 --- a/gr-audio-windows/src/Makefile.swig.gen +++ b/gr-audio-windows/src/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 += audio_windows.py audio_windows.cc +swig_built_sources += audio_windows.py audio_windows_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 @@ audio_windows_swiginclude_HEADERS = \ $(audio_windows_swiginclude_headers) audio_windows_pylib_LTLIBRARIES = \ - _audio_windows.la + _audio_windows_python.la -_audio_windows_la_SOURCES = \ - audio_windows.cc \ +_audio_windows_python_la_SOURCES = \ + audio_windows_python.cc \ $(audio_windows_la_swig_sources) -_audio_windows_la_LIBADD = \ +_audio_windows_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_windows_la_swig_libadd) -_audio_windows_la_LDFLAGS = \ +_audio_windows_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_windows_la_swig_ldflags) -_audio_windows_la_CXXFLAGS = \ +_audio_windows_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(audio_windows_la_swig_cxxflags) @@ -105,9 +105,23 @@ audio_windows_python_PYTHON = \ audio_windows.py \ $(audio_windows_python) +if GUILE +audio_windows_pylib_LTLIBRARIES += _audio_windows_guile.la + +_audio_windows_guile_la_SOURCES = \ + audio_windows_guile.cc \ + $(audio_windows_la_swig_sources) + +# Guile can use the same flags as python does +_audio_windows_guile_la_LIBADD = $(_audio_windows_python_la_LIBADD) +_audio_windows_guile_la_LDFLAGS = $(_audio_windows_python_la_LDFLAGS) +_audio_windows_guile_la_CXXFLAGS = $(_audio_windows_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -audio_windows.h audio_windows.py audio_windows.cc: audio_windows.i +audio_windows.h audio_windows.py audio_windows_python.cc: audio_windows.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 +173,12 @@ audio_windows.h audio_windows.py audio_windows.cc: audio_windows.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/audio_windows-generate-stamp; \ + rm -f $(DEPDIR)/audio_windows-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_windows-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_windows-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/audio_windows-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 +202,27 @@ audio_windows.h audio_windows.py audio_windows.cc: audio_windows.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/audio_windows-generate-stamp; \ + test -f $(DEPDIR)/audio_windows-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/audio_windows-generate-stamp: +$(DEPDIR)/audio_windows-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(audio_windows_swig_args) \ + -MD -MF $(DEPDIR)/audio_windows.Std \ + -module audio_windows -o audio_windows_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/audio_windows.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_windows.Std \ + > $(DEPDIR)/audio_windows.Sd; \ + $(RM) $(DEPDIR)/audio_windows.Std; \ + $(MV) $(DEPDIR)/audio_windows.Sd $(DEPDIR)/audio_windows.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/audio_windows.S*; exit 1; \ + fi; + touch $(DEPDIR)/audio_windows-generate-guile-stamp + +$(DEPDIR)/audio_windows-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 +233,7 @@ $(DEPDIR)/audio_windows-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(audio_windows_swig_args) \ -MD -MF $(DEPDIR)/audio_windows.Std \ - -module audio_windows -o audio_windows.cc $(WHAT); then \ + -module audio_windows -o audio_windows_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/audio_windows.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/audio_windows.Std \ @@ -249,7 +280,7 @@ $(DEPDIR)/audio_windows-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/audio_windows-generate-stamp + touch $(DEPDIR)/audio_windows-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, diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen index dd2c235c33..66edf9ce9d 100644 --- a/gr-comedi/src/Makefile.swig.gen +++ b/gr-comedi/src/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 += comedi.py comedi.cc +swig_built_sources += comedi.py comedi_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 @@ comedi_swiginclude_HEADERS = \ $(comedi_swiginclude_headers) comedi_pylib_LTLIBRARIES = \ - _comedi.la + _comedi_python.la -_comedi_la_SOURCES = \ - comedi.cc \ +_comedi_python_la_SOURCES = \ + comedi_python.cc \ $(comedi_la_swig_sources) -_comedi_la_LIBADD = \ +_comedi_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(comedi_la_swig_libadd) -_comedi_la_LDFLAGS = \ +_comedi_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(comedi_la_swig_ldflags) -_comedi_la_CXXFLAGS = \ +_comedi_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(comedi_la_swig_cxxflags) @@ -105,9 +105,23 @@ comedi_python_PYTHON = \ comedi.py \ $(comedi_python) +if GUILE +comedi_pylib_LTLIBRARIES += _comedi_guile.la + +_comedi_guile_la_SOURCES = \ + comedi_guile.cc \ + $(comedi_la_swig_sources) + +# Guile can use the same flags as python does +_comedi_guile_la_LIBADD = $(_comedi_python_la_LIBADD) +_comedi_guile_la_LDFLAGS = $(_comedi_python_la_LDFLAGS) +_comedi_guile_la_CXXFLAGS = $(_comedi_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -comedi.h comedi.py comedi.cc: comedi.i +comedi.h comedi.py comedi_python.cc: comedi.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 +173,12 @@ comedi.h comedi.py comedi.cc: comedi.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/comedi-generate-stamp; \ + rm -f $(DEPDIR)/comedi-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/comedi-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/comedi-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/comedi-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 +202,27 @@ comedi.h comedi.py comedi.cc: comedi.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/comedi-generate-stamp; \ + test -f $(DEPDIR)/comedi-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/comedi-generate-stamp: +$(DEPDIR)/comedi-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(comedi_swig_args) \ + -MD -MF $(DEPDIR)/comedi.Std \ + -module comedi -o comedi_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/comedi.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/comedi.Std \ + > $(DEPDIR)/comedi.Sd; \ + $(RM) $(DEPDIR)/comedi.Std; \ + $(MV) $(DEPDIR)/comedi.Sd $(DEPDIR)/comedi.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/comedi.S*; exit 1; \ + fi; + touch $(DEPDIR)/comedi-generate-guile-stamp + +$(DEPDIR)/comedi-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 +233,7 @@ $(DEPDIR)/comedi-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(comedi_swig_args) \ -MD -MF $(DEPDIR)/comedi.Std \ - -module comedi -o comedi.cc $(WHAT); then \ + -module comedi -o comedi_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/comedi.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/comedi.Std \ @@ -249,7 +280,7 @@ $(DEPDIR)/comedi-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/comedi-generate-stamp + touch $(DEPDIR)/comedi-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, diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen index e14b0b3f4b..1d210b7c46 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen +++ b/gr-cvsd-vocoder/src/lib/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 += cvsd_vocoder.py cvsd_vocoder-python.cc +swig_built_sources += cvsd_vocoder.py cvsd_vocoder_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 @@ cvsd_vocoder_swiginclude_HEADERS = \ $(cvsd_vocoder_swiginclude_headers) cvsd_vocoder_pylib_LTLIBRARIES = \ - _cvsd_vocoder.la + _cvsd_vocoder_python.la -_cvsd_vocoder_la_SOURCES = \ - cvsd_vocoder-python.cc \ +_cvsd_vocoder_python_la_SOURCES = \ + cvsd_vocoder_python.cc \ $(cvsd_vocoder_la_swig_sources) -_cvsd_vocoder_la_LIBADD = \ +_cvsd_vocoder_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(cvsd_vocoder_la_swig_libadd) -_cvsd_vocoder_la_LDFLAGS = \ +_cvsd_vocoder_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(cvsd_vocoder_la_swig_ldflags) -_cvsd_vocoder_la_CXXFLAGS = \ +_cvsd_vocoder_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(cvsd_vocoder_la_swig_cxxflags) @@ -105,9 +105,23 @@ cvsd_vocoder_python_PYTHON = \ cvsd_vocoder.py \ $(cvsd_vocoder_python) +if GUILE +cvsd_vocoder_pylib_LTLIBRARIES += _cvsd_vocoder_guile.la + +_cvsd_vocoder_guile_la_SOURCES = \ + cvsd_vocoder_guile.cc \ + $(cvsd_vocoder_la_swig_sources) + +# Guile can use the same flags as python does +_cvsd_vocoder_guile_la_LIBADD = $(_cvsd_vocoder_python_la_LIBADD) +_cvsd_vocoder_guile_la_LDFLAGS = $(_cvsd_vocoder_python_la_LDFLAGS) +_cvsd_vocoder_guile_la_CXXFLAGS = $(_cvsd_vocoder_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder-python.cc: cvsd_vocoder.i +cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder_python.cc: cvsd_vocoder.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ cvsd_vocoder.h cvsd_vocoder.py cvsd_vocoder-python.cc: cvsd_vocoder.i fi; $(DEPDIR)/cvsd_vocoder-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(cvsd_vocoder_swig_args) \ -MD -MF $(DEPDIR)/cvsd_vocoder.Std \ - -module cvsd_vocoder -o cvsd_vocoder-guile.cc $(WHAT); then \ + -module cvsd_vocoder -o cvsd_vocoder_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/cvsd_vocoder.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/cvsd_vocoder-generate-guile-stamp: $(RM) $(DEPDIR)/cvsd_vocoder.S*; exit 1; \ fi; touch $(DEPDIR)/cvsd_vocoder-generate-guile-stamp +endif $(DEPDIR)/cvsd_vocoder-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/cvsd_vocoder-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(cvsd_vocoder_swig_args) \ -MD -MF $(DEPDIR)/cvsd_vocoder.Std \ - -module cvsd_vocoder -o cvsd_vocoder-python.cc $(WHAT); then \ + -module cvsd_vocoder -o cvsd_vocoder_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/cvsd_vocoder.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/cvsd_vocoder.Std \ diff --git a/gr-gcell/src/Makefile.swig.gen b/gr-gcell/src/Makefile.swig.gen index 75353c347a..b95bafc2b0 100644 --- a/gr-gcell/src/Makefile.swig.gen +++ b/gr-gcell/src/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 += gcell.py gcell.cc +swig_built_sources += gcell.py gcell_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 @@ gcell_swiginclude_HEADERS = \ $(gcell_swiginclude_headers) gcell_pylib_LTLIBRARIES = \ - _gcell.la + _gcell_python.la -_gcell_la_SOURCES = \ - gcell.cc \ +_gcell_python_la_SOURCES = \ + gcell_python.cc \ $(gcell_la_swig_sources) -_gcell_la_LIBADD = \ +_gcell_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gcell_la_swig_libadd) -_gcell_la_LDFLAGS = \ +_gcell_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gcell_la_swig_ldflags) -_gcell_la_CXXFLAGS = \ +_gcell_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gcell_la_swig_cxxflags) @@ -105,9 +105,23 @@ gcell_python_PYTHON = \ gcell.py \ $(gcell_python) +if GUILE +gcell_pylib_LTLIBRARIES += _gcell_guile.la + +_gcell_guile_la_SOURCES = \ + gcell_guile.cc \ + $(gcell_la_swig_sources) + +# Guile can use the same flags as python does +_gcell_guile_la_LIBADD = $(_gcell_python_la_LIBADD) +_gcell_guile_la_LDFLAGS = $(_gcell_python_la_LDFLAGS) +_gcell_guile_la_CXXFLAGS = $(_gcell_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -gcell.h gcell.py gcell.cc: gcell.i +gcell.h gcell.py gcell_python.cc: gcell.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 +173,12 @@ gcell.h gcell.py gcell.cc: gcell.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/gcell-generate-stamp; \ + rm -f $(DEPDIR)/gcell-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gcell-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gcell-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/gcell-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 +202,27 @@ gcell.h gcell.py gcell.cc: gcell.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/gcell-generate-stamp; \ + test -f $(DEPDIR)/gcell-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/gcell-generate-stamp: +$(DEPDIR)/gcell-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gcell_swig_args) \ + -MD -MF $(DEPDIR)/gcell.Std \ + -module gcell -o gcell_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/gcell.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell.Std \ + > $(DEPDIR)/gcell.Sd; \ + $(RM) $(DEPDIR)/gcell.Std; \ + $(MV) $(DEPDIR)/gcell.Sd $(DEPDIR)/gcell.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/gcell.S*; exit 1; \ + fi; + touch $(DEPDIR)/gcell-generate-guile-stamp + +$(DEPDIR)/gcell-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 +233,7 @@ $(DEPDIR)/gcell-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gcell_swig_args) \ -MD -MF $(DEPDIR)/gcell.Std \ - -module gcell -o gcell.cc $(WHAT); then \ + -module gcell -o gcell_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gcell.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gcell.Std \ @@ -249,7 +280,7 @@ $(DEPDIR)/gcell-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/gcell-generate-stamp + touch $(DEPDIR)/gcell-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, diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen index 3dcb935718..ac879f08e1 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen +++ b/gr-gsm-fr-vocoder/src/lib/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 += gsm_full_rate.py gsm_full_rate-python.cc +swig_built_sources += gsm_full_rate.py gsm_full_rate_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 @@ gsm_full_rate_swiginclude_HEADERS = \ $(gsm_full_rate_swiginclude_headers) gsm_full_rate_pylib_LTLIBRARIES = \ - _gsm_full_rate.la + _gsm_full_rate_python.la -_gsm_full_rate_la_SOURCES = \ - gsm_full_rate-python.cc \ +_gsm_full_rate_python_la_SOURCES = \ + gsm_full_rate_python.cc \ $(gsm_full_rate_la_swig_sources) -_gsm_full_rate_la_LIBADD = \ +_gsm_full_rate_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gsm_full_rate_la_swig_libadd) -_gsm_full_rate_la_LDFLAGS = \ +_gsm_full_rate_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gsm_full_rate_la_swig_ldflags) -_gsm_full_rate_la_CXXFLAGS = \ +_gsm_full_rate_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(gsm_full_rate_la_swig_cxxflags) @@ -105,9 +105,23 @@ gsm_full_rate_python_PYTHON = \ gsm_full_rate.py \ $(gsm_full_rate_python) +if GUILE +gsm_full_rate_pylib_LTLIBRARIES += _gsm_full_rate_guile.la + +_gsm_full_rate_guile_la_SOURCES = \ + gsm_full_rate_guile.cc \ + $(gsm_full_rate_la_swig_sources) + +# Guile can use the same flags as python does +_gsm_full_rate_guile_la_LIBADD = $(_gsm_full_rate_python_la_LIBADD) +_gsm_full_rate_guile_la_LDFLAGS = $(_gsm_full_rate_python_la_LDFLAGS) +_gsm_full_rate_guile_la_CXXFLAGS = $(_gsm_full_rate_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -gsm_full_rate.h gsm_full_rate.py gsm_full_rate-python.cc: gsm_full_rate.i +gsm_full_rate.h gsm_full_rate.py gsm_full_rate_python.cc: gsm_full_rate.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ gsm_full_rate.h gsm_full_rate.py gsm_full_rate-python.cc: gsm_full_rate.i fi; $(DEPDIR)/gsm_full_rate-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(gsm_full_rate_swig_args) \ -MD -MF $(DEPDIR)/gsm_full_rate.Std \ - -module gsm_full_rate -o gsm_full_rate-guile.cc $(WHAT); then \ + -module gsm_full_rate -o gsm_full_rate_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gsm_full_rate.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/gsm_full_rate-generate-guile-stamp: $(RM) $(DEPDIR)/gsm_full_rate.S*; exit 1; \ fi; touch $(DEPDIR)/gsm_full_rate-generate-guile-stamp +endif $(DEPDIR)/gsm_full_rate-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/gsm_full_rate-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(gsm_full_rate_swig_args) \ -MD -MF $(DEPDIR)/gsm_full_rate.Std \ - -module gsm_full_rate -o gsm_full_rate-python.cc $(WHAT); then \ + -module gsm_full_rate -o gsm_full_rate_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/gsm_full_rate.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/gsm_full_rate.Std \ diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index 0ae6651294..b77fa0a867 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/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 += msdd.py msdd-python.cc +swig_built_sources += msdd.py msdd_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 @@ msdd_swiginclude_HEADERS = \ $(msdd_swiginclude_headers) msdd_pylib_LTLIBRARIES = \ - _msdd.la + _msdd_python.la -_msdd_la_SOURCES = \ - msdd-python.cc \ +_msdd_python_la_SOURCES = \ + msdd_python.cc \ $(msdd_la_swig_sources) -_msdd_la_LIBADD = \ +_msdd_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_la_swig_libadd) -_msdd_la_LDFLAGS = \ +_msdd_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_la_swig_ldflags) -_msdd_la_CXXFLAGS = \ +_msdd_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(msdd_la_swig_cxxflags) @@ -105,9 +105,23 @@ msdd_python_PYTHON = \ msdd.py \ $(msdd_python) +if GUILE +msdd_pylib_LTLIBRARIES += _msdd_guile.la + +_msdd_guile_la_SOURCES = \ + msdd_guile.cc \ + $(msdd_la_swig_sources) + +# Guile can use the same flags as python does +_msdd_guile_la_LIBADD = $(_msdd_python_la_LIBADD) +_msdd_guile_la_LDFLAGS = $(_msdd_python_la_LDFLAGS) +_msdd_guile_la_CXXFLAGS = $(_msdd_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -msdd.h msdd.py msdd-python.cc: msdd.i +msdd.h msdd.py msdd_python.cc: msdd.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ msdd.h msdd.py msdd-python.cc: msdd.i fi; $(DEPDIR)/msdd-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_swig_args) \ -MD -MF $(DEPDIR)/msdd.Std \ - -module msdd -o msdd-guile.cc $(WHAT); then \ + -module msdd -o msdd_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/msdd-generate-guile-stamp: $(RM) $(DEPDIR)/msdd.S*; exit 1; \ fi; touch $(DEPDIR)/msdd-generate-guile-stamp +endif $(DEPDIR)/msdd-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/msdd-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_swig_args) \ -MD -MF $(DEPDIR)/msdd.Std \ - -module msdd -o msdd-python.cc $(WHAT); then \ + -module msdd -o msdd_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd.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 += msdd_rs.py msdd_rs-python.cc +swig_built_sources += msdd_rs.py msdd_rs_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 @@ msdd_rs_swiginclude_HEADERS = \ $(msdd_rs_swiginclude_headers) msdd_rs_pylib_LTLIBRARIES = \ - _msdd_rs.la + _msdd_rs_python.la -_msdd_rs_la_SOURCES = \ - msdd_rs-python.cc \ +_msdd_rs_python_la_SOURCES = \ + msdd_rs_python.cc \ $(msdd_rs_la_swig_sources) -_msdd_rs_la_LIBADD = \ +_msdd_rs_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(msdd_rs_la_swig_libadd) -_msdd_rs_la_LDFLAGS = \ +_msdd_rs_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(msdd_rs_la_swig_ldflags) -_msdd_rs_la_CXXFLAGS = \ +_msdd_rs_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(msdd_rs_la_swig_cxxflags) @@ -381,9 +397,23 @@ msdd_rs_python_PYTHON = \ msdd_rs.py \ $(msdd_rs_python) +if GUILE +msdd_rs_pylib_LTLIBRARIES += _msdd_rs_guile.la + +_msdd_rs_guile_la_SOURCES = \ + msdd_rs_guile.cc \ + $(msdd_rs_la_swig_sources) + +# Guile can use the same flags as python does +_msdd_rs_guile_la_LIBADD = $(_msdd_rs_python_la_LIBADD) +_msdd_rs_guile_la_LDFLAGS = $(_msdd_rs_python_la_LDFLAGS) +_msdd_rs_guile_la_CXXFLAGS = $(_msdd_rs_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -msdd_rs.h msdd_rs.py msdd_rs-python.cc: msdd_rs.i +msdd_rs.h msdd_rs.py msdd_rs_python.cc: msdd_rs.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -469,9 +499,10 @@ msdd_rs.h msdd_rs.py msdd_rs-python.cc: msdd_rs.i fi; $(DEPDIR)/msdd_rs-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(msdd_rs_swig_args) \ -MD -MF $(DEPDIR)/msdd_rs.Std \ - -module msdd_rs -o msdd_rs-guile.cc $(WHAT); then \ + -module msdd_rs -o msdd_rs_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd_rs.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.Std \ @@ -483,6 +514,7 @@ $(DEPDIR)/msdd_rs-generate-guile-stamp: $(RM) $(DEPDIR)/msdd_rs.S*; exit 1; \ fi; touch $(DEPDIR)/msdd_rs-generate-guile-stamp +endif $(DEPDIR)/msdd_rs-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -495,7 +527,7 @@ $(DEPDIR)/msdd_rs-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(msdd_rs_swig_args) \ -MD -MF $(DEPDIR)/msdd_rs.Std \ - -module msdd_rs -o msdd_rs-python.cc $(WHAT); then \ + -module msdd_rs -o msdd_rs_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/msdd_rs.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/msdd_rs.Std \ diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen index eb0e2db4db..c710bddd60 100644 --- a/gr-noaa/swig/Makefile.swig.gen +++ b/gr-noaa/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 += noaa_swig.py noaa_swig-python.cc +swig_built_sources += noaa_swig.py noaa_swig_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 @@ noaa_swig_swiginclude_HEADERS = \ $(noaa_swig_swiginclude_headers) noaa_swig_pylib_LTLIBRARIES = \ - _noaa_swig.la + _noaa_swig_python.la -_noaa_swig_la_SOURCES = \ - noaa_swig-python.cc \ +_noaa_swig_python_la_SOURCES = \ + noaa_swig_python.cc \ $(noaa_swig_la_swig_sources) -_noaa_swig_la_LIBADD = \ +_noaa_swig_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(noaa_swig_la_swig_libadd) -_noaa_swig_la_LDFLAGS = \ +_noaa_swig_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(noaa_swig_la_swig_ldflags) -_noaa_swig_la_CXXFLAGS = \ +_noaa_swig_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(noaa_swig_la_swig_cxxflags) @@ -105,9 +105,23 @@ noaa_swig_python_PYTHON = \ noaa_swig.py \ $(noaa_swig_python) +if GUILE +noaa_swig_pylib_LTLIBRARIES += _noaa_swig_guile.la + +_noaa_swig_guile_la_SOURCES = \ + noaa_swig_guile.cc \ + $(noaa_swig_la_swig_sources) + +# Guile can use the same flags as python does +_noaa_swig_guile_la_LIBADD = $(_noaa_swig_python_la_LIBADD) +_noaa_swig_guile_la_LDFLAGS = $(_noaa_swig_python_la_LDFLAGS) +_noaa_swig_guile_la_CXXFLAGS = $(_noaa_swig_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -noaa_swig.h noaa_swig.py noaa_swig-python.cc: noaa_swig.i +noaa_swig.h noaa_swig.py noaa_swig_python.cc: noaa_swig.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ noaa_swig.h noaa_swig.py noaa_swig-python.cc: noaa_swig.i fi; $(DEPDIR)/noaa_swig-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(noaa_swig_swig_args) \ -MD -MF $(DEPDIR)/noaa_swig.Std \ - -module noaa_swig -o noaa_swig-guile.cc $(WHAT); then \ + -module noaa_swig -o noaa_swig_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/noaa_swig.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/noaa_swig.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/noaa_swig-generate-guile-stamp: $(RM) $(DEPDIR)/noaa_swig.S*; exit 1; \ fi; touch $(DEPDIR)/noaa_swig-generate-guile-stamp +endif $(DEPDIR)/noaa_swig-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/noaa_swig-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(noaa_swig_swig_args) \ -MD -MF $(DEPDIR)/noaa_swig.Std \ - -module noaa_swig -o noaa_swig-python.cc $(WHAT); then \ + -module noaa_swig -o noaa_swig_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/noaa_swig.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/noaa_swig.Std \ diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen index 8870c674b4..48567ad4fc 100644 --- a/gr-pager/swig/Makefile.swig.gen +++ b/gr-pager/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 += pager_swig.py pager_swig-python.cc +swig_built_sources += pager_swig.py pager_swig_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 @@ pager_swig_swiginclude_HEADERS = \ $(pager_swig_swiginclude_headers) pager_swig_pylib_LTLIBRARIES = \ - _pager_swig.la + _pager_swig_python.la -_pager_swig_la_SOURCES = \ - pager_swig-python.cc \ +_pager_swig_python_la_SOURCES = \ + pager_swig_python.cc \ $(pager_swig_la_swig_sources) -_pager_swig_la_LIBADD = \ +_pager_swig_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(pager_swig_la_swig_libadd) -_pager_swig_la_LDFLAGS = \ +_pager_swig_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(pager_swig_la_swig_ldflags) -_pager_swig_la_CXXFLAGS = \ +_pager_swig_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(pager_swig_la_swig_cxxflags) @@ -105,9 +105,23 @@ pager_swig_python_PYTHON = \ pager_swig.py \ $(pager_swig_python) +if GUILE +pager_swig_pylib_LTLIBRARIES += _pager_swig_guile.la + +_pager_swig_guile_la_SOURCES = \ + pager_swig_guile.cc \ + $(pager_swig_la_swig_sources) + +# Guile can use the same flags as python does +_pager_swig_guile_la_LIBADD = $(_pager_swig_python_la_LIBADD) +_pager_swig_guile_la_LDFLAGS = $(_pager_swig_python_la_LDFLAGS) +_pager_swig_guile_la_CXXFLAGS = $(_pager_swig_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -pager_swig.h pager_swig.py pager_swig-python.cc: pager_swig.i +pager_swig.h pager_swig.py pager_swig_python.cc: pager_swig.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ pager_swig.h pager_swig.py pager_swig-python.cc: pager_swig.i fi; $(DEPDIR)/pager_swig-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(pager_swig_swig_args) \ -MD -MF $(DEPDIR)/pager_swig.Std \ - -module pager_swig -o pager_swig-guile.cc $(WHAT); then \ + -module pager_swig -o pager_swig_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/pager_swig.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/pager_swig-generate-guile-stamp: $(RM) $(DEPDIR)/pager_swig.S*; exit 1; \ fi; touch $(DEPDIR)/pager_swig-generate-guile-stamp +endif $(DEPDIR)/pager_swig-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/pager_swig-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(pager_swig_swig_args) \ -MD -MF $(DEPDIR)/pager_swig.Std \ - -module pager_swig -o pager_swig-python.cc $(WHAT); then \ + -module pager_swig -o pager_swig_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/pager_swig.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/pager_swig.Std \ diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index e0b2bfd537..ab23f1618b 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/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 += qtgui.py qtgui-python.cc +swig_built_sources += qtgui.py qtgui_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 @@ qtgui_swiginclude_HEADERS = \ $(qtgui_swiginclude_headers) qtgui_pylib_LTLIBRARIES = \ - _qtgui.la + _qtgui_python.la -_qtgui_la_SOURCES = \ - qtgui-python.cc \ +_qtgui_python_la_SOURCES = \ + qtgui_python.cc \ $(qtgui_la_swig_sources) -_qtgui_la_LIBADD = \ +_qtgui_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(qtgui_la_swig_libadd) -_qtgui_la_LDFLAGS = \ +_qtgui_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(qtgui_la_swig_ldflags) -_qtgui_la_CXXFLAGS = \ +_qtgui_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(qtgui_la_swig_cxxflags) @@ -105,9 +105,23 @@ qtgui_python_PYTHON = \ qtgui.py \ $(qtgui_python) +if GUILE +qtgui_pylib_LTLIBRARIES += _qtgui_guile.la + +_qtgui_guile_la_SOURCES = \ + qtgui_guile.cc \ + $(qtgui_la_swig_sources) + +# Guile can use the same flags as python does +_qtgui_guile_la_LIBADD = $(_qtgui_python_la_LIBADD) +_qtgui_guile_la_LDFLAGS = $(_qtgui_python_la_LDFLAGS) +_qtgui_guile_la_CXXFLAGS = $(_qtgui_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -qtgui.h qtgui.py qtgui-python.cc: qtgui.i +qtgui.h qtgui.py qtgui_python.cc: qtgui.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ qtgui.h qtgui.py qtgui-python.cc: qtgui.i fi; $(DEPDIR)/qtgui-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(qtgui_swig_args) \ -MD -MF $(DEPDIR)/qtgui.Std \ - -module qtgui -o qtgui-guile.cc $(WHAT); then \ + -module qtgui -o qtgui_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/qtgui.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/qtgui-generate-guile-stamp: $(RM) $(DEPDIR)/qtgui.S*; exit 1; \ fi; touch $(DEPDIR)/qtgui-generate-guile-stamp +endif $(DEPDIR)/qtgui-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/qtgui-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \ -MD -MF $(DEPDIR)/qtgui.Std \ - -module qtgui -o qtgui-python.cc $(WHAT); then \ + -module qtgui -o qtgui_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/qtgui.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \ diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen index 70687aed77..185052b4f8 100644 --- a/gr-radio-astronomy/src/lib/Makefile.swig.gen +++ b/gr-radio-astronomy/src/lib/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 += ra.py ra-python.cc +swig_built_sources += ra.py ra_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 @@ ra_swiginclude_HEADERS = \ $(ra_swiginclude_headers) ra_pylib_LTLIBRARIES = \ - _ra.la + _ra_python.la -_ra_la_SOURCES = \ - ra-python.cc \ +_ra_python_la_SOURCES = \ + ra_python.cc \ $(ra_la_swig_sources) -_ra_la_LIBADD = \ +_ra_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(ra_la_swig_libadd) -_ra_la_LDFLAGS = \ +_ra_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(ra_la_swig_ldflags) -_ra_la_CXXFLAGS = \ +_ra_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(ra_la_swig_cxxflags) @@ -105,9 +105,23 @@ ra_python_PYTHON = \ ra.py \ $(ra_python) +if GUILE +ra_pylib_LTLIBRARIES += _ra_guile.la + +_ra_guile_la_SOURCES = \ + ra_guile.cc \ + $(ra_la_swig_sources) + +# Guile can use the same flags as python does +_ra_guile_la_LIBADD = $(_ra_python_la_LIBADD) +_ra_guile_la_LDFLAGS = $(_ra_python_la_LDFLAGS) +_ra_guile_la_CXXFLAGS = $(_ra_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -ra.h ra.py ra-python.cc: ra.i +ra.h ra.py ra_python.cc: ra.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ ra.h ra.py ra-python.cc: ra.i fi; $(DEPDIR)/ra-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(ra_swig_args) \ -MD -MF $(DEPDIR)/ra.Std \ - -module ra -o ra-guile.cc $(WHAT); then \ + -module ra -o ra_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/ra.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/ra.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/ra-generate-guile-stamp: $(RM) $(DEPDIR)/ra.S*; exit 1; \ fi; touch $(DEPDIR)/ra-generate-guile-stamp +endif $(DEPDIR)/ra-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/ra-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(ra_swig_args) \ -MD -MF $(DEPDIR)/ra.Std \ - -module ra -o ra-python.cc $(WHAT); then \ + -module ra -o ra_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/ra.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/ra.Std \ diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen index 05f03ee771..8d9557d674 100644 --- a/gr-trellis/src/lib/Makefile.swig.gen +++ b/gr-trellis/src/lib/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 += trellis.py trellis-python.cc +swig_built_sources += trellis.py trellis_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 @@ trellis_swiginclude_HEADERS = \ $(trellis_swiginclude_headers) trellis_pylib_LTLIBRARIES = \ - _trellis.la + _trellis_python.la -_trellis_la_SOURCES = \ - trellis-python.cc \ +_trellis_python_la_SOURCES = \ + trellis_python.cc \ $(trellis_la_swig_sources) -_trellis_la_LIBADD = \ +_trellis_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(trellis_la_swig_libadd) -_trellis_la_LDFLAGS = \ +_trellis_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(trellis_la_swig_ldflags) -_trellis_la_CXXFLAGS = \ +_trellis_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(trellis_la_swig_cxxflags) @@ -105,9 +105,23 @@ trellis_python_PYTHON = \ trellis.py \ $(trellis_python) +if GUILE +trellis_pylib_LTLIBRARIES += _trellis_guile.la + +_trellis_guile_la_SOURCES = \ + trellis_guile.cc \ + $(trellis_la_swig_sources) + +# Guile can use the same flags as python does +_trellis_guile_la_LIBADD = $(_trellis_python_la_LIBADD) +_trellis_guile_la_LDFLAGS = $(_trellis_python_la_LDFLAGS) +_trellis_guile_la_CXXFLAGS = $(_trellis_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -trellis.h trellis.py trellis-python.cc: trellis.i +trellis.h trellis.py trellis_python.cc: trellis.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ trellis.h trellis.py trellis-python.cc: trellis.i fi; $(DEPDIR)/trellis-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(trellis_swig_args) \ -MD -MF $(DEPDIR)/trellis.Std \ - -module trellis -o trellis-guile.cc $(WHAT); then \ + -module trellis -o trellis_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/trellis.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/trellis-generate-guile-stamp: $(RM) $(DEPDIR)/trellis.S*; exit 1; \ fi; touch $(DEPDIR)/trellis-generate-guile-stamp +endif $(DEPDIR)/trellis-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/trellis-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(trellis_swig_args) \ -MD -MF $(DEPDIR)/trellis.Std \ - -module trellis -o trellis-python.cc $(WHAT); then \ + -module trellis -o trellis_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/trellis.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/trellis.Std \ diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen index 3804461a4e..36475a12ee 100644 --- a/gr-uhd/swig/Makefile.swig.gen +++ b/gr-uhd/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 += uhd_swig.py uhd_swig.cc +swig_built_sources += uhd_swig.py uhd_swig_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 @@ uhd_swig_swiginclude_HEADERS = \ $(uhd_swig_swiginclude_headers) uhd_swig_pylib_LTLIBRARIES = \ - _uhd_swig.la + _uhd_swig_python.la -_uhd_swig_la_SOURCES = \ - uhd_swig.cc \ +_uhd_swig_python_la_SOURCES = \ + uhd_swig_python.cc \ $(uhd_swig_la_swig_sources) -_uhd_swig_la_LIBADD = \ +_uhd_swig_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(uhd_swig_la_swig_libadd) -_uhd_swig_la_LDFLAGS = \ +_uhd_swig_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(uhd_swig_la_swig_ldflags) -_uhd_swig_la_CXXFLAGS = \ +_uhd_swig_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(uhd_swig_la_swig_cxxflags) @@ -105,9 +105,23 @@ uhd_swig_python_PYTHON = \ uhd_swig.py \ $(uhd_swig_python) +if GUILE +uhd_swig_pylib_LTLIBRARIES += _uhd_swig_guile.la + +_uhd_swig_guile_la_SOURCES = \ + uhd_swig_guile.cc \ + $(uhd_swig_la_swig_sources) + +# Guile can use the same flags as python does +_uhd_swig_guile_la_LIBADD = $(_uhd_swig_python_la_LIBADD) +_uhd_swig_guile_la_LDFLAGS = $(_uhd_swig_python_la_LDFLAGS) +_uhd_swig_guile_la_CXXFLAGS = $(_uhd_swig_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -uhd_swig.h uhd_swig.py uhd_swig.cc: uhd_swig.i +uhd_swig.h uhd_swig.py uhd_swig_python.cc: uhd_swig.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -159,11 +173,12 @@ uhd_swig.h uhd_swig.py uhd_swig.cc: uhd_swig.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/uhd_swig-generate-stamp; \ + rm -f $(DEPDIR)/uhd_swig-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/uhd_swig-generate-guile-stamp WHAT=$<; \ ## ## Now that the .cc, .h, and .py files have been (re)created from the ## .i file, future checking of this rule during the same MAKE @@ -187,11 +202,27 @@ uhd_swig.h uhd_swig.py uhd_swig.cc: uhd_swig.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/uhd_swig-generate-stamp; \ + test -f $(DEPDIR)/uhd_swig-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/uhd_swig-generate-stamp: +$(DEPDIR)/uhd_swig-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(uhd_swig_swig_args) \ + -MD -MF $(DEPDIR)/uhd_swig.Std \ + -module uhd_swig -o uhd_swig_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/uhd_swig.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \ + > $(DEPDIR)/uhd_swig.Sd; \ + $(RM) $(DEPDIR)/uhd_swig.Std; \ + $(MV) $(DEPDIR)/uhd_swig.Sd $(DEPDIR)/uhd_swig.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/uhd_swig.S*; exit 1; \ + fi; + touch $(DEPDIR)/uhd_swig-generate-guile-stamp + +$(DEPDIR)/uhd_swig-generate-python-stamp: ## This rule will be called only by the first process issuing the ## above rule to succeed in creating the lock directory, after ## removing the actual stamp file in order to guarantee that MAKE will @@ -202,7 +233,7 @@ $(DEPDIR)/uhd_swig-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(uhd_swig_swig_args) \ -MD -MF $(DEPDIR)/uhd_swig.Std \ - -module uhd_swig -o uhd_swig.cc $(WHAT); then \ + -module uhd_swig -o uhd_swig_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/uhd_swig.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/uhd_swig.Std \ @@ -249,7 +280,7 @@ $(DEPDIR)/uhd_swig-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/uhd_swig-generate-stamp + touch $(DEPDIR)/uhd_swig-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, diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen index 9884b3d4f2..df2e3acf01 100644 --- a/gr-usrp/src/Makefile.swig.gen +++ b/gr-usrp/src/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 += usrp_swig.py usrp_swig.cc +swig_built_sources += usrp_swig.py usrp_swig_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 @@ usrp_swig_swiginclude_HEADERS = \ $(usrp_swig_swiginclude_headers) usrp_swig_pylib_LTLIBRARIES = \ - _usrp_swig.la + _usrp_swig_python.la -_usrp_swig_la_SOURCES = \ - usrp_swig.cc \ +_usrp_swig_python_la_SOURCES = \ + usrp_swig_python.cc \ $(usrp_swig_la_swig_sources) -_usrp_swig_la_LIBADD = \ +_usrp_swig_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp_swig_la_swig_libadd) -_usrp_swig_la_LDFLAGS = \ +_usrp_swig_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(usrp_swig_la_swig_ldflags) -_usrp_swig_la_CXXFLAGS = \ +_usrp_swig_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(usrp_swig_la_swig_cxxflags) @@ -105,9 +105,23 @@ usrp_swig_python_PYTHON = \ usrp_swig.py \ $(usrp_swig_python) +if GUILE +usrp_swig_pylib_LTLIBRARIES += _usrp_swig_guile.la + +_usrp_swig_guile_la_SOURCES = \ + usrp_swig_guile.cc \ + $(usrp_swig_la_swig_sources) + +# Guile can use the same flags as python does +_usrp_swig_guile_la_LIBADD = $(_usrp_swig_python_la_LIBADD) +_usrp_swig_guile_la_LDFLAGS = $(_usrp_swig_python_la_LDFLAGS) +_usrp_swig_guile_la_CXXFLAGS = $(_usrp_swig_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i +usrp_swig.h usrp_swig.py usrp_swig_python.cc: usrp_swig.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -159,11 +173,12 @@ usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/usrp_swig-generate-stamp; \ + rm -f $(DEPDIR)/usrp_swig-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-guile-stamp WHAT=$<; \ ## ## Now that the .cc, .h, and .py files have been (re)created from the ## .i file, future checking of this rule during the same MAKE @@ -187,11 +202,27 @@ usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/usrp_swig-generate-stamp; \ + test -f $(DEPDIR)/usrp_swig-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/usrp_swig-generate-stamp: +$(DEPDIR)/usrp_swig-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp_swig_swig_args) \ + -MD -MF $(DEPDIR)/usrp_swig.Std \ + -module usrp_swig -o usrp_swig_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/usrp_swig.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \ + > $(DEPDIR)/usrp_swig.Sd; \ + $(RM) $(DEPDIR)/usrp_swig.Std; \ + $(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \ + fi; + touch $(DEPDIR)/usrp_swig-generate-guile-stamp + +$(DEPDIR)/usrp_swig-generate-python-stamp: ## This rule will be called only by the first process issuing the ## above rule to succeed in creating the lock directory, after ## removing the actual stamp file in order to guarantee that MAKE will @@ -202,7 +233,7 @@ $(DEPDIR)/usrp_swig-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_swig_swig_args) \ -MD -MF $(DEPDIR)/usrp_swig.Std \ - -module usrp_swig -o usrp_swig.cc $(WHAT); then \ + -module usrp_swig -o usrp_swig_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/usrp_swig.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \ @@ -249,7 +280,7 @@ $(DEPDIR)/usrp_swig-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/usrp_swig-generate-stamp + touch $(DEPDIR)/usrp_swig-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, diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index e7518d255a..2498b334e5 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/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 += usrp2.py usrp2-python.cc +swig_built_sources += usrp2.py usrp2_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 @@ usrp2_swiginclude_HEADERS = \ $(usrp2_swiginclude_headers) usrp2_pylib_LTLIBRARIES = \ - _usrp2.la + _usrp2_python.la -_usrp2_la_SOURCES = \ - usrp2-python.cc \ +_usrp2_python_la_SOURCES = \ + usrp2_python.cc \ $(usrp2_la_swig_sources) -_usrp2_la_LIBADD = \ +_usrp2_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp2_la_swig_libadd) -_usrp2_la_LDFLAGS = \ +_usrp2_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(usrp2_la_swig_ldflags) -_usrp2_la_CXXFLAGS = \ +_usrp2_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(usrp2_la_swig_cxxflags) @@ -105,9 +105,23 @@ usrp2_python_PYTHON = \ usrp2.py \ $(usrp2_python) +if GUILE +usrp2_pylib_LTLIBRARIES += _usrp2_guile.la + +_usrp2_guile_la_SOURCES = \ + usrp2_guile.cc \ + $(usrp2_la_swig_sources) + +# Guile can use the same flags as python does +_usrp2_guile_la_LIBADD = $(_usrp2_python_la_LIBADD) +_usrp2_guile_la_LDFLAGS = $(_usrp2_python_la_LDFLAGS) +_usrp2_guile_la_CXXFLAGS = $(_usrp2_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -usrp2.h usrp2.py usrp2-python.cc: usrp2.i +usrp2.h usrp2.py usrp2_python.cc: usrp2.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ usrp2.h usrp2.py usrp2-python.cc: usrp2.i fi; $(DEPDIR)/usrp2-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp2_swig_args) \ -MD -MF $(DEPDIR)/usrp2.Std \ - -module usrp2 -o usrp2-guile.cc $(WHAT); then \ + -module usrp2 -o usrp2_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/usrp2.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/usrp2-generate-guile-stamp: $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ fi; touch $(DEPDIR)/usrp2-generate-guile-stamp +endif $(DEPDIR)/usrp2-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/usrp2-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \ -MD -MF $(DEPDIR)/usrp2.Std \ - -module usrp2 -o usrp2-python.cc $(WHAT); then \ + -module usrp2 -o usrp2_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/usrp2.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen index 949f495b38..41bf20c899 100644 --- a/gr-video-sdl/src/Makefile.swig.gen +++ b/gr-video-sdl/src/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 += video_sdl.py video_sdl-python.cc +swig_built_sources += video_sdl.py video_sdl_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 @@ video_sdl_swiginclude_HEADERS = \ $(video_sdl_swiginclude_headers) video_sdl_pylib_LTLIBRARIES = \ - _video_sdl.la + _video_sdl_python.la -_video_sdl_la_SOURCES = \ - video_sdl-python.cc \ +_video_sdl_python_la_SOURCES = \ + video_sdl_python.cc \ $(video_sdl_la_swig_sources) -_video_sdl_la_LIBADD = \ +_video_sdl_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(video_sdl_la_swig_libadd) -_video_sdl_la_LDFLAGS = \ +_video_sdl_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(video_sdl_la_swig_ldflags) -_video_sdl_la_CXXFLAGS = \ +_video_sdl_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(video_sdl_la_swig_cxxflags) @@ -105,9 +105,23 @@ video_sdl_python_PYTHON = \ video_sdl.py \ $(video_sdl_python) +if GUILE +video_sdl_pylib_LTLIBRARIES += _video_sdl_guile.la + +_video_sdl_guile_la_SOURCES = \ + video_sdl_guile.cc \ + $(video_sdl_la_swig_sources) + +# Guile can use the same flags as python does +_video_sdl_guile_la_LIBADD = $(_video_sdl_python_la_LIBADD) +_video_sdl_guile_la_LDFLAGS = $(_video_sdl_python_la_LDFLAGS) +_video_sdl_guile_la_CXXFLAGS = $(_video_sdl_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -video_sdl.h video_sdl.py video_sdl-python.cc: video_sdl.i +video_sdl.h video_sdl.py video_sdl_python.cc: video_sdl.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -193,9 +207,10 @@ video_sdl.h video_sdl.py video_sdl-python.cc: video_sdl.i fi; $(DEPDIR)/video_sdl-generate-guile-stamp: +if GUILE if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(video_sdl_swig_args) \ -MD -MF $(DEPDIR)/video_sdl.Std \ - -module video_sdl -o video_sdl-guile.cc $(WHAT); then \ + -module video_sdl -o video_sdl_guile.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/video_sdl.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl.Std \ @@ -207,6 +222,7 @@ $(DEPDIR)/video_sdl-generate-guile-stamp: $(RM) $(DEPDIR)/video_sdl.S*; exit 1; \ fi; touch $(DEPDIR)/video_sdl-generate-guile-stamp +endif $(DEPDIR)/video_sdl-generate-python-stamp: ## This rule will be called only by the first process issuing the @@ -219,7 +235,7 @@ $(DEPDIR)/video_sdl-generate-python-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(video_sdl_swig_args) \ -MD -MF $(DEPDIR)/video_sdl.Std \ - -module video_sdl -o video_sdl-python.cc $(WHAT); then \ + -module video_sdl -o video_sdl_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/video_sdl.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl.Std \ diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen index 00de3e4233..df9ec8b030 100644 --- a/usrp/host/swig/Makefile.swig.gen +++ b/usrp/host/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 += usrp_prims.py usrp_prims.cc +swig_built_sources += usrp_prims.py usrp_prims_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 @@ usrp_prims_swiginclude_HEADERS = \ $(usrp_prims_swiginclude_headers) usrp_prims_pylib_LTLIBRARIES = \ - _usrp_prims.la + _usrp_prims_python.la -_usrp_prims_la_SOURCES = \ - usrp_prims.cc \ +_usrp_prims_python_la_SOURCES = \ + usrp_prims_python.cc \ $(usrp_prims_la_swig_sources) -_usrp_prims_la_LIBADD = \ +_usrp_prims_python_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp_prims_la_swig_libadd) -_usrp_prims_la_LDFLAGS = \ +_usrp_prims_python_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(usrp_prims_la_swig_ldflags) -_usrp_prims_la_CXXFLAGS = \ +_usrp_prims_python_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ $(usrp_prims_la_swig_cxxflags) @@ -105,9 +105,23 @@ usrp_prims_python_PYTHON = \ usrp_prims.py \ $(usrp_prims_python) +if GUILE +usrp_prims_pylib_LTLIBRARIES += _usrp_prims_guile.la + +_usrp_prims_guile_la_SOURCES = \ + usrp_prims_guile.cc \ + $(usrp_prims_la_swig_sources) + +# Guile can use the same flags as python does +_usrp_prims_guile_la_LIBADD = $(_usrp_prims_python_la_LIBADD) +_usrp_prims_guile_la_LDFLAGS = $(_usrp_prims_python_la_LDFLAGS) +_usrp_prims_guile_la_CXXFLAGS = $(_usrp_prims_python_la_CXXFLAGS) + +endif # end of GUILE + ## Entry rule for running SWIG -usrp_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i +usrp_prims.h usrp_prims.py usrp_prims_python.cc: usrp_prims.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## @@ -159,11 +173,12 @@ usrp_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i ## ## Remove the stamp associated with this filename. ## - rm -f $(DEPDIR)/usrp_prims-generate-stamp; \ + rm -f $(DEPDIR)/usrp_prims-generate-*stamp; \ ## ## Tell MAKE to run the rule for creating this stamp. ## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-python-stamp WHAT=$<; \ + $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-guile-stamp WHAT=$<; \ ## ## Now that the .cc, .h, and .py files have been (re)created from the ## .i file, future checking of this rule during the same MAKE @@ -187,11 +202,27 @@ usrp_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i ## Succeed if and only if the first process succeeded; exit this ## process returning the status of the generated stamp. ## - test -f $(DEPDIR)/usrp_prims-generate-stamp; \ + test -f $(DEPDIR)/usrp_prims-generate-python-stamp; \ exit $$?; \ fi; -$(DEPDIR)/usrp_prims-generate-stamp: +$(DEPDIR)/usrp_prims-generate-guile-stamp: + if $(SWIG) $(STD_SWIG_GUILE_ARGS) $(usrp_prims_swig_args) \ + -MD -MF $(DEPDIR)/usrp_prims.Std \ + -module usrp_prims -o usrp_prims_guile.cc $(WHAT); then \ + if test $(host_os) = mingw32; then \ + $(RM) $(DEPDIR)/usrp_prims.Sd; \ + $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims.Std \ + > $(DEPDIR)/usrp_prims.Sd; \ + $(RM) $(DEPDIR)/usrp_prims.Std; \ + $(MV) $(DEPDIR)/usrp_prims.Sd $(DEPDIR)/usrp_prims.Std; \ + fi; \ + else \ + $(RM) $(DEPDIR)/usrp_prims.S*; exit 1; \ + fi; + touch $(DEPDIR)/usrp_prims-generate-guile-stamp + +$(DEPDIR)/usrp_prims-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 +233,7 @@ $(DEPDIR)/usrp_prims-generate-stamp: ## if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_prims_swig_args) \ -MD -MF $(DEPDIR)/usrp_prims.Std \ - -module usrp_prims -o usrp_prims.cc $(WHAT); then \ + -module usrp_prims -o usrp_prims_python.cc $(WHAT); then \ if test $(host_os) = mingw32; then \ $(RM) $(DEPDIR)/usrp_prims.Sd; \ $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims.Std \ @@ -249,7 +280,7 @@ $(DEPDIR)/usrp_prims-generate-stamp: ## executing this rule; allows other threads waiting on this process ## to continue. ## - touch $(DEPDIR)/usrp_prims-generate-stamp + touch $(DEPDIR)/usrp_prims-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, |