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-video-sdl/src/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 45cedfb21..1824f1de0 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -37,7 +37,9 @@ lib_LTLIBRARIES = libgnuradio-video-sdl.la
 
 libgnuradio_video_sdl_la_SOURCES = 	\
 	video_sdl_sink_uc.cc		\
-	video_sdl_sink_s.cc
+	video_sdl_sink_s.cc			\
+	python/video_sdl.cc
+	
 
 libgnuradio_video_sdl_la_LIBADD =	\
 	$(SDL_LIBS)			\
-- 
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-video-sdl/src/Makefile.am | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 1824f1de0..45cedfb21 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -37,9 +37,7 @@ lib_LTLIBRARIES = libgnuradio-video-sdl.la
 
 libgnuradio_video_sdl_la_SOURCES = 	\
 	video_sdl_sink_uc.cc		\
-	video_sdl_sink_s.cc			\
-	python/video_sdl.cc
-	
+	video_sdl_sink_s.cc
 
 libgnuradio_video_sdl_la_LIBADD =	\
 	$(SDL_LIBS)			\
-- 
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-video-sdl/src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 45cedfb21..a3e9a5612 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -21,6 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
+TESTS =
 EXTRA_DIST = run_tests.in
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
@@ -48,7 +49,7 @@ libgnuradio_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 if PYTHON
 #################################
 # SWIG 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-video-sdl/src/Makefile.am | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

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

diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index a3e9a5612..04c39542a 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -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
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
 	$(WITH_INCLUDES)
@@ -46,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
@@ -66,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
-- 
cgit