From 99dc38c8f81fe388b13bf46e3f53cc272765249e Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Wed, 24 Nov 2010 13:49:59 -0800
Subject: Consistently use TESTS += in conditionals

---
 gr-usrp2/src/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index 0d55d73ba..8b94ae54f 100644
--- a/gr-usrp2/src/Makefile.am
+++ b/gr-usrp2/src/Makefile.am
@@ -21,6 +21,8 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
+
 # ----------------------------------------------------------------------
 # Local Python files, not installed
 #
@@ -87,7 +89,7 @@ if PYTHON
 # usrp2.py
 # _usrp2.so
 # ----------------------------------------------------------------------
-TESTS = run_tests
+TESTS += run_tests
 
 TOP_SWIG_IFILES =		\
 	usrp2.i
-- 
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-usrp2/src/Makefile.am | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

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

diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index 8b94ae54f..8e1d0c20c 100644
--- a/gr-usrp2/src/Makefile.am
+++ b/gr-usrp2/src/Makefile.am
@@ -20,8 +20,12 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 TESTS =
+EXTRA_DIST += run_tests.in
+DISTCLEANFILES += run_tests
+
 
 # ----------------------------------------------------------------------
 # Local Python files, not installed
@@ -35,9 +39,6 @@ noinst_PYTHON = qa_usrp2.py
 # Miscellaneous build operations
 # ----------------------------------------------------------------------
 
-EXTRA_DIST = run_tests.in
-DISTCLEANFILES = run_tests
-
 # ----------------------------------------------------------------------
 # C++ block API interface librar(ies)
 #
@@ -82,14 +83,12 @@ noinst_HEADERS = \
 	rx_16sc_handler.h \
 	rx_32fc_handler.h
 
-if PYTHON
 # ----------------------------------------------------------------------
-# Python SWIG wrapper around C++ library
+# SWIG wrappers around C++ library
 #
 # usrp2.py
 # _usrp2.so
 # ----------------------------------------------------------------------
-TESTS += run_tests
 
 TOP_SWIG_IFILES =		\
 	usrp2.i
@@ -109,11 +108,6 @@ usrp2_swig_args =		\
 usrp2_la_swig_libadd =		\
 	libgnuradio-usrp2.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)
-endif
+if PYTHON
+TESTS += run_tests
+endif
\ No newline at end of file
-- 
cgit 


From 46c2368192a57fd0bfe9f50f753759736c4b4668 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 27 Dec 2010 18:32:24 -0800
Subject: Rename usrp2.i to usrp2_swig.i to allow insertion of guile
 convenience functions.

---
 gr-usrp2/src/Makefile.am | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

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

diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index 8e1d0c20c..e2cca8b3c 100644
--- a/gr-usrp2/src/Makefile.am
+++ b/gr-usrp2/src/Makefile.am
@@ -27,14 +27,13 @@ EXTRA_DIST += run_tests.in
 DISTCLEANFILES += run_tests
 
 
-# ----------------------------------------------------------------------
-# Local Python files, not installed
-#
-# qa_usrp2.py
-# ----------------------------------------------------------------------
-
 noinst_PYTHON = qa_usrp2.py
 
+if GUILE
+nobase_guile_DATA = gnuradio/usrp2.scm
+endif
+
+
 # ----------------------------------------------------------------------
 # Miscellaneous build operations
 # ----------------------------------------------------------------------
@@ -91,23 +90,27 @@ noinst_HEADERS = \
 # ----------------------------------------------------------------------
 
 TOP_SWIG_IFILES =		\
-	usrp2.i
+	usrp2_swig.i
 
 # Install so that they end up available as:
 #   import gnuradio.usrp2
 # This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-usrp2_pythondir_category =	\
-	gnuradio
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp2
+usrp2_swig_pythondir_category =	\
+	gnuradio/usrp2
 
 # additional arguments to the SWIG command
-usrp2_swig_args =		\
+usrp2_swig_swig_args =		\
 	$(USRP2_INCLUDES)
 
 # additional libraries for linking with the SWIG-generated library
-usrp2_la_swig_libadd =		\
+usrp2_swig_la_swig_libadd =	\
 	libgnuradio-usrp2.la
 
+# additional Python files to be installed along with the SWIG-generated one
+usrp2_swig_python =		\
+	__init__.py
+
 if PYTHON
 TESTS += run_tests
-endif
\ No newline at end of file
+endif
-- 
cgit 


From f290f9e4f1a9b9ca09ef95269d563cd785b08a61 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 27 Dec 2010 18:46:54 -0800
Subject: Add minimal guile test code gr-usrp2.

---
 gr-usrp2/src/Makefile.am | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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

diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index e2cca8b3c..08c41f772 100644
--- a/gr-usrp2/src/Makefile.am
+++ b/gr-usrp2/src/Makefile.am
@@ -23,9 +23,8 @@ include $(top_srcdir)/Makefile.common
 include $(top_srcdir)/Makefile.swig
 
 TESTS =
-EXTRA_DIST += run_tests.in
-DISTCLEANFILES += run_tests
-
+EXTRA_DIST += run_tests.in run_guile_tests.in
+DISTCLEANFILES += run_tests run_guile_tests
 
 noinst_PYTHON = qa_usrp2.py
 
@@ -33,11 +32,6 @@ if GUILE
 nobase_guile_DATA = gnuradio/usrp2.scm
 endif
 
-
-# ----------------------------------------------------------------------
-# Miscellaneous build operations
-# ----------------------------------------------------------------------
-
 # ----------------------------------------------------------------------
 # C++ block API interface librar(ies)
 #
@@ -114,3 +108,7 @@ usrp2_swig_python =		\
 if PYTHON
 TESTS += run_tests
 endif
+
+if GUILE
+TESTS += run_guile_tests
+endif
-- 
cgit 


From 3153f8f24b933043d937de32d65fe5d96652ec56 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Mon, 27 Dec 2010 20:34:30 -0800
Subject: distcheck fix

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

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

diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index 08c41f772..d9599bb78 100644
--- a/gr-usrp2/src/Makefile.am
+++ b/gr-usrp2/src/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common
 include $(top_srcdir)/Makefile.swig
 
 TESTS =
-EXTRA_DIST += run_tests.in run_guile_tests.in
+EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA)
 DISTCLEANFILES += run_tests run_guile_tests
 
 noinst_PYTHON = qa_usrp2.py
-- 
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-usrp2/src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
index d9599bb78..a84637f73 100644
--- a/gr-usrp2/src/Makefile.am
+++ b/gr-usrp2/src/Makefile.am
@@ -27,6 +27,7 @@ EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA)
 DISTCLEANFILES += run_tests run_guile_tests
 
 noinst_PYTHON = qa_usrp2.py
+noinst_GUILE  = usrp2.test
 
 if GUILE
 nobase_guile_DATA = gnuradio/usrp2.scm
-- 
cgit