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-msdd6000/src/Makefile.am | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am
index f6dbd2fb8..3a054a89b 100644
--- a/gr-msdd6000/src/Makefile.am
+++ b/gr-msdd6000/src/Makefile.am
@@ -40,12 +40,13 @@ libgnuradio_msdd6000_rs_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 libgnuradio_msdd6000_la_SOURCES = 	\
 	msdd_source_simple.cc		\
-	msdd6000.cc
-
+	msdd6000.cc			\
+	python/msdd.cc
 
 libgnuradio_msdd6000_rs_la_SOURCES = 	\
-	msdd_rs_source_simple.cc		\
-	msdd6000_rs.cc
+	msdd_rs_source_simple.cc	\
+	msdd6000_rs.cc			\
+	python/msdd_rs.cc
 
 libgnuradio_msdd6000_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-msdd6000/src/Makefile.am | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am
index 3a054a89b..3549747b4 100644
--- a/gr-msdd6000/src/Makefile.am
+++ b/gr-msdd6000/src/Makefile.am
@@ -40,13 +40,11 @@ libgnuradio_msdd6000_rs_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 libgnuradio_msdd6000_la_SOURCES = 	\
 	msdd_source_simple.cc		\
-	msdd6000.cc			\
-	python/msdd.cc
+	msdd6000.cc
 
 libgnuradio_msdd6000_rs_la_SOURCES = 	\
 	msdd_rs_source_simple.cc	\
-	msdd6000_rs.cc			\
-	python/msdd_rs.cc
+	msdd6000_rs.cc
 
 libgnuradio_msdd6000_la_LIBADD = 	\
 	$(GNURADIO_CORE_LA)
-- 
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-msdd6000/src/Makefile.am | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

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

diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am
index 3549747b4..91173702f 100644
--- a/gr-msdd6000/src/Makefile.am
+++ b/gr-msdd6000/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2007,2008,2009 Free Software Foundation, Inc.
+# Copyright 2007,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,6 +20,8 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
 	$(WITH_INCLUDES)
@@ -53,9 +55,8 @@ libgnuradio_msdd6000_rs_la_LIBADD = 	\
 	$(GNURADIO_CORE_LA)
 
 
-if PYTHON
 #################################
-# SWIG interface and library
+# SWIG interfaces and libraries
 
 TOP_SWIG_IFILES =			\
 	msdd.i msdd_rs.i
@@ -76,12 +77,3 @@ msdd_la_swig_libadd =			\
 
 msdd_rs_la_swig_libadd =			\
 	libgnuradio-msdd6000_rs.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
-- 
cgit