From 64bdee166b0d852992873f7d37906d4c61a94b94 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 00:06:15 -0800
Subject: Confirm we can load guile usrp module

---
 gr-usrp/src/Makefile.am | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'gr-usrp/src/Makefile.am')

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index db5be4ade..9c1f4b525 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -20,6 +20,7 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 # ----------------------------------------------------------------
 # Misc. build/installation activities
@@ -30,6 +31,10 @@ DISTCLEANFILES = run_tests
 
 noinst_PYTHON =	qa_usrp.py
 
+nobase_guile_DATA = gnuradio/usrp.scm
+
+TESTS = 
+
 # ----------------------------------------------------------------
 # The straight C++ library
 
@@ -67,10 +72,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 +108,19 @@ 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)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+
+
+if PYTHON
+TESTS += run_tests
 endif
+
+if GUILE
+TESTS += run_guile_tests
+endif
+
-- 
cgit 


From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 17:29:11 -0800
Subject: Major Makefile.am housecleaning.  Passes distcheck.

Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*

Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
---
 gr-usrp/src/Makefile.am | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'gr-usrp/src/Makefile.am')

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 9c1f4b525..7a16fe5b1 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -22,18 +22,16 @@
 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
 
+if GUILE
 nobase_guile_DATA = gnuradio/usrp.scm
-
-TESTS = 
+endif
 
 # ----------------------------------------------------------------
 # The straight C++ library
@@ -109,13 +107,6 @@ usrp_swig_swiginclude_headers =	\
 	usrp_standard.i
 
 
-# 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
-- 
cgit 


From fd8f86713d8f9de79850b9e7aabde7c453b7e890 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 27 Dec 2010 22:56:47 -0800
Subject: Add missing .test files to tarball.

---
 gr-usrp/src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-usrp/src/Makefile.am')

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 7a16fe5b1..a0c6b7a82 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -28,6 +28,7 @@ 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
-- 
cgit