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
  ...

1 files changed, 15 insertions, 12 deletions

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index db5be4ade..a0c6b7a82 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -20,15 +20,19 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
-# ----------------------------------------------------------------
-# Misc. build/installation activities
-
-EXTRA_DIST = run_tests.in
 
-DISTCLEANFILES = run_tests
+TESTS =
+EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA)
+DISTCLEANFILES += run_tests run_guile_tests
 
 noinst_PYTHON =	qa_usrp.py
+noinst_GUILE  = usrp.test
+
+if GUILE
+nobase_guile_DATA = gnuradio/usrp.scm
+endif
 
 # ----------------------------------------------------------------
 # The straight C++ library
@@ -67,10 +71,8 @@ grinclude_HEADERS = \
 	usrp_source_c.h \
 	usrp_source_s.h
 
-if PYTHON
 # ----------------------------------------------------------------
 # The SWIG library
-TESTS = run_tests
 
 TOP_SWIG_IFILES =		\
 	usrp_swig.i
@@ -105,11 +107,12 @@ usrp_swig_swiginclude_headers =	\
 	usrp_sink_s.i		\
 	usrp_standard.i
 
-include $(top_srcdir)/Makefile.swig
 
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = $(swig_built_sources)
+if PYTHON
+TESTS += run_tests
+endif
 
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
+if GUILE
+TESTS += run_guile_tests
 endif
+