Merge remote branch 'gnuradio/next'

* gnuradio/next: (806 commits)
  gruel: added missing ignores
  gruel: fixed swig interface file to dereference pmt_t.
  qtgui: fix distcheck error
  gruel: fixing structure. Passes make check.
  gruel: SWIGing Gruel into Python to access PMTs.
  gnuradio-examples: add C++ audio examples using new gr-audio
  created gruel/attributes.h to house compiler specific attribute macros
  audio: remove obsoleted individual top-level components
  gr-audio: added README and default config fix
  volk: simplify the get new method for the aligned pool
  grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc
  grc: swap store the subprocess object rather than the pid when executing
  qtgui: removed python directory that was added, never used
  uhd: use %ignore to hide warnings and fix errors
  Added/updated ignore files.
  Fixing gr_filter_design program to import from gnuradio Python package.
  audio: high prio for platform specific audio osx
  audio: added windows and osx audio source files
  audio: added config checks for other audios, added jack and port
  audio: make prefs look like old audio, removed old audio.py
  ...

4 files changed, 71 insertions, 176 deletions

diff --git a/gr-video-sdl/src/.gitignore b/gr-video-sdl/src/.gitignore
index e068ddb44..f128bd77b 100644
--- a/gr-video-sdl/src/.gitignore
+++ b/gr-video-sdl/src/.gitignore
@@ -10,3 +10,6 @@
 /video_sdl.cc
 /video_sdl.py
 /run_tests
+/gnuradio
+/guile
+/python
diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 45cedfb21..04c39542a 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -20,8 +20,11 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
-EXTRA_DIST = run_tests.in
+TESTS =
+EXTRA_DIST += run_tests.in
+DISTCLEANFILES += run_tests
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
 	$(WITH_INCLUDES)
@@ -45,11 +48,9 @@ libgnuradio_video_sdl_la_LIBADD =	\
 
 libgnuradio_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
-if PYTHON
+
 #################################
-# SWIG interface and library
-TESTS = run_tests
-DISTCLEANFILES = run_tests
+# SWIG interfaces and libraries
 
 TOP_SWIG_IFILES =			\
 	video_sdl.i
@@ -65,11 +66,6 @@ video_sdl_pythondir_category =		\
 video_sdl_la_swig_libadd =		\
 	libgnuradio-video-sdl.la
 
-include $(top_srcdir)/Makefile.swig
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = $(swig_built_sources)
-
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
+if PYTHON
+TESTS += run_tests
 endif
diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen
index a2728a4f3..d69203f79 100644
--- a/gr-video-sdl/src/Makefile.swig.gen
+++ b/gr-video-sdl/src/Makefile.swig.gen
@@ -38,6 +38,16 @@ video_sdl_pylibdir_category ?= $(video_sdl_pythondir_category)
 video_sdl_pythondir = $(pythondir)/$(video_sdl_pythondir_category)
 video_sdl_pylibdir = $(pyexecdir)/$(video_sdl_pylibdir_category)
 
+# The .so libraries for the guile modules get installed whereever guile
+# is installed, usually /usr/lib/guile/gnuradio/
+# FIXME: determince whether these should be installed with gnuradio.
+video_sdl_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/video_sdl
+# FIXME: determince whether these should be installed with gnuradio.
+video_sdl_scmdir = $(guiledir)
+
 ## SWIG headers are always installed into the same directory.
 
 video_sdl_swigincludedir = $(swigincludedir)
@@ -57,23 +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 .
-
-swig_built_sources += video_sdl.py video_sdl.cc
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -82,13 +79,18 @@ video_sdl_swiginclude_HEADERS =		\
 	video_sdl.i			\
 	$(video_sdl_swiginclude_headers)
 
+if PYTHON
 video_sdl_pylib_LTLIBRARIES =		\
 	_video_sdl.la
 
 _video_sdl_la_SOURCES = 			\
-	video_sdl.cc			\
+	python/video_sdl.cc		\
 	$(video_sdl_la_swig_sources)
 
+video_sdl_python_PYTHON =			\
+	video_sdl.py			\
+	$(video_sdl_python)
+
 _video_sdl_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(video_sdl_la_swig_libadd)
@@ -99,161 +101,45 @@ _video_sdl_la_LDFLAGS =			\
 
 _video_sdl_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(video_sdl_la_swig_cxxflags)
 
-video_sdl_python_PYTHON =			\
-	video_sdl.py			\
-	$(video_sdl_python)
+python/video_sdl.cc: video_sdl.py
+video_sdl.py: video_sdl.i
 
-## Entry rule for running SWIG
+# Include the python dependencies for this file
+-include python/video_sdl.d
 
-video_sdl.h video_sdl.py video_sdl.cc: video_sdl.i
-## This rule will get called only when MAKE decides that one of the
-## targets needs to be created or re-created, because:
-##
-## * The .i file is newer than any or all of the generated files;
-##
-## * Any or all of the .cc, .h, or .py files does not exist and is
-##   needed (in the case this file is not needed, the rule for it is
-##   ignored); or
-##
-## * Some SWIG-based dependecy of the .cc file isn't met and hence the
-##   .cc file needs be be regenerated.  Explanation: Because MAKE
-##   knows how to handle dependencies for .cc files (regardless of
-##   their name or extension), then the .cc file is used as a target
-##   instead of the .i file -- but with the dependencies of the .i
-##   file.  It is this last reason why the line:
-##
-##     	if test -f $@; then :; else
-##
-##   cannot be used in this case: If a .i file dependecy is not met,
-##   then the .cc file needs to be rebuilt.  But if the stamp is newer
-##   than the .cc file, and the .cc file exists, then in the original
-##   version (with the 'test' above) the internal MAKE call will not
-##   be issued and hence the .cc file will not be rebuilt.
-##
-## Once execution gets to here, it should always proceed no matter the
-## state of a stamp (as discussed in link above).  The
-## $(DEPDIR)/video_sdl-generate stuff is used to allow for parallel
-## builds to "do the right thing".  The stamp has no relationship with
-## either the target files or dependency file; it is used solely for
-## the protection of multiple builds during a given call to MAKE.
-##
-## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
-## (15).  At a caught signal, the quoted command will be issued before
-## exiting.  In this case, remove any stamp, whether temporary of not.
-## The trap is valid until the process exits; the process includes all
-## commands appended via "\"s.
-##
-	trap 'rm -rf $(DEPDIR)/video_sdl-generate-*' 1 2 13 15; \
-##
-## Create a temporary directory, which acts as a lock.  The first
-## process to create the directory will succeed and issue the MAKE
-## command to do the actual work, while all subsequent processes will
-## fail -- leading them to wait for the first process to finish.
-##
-	if mkdir $(DEPDIR)/video_sdl-generate-lock 2>/dev/null; then \
-##
-## This code is being executed by the first process to succeed in
-## creating the directory lock.
-##
-## Remove the stamp associated with this filename.
-##
-		rm -f $(DEPDIR)/video_sdl-generate-stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/video_sdl-generate-stamp WHAT=$<; \
-##
-## Now that the .cc, .h, and .py files have been (re)created from the
-## .i file, future checking of this rule during the same MAKE
-## execution will come back that the rule doesn't need to be executed
-## because none of the conditions mentioned at the start of this rule
-## will be positive.  Remove the the directory lock, which frees up
-## any waiting process(es) to continue.
-##
-		rmdir $(DEPDIR)/video_sdl-generate-lock; \
-	else \
-##
-## This code is being executed by any follower processes while the
-## directory lock is in place.
-##
-## Wait until the first process is done, testing once per second.
-##
-		while test -d $(DEPDIR)/video_sdl-generate-lock; do \
-			sleep 1; \
-		done; \
-##
-## Succeed if and only if the first process succeeded; exit this
-## process returning the status of the generated stamp.
-##
-		test -f $(DEPDIR)/video_sdl-generate-stamp; \
-		exit $$?; \
-	fi;
+endif		# end of if python
 
-$(DEPDIR)/video_sdl-generate-stamp:
-## This rule will be called only by the first process issuing the
-## above rule to succeed in creating the lock directory, after
-## removing the actual stamp file in order to guarantee that MAKE will
-## execute this rule.
-##
-## Call SWIG to generate the various output files; special
-## post-processing on 'mingw32' host OS for the dependency file.
-##
-	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(video_sdl_swig_args) \
-		-MD -MF $(DEPDIR)/video_sdl.Std \
-		-module video_sdl -o video_sdl.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/video_sdl.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/video_sdl.Std \
-			> $(DEPDIR)/video_sdl.Sd; \
-		$(RM) $(DEPDIR)/video_sdl.Std; \
-		$(MV) $(DEPDIR)/video_sdl.Sd $(DEPDIR)/video_sdl.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/video_sdl.S*; exit 1; \
-	fi;
-##
-## Mess with the SWIG output .Std dependency file, to create a
-## dependecy file valid for the input .i file: Basically, simulate the
-## dependency file created for libraries by GNU's libtool for C++,
-## where all of the dependencies for the target are first listed, then
-## each individual dependency is listed as a target with no further
-## dependencies.
-##
-## (1) remove the current dependency file
-##
-	$(RM) $(DEPDIR)/video_sdl.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/video_sdl.Std $(DEPDIR)/video_sdl.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/video_sdl.d
-##
-## (4) from the SWIG file, remove the first line (the target); remove
-##     trailing " \" and " " from each line.  Append ":" to each line,
-##     followed by 2 carriage returns, then append this to the end of
-##     the dependency file.
-##
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/video_sdl.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/video_sdl.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/video_sdl.Std
-##
-## Create the stamp for this filename generation, to signal success in
-## executing this rule; allows other threads waiting on this process
-## to continue.
-##
-	touch $(DEPDIR)/video_sdl-generate-stamp
+if GUILE
+
+video_sdl_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-video_sdl.la
+libguile_gnuradio_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
+libguile_gnuradio_video_sdl_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(video_sdl_la_swig_libadd)
+libguile_gnuradio_video_sdl_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(video_sdl_la_swig_ldflags)
+libguile_gnuradio_video_sdl_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(video_sdl_la_swig_cxxflags)
+
+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
 
-# KLUDGE: Force runtime include of a SWIG dependency file.  This is
-# not guaranteed to be portable, but will probably work.  If it works,
-# we have accurate dependencies for our swig stuff, which is good.
+endif				# end of GUILE
 
-@am__include@ @am__quote@./$(DEPDIR)/video_sdl.d@am__quote@
 
diff --git a/gr-video-sdl/src/video_sdl.i b/gr-video-sdl/src/video_sdl.i
index 7084c209b..17b1b799c 100644
--- a/gr-video-sdl/src/video_sdl.i
+++ b/gr-video-sdl/src/video_sdl.i
@@ -60,3 +60,13 @@ class video_sdl_sink_s : public gr_sync_block {
  public:
   ~video_sdl_sink_s ();
 };
+
+#if SWIGGUILE
+%scheme %{
+(load-extension-global "libguile-gnuradio-video_sdl" "scm_init_gnuradio_video_sdl_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif