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

4 files changed, 33 insertions, 8 deletions

diff --git a/gr-cvsd-vocoder/Makefile.am b/gr-cvsd-vocoder/Makefile.am
index f2e929644..48807a34b 100644
--- a/gr-cvsd-vocoder/Makefile.am
+++ b/gr-cvsd-vocoder/Makefile.am
@@ -22,4 +22,6 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS = src
-DIST_SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-cvsd-vocoder.pc
diff --git a/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in b/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
new file mode 100644
index 000000000..056230864
--- /dev/null
+++ b/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: gnuradio-cvsd-vocoder
+Description: GNU Radio blocks implementing a CVSD vocoder
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-cvsd-vocoder
+Cflags: -I${includedir}
diff --git a/gr-cvsd-vocoder/src/Makefile.am b/gr-cvsd-vocoder/src/Makefile.am
index e3f0399eb..be38b7c1a 100644
--- a/gr-cvsd-vocoder/src/Makefile.am
+++ b/gr-cvsd-vocoder/src/Makefile.am
@@ -19,4 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am
index 78a7c6400..500d0e858 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.am
+++ b/gr-cvsd-vocoder/src/lib/Makefile.am
@@ -28,6 +28,19 @@ grinclude_HEADERS =			\
 	cvsd_decode_bs.h		\
 	cvsd_encode_sb.h
 
+lib_LTLIBRARIES = libgnuradio-cvsd-vocoder.la
+
+libgnuradio_cvsd_vocoder_la_SOURCES = 	\
+	cvsd_decode_bs.cc		\
+	cvsd_encode_sb.cc
+
+libgnuradio_cvsd_vocoder_la_LIBADD =	\
+	$(GNURADIO_CORE_LA)
+
+libgnuradio_cvsd_vocoder_la_LDFLAGS =	\
+	$(NO_UNDEFINED)
+
+if PYTHON
 ###################################
 # SWIG Python interface and library
 
@@ -41,14 +54,9 @@ TOP_SWIG_IFILES = 			\
 cvsd_vocoder_pythondir_category =	\
 	gnuradio/vocoder
 
-# additional sources for the SWIG-generated library
-cvsd_vocoder_la_swig_sources =	 	\
-	cvsd_decode_bs.cc		\
-	cvsd_encode_sb.cc
-
 # additional libraries for linking with the SWIG-generated library
 cvsd_vocoder_la_swig_libadd =		\
-	$(GNURADIO_CORE_LA)
+	libgnuradio-cvsd-vocoder.la
 
 include $(top_srcdir)/Makefile.swig
 
@@ -57,3 +65,4 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+endif