diff options
23 files changed, 121 insertions, 274 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen index 0803cbfee..7da681a26 100644 --- a/gnuradio-core/src/lib/swig/Makefile.swig.gen +++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen @@ -112,8 +112,8 @@ gnuradio_core_runtime.py: gnuradio_core_runtime.i if GUILE gnuradio_core_runtime_scmlib_LTLIBRARIES = libguile-gnuradio_core_runtime.la -libguile_gnuradio_core_runtime_la_SOURCES = \ - guile/gnuradio_core_runtime.cc \ +libguile_gnuradio_core_runtime_la_SOURCES = \ + guile/gnuradio_core_runtime.cc \ $(gnuradio_core_runtime_la_swig_sources) nobase_gnuradio_core_runtime_scm_DATA = gnuradio/gnuradio_core_runtime.scm gnuradio/gnuradio_core_runtime-primitive.scm @@ -245,8 +245,8 @@ gnuradio_core_general.py: gnuradio_core_general.i if GUILE gnuradio_core_general_scmlib_LTLIBRARIES = libguile-gnuradio_core_general.la -libguile_gnuradio_core_general_la_SOURCES = \ - guile/gnuradio_core_general.cc \ +libguile_gnuradio_core_general_la_SOURCES = \ + guile/gnuradio_core_general.cc \ $(gnuradio_core_general_la_swig_sources) nobase_gnuradio_core_general_scm_DATA = gnuradio/gnuradio_core_general.scm gnuradio/gnuradio_core_general-primitive.scm @@ -378,8 +378,8 @@ gnuradio_core_gengen.py: gnuradio_core_gengen.i if GUILE gnuradio_core_gengen_scmlib_LTLIBRARIES = libguile-gnuradio_core_gengen.la -libguile_gnuradio_core_gengen_la_SOURCES = \ - guile/gnuradio_core_gengen.cc \ +libguile_gnuradio_core_gengen_la_SOURCES = \ + guile/gnuradio_core_gengen.cc \ $(gnuradio_core_gengen_la_swig_sources) nobase_gnuradio_core_gengen_scm_DATA = gnuradio/gnuradio_core_gengen.scm gnuradio/gnuradio_core_gengen-primitive.scm @@ -511,8 +511,8 @@ gnuradio_core_filter.py: gnuradio_core_filter.i if GUILE gnuradio_core_filter_scmlib_LTLIBRARIES = libguile-gnuradio_core_filter.la -libguile_gnuradio_core_filter_la_SOURCES = \ - guile/gnuradio_core_filter.cc \ +libguile_gnuradio_core_filter_la_SOURCES = \ + guile/gnuradio_core_filter.cc \ $(gnuradio_core_filter_la_swig_sources) nobase_gnuradio_core_filter_scm_DATA = gnuradio/gnuradio_core_filter.scm gnuradio/gnuradio_core_filter-primitive.scm @@ -644,8 +644,8 @@ gnuradio_core_io.py: gnuradio_core_io.i if GUILE gnuradio_core_io_scmlib_LTLIBRARIES = libguile-gnuradio_core_io.la -libguile_gnuradio_core_io_la_SOURCES = \ - guile/gnuradio_core_io.cc \ +libguile_gnuradio_core_io_la_SOURCES = \ + guile/gnuradio_core_io.cc \ $(gnuradio_core_io_la_swig_sources) nobase_gnuradio_core_io_scm_DATA = gnuradio/gnuradio_core_io.scm gnuradio/gnuradio_core_io-primitive.scm @@ -777,8 +777,8 @@ gnuradio_core_hier.py: gnuradio_core_hier.i if GUILE gnuradio_core_hier_scmlib_LTLIBRARIES = libguile-gnuradio_core_hier.la -libguile_gnuradio_core_hier_la_SOURCES = \ - guile/gnuradio_core_hier.cc \ +libguile_gnuradio_core_hier_la_SOURCES = \ + guile/gnuradio_core_hier.cc \ $(gnuradio_core_hier_la_swig_sources) nobase_gnuradio_core_hier_scm_DATA = gnuradio/gnuradio_core_hier.scm gnuradio/gnuradio_core_hier-primitive.scm diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen index 8b53ada78..12557677f 100644 --- a/gr-atsc/src/lib/Makefile.swig.gen +++ b/gr-atsc/src/lib/Makefile.swig.gen @@ -112,8 +112,8 @@ atsc.py: atsc.i if GUILE atsc_scmlib_LTLIBRARIES = libguile-atsc.la -libguile_atsc_la_SOURCES = \ - guile/atsc.cc \ +libguile_atsc_la_SOURCES = \ + guile/atsc.cc \ $(atsc_la_swig_sources) nobase_atsc_scm_DATA = gnuradio/atsc.scm gnuradio/atsc-primitive.scm diff --git a/gr-audio-alsa/src/Makefile.swig.gen b/gr-audio-alsa/src/Makefile.swig.gen index 522ba5c67..bd7113091 100644 --- a/gr-audio-alsa/src/Makefile.swig.gen +++ b/gr-audio-alsa/src/Makefile.swig.gen @@ -112,8 +112,8 @@ audio_alsa.py: audio_alsa.i if GUILE audio_alsa_scmlib_LTLIBRARIES = libguile-audio_alsa.la -libguile_audio_alsa_la_SOURCES = \ - guile/audio_alsa.cc \ +libguile_audio_alsa_la_SOURCES = \ + guile/audio_alsa.cc \ $(audio_alsa_la_swig_sources) nobase_audio_alsa_scm_DATA = gnuradio/audio_alsa.scm gnuradio/audio_alsa-primitive.scm diff --git a/gr-audio-jack/src/Makefile.swig.gen b/gr-audio-jack/src/Makefile.swig.gen index 980b4e56d..93a102730 100644 --- a/gr-audio-jack/src/Makefile.swig.gen +++ b/gr-audio-jack/src/Makefile.swig.gen @@ -67,28 +67,10 @@ audio_jack_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/audio_jack-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += audio_jack.py -# if GUILE -# swig_built_sources += gnuradio/audio_jack.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _audio_jack_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_jack_la_swig_libadd) -# _audio_jack_la_DEPENDENCIES = python/audio_jack.lo - _audio_jack_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_jack_la_swig_ldflags) @@ -123,14 +103,20 @@ audio_jack_python_PYTHON = \ audio_jack.py \ $(audio_jack) +python/audio_jack.cc: audio_jack.py +audio_jack.py: audio_jack.i + +# Include the python dependencies for this file +-include python/audio_jack.d +# end of PYTHON + if GUILE audio_jack_scmlib_LTLIBRARIES = libguile-audio_jack.la -libguile_audio_jack_la_SOURCES = \ +libguile_audio_jack_la_SOURCES = \ guile/audio_jack.cc \ $(audio_jack_la_swig_sources) nobase_audio_jack_scm_DATA = gnuradio/audio_jack.scm gnuradio/audio_jack-primitive.scm -# Guile can use the same flags as python does libguile_audio_jack_la_LIBADD = $(_audio_jack_la_LIBADD) libguile_audio_jack_la_LDFLAGS = $(_audio_jack_la_LDFLAGS) libguile_audio_jack_la_CXXFLAGS = $(_audio_jack_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/audio_jack.cc: gnuradio/audio_jack.scm gnuradio/audio_jack.scm: audio_jack.i gnuradio/audio_jack-primitive.scm: gnuradio/audio_jack.scm +# Include the guile dependencies for this file -include guile/audio_jack.d endif # end of GUILE -audio_jack.lo: audio_jack.py audio_jack.scm -audio_jack.py: audio_jack.i - --include python/audio_jack.d diff --git a/gr-audio-oss/src/Makefile.swig.gen b/gr-audio-oss/src/Makefile.swig.gen index 77938d4a4..910873897 100644 --- a/gr-audio-oss/src/Makefile.swig.gen +++ b/gr-audio-oss/src/Makefile.swig.gen @@ -112,8 +112,8 @@ audio_oss.py: audio_oss.i if GUILE audio_oss_scmlib_LTLIBRARIES = libguile-audio_oss.la -libguile_audio_oss_la_SOURCES = \ - guile/audio_oss.cc \ +libguile_audio_oss_la_SOURCES = \ + guile/audio_oss.cc \ $(audio_oss_la_swig_sources) nobase_audio_oss_scm_DATA = gnuradio/audio_oss.scm gnuradio/audio_oss-primitive.scm diff --git a/gr-audio-osx/src/Makefile.swig.gen b/gr-audio-osx/src/Makefile.swig.gen index d48a85810..8a11ddc45 100644 --- a/gr-audio-osx/src/Makefile.swig.gen +++ b/gr-audio-osx/src/Makefile.swig.gen @@ -67,28 +67,10 @@ audio_osx_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/audio_osx-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += audio_osx.py -# if GUILE -# swig_built_sources += gnuradio/audio_osx.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _audio_osx_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_osx_la_swig_libadd) -# _audio_osx_la_DEPENDENCIES = python/audio_osx.lo - _audio_osx_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_osx_la_swig_ldflags) @@ -123,14 +103,20 @@ audio_osx_python_PYTHON = \ audio_osx.py \ $(audio_osx) +python/audio_osx.cc: audio_osx.py +audio_osx.py: audio_osx.i + +# Include the python dependencies for this file +-include python/audio_osx.d +# end of PYTHON + if GUILE audio_osx_scmlib_LTLIBRARIES = libguile-audio_osx.la -libguile_audio_osx_la_SOURCES = \ +libguile_audio_osx_la_SOURCES = \ guile/audio_osx.cc \ $(audio_osx_la_swig_sources) nobase_audio_osx_scm_DATA = gnuradio/audio_osx.scm gnuradio/audio_osx-primitive.scm -# Guile can use the same flags as python does libguile_audio_osx_la_LIBADD = $(_audio_osx_la_LIBADD) libguile_audio_osx_la_LDFLAGS = $(_audio_osx_la_LDFLAGS) libguile_audio_osx_la_CXXFLAGS = $(_audio_osx_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/audio_osx.cc: gnuradio/audio_osx.scm gnuradio/audio_osx.scm: audio_osx.i gnuradio/audio_osx-primitive.scm: gnuradio/audio_osx.scm +# Include the guile dependencies for this file -include guile/audio_osx.d endif # end of GUILE -audio_osx.lo: audio_osx.py audio_osx.scm -audio_osx.py: audio_osx.i - --include python/audio_osx.d diff --git a/gr-audio-portaudio/src/Makefile.swig.gen b/gr-audio-portaudio/src/Makefile.swig.gen index 05408468a..e7817c1e1 100644 --- a/gr-audio-portaudio/src/Makefile.swig.gen +++ b/gr-audio-portaudio/src/Makefile.swig.gen @@ -67,28 +67,10 @@ audio_portaudio_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/audio_portaudio-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += audio_portaudio.py -# if GUILE -# swig_built_sources += gnuradio/audio_portaudio.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _audio_portaudio_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_portaudio_la_swig_libadd) -# _audio_portaudio_la_DEPENDENCIES = python/audio_portaudio.lo - _audio_portaudio_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_portaudio_la_swig_ldflags) @@ -123,14 +103,20 @@ audio_portaudio_python_PYTHON = \ audio_portaudio.py \ $(audio_portaudio) +python/audio_portaudio.cc: audio_portaudio.py +audio_portaudio.py: audio_portaudio.i + +# Include the python dependencies for this file +-include python/audio_portaudio.d +# end of PYTHON + if GUILE audio_portaudio_scmlib_LTLIBRARIES = libguile-audio_portaudio.la -libguile_audio_portaudio_la_SOURCES = \ +libguile_audio_portaudio_la_SOURCES = \ guile/audio_portaudio.cc \ $(audio_portaudio_la_swig_sources) nobase_audio_portaudio_scm_DATA = gnuradio/audio_portaudio.scm gnuradio/audio_portaudio-primitive.scm -# Guile can use the same flags as python does libguile_audio_portaudio_la_LIBADD = $(_audio_portaudio_la_LIBADD) libguile_audio_portaudio_la_LDFLAGS = $(_audio_portaudio_la_LDFLAGS) libguile_audio_portaudio_la_CXXFLAGS = $(_audio_portaudio_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/audio_portaudio.cc: gnuradio/audio_portaudio.scm gnuradio/audio_portaudio.scm: audio_portaudio.i gnuradio/audio_portaudio-primitive.scm: gnuradio/audio_portaudio.scm +# Include the guile dependencies for this file -include guile/audio_portaudio.d endif # end of GUILE -audio_portaudio.lo: audio_portaudio.py audio_portaudio.scm -audio_portaudio.py: audio_portaudio.i - --include python/audio_portaudio.d diff --git a/gr-audio-windows/src/Makefile.swig.gen b/gr-audio-windows/src/Makefile.swig.gen index 4009fa9b0..4c8c10806 100644 --- a/gr-audio-windows/src/Makefile.swig.gen +++ b/gr-audio-windows/src/Makefile.swig.gen @@ -67,28 +67,10 @@ audio_windows_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/audio_windows-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += audio_windows.py -# if GUILE -# swig_built_sources += gnuradio/audio_windows.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _audio_windows_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(audio_windows_la_swig_libadd) -# _audio_windows_la_DEPENDENCIES = python/audio_windows.lo - _audio_windows_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(audio_windows_la_swig_ldflags) @@ -123,14 +103,20 @@ audio_windows_python_PYTHON = \ audio_windows.py \ $(audio_windows) +python/audio_windows.cc: audio_windows.py +audio_windows.py: audio_windows.i + +# Include the python dependencies for this file +-include python/audio_windows.d +# end of PYTHON + if GUILE audio_windows_scmlib_LTLIBRARIES = libguile-audio_windows.la -libguile_audio_windows_la_SOURCES = \ +libguile_audio_windows_la_SOURCES = \ guile/audio_windows.cc \ $(audio_windows_la_swig_sources) nobase_audio_windows_scm_DATA = gnuradio/audio_windows.scm gnuradio/audio_windows-primitive.scm -# Guile can use the same flags as python does libguile_audio_windows_la_LIBADD = $(_audio_windows_la_LIBADD) libguile_audio_windows_la_LDFLAGS = $(_audio_windows_la_LDFLAGS) libguile_audio_windows_la_CXXFLAGS = $(_audio_windows_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/audio_windows.cc: gnuradio/audio_windows.scm gnuradio/audio_windows.scm: audio_windows.i gnuradio/audio_windows-primitive.scm: gnuradio/audio_windows.scm +# Include the guile dependencies for this file -include guile/audio_windows.d endif # end of GUILE -audio_windows.lo: audio_windows.py audio_windows.scm -audio_windows.py: audio_windows.i - --include python/audio_windows.d diff --git a/gr-comedi/src/Makefile.swig.gen b/gr-comedi/src/Makefile.swig.gen index 8fab4212b..f52a9a25c 100644 --- a/gr-comedi/src/Makefile.swig.gen +++ b/gr-comedi/src/Makefile.swig.gen @@ -67,28 +67,10 @@ comedi_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/comedi-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += comedi.py -# if GUILE -# swig_built_sources += gnuradio/comedi.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _comedi_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(comedi_la_swig_libadd) -# _comedi_la_DEPENDENCIES = python/comedi.lo - _comedi_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(comedi_la_swig_ldflags) @@ -123,14 +103,20 @@ comedi_python_PYTHON = \ comedi.py \ $(comedi) +python/comedi.cc: comedi.py +comedi.py: comedi.i + +# Include the python dependencies for this file +-include python/comedi.d +# end of PYTHON + if GUILE comedi_scmlib_LTLIBRARIES = libguile-comedi.la -libguile_comedi_la_SOURCES = \ +libguile_comedi_la_SOURCES = \ guile/comedi.cc \ $(comedi_la_swig_sources) nobase_comedi_scm_DATA = gnuradio/comedi.scm gnuradio/comedi-primitive.scm -# Guile can use the same flags as python does libguile_comedi_la_LIBADD = $(_comedi_la_LIBADD) libguile_comedi_la_LDFLAGS = $(_comedi_la_LDFLAGS) libguile_comedi_la_CXXFLAGS = $(_comedi_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/comedi.cc: gnuradio/comedi.scm gnuradio/comedi.scm: comedi.i gnuradio/comedi-primitive.scm: gnuradio/comedi.scm +# Include the guile dependencies for this file -include guile/comedi.d endif # end of GUILE -comedi.lo: comedi.py comedi.scm -comedi.py: comedi.i - --include python/comedi.d diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen index 92adb403f..023123ebd 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen +++ b/gr-cvsd-vocoder/src/lib/Makefile.swig.gen @@ -112,8 +112,8 @@ cvsd_vocoder.py: cvsd_vocoder.i if GUILE cvsd_vocoder_scmlib_LTLIBRARIES = libguile-cvsd_vocoder.la -libguile_cvsd_vocoder_la_SOURCES = \ - guile/cvsd_vocoder.cc \ +libguile_cvsd_vocoder_la_SOURCES = \ + guile/cvsd_vocoder.cc \ $(cvsd_vocoder_la_swig_sources) nobase_cvsd_vocoder_scm_DATA = gnuradio/cvsd_vocoder.scm gnuradio/cvsd_vocoder-primitive.scm diff --git a/gr-gcell/src/Makefile.swig.gen b/gr-gcell/src/Makefile.swig.gen index 7a11242dd..fa96d7f12 100644 --- a/gr-gcell/src/Makefile.swig.gen +++ b/gr-gcell/src/Makefile.swig.gen @@ -67,28 +67,10 @@ gcell_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/gcell-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += gcell.py -# if GUILE -# swig_built_sources += gnuradio/gcell.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _gcell_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(gcell_la_swig_libadd) -# _gcell_la_DEPENDENCIES = python/gcell.lo - _gcell_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(gcell_la_swig_ldflags) @@ -123,14 +103,20 @@ gcell_python_PYTHON = \ gcell.py \ $(gcell) +python/gcell.cc: gcell.py +gcell.py: gcell.i + +# Include the python dependencies for this file +-include python/gcell.d +# end of PYTHON + if GUILE gcell_scmlib_LTLIBRARIES = libguile-gcell.la -libguile_gcell_la_SOURCES = \ +libguile_gcell_la_SOURCES = \ guile/gcell.cc \ $(gcell_la_swig_sources) nobase_gcell_scm_DATA = gnuradio/gcell.scm gnuradio/gcell-primitive.scm -# Guile can use the same flags as python does libguile_gcell_la_LIBADD = $(_gcell_la_LIBADD) libguile_gcell_la_LDFLAGS = $(_gcell_la_LDFLAGS) libguile_gcell_la_CXXFLAGS = $(_gcell_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/gcell.cc: gnuradio/gcell.scm gnuradio/gcell.scm: gcell.i gnuradio/gcell-primitive.scm: gnuradio/gcell.scm +# Include the guile dependencies for this file -include guile/gcell.d endif # end of GUILE -gcell.lo: gcell.py gcell.scm -gcell.py: gcell.i - --include python/gcell.d diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen index 332aaf268..a574db699 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen @@ -112,8 +112,8 @@ gsm_full_rate.py: gsm_full_rate.i if GUILE gsm_full_rate_scmlib_LTLIBRARIES = libguile-gsm_full_rate.la -libguile_gsm_full_rate_la_SOURCES = \ - guile/gsm_full_rate.cc \ +libguile_gsm_full_rate_la_SOURCES = \ + guile/gsm_full_rate.cc \ $(gsm_full_rate_la_swig_sources) nobase_gsm_full_rate_scm_DATA = gnuradio/gsm_full_rate.scm gnuradio/gsm_full_rate-primitive.scm diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen index 7f0d484b9..e3fd6b281 100644 --- a/gr-msdd6000/src/Makefile.swig.gen +++ b/gr-msdd6000/src/Makefile.swig.gen @@ -112,8 +112,8 @@ msdd.py: msdd.i if GUILE msdd_scmlib_LTLIBRARIES = libguile-msdd.la -libguile_msdd_la_SOURCES = \ - guile/msdd.cc \ +libguile_msdd_la_SOURCES = \ + guile/msdd.cc \ $(msdd_la_swig_sources) nobase_msdd_scm_DATA = gnuradio/msdd.scm gnuradio/msdd-primitive.scm @@ -245,8 +245,8 @@ msdd_rs.py: msdd_rs.i if GUILE msdd_rs_scmlib_LTLIBRARIES = libguile-msdd_rs.la -libguile_msdd_rs_la_SOURCES = \ - guile/msdd_rs.cc \ +libguile_msdd_rs_la_SOURCES = \ + guile/msdd_rs.cc \ $(msdd_rs_la_swig_sources) nobase_msdd_rs_scm_DATA = gnuradio/msdd_rs.scm gnuradio/msdd_rs-primitive.scm diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen index 5bbb7a6d8..860055b3b 100644 --- a/gr-noaa/swig/Makefile.swig.gen +++ b/gr-noaa/swig/Makefile.swig.gen @@ -112,8 +112,8 @@ noaa_swig.py: noaa_swig.i if GUILE noaa_swig_scmlib_LTLIBRARIES = libguile-noaa_swig.la -libguile_noaa_swig_la_SOURCES = \ - guile/noaa_swig.cc \ +libguile_noaa_swig_la_SOURCES = \ + guile/noaa_swig.cc \ $(noaa_swig_la_swig_sources) nobase_noaa_swig_scm_DATA = gnuradio/noaa_swig.scm gnuradio/noaa_swig-primitive.scm diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen index 5321807fb..3f54ab809 100644 --- a/gr-pager/swig/Makefile.swig.gen +++ b/gr-pager/swig/Makefile.swig.gen @@ -112,8 +112,8 @@ pager_swig.py: pager_swig.i if GUILE pager_swig_scmlib_LTLIBRARIES = libguile-pager_swig.la -libguile_pager_swig_la_SOURCES = \ - guile/pager_swig.cc \ +libguile_pager_swig_la_SOURCES = \ + guile/pager_swig.cc \ $(pager_swig_la_swig_sources) nobase_pager_swig_scm_DATA = gnuradio/pager_swig.scm gnuradio/pager_swig-primitive.scm diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index 6adf72209..feacbe738 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -112,8 +112,8 @@ qtgui.py: qtgui.i if GUILE qtgui_scmlib_LTLIBRARIES = libguile-qtgui.la -libguile_qtgui_la_SOURCES = \ - guile/qtgui.cc \ +libguile_qtgui_la_SOURCES = \ + guile/qtgui.cc \ $(qtgui_la_swig_sources) nobase_qtgui_scm_DATA = gnuradio/qtgui.scm gnuradio/qtgui-primitive.scm diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen index 064a8c13d..764cca5c5 100644 --- a/gr-radio-astronomy/src/lib/Makefile.swig.gen +++ b/gr-radio-astronomy/src/lib/Makefile.swig.gen @@ -112,8 +112,8 @@ ra.py: ra.i if GUILE ra_scmlib_LTLIBRARIES = libguile-ra.la -libguile_ra_la_SOURCES = \ - guile/ra.cc \ +libguile_ra_la_SOURCES = \ + guile/ra.cc \ $(ra_la_swig_sources) nobase_ra_scm_DATA = gnuradio/ra.scm gnuradio/ra-primitive.scm diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen index 8edc2a743..986ff53cc 100644 --- a/gr-trellis/src/lib/Makefile.swig.gen +++ b/gr-trellis/src/lib/Makefile.swig.gen @@ -112,8 +112,8 @@ trellis.py: trellis.i if GUILE trellis_scmlib_LTLIBRARIES = libguile-trellis.la -libguile_trellis_la_SOURCES = \ - guile/trellis.cc \ +libguile_trellis_la_SOURCES = \ + guile/trellis.cc \ $(trellis_la_swig_sources) nobase_trellis_scm_DATA = gnuradio/trellis.scm gnuradio/trellis-primitive.scm diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen index c0823e5f2..1ddbf0bd9 100644 --- a/gr-uhd/swig/Makefile.swig.gen +++ b/gr-uhd/swig/Makefile.swig.gen @@ -67,28 +67,10 @@ uhd_swig_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/uhd_swig-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += uhd_swig.py -# if GUILE -# swig_built_sources += gnuradio/uhd_swig.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _uhd_swig_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(uhd_swig_la_swig_libadd) -# _uhd_swig_la_DEPENDENCIES = python/uhd_swig.lo - _uhd_swig_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(uhd_swig_la_swig_ldflags) @@ -123,14 +103,20 @@ uhd_swig_python_PYTHON = \ uhd_swig.py \ $(uhd_swig) +python/uhd_swig.cc: uhd_swig.py +uhd_swig.py: uhd_swig.i + +# Include the python dependencies for this file +-include python/uhd_swig.d +# end of PYTHON + if GUILE uhd_swig_scmlib_LTLIBRARIES = libguile-uhd_swig.la -libguile_uhd_swig_la_SOURCES = \ +libguile_uhd_swig_la_SOURCES = \ guile/uhd_swig.cc \ $(uhd_swig_la_swig_sources) nobase_uhd_swig_scm_DATA = gnuradio/uhd_swig.scm gnuradio/uhd_swig-primitive.scm -# Guile can use the same flags as python does libguile_uhd_swig_la_LIBADD = $(_uhd_swig_la_LIBADD) libguile_uhd_swig_la_LDFLAGS = $(_uhd_swig_la_LDFLAGS) libguile_uhd_swig_la_CXXFLAGS = $(_uhd_swig_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/uhd_swig.cc: gnuradio/uhd_swig.scm gnuradio/uhd_swig.scm: uhd_swig.i gnuradio/uhd_swig-primitive.scm: gnuradio/uhd_swig.scm +# Include the guile dependencies for this file -include guile/uhd_swig.d endif # end of GUILE -uhd_swig.lo: uhd_swig.py uhd_swig.scm -uhd_swig.py: uhd_swig.i - --include python/uhd_swig.d diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen index c5ead816e..5e99ac1b4 100644 --- a/gr-usrp/src/Makefile.swig.gen +++ b/gr-usrp/src/Makefile.swig.gen @@ -67,28 +67,10 @@ usrp_swig_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/usrp_swig-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += usrp_swig.py -# if GUILE -# swig_built_sources += gnuradio/usrp_swig.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _usrp_swig_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp_swig_la_swig_libadd) -# _usrp_swig_la_DEPENDENCIES = python/usrp_swig.lo - _usrp_swig_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(usrp_swig_la_swig_ldflags) @@ -123,14 +103,20 @@ usrp_swig_python_PYTHON = \ usrp_swig.py \ $(usrp_swig) +python/usrp_swig.cc: usrp_swig.py +usrp_swig.py: usrp_swig.i + +# Include the python dependencies for this file +-include python/usrp_swig.d +# end of PYTHON + if GUILE usrp_swig_scmlib_LTLIBRARIES = libguile-usrp_swig.la -libguile_usrp_swig_la_SOURCES = \ +libguile_usrp_swig_la_SOURCES = \ guile/usrp_swig.cc \ $(usrp_swig_la_swig_sources) nobase_usrp_swig_scm_DATA = gnuradio/usrp_swig.scm gnuradio/usrp_swig-primitive.scm -# Guile can use the same flags as python does libguile_usrp_swig_la_LIBADD = $(_usrp_swig_la_LIBADD) libguile_usrp_swig_la_LDFLAGS = $(_usrp_swig_la_LDFLAGS) libguile_usrp_swig_la_CXXFLAGS = $(_usrp_swig_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/usrp_swig.cc: gnuradio/usrp_swig.scm gnuradio/usrp_swig.scm: usrp_swig.i gnuradio/usrp_swig-primitive.scm: gnuradio/usrp_swig.scm +# Include the guile dependencies for this file -include guile/usrp_swig.d endif # end of GUILE -usrp_swig.lo: usrp_swig.py usrp_swig.scm -usrp_swig.py: usrp_swig.i - --include python/usrp_swig.d diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index a39ae12c8..3e79e2533 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -112,8 +112,8 @@ usrp2.py: usrp2.i if GUILE usrp2_scmlib_LTLIBRARIES = libguile-usrp2.la -libguile_usrp2_la_SOURCES = \ - guile/usrp2.cc \ +libguile_usrp2_la_SOURCES = \ + guile/usrp2.cc \ $(usrp2_la_swig_sources) nobase_usrp2_scm_DATA = gnuradio/usrp2.scm gnuradio/usrp2-primitive.scm diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen index 6ec66de4b..8cccaeb79 100644 --- a/gr-video-sdl/src/Makefile.swig.gen +++ b/gr-video-sdl/src/Makefile.swig.gen @@ -112,8 +112,8 @@ video_sdl.py: video_sdl.i if GUILE video_sdl_scmlib_LTLIBRARIES = libguile-video_sdl.la -libguile_video_sdl_la_SOURCES = \ - guile/video_sdl.cc \ +libguile_video_sdl_la_SOURCES = \ + guile/video_sdl.cc \ $(video_sdl_la_swig_sources) nobase_video_sdl_scm_DATA = gnuradio/video_sdl.scm gnuradio/video_sdl-primitive.scm diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen index 7b778a11b..3af94a3c2 100644 --- a/usrp/host/swig/Makefile.swig.gen +++ b/usrp/host/swig/Makefile.swig.gen @@ -67,28 +67,10 @@ usrp_prims_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/usrp_prims-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -# generating the py or scm file also generates the .cc or .h files, -# but dependencies work better without the .cc ort .h files listed. -# swig_built_sources += usrp_prims.py -# if GUILE -# swig_built_sources += gnuradio/usrp_prims.scm -# endif - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -108,8 +90,6 @@ _usrp_prims_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(usrp_prims_la_swig_libadd) -# _usrp_prims_la_DEPENDENCIES = python/usrp_prims.lo - _usrp_prims_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(usrp_prims_la_swig_ldflags) @@ -123,14 +103,20 @@ usrp_prims_python_PYTHON = \ usrp_prims.py \ $(usrp_prims) +python/usrp_prims.cc: usrp_prims.py +usrp_prims.py: usrp_prims.i + +# Include the python dependencies for this file +-include python/usrp_prims.d +# end of PYTHON + if GUILE usrp_prims_scmlib_LTLIBRARIES = libguile-usrp_prims.la -libguile_usrp_prims_la_SOURCES = \ +libguile_usrp_prims_la_SOURCES = \ guile/usrp_prims.cc \ $(usrp_prims_la_swig_sources) nobase_usrp_prims_scm_DATA = gnuradio/usrp_prims.scm gnuradio/usrp_prims-primitive.scm -# Guile can use the same flags as python does libguile_usrp_prims_la_LIBADD = $(_usrp_prims_la_LIBADD) libguile_usrp_prims_la_LDFLAGS = $(_usrp_prims_la_LDFLAGS) libguile_usrp_prims_la_CXXFLAGS = $(_usrp_prims_la_CXXFLAGS) @@ -139,12 +125,9 @@ guile/usrp_prims.cc: gnuradio/usrp_prims.scm gnuradio/usrp_prims.scm: usrp_prims.i gnuradio/usrp_prims-primitive.scm: gnuradio/usrp_prims.scm +# Include the guile dependencies for this file -include guile/usrp_prims.d endif # end of GUILE -usrp_prims.lo: usrp_prims.py usrp_prims.scm -usrp_prims.py: usrp_prims.i - --include python/usrp_prims.d |