From a52aed2448c5f6d6fbf83d2b2cf35c9a06e59ef0 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 10 Nov 2010 13:01:38 -0800 Subject: [PATCH] regenerated --- host/swig/Makefile.swig.gen | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/host/swig/Makefile.swig.gen b/host/swig/Makefile.swig.gen index 7b778a1..3af94a3 100644 --- a/host/swig/Makefile.swig.gen +++ b/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