[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11150 - in gnuradio/trunk: . config debian gnuradio-c
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11150 - in gnuradio/trunk: . config debian gnuradio-core gnuradio-core/src gnuradio-core/src/lib gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/hier gnuradio-core/src/lib/io gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-core/src/python/gnuradio gnuradio-core/src/python/gnuradio/gr gnuradio-examples gnuradio-examples/python/digital gr-atsc gr-atsc/src gr-atsc/src/lib gr-audio-alsa gr-audio-alsa/src gr-audio-jack gr-audio-jack/src gr-audio-oss gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio gr-audio-portaudio/src gr-audio-windows/src gr-comedi gr-comedi/src gr-cvsd-vocoder gr-cvsd-vocoder/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src gr-gsm-fr-vocoder gr-gsm-fr-vocoder/src gr-gsm-fr-vocoder/src/lib gr-msdd6000 gr-msdd6000/src gr-pager gr-pager/src gr-qtgui/src gr-qtgui/src/lib gr-qtgui/src/python gr-radar-mono/src gr-radio-astronomy/src gr-radio-astronomy/src/lib gr-sounder/ src gr-trellis gr-trellis/src gr-trellis/src/lib gr-usrp/src gr-usrp2/src gr-utils/src gr-video-sdl gr-video-sdl/src gr-wxgui gr-wxgui/src/python/plotter grc grc/data/platforms/python/blocks grc/src/grc_gnuradio/wxgui/forms grc/src/utils mblock omnithread pmt usrp usrp/host usrp/host/lib/legacy usrp2/fpga/top/u2_rev3_iad usrp2/host/include/usrp2 |
|
Date: |
Tue, 26 May 2009 19:54:42 -0600 (MDT) |
Author: jcorgan
Date: 2009-05-26 19:54:41 -0600 (Tue, 26 May 2009)
New Revision: 11150
Added:
gnuradio/trunk/gr-atsc/gnuradio-atsc.pc.in
gnuradio/trunk/gr-audio-alsa/gnuradio-audio-alsa.pc.in
gnuradio/trunk/gr-audio-jack/gnuradio-audio-jack.pc.in
gnuradio/trunk/gr-audio-oss/gnuradio-audio-oss.pc.in
gnuradio/trunk/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
gnuradio/trunk/gr-comedi/gnuradio-comedi.pc.in
gnuradio/trunk/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
gnuradio/trunk/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
gnuradio/trunk/gr-msdd6000/gnuradio-msdd6000.pc.in
gnuradio/trunk/gr-pager/gnuradio-pager.pc.in
gnuradio/trunk/gr-trellis/gnuradio-trellis.pc.in
gnuradio/trunk/gr-video-sdl/gnuradio-video-sdl.pc.in
Removed:
gnuradio/trunk/gr-audio-alsa/gr-audio-alsa.pc.in
Modified:
gnuradio/trunk/
gnuradio/trunk/Makefile.common
gnuradio/trunk/config/grc_gr_atsc.m4
gnuradio/trunk/config/grc_gr_audio_alsa.m4
gnuradio/trunk/config/grc_gr_audio_jack.m4
gnuradio/trunk/config/grc_gr_audio_oss.m4
gnuradio/trunk/config/grc_gr_audio_portaudio.m4
gnuradio/trunk/config/grc_gr_comedi.m4
gnuradio/trunk/config/grc_gr_cvsd_vocoder.m4
gnuradio/trunk/config/grc_gr_gsm_fr_vocoder.m4
gnuradio/trunk/config/grc_gr_msdd6000.m4
gnuradio/trunk/config/grc_gr_pager.m4
gnuradio/trunk/config/grc_gr_trellis.m4
gnuradio/trunk/config/grc_gr_video_sdl.m4
gnuradio/trunk/configure.ac
gnuradio/trunk/debian/gen-install-files.sh
gnuradio/trunk/gnuradio-core/gnuradio-core.pc.in
gnuradio/trunk/gnuradio-core/src/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/hier/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/trunk/gnuradio-core/src/python/gnuradio/Makefile.am
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py
gnuradio/trunk/gnuradio-examples/Makefile.am
gnuradio/trunk/gnuradio-examples/python/digital/
gnuradio/trunk/gr-atsc/
gnuradio/trunk/gr-atsc/Makefile.am
gnuradio/trunk/gr-atsc/src/Makefile.am
gnuradio/trunk/gr-atsc/src/lib/Makefile.am
gnuradio/trunk/gr-audio-alsa/Makefile.am
gnuradio/trunk/gr-audio-alsa/src/Makefile.am
gnuradio/trunk/gr-audio-jack/Makefile.am
gnuradio/trunk/gr-audio-jack/src/Makefile.am
gnuradio/trunk/gr-audio-oss/Makefile.am
gnuradio/trunk/gr-audio-oss/src/Makefile.am
gnuradio/trunk/gr-audio-osx/src/Makefile.am
gnuradio/trunk/gr-audio-portaudio/Makefile.am
gnuradio/trunk/gr-audio-portaudio/src/Makefile.am
gnuradio/trunk/gr-audio-windows/src/Makefile.am
gnuradio/trunk/gr-comedi/Makefile.am
gnuradio/trunk/gr-comedi/src/Makefile.am
gnuradio/trunk/gr-cvsd-vocoder/
gnuradio/trunk/gr-cvsd-vocoder/Makefile.am
gnuradio/trunk/gr-cvsd-vocoder/src/Makefile.am
gnuradio/trunk/gr-cvsd-vocoder/src/lib/Makefile.am
gnuradio/trunk/gr-gcell/src/Makefile.am
gnuradio/trunk/gr-gpio/src/Makefile.am
gnuradio/trunk/gr-gsm-fr-vocoder/
gnuradio/trunk/gr-gsm-fr-vocoder/Makefile.am
gnuradio/trunk/gr-gsm-fr-vocoder/src/Makefile.am
gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/trunk/gr-msdd6000/
gnuradio/trunk/gr-msdd6000/Makefile.am
gnuradio/trunk/gr-msdd6000/src/Makefile.am
gnuradio/trunk/gr-pager/
gnuradio/trunk/gr-pager/Makefile.am
gnuradio/trunk/gr-pager/src/Makefile.am
gnuradio/trunk/gr-qtgui/src/Makefile.am
gnuradio/trunk/gr-qtgui/src/lib/Makefile.am
gnuradio/trunk/gr-qtgui/src/python/usrp_display.py
gnuradio/trunk/gr-radar-mono/src/Makefile.am
gnuradio/trunk/gr-radio-astronomy/src/Makefile.am
gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am
gnuradio/trunk/gr-sounder/src/Makefile.am
gnuradio/trunk/gr-trellis/
gnuradio/trunk/gr-trellis/Makefile.am
gnuradio/trunk/gr-trellis/src/Makefile.am
gnuradio/trunk/gr-trellis/src/lib/Makefile.am
gnuradio/trunk/gr-usrp/src/Makefile.am
gnuradio/trunk/gr-usrp2/src/Makefile.am
gnuradio/trunk/gr-utils/src/Makefile.am
gnuradio/trunk/gr-video-sdl/Makefile.am
gnuradio/trunk/gr-video-sdl/src/Makefile.am
gnuradio/trunk/gr-wxgui/Makefile.am
gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py
gnuradio/trunk/grc/Makefile.am
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_source.xml
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml
gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml
gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml
gnuradio/trunk/grc/src/grc_gnuradio/wxgui/forms/forms.py
gnuradio/trunk/grc/src/utils/odict.py
gnuradio/trunk/mblock/mblock.pc.in
gnuradio/trunk/omnithread/gnuradio-omnithread.pc.in
gnuradio/trunk/pmt/pmt.pc.in
gnuradio/trunk/usrp/host/Makefile.am
gnuradio/trunk/usrp/host/lib/legacy/Makefile.am
gnuradio/trunk/usrp/usrp-inband.pc.in
gnuradio/trunk/usrp/usrp.pc.in
gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/Makefile
gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v
gnuradio/trunk/usrp2/host/include/usrp2/mimo_config.h
Log:
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.
Property changes on: gnuradio/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/deb:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/iad2:10771-10887
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
+ /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/eb/t364:11016-11017
/gnuradio/branches/developers/eb/t367:11021-11025
/gnuradio/branches/developers/eb/t371:10958-10971
/gnuradio/branches/developers/eb/t378:10683-10688
/gnuradio/branches/developers/jblum/grc:10680-10938
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier:10818-10858
/gnuradio/branches/developers/jcorgan/deb:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2:10713-10765
/gnuradio/branches/developers/jcorgan/iad2:10771-10887
/gnuradio/branches/developers/jcorgan/np:11124-11148
/gnuradio/branches/developers/jcorgan/t161:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
Modified: gnuradio/trunk/Makefile.common
===================================================================
--- gnuradio/trunk/Makefile.common 2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/Makefile.common 2009-05-27 01:54:41 UTC (rev 11150)
@@ -26,6 +26,7 @@
# includes
grincludedir = $(includedir)/gnuradio
+if PYTHON
# swig includes
swigincludedir = $(grincludedir)/swig
@@ -42,6 +43,7 @@
usrppythondir = $(pythondir)/usrpm
usrppyexecdir = $(pyexecdir)/usrpm
+endif
# gcell includes
gcellincludedir = $(includedir)/gcell
Modified: gnuradio/trunk/config/grc_gr_atsc.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_atsc.m4 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/config/grc_gr_atsc.m4 2009-05-27 01:54:41 UTC (rev
11150)
@@ -25,6 +25,7 @@
AC_CONFIG_FILES([\
gr-atsc/Makefile \
+ gr-atsc/gnuradio-atsc.pc \
gr-atsc/doc/Makefile \
gr-atsc/src/Makefile \
gr-atsc/src/lib/Makefile \
Modified: gnuradio/trunk/config/grc_gr_audio_alsa.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_audio_alsa.m4 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/config/grc_gr_audio_alsa.m4 2009-05-27 01:54:41 UTC (rev
11150)
@@ -35,7 +35,7 @@
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 \
])
Modified: gnuradio/trunk/config/grc_gr_audio_jack.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_audio_jack.m4 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/config/grc_gr_audio_jack.m4 2009-05-27 01:54:41 UTC (rev
11150)
@@ -35,6 +35,7 @@
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 \
])
Modified: gnuradio/trunk/config/grc_gr_audio_oss.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_audio_oss.m4 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/config/grc_gr_audio_oss.m4 2009-05-27 01:54:41 UTC (rev
11150)
@@ -51,6 +51,7 @@
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 \
])
Modified: gnuradio/trunk/config/grc_gr_audio_portaudio.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_audio_portaudio.m4 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/config/grc_gr_audio_portaudio.m4 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -35,6 +35,7 @@
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 \
])
Modified: gnuradio/trunk/config/grc_gr_comedi.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_comedi.m4 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/config/grc_gr_comedi.m4 2009-05-27 01:54:41 UTC (rev
11150)
@@ -35,6 +35,7 @@
AC_CONFIG_FILES([ \
gr-comedi/Makefile \
+ gr-comedi/gnuradio-comedi.pc \
gr-comedi/src/Makefile \
gr-comedi/src/run_tests \
])
Modified: gnuradio/trunk/config/grc_gr_cvsd_vocoder.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_cvsd_vocoder.m4 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/config/grc_gr_cvsd_vocoder.m4 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -25,6 +25,7 @@
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 \
Modified: gnuradio/trunk/config/grc_gr_gsm_fr_vocoder.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_gsm_fr_vocoder.m4 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/config/grc_gr_gsm_fr_vocoder.m4 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -25,6 +25,7 @@
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 \
Modified: gnuradio/trunk/config/grc_gr_msdd6000.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_msdd6000.m4 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/config/grc_gr_msdd6000.m4 2009-05-27 01:54:41 UTC (rev
11150)
@@ -22,6 +22,7 @@
AC_CONFIG_FILES([\
gr-msdd6000/Makefile \
+ gr-msdd6000/gnuradio-msdd6000.pc \
gr-msdd6000/src/Makefile
])
Modified: gnuradio/trunk/config/grc_gr_pager.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_pager.m4 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/config/grc_gr_pager.m4 2009-05-27 01:54:41 UTC (rev
11150)
@@ -25,6 +25,7 @@
AC_CONFIG_FILES([\
gr-pager/Makefile \
+ gr-pager/gnuradio-pager.pc \
gr-pager/src/Makefile \
gr-pager/src/run_tests
])
Modified: gnuradio/trunk/config/grc_gr_trellis.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_trellis.m4 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/config/grc_gr_trellis.m4 2009-05-27 01:54:41 UTC (rev
11150)
@@ -25,6 +25,7 @@
AC_CONFIG_FILES([\
gr-trellis/Makefile \
+ gr-trellis/gnuradio-trellis.pc \
gr-trellis/doc/Makefile \
gr-trellis/src/Makefile \
gr-trellis/src/lib/Makefile \
Modified: gnuradio/trunk/config/grc_gr_video_sdl.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_video_sdl.m4 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/config/grc_gr_video_sdl.m4 2009-05-27 01:54:41 UTC (rev
11150)
@@ -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_CONFIG_FILES([ \
gr-video-sdl/Makefile \
+ gr-video-sdl/gnuradio-video-sdl.pc \
gr-video-sdl/src/Makefile \
gr-video-sdl/src/run_tests \
])
Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/configure.ac 2009-05-27 01:54:41 UTC (rev 11150)
@@ -126,6 +126,20 @@
GR_NO_UNDEFINED dnl do we need the -no-undefined linker flag
GR_SCRIPTING
+# Allow user to choose whether to generate SWIG/Python
+# Default is enabled
+AC_ARG_ENABLE([python],
+ [AS_HELP_STRING([--enable-python],
+ [generate SWIG/Python components (default is yes)])],
+ [case "${enableval}" in
+ yes) enable_python=yes ;;
+ no) enable_python=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-python]) ;;
+ esac],
+ [enable_python=yes]
+)
+AM_CONDITIONAL([PYTHON], [test x$enable_python = xyes])
+
AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
@@ -327,7 +341,7 @@
GRC_GR_WXGUI
GRC_GR_QTGUI
GRC_GR_SOUNDER dnl this must come after GRC_USRP
-GRC_GR_UTILS dnl this must come after GRC_GR_WXGUI
+GRC_GR_UTILS dnl this must come after GRC_GR_WXGUI
GRC_GNURADIO_EXAMPLES dnl must come after all GRC_GR_*
GRC_GRC
GRC_DOCS dnl must be last
@@ -402,3 +416,4 @@
echo These components will not be built.
echo
fi
+
Modified: gnuradio/trunk/debian/gen-install-files.sh
===================================================================
--- gnuradio/trunk/debian/gen-install-files.sh 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/debian/gen-install-files.sh 2009-05-27 01:54:41 UTC (rev
11150)
@@ -57,7 +57,7 @@
touch $NAME
$EXTRACT gr-audio-alsa/src/Makefile grinclude_HEADERS >>$NAME
echo usr/lib/libgnuradio-audio-alsa.so >>$NAME
-echo usr/lib/pkgconfig/gr-audio-alsa.pc >>$NAME
+echo usr/lib/pkgconfig/gnuradio-audio-alsa.pc >>$NAME
# libgnuradio-qtgui
NAME=debian/libgnuradio-qtgui.install
Modified: gnuradio/trunk/gnuradio-core/gnuradio-core.pc.in
===================================================================
--- gnuradio/trunk/gnuradio-core/gnuradio-core.pc.in 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gnuradio-core/gnuradio-core.pc.in 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -7,5 +7,6 @@
Description: GNU Software Radio toolkit
Requires: gruel fftw3f gsl gnuradio-omnithread
Version: @VERSION@
-Libs: -L${libdir} -lgnuradio-core @BOOST_LDFLAGS@ @BOOST_THREAD_LIB@
@BOOST_DATE_TIME_LIB@
-Cflags: @BOOST_CPPFLAGS@ @BOOST_CXXFLAGS@ -I${includedir} @DEFINES@
+Libs.private: @BOOST_LDFLAGS@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@
+Libs: -L${libdir} -lgnuradio-core
+Cflags: @BOOST_CPPFLAGS@ @BOOST_CXXFLAGS@ -I${includedir}
Modified: gnuradio/trunk/gnuradio-core/src/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2004 Free Software Foundation, Inc.
+# Copyright 2001,2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,6 +21,9 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = gen_interpolator_taps lib tests python
+SUBDIRS = gen_interpolator_taps lib tests
+if PYTHON
+SUBDIRS += python
+endif
DIST_SUBDIRS = gen_interpolator_taps lib tests python utils
Modified: gnuradio/trunk/gnuradio-core/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/lib/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2004 Free Software Foundation, Inc.
+# Copyright 2001,2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -24,7 +24,10 @@
## Process this file with automake to produce Makefile.in
# We've got to build . before swig
-SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io
hier . swig
+SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io
hier .
+if PYTHON
+SUBDIRS += swig
+endif
# generate libgnuradio-core.la from the convenience libraries in subdirs
Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am 2009-05-27
01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am 2009-05-27
01:54:41 UTC (rev 11150)
@@ -293,7 +293,7 @@
qa_gri_mmse_fir_interpolator_cc.h
-
+if PYTHON
swiginclude_HEADERS = \
filter.i \
filter_generated.i \
@@ -310,6 +310,7 @@
gr_single_pole_iir_filter_ff.i \
gr_single_pole_iir_filter_cc.i \
$(GENERATED_I)
+endif
# Do creation and inclusion of other Makefiles last
Modified: gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am 2009-05-27
01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am 2009-05-27
01:54:41 UTC (rev 11150)
@@ -353,6 +353,7 @@
sine_table.h \
qa_gr_math.h
+if PYTHON
swiginclude_HEADERS = \
general.i \
gr_agc_cc.i \
@@ -478,3 +479,4 @@
gr_scrambler_bb.i \
gr_probe_mpsk_snr_c.i \
gr_probe_density_b.i
+endif
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am 2009-05-27
01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am 2009-05-27
01:54:41 UTC (rev 11150)
@@ -135,11 +135,13 @@
gr_noise_type.h \
gr_sig_source_waveform.h
+if PYTHON
swiginclude_HEADERS = \
$(GENERATED_I) \
gr_endianness.i \
gengen.i \
gengen_generated.i
+endif
# Do creation and inclusion of other Makefiles last
Modified: gnuradio/trunk/gnuradio-core/src/lib/hier/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/hier/Makefile.am 2009-05-27
01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/lib/hier/Makefile.am 2009-05-27
01:54:41 UTC (rev 11150)
@@ -32,6 +32,8 @@
grinclude_HEADERS = \
gr_channel_model.h
+if PYTHON
swiginclude_HEADERS = \
hier.i \
gr_channel_model.i
+endif
Modified: gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -93,9 +93,7 @@
gr_wavfile_sink.h \
gri_wavfile.h
-
-
-
+if PYTHON
swiginclude_HEADERS = \
io.i \
gr_file_sink.i \
@@ -116,4 +114,4 @@
gr_udp_source.i \
gr_wavfile_source.i \
gr_wavfile_sink.i
-
+endif
Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am 2009-05-27
01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/Makefile.am 2009-05-27
01:54:41 UTC (rev 11150)
@@ -135,6 +135,7 @@
qa_gr_vmcircbuf.h \
qa_runtime.h
+if PYTHON
swiginclude_HEADERS = \
gr_basic_block.i \
gr_block.i \
@@ -154,3 +155,4 @@
gr_sync_interpolator.i \
gr_top_block.i \
runtime.i
+endif
Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am 2009-05-27
01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am 2009-05-27
01:54:41 UTC (rev 11150)
@@ -21,6 +21,7 @@
include $(top_srcdir)/Makefile.common
+if PYTHON
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \
$(WITH_INCLUDES)
@@ -99,3 +100,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gnuradio-core/src/python/gnuradio/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/python/gnuradio/Makefile.am
2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gnuradio-core/src/python/gnuradio/Makefile.am
2009-05-27 01:54:41 UTC (rev 11150)
@@ -21,6 +21,7 @@
include $(top_srcdir)/Makefile.common
+if PYTHON
SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
grpython_PYTHON = \
@@ -34,3 +35,4 @@
gr_unittest.py \
optfir.py \
window.py
+endif
Property changes on:
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/python/gnuradio/gr/pubsub.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10876-10880
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
Modified: gnuradio/trunk/gnuradio-examples/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gnuradio-examples/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -21,4 +21,7 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = python c++
+SUBDIRS = c++
+if PYTHON
+SUBDIRS += python
+endif
Property changes on: gnuradio/trunk/gnuradio-examples/python/digital
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
+
/gnuradio/branches/developers/eb/t348/gnuradio-examples/python/digital:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-examples/python/digital:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-examples/python/digital:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-examples/python/digital:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-examples/python/digital:10683-10688
/gnuradio/branches/developers/jblum/digital:10901-10941
/gnuradio/branches/developers/jblum/grc/gnuradio-examples/python/digital:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-examples/python/digital:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-examples/python/digital:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-examples/python/digital:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-examples/python/digital:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-examples/python/digital:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-examples/python/digital:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-examples/python/digital:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-examples/python/digital:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-examples/python/digital:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-examples/python/digital:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-examples/python/digital:10540-10546
Property changes on: gnuradio/trunk/gr-atsc
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
+ Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
gnuradio-atsc.pc
Modified: gnuradio/trunk/gr-atsc/Makefile.am
===================================================================
--- gnuradio/trunk/gr-atsc/Makefile.am 2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gr-atsc/Makefile.am 2009-05-27 01:54:41 UTC (rev 11150)
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -25,4 +25,4 @@
DIST_SUBDIRS = src doc
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =
+dist_pkgconfig_DATA = gnuradio-atsc.pc
Copied: gnuradio/trunk/gr-atsc/gnuradio-atsc.pc.in (from rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-atsc/gnuradio-atsc.pc.in)
===================================================================
--- gnuradio/trunk/gr-atsc/gnuradio-atsc.pc.in (rev 0)
+++ gnuradio/trunk/gr-atsc/gnuradio-atsc.pc.in 2009-05-27 01:54:41 UTC (rev
11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-atsc
+Description: The GNU Radio blocks for ATSC decoding
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-atsc
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-atsc/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-atsc/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-atsc/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -19,4 +19,8 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
+
Modified: gnuradio/trunk/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-atsc/src/lib/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -32,12 +32,10 @@
qa_atsci_viterbi_decoder_t1_input.dat \
qa_atsci_viterbi_decoder_t1_output.dat
-TESTS = \
- test_atsci
-# We build two libtool convenience libraries
+TESTS = test_atsci
-noinst_LTLIBRARIES = libatsc.la libatsc-qa.la
+lib_LTLIBRARIES = libgnuradio-atsc.la
# FIXME
# atsci_exp2_lp.cc \
@@ -46,7 +44,7 @@
# atsci_vsbtx_lp.cc \
#
-libatsc_la_SOURCES = \
+libgnuradio_atsc_la_SOURCES = \
atsc_derandomizer.cc \
atsc_randomizer.cc \
atsc_rs_decoder.cc \
@@ -88,10 +86,15 @@
create_atsci_fs_correlator.cc \
plinfo.cc
-libatsc_la_LIBADD = \
+BUILT_SOURCES = \
+ atsci_viterbi_mux.cc
+
+libgnuradio_atsc_la_LIBADD = \
$(GNURADIO_CORE_LA)
-libatsc_qa_la_SOURCES = \
+noinst_LTLIBRARIES = libgnuradio-atsc-qa.la
+
+libgnuradio_atsc_qa_la_SOURCES = \
qa_atsci_basic_trellis_encoder.cc \
qa_atsci_data_interleaver.cc \
qa_atsci_equalizer_nop.cc \
@@ -107,9 +110,10 @@
qa_atsci.cc \
qa_interleaver_fifo.cc
-libatsc_qa_la_LIBADD = \
+libgnuradio_atsc_qa_la_LIBADD = \
$(GNURADIO_CORE_LA)
+
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
atsc_consts.h \
@@ -193,8 +197,8 @@
test_atsci_SOURCES = test_atsci.cc
test_atsci_LDADD = \
- libatsc-qa.la \
- libatsc.la \
+ libgnuradio-atsc-qa.la \
+ libgnuradio-atsc.la \
$(CPPUNIT_LIBS)
# ------------------------------------------------------------------------
@@ -203,6 +207,7 @@
CLEANFILES = atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT)
+if PYTHON
# ------------------------------------------------------------------------
# This is the swig-ish part of the Makefile.
# It builds the atsc module which we'll load into python
@@ -220,14 +225,13 @@
# additional libraries for linking with the SWIG-generated library
atsc_la_swig_libadd = \
- libatsc.la
+ libgnuradio-atsc.la
include $(top_srcdir)/Makefile.swig
# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = \
- atsci_viterbi_mux.cc \
- $(swig_built_sources)
+BUILT_SOURCES += $(swig_built_sources)
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-audio-alsa/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-audio-alsa/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -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
Copied: gnuradio/trunk/gr-audio-alsa/gnuradio-audio-alsa.pc.in (from rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/gnuradio-audio-alsa.pc.in)
===================================================================
--- gnuradio/trunk/gr-audio-alsa/gnuradio-audio-alsa.pc.in
(rev 0)
+++ gnuradio/trunk/gr-audio-alsa/gnuradio-audio-alsa.pc.in 2009-05-27
01:54:41 UTC (rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-audio-alsa
+Description: The GNU Radio block for the ALSA sound system
+Requires: gnuradio-core alsa
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-alsa
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/src/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-audio-alsa/src/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -23,10 +23,6 @@
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_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 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
\ No newline at end of file
Modified: gnuradio/trunk/gr-audio-jack/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-jack/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-audio-jack/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -23,5 +23,8 @@
SUBDIRS = src
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio-jack.pc
+
etcdir = $(sysconfdir)/gnuradio/conf.d
dist_etc_DATA = gr-audio-jack.conf
Copied: gnuradio/trunk/gr-audio-jack/gnuradio-audio-jack.pc.in (from rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-audio-jack/gnuradio-audio-jack.pc.in)
===================================================================
--- gnuradio/trunk/gr-audio-jack/gnuradio-audio-jack.pc.in
(rev 0)
+++ gnuradio/trunk/gr-audio-jack/gnuradio-audio-jack.pc.in 2009-05-27
01:54:41 UTC (rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-audio-jack
+Description: GNU Radio blocks for the JACK sound system
+Requires: gnuradio-core jack
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-jack
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-jack/src/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-audio-jack/src/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -23,10 +23,6 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
audio_jack_sink.h \
@@ -35,13 +31,30 @@
noinst_HEADERS = \
gri_jack.h
+lib_LTLIBRARIES = libgnuradio-audio-jack.la
+
+libgnuradio_audio_jack_la_SOURCES = \
+ audio_jack_sink.cc \
+ audio_jack_source.cc \
+ gri_jack.cc
+
+libgnuradio_audio_jack_la_LIBADD = \
+ $(GNURADIO_CORE_LA) \
+ $(JACK_LIBS)
+
+libgnuradio_audio_jack_la_LDFLAGS = \
+ $(NO_UNDEFINED)
+
noinst_PYTHON = \
qa_jack.py
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+if PYTHON
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_jack.i
@@ -53,16 +66,9 @@
audio_jack_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-audio_jack_la_swig_sources = \
- audio_jack_sink.cc \
- audio_jack_source.cc \
- gri_jack.cc
-
# additional libraries for linking with the SWIG-generated library
audio_jack_la_swig_libadd = \
- $(GNURADIO_CORE_LA) \
- $(JACK_LIBS)
+ libgnuradio-audio-jack.la
include $(top_srcdir)/Makefile.swig
@@ -71,3 +77,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-audio-oss/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-oss/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-audio-oss/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -23,5 +23,8 @@
SUBDIRS = src
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio-oss.pc
+
etcdir = $(sysconfdir)/gnuradio/conf.d
dist_etc_DATA = gr-audio-oss.conf
Copied: gnuradio/trunk/gr-audio-oss/gnuradio-audio-oss.pc.in (from rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-audio-oss/gnuradio-audio-oss.pc.in)
===================================================================
--- gnuradio/trunk/gr-audio-oss/gnuradio-audio-oss.pc.in
(rev 0)
+++ gnuradio/trunk/gr-audio-oss/gnuradio-audio-oss.pc.in 2009-05-27
01:54:41 UTC (rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-audio-oss
+Description: The GNU Radio block for the OSS sound system
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-oss
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-oss/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-audio-oss/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -21,12 +21,10 @@
include $(top_srcdir)/Makefile.common
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
audio_oss_sink.h \
@@ -34,10 +32,24 @@
noinst_PYTHON = qa_oss.py
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+lib_LTLIBRARIES = libgnuradio-audio-oss.la
+libgnuradio_audio_oss_la_SOURCES = \
+ audio_oss_sink.cc \
+ audio_oss_source.cc
+
+libgnuradio_audio_oss_la_LIBADD = \
+ $(GNURADIO_CORE_LA) \
+ $(OSS_LIBS)
+
+libgnuradio_audio_oss_la_LDFLAGS = \
+ $(NO_UNDEFINED)
+
+if PYTHON
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_oss.i
@@ -49,15 +61,9 @@
audio_oss_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-audio_oss_la_swig_sources = \
- audio_oss_sink.cc \
- audio_oss_source.cc
-
# additional libraries for linking with the SWIG-generated library
audio_oss_la_swig_libadd = \
- $(GNURADIO_CORE_LA) \
- $(OSS_LIBS)
+ libgnuradio-audio-oss.la
include $(top_srcdir)/Makefile.swig
@@ -66,3 +72,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-audio-osx/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-osx/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-audio-osx/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -23,10 +23,6 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
# C/C++ headers get installed in ${prefix}/include/gnuradio
@@ -43,8 +39,26 @@
qa_osx.py \
test_audio_loop.py
+lib_LTLIBRARIES = libgnuradio-audio-osx.la
+
+libgnuradio_audio_osx_la_SOURCES = \
+ audio_osx_sink.cc \
+ audio_osx_source.cc
+
+libgnuradio_audio_osx_la_LIBADD = \
+ $(GNURADIO_CORE_LA)
+
+libgnuradio_audio_osx_la_LDFLAGS = \
+ -framework AudioUnit \
+ -framework CoreAudio \
+ -framework AudioToolbox \
+ $(NO_UNDEFINED)
+
+if PYTHON
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_osx.i
@@ -56,21 +70,10 @@
audio_osx_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-audio_osx_la_swig_sources = \
- audio_osx_sink.cc \
- audio_osx_source.cc
-
# additional libraries for linking with the SWIG-generated library
audio_osx_la_swig_libadd = \
- $(GNURADIO_CORE_LA)
+ libgnuradio_audio_osx.la
-# additional LD flags for linking the SWIG-generated library
-audio_osx_la_swig_ldflags = \
- -framework AudioUnit \
- -framework CoreAudio \
- -framework AudioToolbox
-
include $(top_srcdir)/Makefile.swig
# add some of the variables generated inside the Makefile.swig.gen
@@ -78,3 +81,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-audio-portaudio/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-audio-portaudio/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -23,5 +23,8 @@
SUBDIRS = src
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-audio-portaudio.pc
+
etcdir = $(sysconfdir)/gnuradio/conf.d
dist_etc_DATA = gr-audio-portaudio.conf
Copied: gnuradio/trunk/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in (from
rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in)
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
(rev 0)
+++ gnuradio/trunk/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in
2009-05-27 01:54:41 UTC (rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-audio-portaudio
+Description: The GNU Radio block for the PORTAUDIO sound system
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-portaudio
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-audio-portaudio/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-audio-portaudio/src/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -23,10 +23,6 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
$(PORTAUDIO_CFLAGS) $(WITH_INCLUDES)
@@ -41,8 +37,26 @@
noinst_PYTHON = \
qa_portaudio.py
+lib_LTLIBRARIES = libgnuradio-audio-portaudio.la
+
+libgnuradio_audio_portaudio_la_SOURCES = \
+ audio_portaudio_sink.cc \
+ audio_portaudio_source.cc \
+ gri_portaudio.cc
+
+libgnuradio_audio_portaudio_la_LIBADD = \
+ $(GNURADIO_CORE_LA) \
+ $(PORTAUDIO_LIBS)
+
+libgnuradio_audio_portaudio_la_LDFLAGS = \
+ $(NO_UNDEFINED)
+
+
+if PYTHON
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_portaudio.i
@@ -54,16 +68,9 @@
audio_portaudio_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-audio_portaudio_la_swig_sources = \
- audio_portaudio_sink.cc \
- audio_portaudio_source.cc \
- gri_portaudio.cc
-
# additional libraries for linking with the SWIG-generated library
audio_portaudio_la_swig_libadd = \
- $(GNURADIO_CORE_LA) \
- $(PORTAUDIO_LIBS)
+ libgnuradio-audio-portaudio.la
include $(top_srcdir)/Makefile.swig
@@ -72,3 +79,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-audio-windows/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-windows/src/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-audio-windows/src/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -23,21 +23,34 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-DISTCLEANFILES = run_tests
-
noinst_PYTHON = qa_audio_windows.py
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
audio_windows_sink.h \
audio_windows_source.h
+lib_LTLIBRARIES = libgnuradio-audio-windows.la
+
+libgnuradio_audio_windows_la_SOURCES = \
+ audio_windows_sink.cc \
+ audio_windows_source.cc
+
+libgnuradio_audio_windows_la_LIBADD = \
+ $(GNURADIO_CORE_LA) \
+ $(WINAUDIO_LIBS)
+
+libgnuradio_audio_windows_la_LDFLAGS = \
+ $(LIBGNURADIO_CORE_EXTRA_LDFLAGS) \
+ $(NO_UNDEFINED)
+
+if PYTHON
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_windows.i
@@ -49,20 +62,10 @@
audio_windows_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-audio_windows_la_swig_sources = \
- audio_windows_sink.cc \
- audio_windows_source.cc
-
# additional libraries for linking with the SWIG-generated library
audio_windows_la_swig_libadd = \
- $(GNURADIO_CORE_LA) \
- $(WINAUDIO_LIBS)
+ libgnuradio-audio-windows.la
-# additional LD flags for linking the SWIG-generated library
-audio_windows_la_swig_ldflags = \
- $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
-
include $(top_srcdir)/Makefile.swig
# add some of the variables generated inside the Makefile.swig.gen
@@ -70,3 +73,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-comedi/Makefile.am
===================================================================
--- gnuradio/trunk/gr-comedi/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-comedi/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -22,3 +22,6 @@
include $(top_srcdir)/Makefile.common
SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-comedi.pc
Copied: gnuradio/trunk/gr-comedi/gnuradio-comedi.pc.in (from rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-comedi/gnuradio-comedi.pc.in)
===================================================================
--- gnuradio/trunk/gr-comedi/gnuradio-comedi.pc.in
(rev 0)
+++ gnuradio/trunk/gr-comedi/gnuradio-comedi.pc.in 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks for the comedi library
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-comedi
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-comedi/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-comedi/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -23,10 +23,6 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
# C/C++ headers get installed in ${prefix}/include/gnuradio
@@ -40,8 +36,25 @@
noinst_PYTHON = \
qa_comedi.py
+lib_LTLIBRARIES = libgnuradio-comedi.la
+
+libgnuradio_comedi_la_SOURCES = \
+ comedi_sink.cc \
+ comedi_source.cc \
+ gri_comedi.cc
+
+libgnuradio_comedi_la_LIBADD = \
+ $(GNURADIO_CORE_LA) \
+ $(COMEDI_LIBS)
+
+libgnuradio_comedi_la_LDFLAGS = \
+ $(NO_UNDEFINED)
+
+if PYTHON
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
comedi.i
@@ -53,16 +66,9 @@
comedi_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-comedi_la_swig_sources = \
- comedi_sink_s.cc \
- comedi_source_s.cc \
- gri_comedi.cc
-
# additional libraries for linking with the SWIG-generated library
comedi_la_swig_libadd = \
- $(GNURADIO_CORE_LA) \
- $(COMEDI_LIBS)
+ libgnuradio-comedi.la
include $(top_srcdir)/Makefile.swig
@@ -71,3 +77,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Property changes on: gnuradio/trunk/gr-cvsd-vocoder
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
+ Makefile
Makefile.in
*.pc
Modified: gnuradio/trunk/gr-cvsd-vocoder/Makefile.am
===================================================================
--- gnuradio/trunk/gr-cvsd-vocoder/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-cvsd-vocoder/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -22,4 +22,6 @@
include $(top_srcdir)/Makefile.common
SUBDIRS = src
-DIST_SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-cvsd-vocoder.pc
Copied: gnuradio/trunk/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in (from rev
11148,
gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in)
===================================================================
--- gnuradio/trunk/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
(rev 0)
+++ gnuradio/trunk/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in 2009-05-27
01:54:41 UTC (rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-cvsd-vocoder
+Description: GNU Radio blocks implementing a CVSD vocoder
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-cvsd-vocoder
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-cvsd-vocoder/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-cvsd-vocoder/src/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-cvsd-vocoder/src/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/trunk/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-cvsd-vocoder/src/lib/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-cvsd-vocoder/src/lib/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -28,6 +28,19 @@
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 @@
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 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-gcell/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gcell/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-gcell/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -22,10 +22,6 @@
SUBDIRS = . examples
-EXTRA_DIST = run_tests.in
-
-TESTS = run_tests
-
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \
$(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
@@ -43,24 +39,27 @@
# ----------------------------------------------------------------
# the library for the C++ blocks
-lib_LTLIBRARIES = libgr_gcell.la
+lib_LTLIBRARIES = libgnuradio_gcell.la
-libgr_gcell_la_SOURCES = \
+libgnuradio_gcell_la_SOURCES = \
gcell_fft_vcc.cc
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
gcell_fft_vcc.h
-libgr_gcell_la_LIBADD = \
+libgnuradio_gcell_la_LIBADD = \
$(GNURADIO_CORE_LA) \
$(GCELL_LA)
-libgr_gcell_la_LDFLAGS = $(NO_UNDEFINED)
+libgnuradio_gcell_la_LDFLAGS = $(NO_UNDEFINED)
+if PYTHON
# ----------------------------------------------------------------
# SWIG stuff
# ----------------------------------------------------------------
+EXTRA_DIST = run_tests.in
+TESTS = run_tests
TOP_SWIG_IFILES = \
gcell.i
@@ -78,7 +77,7 @@
# additional libraries for linking with the SWIG-generated library
gcell_la_swig_libadd = \
- libgr_gcell.la
+ libgnuradio_gcell.la
# additional SWIG files to be installed
gcell_swiginclude_headers = \
@@ -92,3 +91,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-gpio/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gpio/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-gpio/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -19,4 +19,8 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = python fpga
+SUBDIRS = fpga
+if PYTHON
+SUBDIRS += python
+endif
+
Property changes on: gnuradio/trunk/gr-gsm-fr-vocoder
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
+ Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
*.pc
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -22,4 +22,6 @@
include $(top_srcdir)/Makefile.common
SUBDIRS = src
-DIST_SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-gsm-fr-vocoder.pc
Copied: gnuradio/trunk/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in (from
rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in)
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
(rev 0)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
2009-05-27 01:54:41 UTC (rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks implementing a GSM full rate vocoder
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-gsm-fr-vocoder
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am 2009-05-27
01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am 2009-05-27
01:54:41 UTC (rev 11150)
@@ -30,8 +30,21 @@
gsm_fr_decode_ps.h \
gsm_fr_encode_sp.h
+lib_LTLIBRARIES = libgnuradio-gsm-fr-vocoder.la
+
+libgnuradio_gsm_fr_vocoder_la_SOURCES = \
+ gsm_fr_decode_ps.cc \
+ gsm_fr_encode_sp.cc
+
+libgnuradio_gsm_fr_vocoder_la_LIBADD = \
+ $(GNURADIO_CORE_LA) \
+ gsm/libgsm.la
+
+libgnuradio_gsm_fr_vocoder_la_LDFLAGS = \
+ $(NO_UNDEFINED)
+
+if PYTHON
# SWIG interface and library
-
TOP_SWIG_IFILES = \
gsm_full_rate.i
@@ -42,15 +55,9 @@
gsm_full_rate_pythondir_category = \
gnuradio/vocoder
-# additional sources for the SWIG-generated library
-gsm_full_rate_la_swig_sources = \
- gsm_fr_decode_ps.cc \
- gsm_fr_encode_sp.cc
-
# additional libraries for linking with the SWIG-generated library
gsm_full_rate_la_swig_libadd = \
- $(GNURADIO_CORE_LA) \
- gsm/libgsm.la
+ libgnuradio-gsm-fr-vocoder.la
include $(top_srcdir)/Makefile.swig
@@ -59,3 +66,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Property changes on: gnuradio/trunk/gr-msdd6000
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
+ Makefile
Makefile.in
*.pc
Modified: gnuradio/trunk/gr-msdd6000/Makefile.am
===================================================================
--- gnuradio/trunk/gr-msdd6000/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-msdd6000/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -23,3 +23,5 @@
SUBDIRS = src
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-msdd6000.pc
Copied: gnuradio/trunk/gr-msdd6000/gnuradio-msdd6000.pc.in (from rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-msdd6000/gnuradio-msdd6000.pc.in)
===================================================================
--- gnuradio/trunk/gr-msdd6000/gnuradio-msdd6000.pc.in
(rev 0)
+++ gnuradio/trunk/gr-msdd6000/gnuradio-msdd6000.pc.in 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks for the comedi library
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-comedi
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-msdd6000/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-msdd6000/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-msdd6000/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -30,6 +30,19 @@
msdd_buffer_copy_behaviors.h \
msdd6000.h
+lib_LTLIBRARIES = libgnuradio-msdd6000.la
+
+libgnuradio_msdd6000_la_SOURCES = \
+ msdd_source_simple.cc \
+ msdd6000.cc
+
+libgnuradio_msdd6000_la_LIBADD = \
+ $(GNURADIO_CORE_LA)
+
+libgnuradio_msdd6000_la_LDFLAGS = \
+ $(NO_UNDEFINED)
+
+if PYTHON
#################################
# SWIG interface and library
@@ -43,14 +56,9 @@
msdd_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-msdd_la_swig_sources = \
- msdd_source_simple.cc \
- msdd6000.cc
-
# additional libraries for linking with the SWIG-generated library
msdd_la_swig_libadd = \
- $(GNURADIO_CORE_LA)
+ libgnuradio-msdd6000.la
include $(top_srcdir)/Makefile.swig
@@ -59,3 +67,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Property changes on: gnuradio/trunk/gr-pager
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
data
+ Makefile
Makefile.in
data
*.pc
Modified: gnuradio/trunk/gr-pager/Makefile.am
===================================================================
--- gnuradio/trunk/gr-pager/Makefile.am 2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gr-pager/Makefile.am 2009-05-27 01:54:41 UTC (rev 11150)
@@ -22,3 +22,6 @@
include $(top_srcdir)/Makefile.common
SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-pager.pc
Copied: gnuradio/trunk/gr-pager/gnuradio-pager.pc.in (from rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-pager/gnuradio-pager.pc.in)
===================================================================
--- gnuradio/trunk/gr-pager/gnuradio-pager.pc.in
(rev 0)
+++ gnuradio/trunk/gr-pager/gnuradio-pager.pc.in 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+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}
Modified: gnuradio/trunk/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-pager/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-pager/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -23,17 +23,8 @@
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 @@
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 @@
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 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-qtgui/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-qtgui/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-qtgui/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/trunk/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-qtgui/src/lib/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-qtgui/src/lib/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -39,6 +39,8 @@
EXTRA_DIST = spectrumdisplayform.ui
+BUILT_SOURCES = $(QMAKE_SOURCES)
+
# Build the normal library for C++ apps to link against
lib_LTLIBRARIES = libgnuradio-qtgui.la
@@ -97,6 +99,7 @@
-lstdc++ \
$(QT_LIBS)
+if PYTHON
##############################
# SWIG interface and library
@@ -117,9 +120,9 @@
include $(top_srcdir)/Makefile.swig
# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = \
- $(QMAKE_SOURCES) \
+BUILT_SOURCES += \
$(swig_built_sources)
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Property changes on: gnuradio/trunk/gr-qtgui/src/python/usrp_display.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t364/gr-qtgui/src/python/usrp_display.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-qtgui/src/python/usrp_display.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-qtgui/src/python/usrp_display.py:10958-10971
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-qtgui/src/python/usrp_display.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
+
/gnuradio/branches/developers/eb/t364/gr-qtgui/src/python/usrp_display.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-qtgui/src/python/usrp_display.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-qtgui/src/python/usrp_display.py:10958-10971
/gnuradio/branches/developers/jcorgan/cpphier/gr-qtgui/src/python/usrp_display.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-qtgui/src/python/usrp_display.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/np/gr-qtgui/src/python/usrp_display.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gr-qtgui/src/python/usrp_display.py:10876-10880
Modified: gnuradio/trunk/gr-radar-mono/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-radar-mono/src/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -21,4 +21,7 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = fpga lib python
+SUBDIRS = fpga lib
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/trunk/gr-radio-astronomy/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-radio-astronomy/src/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am 2009-05-27
01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am 2009-05-27
01:54:41 UTC (rev 11150)
@@ -23,6 +23,7 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+if PYTHON
TOP_SWIG_IFILES = \
ra.i
@@ -40,3 +41,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-sounder/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-sounder/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-sounder/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -21,4 +21,7 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = fpga lib python
+SUBDIRS = fpga lib
+if PYTHON
+SUBDIRS += python
+endif
Property changes on: gnuradio/trunk/gr-trellis
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
+ Makefile
Makefile.in
aclocal.m4
configure
config.h.in
stamp-h.in
libtool
config.log
config.h
config.cache
config.status
missing
stamp-h
stamp-h1
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
missing
make.log
*.pc
Modified: gnuradio/trunk/gr-trellis/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-trellis/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -23,3 +23,5 @@
SUBDIRS = src doc
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-trellis.pc
Copied: gnuradio/trunk/gr-trellis/gnuradio-trellis.pc.in (from rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-trellis/gnuradio-trellis.pc.in)
===================================================================
--- gnuradio/trunk/gr-trellis/gnuradio-trellis.pc.in
(rev 0)
+++ gnuradio/trunk/gr-trellis/gnuradio-trellis.pc.in 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks for the comedi library
+Requires: gnuradio-core
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-comedi
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-trellis/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-trellis/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python examples
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python examples
+endif
Modified: gnuradio/trunk/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/gr-trellis/src/lib/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -66,6 +66,29 @@
trellis_siso_combined_f.h \
$(GENERATED_H)
+lib_LTLIBRARIES = libgnuradio-trellis.la
+
+libgnuradio_trellis_la_SOURCES = \
+ fsm.cc \
+ quicksort_index.cc \
+ base.cc \
+ interleaver.cc \
+ trellis_calc_metric.cc \
+ trellis_permutation.cc \
+ trellis_siso_f.cc \
+ trellis_siso_combined_f.cc \
+ $(GENERATED_CC)
+
+libgnuradio_trellis_la_LIBADD = \
+ $(GNURADIO_CORE_LA)
+
+libgnuradio_trellis_la_LDFLAGS = \
+ $(NO_UNDEFINED)
+
+
+
+
+if PYTHON
#################################
# SWIG interface and library
@@ -79,21 +102,9 @@
trellis_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-trellis_la_swig_sources = \
- fsm.cc \
- quicksort_index.cc \
- base.cc \
- interleaver.cc \
- trellis_calc_metric.cc \
- trellis_permutation.cc \
- trellis_siso_f.cc \
- trellis_siso_combined_f.cc \
- $(GENERATED_CC)
-
# additional libraries for linking with the SWIG-generated library
trellis_la_swig_libadd = \
- $(GNURADIO_CORE_LA)
+ libgnuradio-trellis.la
# additional SWIG files to be installed
trellis_swiginclude_headers = \
@@ -131,3 +142,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-usrp/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-usrp/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -26,8 +26,6 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
DISTCLEANFILES = run_tests
noinst_PYTHON = qa_usrp.py
@@ -68,8 +66,10 @@
usrp_source_c.h \
usrp_source_s.h
+if PYTHON
# ----------------------------------------------------------------
# The SWIG library
+TESTS = run_tests
TOP_SWIG_IFILES = \
usrp_swig.i
@@ -111,3 +111,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-usrp2/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-usrp2/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-usrp2/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -34,7 +34,6 @@
# ----------------------------------------------------------------------
EXTRA_DIST = run_tests.in
-TESTS = run_tests
DISTCLEANFILES = run_tests
# ----------------------------------------------------------------------
@@ -79,12 +78,14 @@
rx_16sc_handler.h \
rx_32fc_handler.h
+if PYTHON
# ----------------------------------------------------------------------
# Python SWIG wrapper around C++ library
#
# usrp2.py
# _usrp2.so
# ----------------------------------------------------------------------
+TESTS = run_tests
TOP_SWIG_IFILES = \
usrp2.i
@@ -111,3 +112,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-utils/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-utils/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-utils/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/trunk/gr-video-sdl/Makefile.am
===================================================================
--- gnuradio/trunk/gr-video-sdl/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-video-sdl/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -22,3 +22,6 @@
include $(top_srcdir)/Makefile.common
SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-video-sdl.pc
Copied: gnuradio/trunk/gr-video-sdl/gnuradio-video-sdl.pc.in (from rev 11148,
gnuradio/branches/developers/jcorgan/np/gr-video-sdl/gnuradio-video-sdl.pc.in)
===================================================================
--- gnuradio/trunk/gr-video-sdl/gnuradio-video-sdl.pc.in
(rev 0)
+++ gnuradio/trunk/gr-video-sdl/gnuradio-video-sdl.pc.in 2009-05-27
01:54:41 UTC (rev 11150)
@@ -0,0 +1,11 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: gnuradio-comedi
+Description: GNU Radio blocks for the SDL library
+Requires: gnuradio-core sdl
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-video-sdl
+Cflags: -I${includedir}
Modified: gnuradio/trunk/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-video-sdl/src/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/gr-video-sdl/src/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -23,22 +23,34 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
+ $(WITH_INCLUDES)
-DISTCLEANFILES = run_tests
-
noinst_PYTHON = \
qa_video_sdl.py
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
- $(WITH_INCLUDES)
-
grinclude_HEADERS = \
video_sdl_sink_uc.h \
video_sdl_sink_s.h
+lib_LTLIBRARIES = libgnuradio-video-sdl.la
+
+libgnuradio_video_sdl_la_SOURCES = \
+ video_sdl_sink_uc.cc \
+ video_sdl_sink_s.cc
+
+libgnuradio_video_sdl_la_LIBADD = \
+ $(SDL_LIBS) \
+ $(GNURADIO_CORE_LA)
+
+libgnuradio_video_sdl_la_LDFLAGS = \
+ $(NO_UNDEFINED)
+
+if PYTHON
#################################
# SWIG interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
video_sdl.i
@@ -50,15 +62,9 @@
video_sdl_pythondir_category = \
gnuradio
-# additional sources for the SWIG-generated library
-video_sdl_la_swig_sources = \
- video_sdl_sink_uc.cc \
- video_sdl_sink_s.cc
-
# additional libraries for linking with the SWIG-generated library
video_sdl_la_swig_libadd = \
- $(SDL_LIBS) \
- $(GNURADIO_CORE_LA)
+ libgnuradio-video-sdl.la
include $(top_srcdir)/Makefile.swig
@@ -67,3 +73,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/trunk/gr-wxgui/Makefile.am
===================================================================
--- gnuradio/trunk/gr-wxgui/Makefile.am 2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/gr-wxgui/Makefile.am 2009-05-27 01:54:41 UTC (rev 11150)
@@ -26,6 +26,7 @@
README \
README.gl
+if PYTHON
SUBDIRS = src
etcdir = $(sysconfdir)/gnuradio/conf.d
@@ -33,3 +34,4 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gr-wxgui.pc
+endif
Property changes on:
gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t364/gr-wxgui/src/python/plotter/grid_plotter_base.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-wxgui/src/python/plotter/grid_plotter_base.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-wxgui/src/python/plotter/grid_plotter_base.py:10958-10971
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-wxgui/src/python/plotter/grid_plotter_base.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-wxgui/src/python/plotter/grid_plotter_base.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10771-10887
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
+
/gnuradio/branches/developers/eb/t364/gr-wxgui/src/python/plotter/grid_plotter_base.py:11016-11017
/gnuradio/branches/developers/eb/t367/gr-wxgui/src/python/plotter/grid_plotter_base.py:11021-11025
/gnuradio/branches/developers/eb/t371/gr-wxgui/src/python/plotter/grid_plotter_base.py:10958-10971
/gnuradio/branches/developers/eb/t378/gr-wxgui/src/python/plotter/grid_plotter_base.py:10683-10688
/gnuradio/branches/developers/jblum/grc/gr-wxgui/src/python/plotter/grid_plotter_base.py:10680-10938
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/gr-wxgui/src/python/plotter/grid_plotter_base.py:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gr-wxgui/src/python/plotter/grid_plotter_base.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gr-wxgui/src/python/plotter/grid_plotter_base.py:10771-10887
/gnuradio/branches/developers/jcorgan/np/gr-wxgui/src/python/plotter/grid_plotter_base.py:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gr-wxgui/src/python/plotter/grid_plotter_base.py:10876-10880
Modified: gnuradio/trunk/grc/Makefile.am
===================================================================
--- gnuradio/trunk/grc/Makefile.am 2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/grc/Makefile.am 2009-05-27 01:54:41 UTC (rev 11150)
@@ -21,6 +21,7 @@
include $(top_srcdir)/grc/Makefile.inc
+if PYTHON
SUBDIRS = \
data \
examples \
@@ -31,3 +32,4 @@
if XDG_UTILS
SUBDIRS += freedesktop
endif
+endif
Property changes on:
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_sink.xml:10540-10546
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/np/grc/data/platforms/python/blocks/blks2_tcp_sink.xml:11124-11148
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_sink.xml:10540-10546
Property changes on:
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_tcp_source.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_source.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_source.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_source.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_source.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_source.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_source.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_source.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_source.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_source.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_source.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_source.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_source.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_source.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_source.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_source.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_source.xml:10540-10546
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_udp_source.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_udp_source.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_udp_source.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_udp_source.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_udp_source.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_udp_source.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_udp_source.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_udp_source.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_udp_source.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_udp_source.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/gr_udp_source.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_udp_source.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_udp_source.xml:10771-10887
/gnuradio/branches/developers/jcorgan/np/grc/data/platforms/python/blocks/blks2_tcp_source.xml:11124-11148
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_udp_source.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_udp_source.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_udp_source.xml:10540-10546
Property changes on:
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/variable_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/variable_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/variable_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/variable_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/variable_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/variable_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/variable_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/variable_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/variable_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/variable_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/variable_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/variable_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/variable_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/variable_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/variable_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/variable_sink.xml:10540-10546
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/variable_sink.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/variable_sink.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/variable_sink.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/variable_sink.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/variable_sink.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/variable_sink.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/variable_sink.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/variable_sink.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/variable_sink.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11075-11077
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/variable_sink.xml:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/variable_sink.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/variable_sink.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/variable_sink.xml:10771-10887
/gnuradio/branches/developers/jcorgan/np/grc/data/platforms/python/blocks/blks2_variable_sink_x.xml:11124-11148
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/variable_sink.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/variable_sink.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/variable_sink.xml:10540-10546
Property changes on:
gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_add_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_add_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_add_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_add_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_add_xx.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_add_xx.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_add_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_add_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_add_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_add_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_add_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_add_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_add_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_add_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_add_xx.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_add_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_add_xx.xml:10771-10887
/gnuradio/branches/developers/jcorgan/np/grc/data/platforms/python/blocks/gr_add_xx.xml:11124-11148
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_add_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_add_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_add_vxx.xml:10540-10546
Property changes on:
gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_channel_model.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_channel_model.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_channel_model.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_channel_model.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_channel_model.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_channel_model.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_channel_model.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_channel_model.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/jcorgan/np/grc/data/platforms/python/blocks/gr_channel_model.xml:11124-11148
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_channel_model.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546
Property changes on:
gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10771-10887
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
+
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10638-10648
/gnuradio/branches/developers/eb/t364/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11016-11017
/gnuradio/branches/developers/eb/t367/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11021-11025
/gnuradio/branches/developers/eb/t371/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10958-10971
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10683-10688
/gnuradio/branches/developers/jblum/grc/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10464-10658
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10818-10858
/gnuradio/branches/developers/jcorgan/deb/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10771-10887
/gnuradio/branches/developers/jcorgan/np/grc/data/platforms/python/blocks/gr_multiply_xx.xml:11124-11148
/gnuradio/branches/developers/jcorgan/t161/grc/data/platforms/python/blocks/gr_multiply_xx.xml:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/gr_multiply_vxx.xml:10540-10546
Property changes on: gnuradio/trunk/grc/src/grc_gnuradio/wxgui/forms/forms.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t364/grc/src/grc_gnuradio/wxgui/forms/forms.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/grc_gnuradio/wxgui/forms/forms.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/grc_gnuradio/wxgui/forms/forms.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/grc_gnuradio/wxgui/forms/forms.py:10949-10959,11013-11022,11046-11059,11075-11077
+
/gnuradio/branches/developers/eb/t364/grc/src/grc_gnuradio/wxgui/forms/forms.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/grc_gnuradio/wxgui/forms/forms.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/grc_gnuradio/wxgui/forms/forms.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/grc_gnuradio/wxgui/forms/forms.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/np/grc/src/grc_gnuradio/wxgui/forms/forms.py:11124-11148
Property changes on: gnuradio/trunk/grc/src/utils/odict.py
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t364/grc/src/utils/odict.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/utils/odict.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/utils/odict.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/utils/odict.py:10949-10959,11013-11022,11046-11059,11075-11077
+ /gnuradio/branches/developers/eb/t364/grc/src/utils/odict.py:11016-11017
/gnuradio/branches/developers/eb/t367/grc/src/utils/odict.py:11021-11025
/gnuradio/branches/developers/eb/t371/grc/src/utils/odict.py:10958-10971
/gnuradio/branches/developers/jcorgan/deb/grc/src/utils/odict.py:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/np/grc/src/utils/odict.py:11124-11148
Modified: gnuradio/trunk/mblock/mblock.pc.in
===================================================================
--- gnuradio/trunk/mblock/mblock.pc.in 2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/mblock/mblock.pc.in 2009-05-27 01:54:41 UTC (rev 11150)
@@ -8,4 +8,4 @@
Requires: pmt gnuradio-omnithread
Version: @VERSION@
Libs: -L${libdir} -lmblock
-Cflags: -I${includedir} @DEFINES@
+Cflags: -I${includedir}
\ No newline at end of file
Modified: gnuradio/trunk/omnithread/gnuradio-omnithread.pc.in
===================================================================
--- gnuradio/trunk/omnithread/gnuradio-omnithread.pc.in 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/omnithread/gnuradio-omnithread.pc.in 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -8,4 +8,4 @@
Requires:
Version: @VERSION@
Libs: -L${libdir} -lgromnithread
-Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
+Cflags: -I${includedir}
Modified: gnuradio/trunk/pmt/pmt.pc.in
===================================================================
--- gnuradio/trunk/pmt/pmt.pc.in 2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/pmt/pmt.pc.in 2009-05-27 01:54:41 UTC (rev 11150)
@@ -8,4 +8,4 @@
Requires: gnuradio-omnithread
Version: @VERSION@
Libs: -L${libdir} -lpmt
-Cflags: -I${includedir} @DEFINES@
+Cflags: -I${includedir}
\ No newline at end of file
Modified: gnuradio/trunk/usrp/host/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/Makefile.am 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/usrp/host/Makefile.am 2009-05-27 01:54:41 UTC (rev
11150)
@@ -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
Modified: gnuradio/trunk/usrp/host/lib/legacy/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/lib/legacy/Makefile.am 2009-05-27 01:33:30 UTC
(rev 11149)
+++ gnuradio/trunk/usrp/host/lib/legacy/Makefile.am 2009-05-27 01:54:41 UTC
(rev 11150)
@@ -47,10 +47,10 @@
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 @@
db_dtt768.cc \
db_util.cc
-# db_wbx.cc
if FUSB_TECH_generic
@@ -177,6 +176,7 @@
rate_to_regval.h \
usrp_local_sighandler.h
+if PYTHON
usrppython_PYTHON = \
usrp_dbid.py
@@ -186,6 +186,7 @@
dump_data.py
swiginclude_HEADERS = db_base.i
+endif
# common way for generating sources from templates when using
# BUILT_SOURCES, using parallel build protection.
Modified: gnuradio/trunk/usrp/usrp-inband.pc.in
===================================================================
--- gnuradio/trunk/usrp/usrp-inband.pc.in 2009-05-27 01:33:30 UTC (rev
11149)
+++ gnuradio/trunk/usrp/usrp-inband.pc.in 2009-05-27 01:54:41 UTC (rev
11150)
@@ -3,9 +3,9 @@
address@hidden@
address@hidden@
-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}
Modified: gnuradio/trunk/usrp/usrp.pc.in
===================================================================
--- gnuradio/trunk/usrp/usrp.pc.in 2009-05-27 01:33:30 UTC (rev 11149)
+++ gnuradio/trunk/usrp/usrp.pc.in 2009-05-27 01:54:41 UTC (rev 11150)
@@ -8,4 +8,4 @@
Requires: libusb @usrp_darwin_omnithread_pc_requires@
Version: @VERSION@
Libs: -L${libdir} -lusrp
-Cflags: -I${includedir} @DEFINES@
+Cflags: -I${includedir}
Property changes on: gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/Makefile
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/usrp2/fpga/top/u2_rev3/Makefile:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/fpga/top/u2_rev3_iad/Makefile:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/fpga/top/u2_rev3_iad/Makefile:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/fpga/top/u2_rev3_iad/Makefile:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/fpga/top/u2_rev3/Makefile:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/usrp2/fpga/top/u2_rev3/Makefile:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/fpga/top/u2_rev3/Makefile:10667-10677
/gnuradio/branches/developers/jcorgan/deb/usrp2/fpga/top/u2_rev3_iad/Makefile:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/fpga/top/u2_rev3/Makefile:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/top/u2_rev3/Makefile:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/fpga/top/u2_rev3/Makefile:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/fpga/top/u2_rev3/Makefile:10540-10546
+
/gnuradio/branches/developers/eb/t348/usrp2/fpga/top/u2_rev3/Makefile:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/fpga/top/u2_rev3_iad/Makefile:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/fpga/top/u2_rev3_iad/Makefile:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/fpga/top/u2_rev3_iad/Makefile:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/fpga/top/u2_rev3/Makefile:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/usrp2/fpga/top/u2_rev3/Makefile:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/fpga/top/u2_rev3/Makefile:10667-10677
/gnuradio/branches/developers/jcorgan/deb/usrp2/fpga/top/u2_rev3_iad/Makefile:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/fpga/top/u2_rev3/Makefile:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/top/u2_rev3/Makefile:10713-10765
/gnuradio/branches/developers/jcorgan/np/usrp2/fpga/top/u2_rev3_iad/Makefile:11124-11148
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/fpga/top/u2_rev3/Makefile:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/fpga/top/u2_rev3/Makefile:10540-10546
Property changes on: gnuradio/trunk/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/usrp2/fpga/sdr_lib/dsp_core_rx.v:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/fpga/sdr_lib/dsp_core_rx.v:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/usrp2/fpga/sdr_lib/dsp_core_rx.v:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/fpga/sdr_lib/dsp_core_rx.v:10667-10677
/gnuradio/branches/developers/jcorgan/deb/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/fpga/sdr_lib/dsp_core_rx.v:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/sdr_lib/dsp_core_rx.v:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/fpga/sdr_lib/dsp_core_rx.v:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/fpga/sdr_lib/dsp_core_rx.v:10540-10546
+
/gnuradio/branches/developers/eb/t348/usrp2/fpga/sdr_lib/dsp_core_rx.v:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/fpga/sdr_lib/dsp_core_rx.v:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/usrp2/fpga/sdr_lib/dsp_core_rx.v:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/fpga/sdr_lib/dsp_core_rx.v:10667-10677
/gnuradio/branches/developers/jcorgan/deb/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/fpga/sdr_lib/dsp_core_rx.v:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/fpga/sdr_lib/dsp_core_rx.v:10713-10765
/gnuradio/branches/developers/jcorgan/np/usrp2/fpga/top/u2_rev3_iad/dsp_core_rx.v:11124-11148
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/fpga/sdr_lib/dsp_core_rx.v:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/fpga/sdr_lib/dsp_core_rx.v:10540-10546
Property changes on: gnuradio/trunk/usrp2/host/include/usrp2/mimo_config.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/usrp2/firmware/include/usrp2_mimo_config.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/firmware/include/usrp2_mimo_config.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/firmware/include/usrp2_mimo_config.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/firmware/include/usrp2_mimo_config.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/firmware/include/usrp2_mimo_config.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp2/firmware/include/usrp2_mimo_config.h:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/usrp2/firmware/include/usrp2_mimo_config.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/firmware/include/usrp2_mimo_config.h:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/usrp2/firmware/include/usrp2_mimo_config.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp2/firmware/include/usrp2_mimo_config.h:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/deb/usrp2/host/include/usrp2/mimo_config.h:11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/firmware/include/usrp2_mimo_config.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/include/usrp2_mimo_config.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp2/firmware/include/usrp2_mimo_config.h:10771-10887
/gnuradio/branches/developers/jcorgan/t161/usrp2/firmware/include/usrp2_mimo_config.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/firmware/include/usrp2_mimo_config.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/firmware/include/usrp2_mimo_config.h:10540-10546
+
/gnuradio/branches/developers/eb/t348/usrp2/firmware/include/usrp2_mimo_config.h:10638-10648
/gnuradio/branches/developers/eb/t364/usrp2/firmware/include/usrp2_mimo_config.h:11016-11017
/gnuradio/branches/developers/eb/t367/usrp2/firmware/include/usrp2_mimo_config.h:11021-11025
/gnuradio/branches/developers/eb/t371/usrp2/firmware/include/usrp2_mimo_config.h:10958-10971
/gnuradio/branches/developers/eb/t378/usrp2/firmware/include/usrp2_mimo_config.h:10683-10688
/gnuradio/branches/developers/jblum/grc/usrp2/firmware/include/usrp2_mimo_config.h:10680-10938
/gnuradio/branches/developers/jblum/gui_guts/usrp2/firmware/include/usrp2_mimo_config.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/usrp2/firmware/include/usrp2_mimo_config.h:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/usrp2/firmware/include/usrp2_mimo_config.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/usrp2/firmware/include/usrp2_mimo_config.h:10949-10959,11013-11022
/gnuradio/branches/developers/jcorgan/deb/usrp2/host/include/usrp2/mimo_config.h:11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/usrp2/firmware/include/usrp2_mimo_config.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/usrp2/firmware/include/usrp2_mimo_config.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/usrp2/firmware/include/usrp2_mimo_config.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/usrp2/host/include/usrp2/mimo_config.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/usrp2/firmware/include/usrp2_mimo_config.h:10876-10880
/gnuradio/branches/developers/michaelld/am_swig_4/usrp2/firmware/include/usrp2_mimo_config.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/usrp2/firmware/include/usrp2_mimo_config.h:10540-10546
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11150 - in gnuradio/trunk: . config debian gnuradio-core gnuradio-core/src gnuradio-core/src/lib gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/hier gnuradio-core/src/lib/io gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-core/src/python/gnuradio gnuradio-core/src/python/gnuradio/gr gnuradio-examples gnuradio-examples/python/digital gr-atsc gr-atsc/src gr-atsc/src/lib gr-audio-alsa gr-audio-alsa/src gr-audio-jack gr-audio-jack/src gr-audio-oss gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio gr-audio-portaudio/src gr-audio-windows/src gr-comedi gr-comedi/src gr-cvsd-vocoder gr-cvsd-vocoder/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src gr-gsm-fr-vocoder gr-gsm-fr-vocoder/src gr-gsm-fr-vocoder/src/lib gr-msdd6000 gr-msdd6000/src gr-pager gr-pager/src gr-qtgui/src gr-qtgui/src/lib gr-qtgui/src/python gr-radar-mono/src gr-radio-astronomy/src gr-radio-astronomy/src/lib gr-sounder/ src gr-trellis gr-trellis/src gr-trellis/src/lib gr-usrp/src gr-usrp2/src gr-utils/src gr-video-sdl gr-video-sdl/src gr-wxgui gr-wxgui/src/python/plotter grc grc/data/platforms/python/blocks grc/src/grc_gnuradio/wxgui/forms grc/src/utils mblock omnithread pmt usrp usrp/host usrp/host/lib/legacy usrp2/fpga/top/u2_rev3_iad usrp2/host/include/usrp2,
jcorgan <=