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 /usrp | |
| 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 'usrp')
| -rw-r--r-- | usrp/host/Makefile.am | 7 | ||||
| -rw-r--r-- | usrp/host/lib/legacy/Makefile.am | 9 | ||||
| -rw-r--r-- | usrp/usrp-inband.pc.in | 8 | ||||
| -rw-r--r-- | usrp/usrp.pc.in | 2 |
4 files changed, 15 insertions, 11 deletions
diff --git a/usrp/host/Makefile.am b/usrp/host/Makefile.am index 1716f513d4..514b835a9d 100644 --- a/usrp/host/Makefile.am +++ b/usrp/host/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2007 Free Software Foundation, Inc. +# Copyright 2001,2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -19,5 +19,8 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = misc lib swig apps apps-inband +SUBDIRS = misc lib apps apps-inband +if PYTHON +SUBDIRS += swig +endif diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am index e2fabc229c..e1b1b850ab 100644 --- a/usrp/host/lib/legacy/Makefile.am +++ b/usrp/host/lib/legacy/Makefile.am @@ -47,10 +47,10 @@ EXTRA_DIST = \ usrp_dbid.dat BUILT_SOURCES = \ - usrp_dbid.h \ - usrp_dbid.cc \ - usrp_dbid.py + usrp_dbid.h +BUILT_SOURCES += usrp_dbid.cc \ + usrp_dbid.py # ---------------------------------------------------------------- # FUSB_TECH is set at configure time by way of @@ -118,7 +118,6 @@ libusrp_la_common_SOURCES = \ db_dtt768.cc \ db_util.cc -# db_wbx.cc if FUSB_TECH_generic @@ -177,6 +176,7 @@ noinst_HEADERS = \ rate_to_regval.h \ usrp_local_sighandler.h +if PYTHON usrppython_PYTHON = \ usrp_dbid.py @@ -186,6 +186,7 @@ noinst_PYTHON = \ dump_data.py swiginclude_HEADERS = db_base.i +endif # common way for generating sources from templates when using # BUILT_SOURCES, using parallel build protection. diff --git a/usrp/usrp-inband.pc.in b/usrp/usrp-inband.pc.in index 74665bdbb5..57e2746249 100644 --- a/usrp/usrp-inband.pc.in +++ b/usrp/usrp-inband.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: usrp +Name: usrp-inband Description: USRP C++ Interface with in-band signaling -Requires: mblock pmt gnuradio-omnithread libusb +Requires: usrp pmt mblock Version: @VERSION@ -Libs: -L${libdir} -lusrp-inband -lusrp -Cflags: -I${includedir} @DEFINES@ +Libs: -L${libdir} -lusrp-inband +Cflags: -I${includedir} diff --git a/usrp/usrp.pc.in b/usrp/usrp.pc.in index 77430ea463..297775fb1d 100644 --- a/usrp/usrp.pc.in +++ b/usrp/usrp.pc.in @@ -8,4 +8,4 @@ Description: USRP Client Side C++ interface Requires: libusb @usrp_darwin_omnithread_pc_requires@ Version: @VERSION@ Libs: -L${libdir} -lusrp -Cflags: -I${includedir} @DEFINES@ +Cflags: -I${includedir} |