From 40b8a57d69b4b85f207fb0408347c210e23202cc Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
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-audio-portaudio/src/Makefile.am | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'gr-audio-portaudio/src')

diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am
index 4b44807d83..1df6bbceaf 100644
--- a/gr-audio-portaudio/src/Makefile.am
+++ b/gr-audio-portaudio/src/Makefile.am
@@ -23,10 +23,6 @@ include $(top_srcdir)/Makefile.common
 
 EXTRA_DIST = run_tests.in
 
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
 	$(PORTAUDIO_CFLAGS) $(WITH_INCLUDES)
 
@@ -41,8 +37,26 @@ noinst_HEADERS = 			\
 noinst_PYTHON = 			\
 	qa_portaudio.py
 
+lib_LTLIBRARIES = libgnuradio-audio-portaudio.la
+
+libgnuradio_audio_portaudio_la_SOURCES = \
+	audio_portaudio_sink.cc		\
+	audio_portaudio_source.cc	\
+	gri_portaudio.cc
+
+libgnuradio_audio_portaudio_la_LIBADD =	\
+	$(GNURADIO_CORE_LA)		\
+	$(PORTAUDIO_LIBS)
+
+libgnuradio_audio_portaudio_la_LDFLAGS = \
+	$(NO_UNDEFINED)
+
+
+if PYTHON
 ###################################
 # SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES = 			\
 	audio_portaudio.i
@@ -54,16 +68,9 @@ TOP_SWIG_IFILES = 			\
 audio_portaudio_pythondir_category =	\
 	gnuradio
 
-# additional sources for the SWIG-generated library
-audio_portaudio_la_swig_sources = 	\
-	audio_portaudio_sink.cc		\
-	audio_portaudio_source.cc	\
-	gri_portaudio.cc
-
 # additional libraries for linking with the SWIG-generated library
 audio_portaudio_la_swig_libadd =	\
-	$(GNURADIO_CORE_LA)		\
-	$(PORTAUDIO_LIBS)
+	libgnuradio-audio-portaudio.la
 
 include $(top_srcdir)/Makefile.swig
 
@@ -72,3 +79,4 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+endif
-- 
cgit v1.2.3