From 32a71023bf7350167fdd4f3797d384d47cafd71f Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 21 Oct 2010 13:17:11 -0600
Subject: add python/*.cc to SOURCES so dependencies work properly.

---
 gr-audio-jack/src/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index 8e0dfe1e3..f32ccc2a0 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -35,8 +35,9 @@ lib_LTLIBRARIES = libgnuradio-audio-jack.la
 
 libgnuradio_audio_jack_la_SOURCES = 	\
 	audio_jack_sink.cc		\
-	audio_jack_source.cc		\
-	gri_jack.cc
+	audio_jack_source.cc	\
+	gri_jack.cc				\
+	python/audio_jack.cc
 
 libgnuradio_audio_jack_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)		\
-- 
cgit 


From 0282499102abcef25849ae3a5255902502c1382a Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Sun, 31 Oct 2010 13:24:29 -0700
Subject: Remove swig generated python code from C++-only libraries

---
 gr-audio-jack/src/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index f32ccc2a0..f06f445a5 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -36,8 +36,7 @@ lib_LTLIBRARIES = libgnuradio-audio-jack.la
 libgnuradio_audio_jack_la_SOURCES = 	\
 	audio_jack_sink.cc		\
 	audio_jack_source.cc	\
-	gri_jack.cc				\
-	python/audio_jack.cc
+	gri_jack.cc
 
 libgnuradio_audio_jack_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)		\
-- 
cgit 


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-audio-jack/src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index f06f445a5..f7f65a744 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -21,6 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
 EXTRA_DIST = run_tests.in
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
@@ -52,7 +53,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 if PYTHON
 ###################################
 # SWIG Python interface and library
-TESTS = run_tests
+TESTS += run_tests
 DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES = 			\
-- 
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-audio-jack/src/Makefile.am | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

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

diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index f7f65a744..9a0c8b9be 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2008,2009 Free Software Foundation, Inc.
+# Copyright 2005,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,9 +20,11 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 TESTS =
-EXTRA_DIST = run_tests.in
+EXTRA_DIST += run_tests.in
+DISTCLEANFILES += run_tests
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
@@ -50,11 +52,8 @@ noinst_PYTHON = 			\
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-if PYTHON
 ###################################
-# SWIG Python interface and library
-TESTS += run_tests
-DISTCLEANFILES = run_tests
+# SWIG interfaces and libraries
 
 TOP_SWIG_IFILES = 			\
 	audio_jack.i
@@ -70,11 +69,7 @@ audio_jack_pythondir_category =		\
 audio_jack_la_swig_libadd =		\
 	libgnuradio-audio-jack.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
-- 
cgit