diff options
| author | jcorgan | 2009-05-27 01:54:41 +0000 |
|---|---|---|
| committer | jcorgan | 2009-05-27 01:54:41 +0000 |
| commit | 40b8a57d69b4b85f207fb0408347c210e23202cc (patch) | |
| tree | 8d1e3bbc9159bdd0de98bb897432abd81563dbca /gr-audio-alsa | |
| parent | e3cd8f7d59aad0ffd51c417b2623ab02588fdb08 (diff) | |
| download | gnuradio-40b8a57d69b4b85f207fb0408347c210e23202cc.tar.gz gnuradio-40b8a57d69b4b85f207fb0408347c210e23202cc.tar.bz2 gnuradio-40b8a57d69b4b85f207fb0408347c210e23202cc.zip | |
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-alsa')
| -rw-r--r-- | gr-audio-alsa/Makefile.am | 5 | ||||
| -rw-r--r-- | gr-audio-alsa/gnuradio-audio-alsa.pc.in (renamed from gr-audio-alsa/gr-audio-alsa.pc.in) | 2 | ||||
| -rw-r--r-- | gr-audio-alsa/src/Makefile.am | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/gr-audio-alsa/Makefile.am b/gr-audio-alsa/Makefile.am index 0b472f9c9..e2f67725a 100644 --- a/gr-audio-alsa/Makefile.am +++ b/gr-audio-alsa/Makefile.am @@ -21,13 +21,10 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ - gr-audio-alsa.pc.in - SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gr-audio-alsa.pc +dist_pkgconfig_DATA = gnuradio-audio-alsa.pc etcdir = $(sysconfdir)/gnuradio/conf.d dist_etc_DATA = gr-audio-alsa.conf diff --git a/gr-audio-alsa/gr-audio-alsa.pc.in b/gr-audio-alsa/gnuradio-audio-alsa.pc.in index 69b6e8c6b..797bfc024 100644 --- a/gr-audio-alsa/gr-audio-alsa.pc.in +++ b/gr-audio-alsa/gnuradio-audio-alsa.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: gnuradio-audio-alsa Description: The GNU Radio block for the ALSA sound system -Requires: gnuradio-core +Requires: gnuradio-core alsa Version: @VERSION@ Libs: -L${libdir} -lgnuradio-audio-alsa Cflags: -I${includedir} diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index 8230ab569..ee7498af4 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/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_alsa_sink.h \ @@ -57,8 +53,11 @@ libgnuradio_audio_alsa_la_LIBADD = \ libgnuradio_audio_alsa_la_LDFLAGS = \ $(NO_UNDEFINED) +if PYTHON ################################### # SWIG Python interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ audio_alsa.i @@ -81,3 +80,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif
\ No newline at end of file |