summaryrefslogtreecommitdiff
path: root/gr-video-sdl/src
diff options
context:
space:
mode:
authorRob Savoye2010-11-01 19:02:55 -0600
committerEric Blossom2010-11-10 12:15:43 -0800
commit0939607d0b4a3ae047ceff60fab300000c7d2069 (patch)
tree318cb73601f80410e4c8d7a68f8245aee2d4e9fb /gr-video-sdl/src
parent77fbf9dbc94aabebf7c760546d43c522c536fe24 (diff)
downloadgnuradio-0939607d0b4a3ae047ceff60fab300000c7d2069.tar.gz
gnuradio-0939607d0b4a3ae047ceff60fab300000c7d2069.tar.bz2
gnuradio-0939607d0b4a3ae047ceff60fab300000c7d2069.zip
regenerated
Diffstat (limited to 'gr-video-sdl/src')
-rw-r--r--gr-video-sdl/src/Makefile.swig.gen37
1 files changed, 10 insertions, 27 deletions
diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen
index 6a8e6e040..6ec66de4b 100644
--- a/gr-video-sdl/src/Makefile.swig.gen
+++ b/gr-video-sdl/src/Makefile.swig.gen
@@ -67,28 +67,10 @@ video_sdl_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)/video_sdl-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 += video_sdl.py
-# if GUILE
-# swig_built_sources += gnuradio/video_sdl.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 @@ _video_sdl_la_LIBADD = \
$(STD_SWIG_LA_LIB_ADD) \
$(video_sdl_la_swig_libadd)
-# _video_sdl_la_DEPENDENCIES = python/video_sdl.lo
-
_video_sdl_la_LDFLAGS = \
$(STD_SWIG_LA_LD_FLAGS) \
$(video_sdl_la_swig_ldflags)
@@ -123,14 +103,20 @@ video_sdl_python_PYTHON = \
video_sdl.py \
$(video_sdl)
+python/video_sdl.cc: video_sdl.py
+video_sdl.py: video_sdl.i
+
+# Include the python dependencies for this file
+-include python/video_sdl.d
+# end of PYTHON
+
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
-# Guile can use the same flags as python does
libguile_video_sdl_la_LIBADD = $(_video_sdl_la_LIBADD)
libguile_video_sdl_la_LDFLAGS = $(_video_sdl_la_LDFLAGS)
libguile_video_sdl_la_CXXFLAGS = $(_video_sdl_la_CXXFLAGS)
@@ -139,12 +125,9 @@ guile/video_sdl.cc: gnuradio/video_sdl.scm
gnuradio/video_sdl.scm: video_sdl.i
gnuradio/video_sdl-primitive.scm: gnuradio/video_sdl.scm
+# Include the guile dependencies for this file
-include guile/video_sdl.d
endif # end of GUILE
-video_sdl.lo: video_sdl.py video_sdl.scm
-video_sdl.py: video_sdl.i
-
--include python/video_sdl.d