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-cvsd-vocoder/src/lib | |
| 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-cvsd-vocoder/src/lib')
| -rw-r--r-- | gr-cvsd-vocoder/src/lib/Makefile.am | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am index 78a7c6400e..500d0e858c 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 |