diff options
| -rw-r--r-- | Makefile.swig.gen.t | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/Makefile.swig.gen.t b/Makefile.swig.gen.t index 814a64c0b..9603ec3a5 100644 --- a/Makefile.swig.gen.t +++ b/Makefile.swig.gen.t @@ -67,28 +67,10 @@ ## 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)/@NAME@-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 += @NAME@.py -# if GUILE -# swig_built_sources += gnuradio/@NAME@.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 @@ _@NAME@_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(@NAME@_la_swig_libadd) -# _@NAME@_la_DEPENDENCIES = python/@NAME@.lo - _@NAME@_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ $(@NAME@_la_swig_ldflags) @@ -123,14 +103,20 @@ _@NAME@_la_CXXFLAGS = \ @NAME@.py \ $(@NAME@) +python/@NAME@.cc: @NAME@.py +@NAME@.py: @NAME@.i + +# Include the python dependencies for this file +-include python/@NAME@.d +# end of PYTHON + if GUILE @NAME@_scmlib_LTLIBRARIES = libguile-@NAME@.la -libguile_@NAME@_la_SOURCES = \ +libguile_@NAME@_la_SOURCES = \ guile/@NAME@.cc \ $(@NAME@_la_swig_sources) nobase_@NAME@_scm_DATA = gnuradio/@NAME@.scm gnuradio/@NAME@-primitive.scm -# Guile can use the same flags as python does libguile_@NAME@_la_LIBADD = $(_@NAME@_la_LIBADD) libguile_@NAME@_la_LDFLAGS = $(_@NAME@_la_LDFLAGS) libguile_@NAME@_la_CXXFLAGS = $(_@NAME@_la_CXXFLAGS) @@ -139,11 +125,8 @@ guile/@NAME@.cc: gnuradio/@NAME@.scm gnuradio/@NAME@.scm: @NAME@.i gnuradio/@NAME@-primitive.scm: gnuradio/@NAME@.scm +# Include the guile dependencies for this file -include guile/@NAME@.d endif # end of GUILE -@NAME@.lo: @NAME@.py @NAME@.scm -@NAME@.py: @NAME@.i - --include python/@NAME@.d |