From 40b8a57d69b4b85f207fb0408347c210e23202cc Mon Sep 17 00:00:00 2001
From: jcorgan
Date: Wed, 27 May 2009 01:54:41 +0000
Subject: Merged r11123:11148 from jcorgan/np into trunk.

Adds --enable-python option to configure (defaults to yes).

Using --disable-python or --enable-python=no will cause only
C++ API targets to be created and installed.

Several new shared libraries are now created.  Where in the past,
the C++ objects of the actual gnuradio blocks that were in a component
were hidden inside their corresponding Python extension modules, these
are now split out into a libgnuradio-foo.so library, and the _foo.so
Python module is linked to that.  This has been the way several top-
level components have operated for some time, such as gr-audio-alsa
and gr-usrp and gr-usrp2.  This changeset applies that pattern to all
components.

C++ API users can use pkg-config to discover the cflags and libs 
parameters needed to include and link against these libraries.

These components have not been tested:

gr-comedi
gr-audio-osx
gr-audio-windows

Passes distcheck.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11150 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gr-gsm-fr-vocoder/src/lib/Makefile.am | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

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

diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am
index 0cf0fb078..3b0270c2f 100644
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.am
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am
@@ -30,8 +30,21 @@ grinclude_HEADERS =			\
 	gsm_fr_decode_ps.h		\
 	gsm_fr_encode_sp.h
 
-# SWIG interface and library
+lib_LTLIBRARIES = libgnuradio-gsm-fr-vocoder.la
+
+libgnuradio_gsm_fr_vocoder_la_SOURCES = \
+	gsm_fr_decode_ps.cc		\
+	gsm_fr_encode_sp.cc
+
+libgnuradio_gsm_fr_vocoder_la_LIBADD =	\
+	$(GNURADIO_CORE_LA)		\
+	gsm/libgsm.la
 
+libgnuradio_gsm_fr_vocoder_la_LDFLAGS =	\
+	$(NO_UNDEFINED)
+
+if PYTHON
+# SWIG interface and library
 TOP_SWIG_IFILES = 			\
 	gsm_full_rate.i
 
@@ -42,15 +55,9 @@ TOP_SWIG_IFILES = 			\
 gsm_full_rate_pythondir_category =	\
 	gnuradio/vocoder
 
-# additional sources for the SWIG-generated library
-gsm_full_rate_la_swig_sources = 	\
-	gsm_fr_decode_ps.cc		\
-	gsm_fr_encode_sp.cc
-
 # additional libraries for linking with the SWIG-generated library
 gsm_full_rate_la_swig_libadd =		\
-	$(GNURADIO_CORE_LA)		\
-	gsm/libgsm.la
+	libgnuradio-gsm-fr-vocoder.la
 
 include $(top_srcdir)/Makefile.swig
 
@@ -59,3 +66,4 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+endif
-- 
cgit