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

3 files changed, 33 insertions, 12 deletions

diff --git a/gr-audio-jack/Makefile.am b/gr-audio-jack/Makefile.am
index 4f3a452be..8eeb9bffe 100644
--- a/gr-audio-jack/Makefile.am
+++ b/gr-audio-jack/Makefile.am
@@ -23,5 +23,8 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = src
 
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio-jack.pc
+
 etcdir = $(sysconfdir)/gnuradio/conf.d
 dist_etc_DATA = gr-audio-jack.conf
diff --git a/gr-audio-jack/gnuradio-audio-jack.pc.in b/gr-audio-jack/gnuradio-audio-jack.pc.in
new file mode 100644
index 000000000..eaceaea2f
--- /dev/null
+++ b/gr-audio-jack/gnuradio-audio-jack.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: gnuradio-audio-jack
+Description: GNU Radio blocks for the JACK sound system
+Requires: gnuradio-core jack
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-jack
+Cflags: -I${includedir}
diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index bd8694a26..b766ec201 100644
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -23,10 +23,6 @@ include $(top_srcdir)/Makefile.common
 
 EXTRA_DIST = run_tests.in
 
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
 	audio_jack_sink.h		\
@@ -35,13 +31,30 @@ grinclude_HEADERS =			\
 noinst_HEADERS = 			\
 	gri_jack.h
 
+lib_LTLIBRARIES = libgnuradio-audio-jack.la
+
+libgnuradio_audio_jack_la_SOURCES = 	\
+	audio_jack_sink.cc		\
+	audio_jack_source.cc		\
+	gri_jack.cc
+
+libgnuradio_audio_jack_la_LIBADD =	\
+	$(GNURADIO_CORE_LA)		\
+	$(JACK_LIBS)
+
+libgnuradio_audio_jack_la_LDFLAGS =	\
+	$(NO_UNDEFINED)
+
 noinst_PYTHON = 			\
 	qa_jack.py
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
+if PYTHON
 ###################################
 # SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES = 			\
 	audio_jack.i
@@ -53,16 +66,9 @@ TOP_SWIG_IFILES = 			\
 audio_jack_pythondir_category =		\
 	gnuradio
 
-# additional sources for the SWIG-generated library
-audio_jack_la_swig_sources = 		\
-	audio_jack_sink.cc		\
-	audio_jack_source.cc		\
-	gri_jack.cc
-
 # additional libraries for linking with the SWIG-generated library
 audio_jack_la_swig_libadd =		\
-	$(GNURADIO_CORE_LA)		\
-	$(JACK_LIBS)
+	libgnuradio-audio-jack.la
 
 include $(top_srcdir)/Makefile.swig
 
@@ -71,3 +77,4 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+endif