summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorjcorgan2009-05-27 01:54:41 +0000
committerjcorgan2009-05-27 01:54:41 +0000
commit40b8a57d69b4b85f207fb0408347c210e23202cc (patch)
tree8d1e3bbc9159bdd0de98bb897432abd81563dbca /config
parente3cd8f7d59aad0ffd51c417b2623ab02588fdb08 (diff)
downloadgnuradio-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 'config')
-rw-r--r--config/grc_gr_atsc.m41
-rw-r--r--config/grc_gr_audio_alsa.m42
-rw-r--r--config/grc_gr_audio_jack.m41
-rw-r--r--config/grc_gr_audio_oss.m41
-rw-r--r--config/grc_gr_audio_portaudio.m41
-rw-r--r--config/grc_gr_comedi.m41
-rw-r--r--config/grc_gr_cvsd_vocoder.m41
-rw-r--r--config/grc_gr_gsm_fr_vocoder.m41
-rw-r--r--config/grc_gr_msdd6000.m41
-rw-r--r--config/grc_gr_pager.m41
-rw-r--r--config/grc_gr_trellis.m41
-rw-r--r--config/grc_gr_video_sdl.m43
12 files changed, 13 insertions, 2 deletions
diff --git a/config/grc_gr_atsc.m4 b/config/grc_gr_atsc.m4
index 003d1b7c7..6dfb40132 100644
--- a/config/grc_gr_atsc.m4
+++ b/config/grc_gr_atsc.m4
@@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_ATSC],[
AC_CONFIG_FILES([\
gr-atsc/Makefile \
+ gr-atsc/gnuradio-atsc.pc \
gr-atsc/doc/Makefile \
gr-atsc/src/Makefile \
gr-atsc/src/lib/Makefile \
diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4
index 9c653c1c2..d6955980d 100644
--- a/config/grc_gr_audio_alsa.m4
+++ b/config/grc_gr_audio_alsa.m4
@@ -35,7 +35,7 @@ AC_DEFUN([GRC_GR_AUDIO_ALSA],[
AC_CONFIG_FILES([ \
gr-audio-alsa/Makefile \
- gr-audio-alsa/gr-audio-alsa.pc \
+ gr-audio-alsa/gnuradio-audio-alsa.pc \
gr-audio-alsa/src/Makefile \
gr-audio-alsa/src/run_tests \
])
diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4
index cb7bf2990..d1853588b 100644
--- a/config/grc_gr_audio_jack.m4
+++ b/config/grc_gr_audio_jack.m4
@@ -35,6 +35,7 @@ AC_DEFUN([GRC_GR_AUDIO_JACK],[
AC_CONFIG_FILES([ \
gr-audio-jack/Makefile \
+ gr-audio-jack/gnuradio-audio-jack.pc \
gr-audio-jack/src/Makefile \
gr-audio-jack/src/run_tests \
])
diff --git a/config/grc_gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4
index 6fd4577a8..13c83bba9 100644
--- a/config/grc_gr_audio_oss.m4
+++ b/config/grc_gr_audio_oss.m4
@@ -51,6 +51,7 @@ AC_DEFUN([GRC_GR_AUDIO_OSS],[
AC_CONFIG_FILES([ \
gr-audio-oss/Makefile \
+ gr-audio-oss/gnuradio-audio-oss.pc \
gr-audio-oss/src/Makefile \
gr-audio-oss/src/run_tests \
])
diff --git a/config/grc_gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4
index b2f27f2c8..ff551b38a 100644
--- a/config/grc_gr_audio_portaudio.m4
+++ b/config/grc_gr_audio_portaudio.m4
@@ -35,6 +35,7 @@ AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[
AC_CONFIG_FILES([ \
gr-audio-portaudio/Makefile \
+ gr-audio-portaudio/gnuradio-audio-portaudio.pc \
gr-audio-portaudio/src/Makefile \
gr-audio-portaudio/src/run_tests \
])
diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4
index 2bdfacbc0..5e3089417 100644
--- a/config/grc_gr_comedi.m4
+++ b/config/grc_gr_comedi.m4
@@ -35,6 +35,7 @@ AC_DEFUN([GRC_GR_COMEDI],[
AC_CONFIG_FILES([ \
gr-comedi/Makefile \
+ gr-comedi/gnuradio-comedi.pc \
gr-comedi/src/Makefile \
gr-comedi/src/run_tests \
])
diff --git a/config/grc_gr_cvsd_vocoder.m4 b/config/grc_gr_cvsd_vocoder.m4
index c73a3052b..ddf6f9b2f 100644
--- a/config/grc_gr_cvsd_vocoder.m4
+++ b/config/grc_gr_cvsd_vocoder.m4
@@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_CVSD_VOCODER],[
AC_CONFIG_FILES([\
gr-cvsd-vocoder/Makefile \
+ gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc \
gr-cvsd-vocoder/src/Makefile \
gr-cvsd-vocoder/src/lib/Makefile \
gr-cvsd-vocoder/src/python/Makefile \
diff --git a/config/grc_gr_gsm_fr_vocoder.m4 b/config/grc_gr_gsm_fr_vocoder.m4
index 941cb2557..a93d4edb7 100644
--- a/config/grc_gr_gsm_fr_vocoder.m4
+++ b/config/grc_gr_gsm_fr_vocoder.m4
@@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_GSM_FR_VOCODER],[
AC_CONFIG_FILES([\
gr-gsm-fr-vocoder/Makefile \
+ gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc \
gr-gsm-fr-vocoder/src/Makefile \
gr-gsm-fr-vocoder/src/lib/Makefile \
gr-gsm-fr-vocoder/src/lib/gsm/Makefile \
diff --git a/config/grc_gr_msdd6000.m4 b/config/grc_gr_msdd6000.m4
index 3f2e17a2a..6d40e8931 100644
--- a/config/grc_gr_msdd6000.m4
+++ b/config/grc_gr_msdd6000.m4
@@ -22,6 +22,7 @@ AC_DEFUN([GRC_GR_MSDD6000],[
AC_CONFIG_FILES([\
gr-msdd6000/Makefile \
+ gr-msdd6000/gnuradio-msdd6000.pc \
gr-msdd6000/src/Makefile
])
diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4
index cb417ae25..23af7a9c4 100644
--- a/config/grc_gr_pager.m4
+++ b/config/grc_gr_pager.m4
@@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_PAGER],[
AC_CONFIG_FILES([\
gr-pager/Makefile \
+ gr-pager/gnuradio-pager.pc \
gr-pager/src/Makefile \
gr-pager/src/run_tests
])
diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4
index f6ed4a488..cb51325d6 100644
--- a/config/grc_gr_trellis.m4
+++ b/config/grc_gr_trellis.m4
@@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_TRELLIS],[
AC_CONFIG_FILES([\
gr-trellis/Makefile \
+ gr-trellis/gnuradio-trellis.pc \
gr-trellis/doc/Makefile \
gr-trellis/src/Makefile \
gr-trellis/src/lib/Makefile \
diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4
index 774f7250c..c890bc31c 100644
--- a/config/grc_gr_video_sdl.m4
+++ b/config/grc_gr_video_sdl.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -37,6 +37,7 @@ AC_DEFUN([GRC_GR_VIDEO_SDL],[
AC_CONFIG_FILES([ \
gr-video-sdl/Makefile \
+ gr-video-sdl/gnuradio-video-sdl.pc \
gr-video-sdl/src/Makefile \
gr-video-sdl/src/run_tests \
])