From aa162012cc25cf080ee744a2cb795a6154fcca86 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Thu, 21 Oct 2010 13:16:05 -0600
Subject: regenerated

---
 gr-gsm-fr-vocoder/src/lib/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gr-gsm-fr-vocoder/src/lib/Makefile.am')

diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am
index 97d6fc306..dccfb31f2 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.am
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am
@@ -34,7 +34,8 @@ lib_LTLIBRARIES = libgnuradio-gsm-fr-vocoder.la
 
 libgnuradio_gsm_fr_vocoder_la_SOURCES = \
 	gsm_fr_decode_ps.cc		\
-	gsm_fr_encode_sp.cc
+	gsm_fr_encode_sp.cc		\
+	python/gsm_full_rate.cc
 
 libgnuradio_gsm_fr_vocoder_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-gsm-fr-vocoder/src/lib/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'gr-gsm-fr-vocoder/src/lib/Makefile.am')

diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am
index dccfb31f2..97d6fc306 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.am
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am
@@ -34,8 +34,7 @@ lib_LTLIBRARIES = libgnuradio-gsm-fr-vocoder.la
 
 libgnuradio_gsm_fr_vocoder_la_SOURCES = \
 	gsm_fr_decode_ps.cc		\
-	gsm_fr_encode_sp.cc		\
-	python/gsm_full_rate.cc
+	gsm_fr_encode_sp.cc
 
 libgnuradio_gsm_fr_vocoder_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-gsm-fr-vocoder/src/lib/Makefile.am | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'gr-gsm-fr-vocoder/src/lib/Makefile.am')

diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am
index 97d6fc306..4ce65bc31 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.am
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2008,2009 Free Software Foundation, Inc.
+# Copyright 2004,2005,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,6 +20,7 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 SUBDIRS = gsm .
 
@@ -42,7 +43,7 @@ libgnuradio_gsm_fr_vocoder_la_LIBADD =	\
 
 libgnuradio_gsm_fr_vocoder_la_LDFLAGS =	$(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
-if PYTHON
+
 # SWIG interface and library
 TOP_SWIG_IFILES = 			\
 	gsm_full_rate.i
@@ -58,11 +59,3 @@ gsm_full_rate_pythondir_category =	\
 gsm_full_rate_la_swig_libadd =		\
 	libgnuradio-gsm-fr-vocoder.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