summaryrefslogtreecommitdiff
path: root/gr-comedi
diff options
context:
space:
mode:
Diffstat (limited to 'gr-comedi')
-rw-r--r--gr-comedi/src/Makefile.swig.gen35
1 files changed, 9 insertions, 26 deletions
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