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-pager | |
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-pager')
-rw-r--r-- | gr-pager/Makefile.am | 3 | ||||
-rw-r--r-- | gr-pager/gnuradio-pager.pc.in | 11 | ||||
-rw-r--r-- | gr-pager/src/Makefile.am | 50 |
3 files changed, 43 insertions, 21 deletions
diff --git a/gr-pager/Makefile.am b/gr-pager/Makefile.am index 7297661a1..d73e4050f 100644 --- a/gr-pager/Makefile.am +++ b/gr-pager/Makefile.am @@ -22,3 +22,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src + +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-pager.pc diff --git a/gr-pager/gnuradio-pager.pc.in b/gr-pager/gnuradio-pager.pc.in new file mode 100644 index 000000000..35516b6ed --- /dev/null +++ b/gr-pager/gnuradio-pager.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-comedi +Description: GNU Radio blocks implementing a FLEX pager decoder +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-pager +Cflags: -I${includedir} diff --git a/gr-pager/src/Makefile.am b/gr-pager/src/Makefile.am index b12f7b8ff..d084d05f8 100644 --- a/gr-pager/src/Makefile.am +++ b/gr-pager/src/Makefile.am @@ -23,17 +23,8 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in -TESTS = run_tests - -DISTCLEANFILES = run_tests - AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -dist_bin_SCRIPTS = \ - usrp_flex.py \ - usrp_flex_all.py \ - usrp_flex_band.py - noinst_PYTHON = \ qa_pager.py @@ -48,8 +39,35 @@ grinclude_HEADERS = \ pageri_flex_modes.h \ pageri_util.h +lib_LTLIBRARIES = libgnuradio-pager.la + +libgnuradio_pager_la_SOURCES = \ + pager_flex_frame.cc \ + pager_slicer_fb.cc \ + pager_flex_sync.cc \ + pager_flex_deinterleave.cc \ + pager_flex_parse.cc \ + pageri_bch3221.cc \ + pageri_flex_modes.cc \ + pageri_util.cc + +libgnuradio_pager_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_pager_la_LDFLAGS = \ + $(NO_UNDEFINED) + +if PYTHON + +dist_bin_SCRIPTS = \ + usrp_flex.py \ + usrp_flex_all.py \ + usrp_flex_band.py + ############################## # SWIG interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ pager_swig.i @@ -61,20 +79,9 @@ TOP_SWIG_IFILES = \ pager_swig_pythondir_category = \ gnuradio/pager -# additional sources for the SWIG-generated library -pager_swig_la_swig_sources = \ - pager_flex_frame.cc \ - pager_slicer_fb.cc \ - pager_flex_sync.cc \ - pager_flex_deinterleave.cc \ - pager_flex_parse.cc \ - pageri_bch3221.cc \ - pageri_flex_modes.cc \ - pageri_util.cc - # additional libraries for linking with the SWIG-generated library pager_swig_la_swig_libadd = \ - $(GNURADIO_CORE_LA) + libgnuradio-pager.la # additional Python files to be installed along with the SWIG-generated one pager_swig_python = \ @@ -93,3 +100,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif |