diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-05-27 01:54:41 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-05-27 01:54:41 +0000 |
| commit | 40b8a57d69b4b85f207fb0408347c210e23202cc (patch) | |
| tree | 8d1e3bbc9159bdd0de98bb897432abd81563dbca /gr-audio-portaudio | |
| parent | e3cd8f7d59aad0ffd51c417b2623ab02588fdb08 (diff) | |
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
Diffstat (limited to 'gr-audio-portaudio')
| -rw-r--r-- | gr-audio-portaudio/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-audio-portaudio/gnuradio-audio-portaudio.pc.in | 11 | ||||
| -rw-r--r-- | gr-audio-portaudio/src/Makefile.am | 32 |
3 files changed, 34 insertions, 12 deletions
diff --git a/gr-audio-portaudio/Makefile.am b/gr-audio-portaudio/Makefile.am index bf10b39c3d..30a90647ec 100644 --- a/gr-audio-portaudio/Makefile.am +++ b/gr-audio-portaudio/Makefile.am @@ -23,5 +23,8 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-audio-portaudio.pc + etcdir = $(sysconfdir)/gnuradio/conf.d dist_etc_DATA = gr-audio-portaudio.conf diff --git a/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in b/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in new file mode 100644 index 0000000000..8f2c808698 --- /dev/null +++ b/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-audio-portaudio +Description: The GNU Radio block for the PORTAUDIO sound system +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-audio-portaudio +Cflags: -I${includedir} 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 |