From: Bdale Garbee Date: Mon, 10 Aug 2009 18:09:51 +0000 (-0600) Subject: Imported Upstream version 3.0.3 X-Git-Tag: upstream/3.0.3^0 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b78ae1de4d9bbde942e5e7556630d7ccd8161c30;hp=0cfd4875e519e2b1ee05d074f72ec67391ed13bf;p=debian%2Fgnuradio Imported Upstream version 3.0.3 --- diff --git a/Makefile.common b/Makefile.common index 31bf0839..3414f59b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1,6 +1,6 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -51,25 +51,16 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ -I$(top_builddir)/gnuradio-core/src/lib/swig \ $(FFTW3F_CFLAGS) - -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include - -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/Makefile.in b/Makefile.in index 76ee18b1..2faed5bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -394,25 +394,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/README b/README index 90052eed..8ec162dd 100644 --- a/README +++ b/README @@ -201,6 +201,10 @@ available. As a last resort, build it from source (not recommended!) http://www.wxpython.org +(11) xmlto version ? or later. http://cyberelk.net/tim/xmlto/index.html + +Wrapper for XML conversion tools to ease e.g. making html from docbook. + ---------------------------------------------------------------- diff --git a/config/Makefile.in b/config/Makefile.in index 393e0a7b..6b2d2507 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -370,25 +370,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/config/gr_python.m4 b/config/gr_python.m4 index b2acbbb0..d2f3a4b6 100644 --- a/config/gr_python.m4 +++ b/config/gr_python.m4 @@ -28,6 +28,13 @@ AC_DEFUN([PYTHON_DEVEL],[ AC_REQUIRE([AM_PATH_PYTHON]) AC_REQUIRE([AC_CANONICAL_HOST]) + # For Fedora Core 5 and 6, see ticket:39 in Trac + if test -f '/etc/redhat-release'; then + if (echo $pyexecdir | grep -q lib64); then + pythondir="$pyexecdir" + fi + fi + # Check for Python include path AC_MSG_CHECKING([for Python include path]) if test -z "$PYTHON" ; then @@ -93,22 +100,10 @@ print path PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name" AC_MSG_RESULT($PYTHON_LDFLAGS) # Replace all backslashes in PYTHON Paths with forward slashes - AC_MSG_CHECKING([for pythondir]) pythondir=`echo $pythondir |sed 's,\\\\,/,g'` - AC_MSG_RESULT($pythondir) - AC_SUBST([pythondir]) - AC_MSG_CHECKING([for pkgpythondir]) pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'` - AC_MSG_RESULT($pkgpythondir) - AC_SUBST([pkgpythondir]) - AC_MSG_CHECKING([for pyexecdir]) pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'` - AC_MSG_RESULT($pyexecdir) - AC_SUBST([pyexecdir]) - AC_MSG_CHECKING([for pkgpyexecdir]) pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'` - AC_MSG_RESULT($pkgpyexecdir) - AC_SUBST([pkgpyexecdir]) ;; esac diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4 index dff666b0..8c8848f4 100644 --- a/config/grc_gr_wxgui.m4 +++ b/config/grc_gr_wxgui.m4 @@ -26,9 +26,7 @@ AC_DEFUN([GRC_GR_WXGUI],[ gr-wxgui/src/python/Makefile \ ]) - # FIXME: this breaks pkgsrc by calling python without a version number - # gdt--patch welcome :-) - if python -c 'import wx'; then + if ${PYTHON} -c 'import wx'; then passed=yes else passed=no diff --git a/config/lf_cxx.m4 b/config/lf_cxx.m4 index c2b3cd53..9465290b 100644 --- a/config/lf_cxx.m4 +++ b/config/lf_cxx.m4 @@ -85,7 +85,7 @@ AC_DEFUN([LF_CXX_PORTABILITY],[ dnl Test whether C++ has std::isnan AC_MSG_CHECKING(whether C++ has std::isnan) - AC_TRY_COMPILE([#include ], [ + AC_TRY_COMPILE([#include ], [ std::isnan(0); ], [ AC_MSG_RESULT(yes) AC_DEFINE(CXX_HAS_STD_ISNAN,[],[Define if has std::isnan]) ], diff --git a/configure b/configure index d04da58b..d27bb119 100755 --- a/configure +++ b/configure @@ -2487,7 +2487,7 @@ fi # Define the identity of the package. PACKAGE=gnuradio - VERSION=3.0.2 + VERSION=3.0.3 cat >>confdefs.h <<_ACEOF @@ -5787,7 +5787,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { @@ -22059,6 +22059,13 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; } + # For Fedora Core 5 and 6, see ticket:39 in Trac + if test -f '/etc/redhat-release'; then + if (echo $pyexecdir | grep -q lib64); then + pythondir="$pyexecdir" + fi + fi + # Check for Python include path { echo "$as_me:$LINENO: checking for Python include path" >&5 echo $ECHO_N "checking for Python include path... $ECHO_C" >&6; } @@ -22299,30 +22306,10 @@ print path { echo "$as_me:$LINENO: result: $PYTHON_LDFLAGS" >&5 echo "${ECHO_T}$PYTHON_LDFLAGS" >&6; } # Replace all backslashes in PYTHON Paths with forward slashes - { echo "$as_me:$LINENO: checking for pythondir" >&5 -echo $ECHO_N "checking for pythondir... $ECHO_C" >&6; } pythondir=`echo $pythondir |sed 's,\\\\,/,g'` - { echo "$as_me:$LINENO: result: $pythondir" >&5 -echo "${ECHO_T}$pythondir" >&6; } - - { echo "$as_me:$LINENO: checking for pkgpythondir" >&5 -echo $ECHO_N "checking for pkgpythondir... $ECHO_C" >&6; } pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'` - { echo "$as_me:$LINENO: result: $pkgpythondir" >&5 -echo "${ECHO_T}$pkgpythondir" >&6; } - - { echo "$as_me:$LINENO: checking for pyexecdir" >&5 -echo $ECHO_N "checking for pyexecdir... $ECHO_C" >&6; } pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'` - { echo "$as_me:$LINENO: result: $pyexecdir" >&5 -echo "${ECHO_T}$pyexecdir" >&6; } - - { echo "$as_me:$LINENO: checking for pkgpyexecdir" >&5 -echo $ECHO_N "checking for pkgpyexecdir... $ECHO_C" >&6; } pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'` - { echo "$as_me:$LINENO: result: $pkgpyexecdir" >&5 -echo "${ECHO_T}$pkgpyexecdir" >&6; } - ;; esac @@ -33945,9 +33932,7 @@ fi ac_config_files="$ac_config_files gr-wxgui/Makefile gr-wxgui/src/Makefile gr-wxgui/src/python/Makefile" - # FIXME: this breaks pkgsrc by calling python without a version number - # gdt--patch welcome :-) - if python -c 'import wx'; then + if ${PYTHON} -c 'import wx'; then passed=yes else passed=no diff --git a/configure.ac b/configure.ac index 4cc03188..a6a84bd9 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST AC_CANONICAL_TARGET([]) -AM_INIT_AUTOMAKE(gnuradio,3.0.2) +AM_INIT_AUTOMAKE(gnuradio,3.0.3) AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc]) GR_X86_64 dnl check for lib64 suffix diff --git a/gnuradio-core/Makefile.in b/gnuradio-core/Makefile.in index 8877e101..c514f732 100644 --- a/gnuradio-core/Makefile.in +++ b/gnuradio-core/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -391,25 +391,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/doc/Doxyfile.in b/gnuradio-core/doc/Doxyfile.in index 7d4e6552..5a71393e 100644 --- a/gnuradio-core/doc/Doxyfile.in +++ b/gnuradio-core/doc/Doxyfile.in @@ -17,7 +17,7 @@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "GNU Radio 2.x" +PROJECT_NAME = "GNU Radio @VERSION@" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or @@ -447,7 +447,19 @@ WARN_LOGFILE = INPUT = @top_srcdir@/gnuradio-core/src/lib \ @top_srcdir@/gnuradio-core/src/tests \ - @top_srcdir@/gnuradio-core/doc/other + @top_srcdir@/gnuradio-core/doc/other \ + @top_srcdir@/gr-audio-alsa \ + @top_srcdir@/gr-audio-jack \ + @top_srcdir@/gr-audio-oss \ + @top_srcdir@/gr-audio-osx \ + @top_srcdir@/gr-audio-portaudio \ + @top_srcdir@/gr-gsm-fr-vocoder \ + @top_srcdir@/gr-radio-astronomy \ + @top_srcdir@/gr-trellis \ + @top_srcdir@/gr-usrp \ + @top_srcdir@/gr-video-sdl \ + @top_srcdir@/usrp/host + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -470,11 +482,22 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = CVS \ - @top_srcdir@/gnuradio-core/src/lib/swig/gnuradio_swig_python.cc \ - @top_srcdir@/gnuradio-core/src/lib/atsc \ - @top_srcdir@/gnuradio-core/src/lib/io-orig \ - @top_srcdir@/gnuradio-core/src/lib/vrx +EXCLUDE = CVS .svn .libs .deps \ + @top_builddir@/gnuradio-core/src/lib/swig/gnuradio_swig_python_.cc \ + @top_builddir@/gr-atsc/src/lib/atsc.cc \ + @top_builddir@/gr-audio-alsa/src/audio_alsa.cc \ + @top_builddir@/gr-audio-jack/src/audio_jack.cc \ + @top_builddir@/gr-audio-oss/src/audio_oss.cc \ + @top_builddir@/gr-audio-osx/src/audio_osx.cc \ + @top_builddir@/gr-audio-portaudio/src/audio_portaudio.cc \ + @top_builddir@/gr-audio-windows/src/audio_windows.cc \ + @top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.cc \ + @top_builddir@/gr-radio-astronomy/src/lib/ra.cc \ + @top_builddir@/gr-trellis/src/lib/trellis.cc \ + @top_builddir@/gr-usrp/src/usrp1.cc \ + @top_builddir@/gr-video-sdl/src/video_sdl.cc \ + @top_builddir@/usrp/host/swig/prims.cc + # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/gnuradio-core/doc/Makefile.in b/gnuradio-core/doc/Makefile.in index 1d9522d2..0582c4c1 100644 --- a/gnuradio-core/doc/Makefile.in +++ b/gnuradio-core/doc/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/doc/other/Makefile.in b/gnuradio-core/doc/other/Makefile.in index 89cd3adc..34d4fc5c 100644 --- a/gnuradio-core/doc/other/Makefile.in +++ b/gnuradio-core/doc/other/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -370,25 +370,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/Makefile.in b/gnuradio-core/src/Makefile.in index 0ff53bad..03113630 100644 --- a/gnuradio-core/src/Makefile.in +++ b/gnuradio-core/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -378,25 +378,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/gen_interpolator_taps/Makefile.in b/gnuradio-core/src/gen_interpolator_taps/Makefile.in index 684a74a6..96ad61b0 100644 --- a/gnuradio-core/src/gen_interpolator_taps/Makefile.in +++ b/gnuradio-core/src/gen_interpolator_taps/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -405,25 +405,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am index 05461a05..5dc053d2 100644 --- a/gnuradio-core/src/lib/Makefile.am +++ b/gnuradio-core/src/lib/Makefile.am @@ -36,7 +36,6 @@ libgnuradio_core_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \ $(LIBGNURADIO_CORE_EXTRA_LDFLAGS) - libgnuradio_core_la_LIBADD = \ filter/libfilter.la \ g72x/libccitt.la \ diff --git a/gnuradio-core/src/lib/Makefile.in b/gnuradio-core/src/lib/Makefile.in index 4507c3fb..e3dabe0a 100644 --- a/gnuradio-core/src/lib/Makefile.in +++ b/gnuradio-core/src/lib/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -416,25 +416,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am index 7eb519d0..32be2704 100644 --- a/gnuradio-core/src/lib/filter/Makefile.am +++ b/gnuradio-core/src/lib/filter/Makefile.am @@ -69,7 +69,7 @@ include Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR) - PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(srcdir)/generate_all.py + PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC) diff --git a/gnuradio-core/src/lib/filter/Makefile.in b/gnuradio-core/src/lib/filter/Makefile.in index c37da6c4..e6442558 100644 --- a/gnuradio-core/src/lib/filter/Makefile.in +++ b/gnuradio-core/src/lib/filter/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -548,25 +548,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -1364,7 +1356,7 @@ uninstall-am: uninstall-grincludeHEADERS uninstall-info-am \ # include $(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR) - PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(srcdir)/generate_all.py + PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/gnuradio-core/src/lib/g72x/Makefile.in b/gnuradio-core/src/lib/g72x/Makefile.in index 7b20075d..66b5c6e9 100644 --- a/gnuradio-core/src/lib/g72x/Makefile.in +++ b/gnuradio-core/src/lib/g72x/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -388,25 +388,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index b8741154..628c12be 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2002,2004,2006 Free Software Foundation, Inc. +# Copyright 2001,2002,2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -91,7 +91,7 @@ include Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR) - PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(srcdir)/generate_all.py + PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC) diff --git a/gnuradio-core/src/lib/general/Makefile.in b/gnuradio-core/src/lib/general/Makefile.in index eb55a766..5495d601 100644 --- a/gnuradio-core/src/lib/general/Makefile.in +++ b/gnuradio-core/src/lib/general/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# Copyright 2001,2002,2004,2006 Free Software Foundation, Inc. +# Copyright 2001,2002,2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -485,25 +485,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -1687,7 +1679,7 @@ uninstall-am: uninstall-grincludeHEADERS uninstall-info-am \ # include $(srcdir)/Makefile.gen $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR) - PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(srcdir)/generate_all.py + PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc b/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc index 4656f8c5..18253e96 100644 --- a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc +++ b/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc @@ -45,7 +45,7 @@ gr_correlate_access_code_bb::gr_correlate_access_code_bb ( gr_make_io_signature (1, 1, sizeof(char)), gr_make_io_signature (1, 1, sizeof(char))), d_data_reg(0), d_flag_reg(0), d_flag_bit(0), d_mask(0), - d_threshold(threshold), d_flip(0) + d_threshold(threshold) { if (!set_access_code(access_code)){ @@ -94,7 +94,7 @@ gr_correlate_access_code_bb::work (int noutput_items, // compute output value unsigned int t = 0; - t |= d_flip ^ (((d_data_reg >> 63) & 0x1) << 0); + t |= ((d_data_reg >> 63) & 0x1) << 0; t |= ((d_flag_reg >> 63) & 0x1) << 1; // flag bit out[i] = t; @@ -106,8 +106,8 @@ gr_correlate_access_code_bb::work (int noutput_items, wrong_bits = (d_data_reg ^ d_access_code) & d_mask; nwrong = gr_count_bits64(wrong_bits); - // test for access code with up to threshold errors or its compelement - new_flag = (nwrong <= d_threshold) || (nwrong >= (64-d_threshold)); + // test for access code with up to threshold errors + new_flag = (nwrong <= d_threshold); #if 0 if(new_flag) { @@ -120,7 +120,6 @@ gr_correlate_access_code_bb::work (int noutput_items, d_flag_reg = (d_flag_reg << 1); if (new_flag) { d_flag_reg |= d_flag_bit; - d_flip = nwrong >= (64-d_threshold); // flip bits if this is true } } diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h b/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h index 8a2bdefc..5f9b2307 100644 --- a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h +++ b/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h @@ -62,8 +62,6 @@ class gr_correlate_access_code_bb : public gr_sync_block unsigned long long d_mask; // masks access_code bits (top N bits are set where // N is the number of bits in the access code) unsigned int d_threshold; // how many bits may be wrong in sync vector - unsigned int d_flip; // flip bits if 180 degress out of sync - protected: gr_correlate_access_code_bb(const std::string &access_code, int threshold); diff --git a/gnuradio-core/src/lib/general/gr_firdes.cc b/gnuradio-core/src/lib/general/gr_firdes.cc index 994424ed..87724fcd 100644 --- a/gnuradio-core/src/lib/general/gr_firdes.cc +++ b/gnuradio-core/src/lib/general/gr_firdes.cc @@ -272,7 +272,7 @@ gr_firdes::band_reject (double gain, for (int n = -M; n <= M; n++){ if (n == 0) - taps[n + M] = (1.0 + (fwT0 - fwT1)) / M_PI * w[n + M]; + taps[n + M] = 1.0 + ((fwT0 - fwT1) / M_PI * w[n + M]); else { taps[n + M] = (sin (n * fwT0) - sin (n * fwT1)) / (n * M_PI) * w[n + M]; } diff --git a/gnuradio-core/src/lib/io/Makefile.in b/gnuradio-core/src/lib/io/Makefile.in index 6a091b4d..d486f61e 100644 --- a/gnuradio-core/src/lib/io/Makefile.in +++ b/gnuradio-core/src/lib/io/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -408,25 +408,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/lib/io/gr_oscope_guts.cc b/gnuradio-core/src/lib/io/gr_oscope_guts.cc index 2a152b95..286a7d1f 100644 --- a/gnuradio-core/src/lib/io/gr_oscope_guts.cc +++ b/gnuradio-core/src/lib/io/gr_oscope_guts.cc @@ -60,11 +60,11 @@ gr_oscope_guts::gr_oscope_guts (int nchannels, double sample_rate, gr_msg_queue_ d_update_rate (20), d_trigger_level (0), d_obi (0), - d_state (LOOK_FOR_TRIGGER), + d_state (HOLD_OFF), d_decimator_count (0), d_decimator_count_init (1), d_hold_off_count (0), - d_hold_off_count_init (0), + d_hold_off_count_init (OUTPUT_RECORD_SIZE/2-1), d_post_trigger_count (0), d_post_trigger_count_init (OUTPUT_RECORD_SIZE/2), d_prev_sample (0) @@ -77,11 +77,15 @@ gr_oscope_guts::gr_oscope_guts (int nchannels, double sample_rate, gr_msg_queue_ for (int i = 0; i < MAX_CHANNELS; i++) d_buffer[i] = 0; - for (int i = 0; i < d_nchannels; i++) + for (int i = 0; i < d_nchannels; i++){ d_buffer[i] = new float [OUTPUT_RECORD_SIZE]; + for (int j = 0; j < OUTPUT_RECORD_SIZE; j++) + d_buffer[i][j] = 0.0; + } + // be sure buffer is full before first write + enter_hold_off (); update_rate_or_decimation_changed (); - enter_look_for_trigger (); } gr_oscope_guts::~gr_oscope_guts () @@ -228,9 +232,9 @@ gr_oscope_guts::write_output_records () float *out = (float *)msg->msg(); // get pointer to raw message buffer for (int ch = 0; ch < d_nchannels; ch++){ - // note that d_obi points at the oldest sample in the buffer + // note that d_obi + 1 points at the oldest sample in the buffer for (int i = 0; i < OUTPUT_RECORD_SIZE; i++) - out[i] = d_buffer[ch][wrap_bi(d_obi + i)]; + out[i] = d_buffer[ch][wrap_bi(d_obi + 1 + i)]; out += OUTPUT_RECORD_SIZE; } diff --git a/gnuradio-core/src/lib/missing/Makefile.in b/gnuradio-core/src/lib/missing/Makefile.in index 1e669045..7fa34f1a 100644 --- a/gnuradio-core/src/lib/missing/Makefile.in +++ b/gnuradio-core/src/lib/missing/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -388,25 +388,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/lib/omnithread/Makefile.in b/gnuradio-core/src/lib/omnithread/Makefile.in index ae89a175..06955d6f 100644 --- a/gnuradio-core/src/lib/omnithread/Makefile.in +++ b/gnuradio-core/src/lib/omnithread/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -402,25 +402,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/lib/reed-solomon/Makefile.in b/gnuradio-core/src/lib/reed-solomon/Makefile.in index bcd6db21..09fa248e 100644 --- a/gnuradio-core/src/lib/reed-solomon/Makefile.in +++ b/gnuradio-core/src/lib/reed-solomon/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -405,25 +405,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/lib/runtime/Makefile.in b/gnuradio-core/src/lib/runtime/Makefile.in index 5e0d5e04..dbd7db77 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.in +++ b/gnuradio-core/src/lib/runtime/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -414,25 +414,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc index fe0322f7..ccb169b9 100644 --- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc +++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc @@ -68,11 +68,13 @@ gr_vmcircbuf_sysv_shm::gr_vmcircbuf_sysv_shm (int size) if ((shmid2 = shmget (IPC_PRIVATE, 2 * size + 2 * pagesize, IPC_CREAT | 0700)) == -1){ perror ("gr_vmcircbuf_sysv_shm: shmget (1)"); + shmctl (shmid_guard, IPC_RMID, 0); throw std::runtime_error ("gr_vmcircbuf_sysv_shm"); } if ((shmid1 = shmget (IPC_PRIVATE, size, IPC_CREAT | 0700)) == -1){ perror ("gr_vmcircbuf_sysv_shm: shmget (2)"); + shmctl (shmid_guard, IPC_RMID, 0); shmctl (shmid2, IPC_RMID, 0); throw std::runtime_error ("gr_vmcircbuf_sysv_shm"); } diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 590b07b8..94e3c900 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -68,7 +68,7 @@ _gnuradio_swig_python_la_SOURCES = \ _gnuradio_swig_python_la_LIBADD = \ - $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \ + $(GNURADIO_CORE_LA) \ $(PYTHON_LDFLAGS) \ -lstdc++ @@ -91,7 +91,7 @@ gnuradio_swig_python.cc : gnuradio.i gnuradio_swig_bug_workaround.h : gnuradio_swig_python.cc $(srcdir)/gen-swig-bug-fix - $(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@ + $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@ # ---------------------------------------------------------------- diff --git a/gnuradio-core/src/lib/swig/Makefile.in b/gnuradio-core/src/lib/swig/Makefile.in index 81a9e088..04319570 100644 --- a/gnuradio-core/src/lib/swig/Makefile.in +++ b/gnuradio-core/src/lib/swig/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -145,10 +145,11 @@ am__installdirs = "$(DESTDIR)$(grgrlibdir)" \ "$(DESTDIR)$(swigincludedir)" grgrlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(grgrlib_LTLIBRARIES) -am__DEPENDENCIES_1 = -_gnuradio_swig_python_la_DEPENDENCIES = \ - $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \ - $(am__DEPENDENCIES_1) +am__DEPENDENCIES_1 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la +am__DEPENDENCIES_2 = +_gnuradio_swig_python_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) am__gnuradio_swig_python_la_OBJECTS = gnuradio_swig_python.lo _gnuradio_swig_python_la_OBJECTS = \ $(am__gnuradio_swig_python_la_OBJECTS) @@ -409,25 +410,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -472,7 +465,7 @@ _gnuradio_swig_python_la_SOURCES = \ gnuradio_swig_python.cc _gnuradio_swig_python_la_LIBADD = \ - $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \ + $(GNURADIO_CORE_LA) \ $(PYTHON_LDFLAGS) \ -lstdc++ @@ -853,7 +846,7 @@ gnuradio_swig_python.cc : gnuradio.i else rm -f gnuradio_swig_python.Td; exit 1; fi gnuradio_swig_bug_workaround.h : gnuradio_swig_python.cc $(srcdir)/gen-swig-bug-fix - $(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@ + $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@ # ---------------------------------------------------------------- diff --git a/gnuradio-core/src/python/Makefile.in b/gnuradio-core/src/python/Makefile.in index 964b0502..7a0d7bb7 100644 --- a/gnuradio-core/src/python/Makefile.in +++ b/gnuradio-core/src/python/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -380,25 +380,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/python/bin/Makefile.in b/gnuradio-core/src/python/bin/Makefile.in index 495213b9..e5b29d16 100644 --- a/gnuradio-core/src/python/bin/Makefile.in +++ b/gnuradio-core/src/python/bin/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -374,25 +374,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/python/gnuradio/Makefile.in b/gnuradio-core/src/python/gnuradio/Makefile.in index e0f0ecd6..4260ede0 100644 --- a/gnuradio-core/src/python/gnuradio/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -388,25 +388,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/python/gnuradio/blks/Makefile.in b/gnuradio-core/src/python/gnuradio/blks/Makefile.in index eb3b87f2..1b3af744 100644 --- a/gnuradio-core/src/python/gnuradio/blks/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/blks/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -380,25 +380,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.in b/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.in index a793f1cf..f9bf311c 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -380,25 +380,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py b/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py index 7df4f240..cf38f02e 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py @@ -39,7 +39,7 @@ _def_gray_code = True _def_verbose = False _def_log = False -_def_costas_alpha = 0.05 +_def_costas_alpha = None _def_gain_mu = 0.03 _def_mu = 0.05 _def_omega_relative_limit = 0.005 @@ -241,10 +241,12 @@ class dbpsk_demod(gr.hier_block): # Costas loop (carrier tracking) - # FIXME: need to decide how to handle this more generally; do we pull it from higher layer? - costas_order = 2 - beta = .25 * self._costas_alpha * self._costas_alpha - self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.002, -0.002, costas_order) + # The Costas loop is not needed for BPSK, though it can help. Turn the Costas loop on + # by setting an alpha value not None. + if self._costas_alpha is not None: + costas_order = 2 + beta = .25 * self._costas_alpha * self._costas_alpha + self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.002, -0.002, costas_order) # RRC data filter ntaps = 11 * self._samples_per_symbol @@ -289,9 +291,14 @@ class dbpsk_demod(gr.hier_block): self._setup_logging() # Connect and Initialize base class - self._fg.connect(self.pre_scaler, self.agc, self.costas_loop, - self.rrc_filter, self.clock_recovery, self.diffdec, - self.slicer, self.symbol_mapper, self.unpack) + if self._costas_alpha is not None: # With Costas Loop + self._fg.connect(self.pre_scaler, self.agc, self.costas_loop, + self.rrc_filter, self.clock_recovery, self.diffdec, + self.slicer, self.symbol_mapper, self.unpack) + else: # Without Costas Loop + self._fg.connect(self.pre_scaler, self.agc, + self.rrc_filter, self.clock_recovery, self.diffdec, + self.slicer, self.symbol_mapper, self.unpack) gr.hier_block.__init__(self, self._fg, self.pre_scaler, self.unpack) @@ -306,7 +313,10 @@ class dbpsk_demod(gr.hier_block): print "bits per symbol = %d" % self.bits_per_symbol() print "Gray code = %s" % self._gray_code print "RRC roll-off factor = %.2f" % self._excess_bw - print "Costas Loop alpha = %.5f" % self._costas_alpha + if self._costas_alpha is not None: + print "Costas Loop alpha = %.5f" % self._costas_alpha + else: + print "Costas Loop is turned off" print "M&M symbol sync gain = %.5f" % self._gain_mu print "M&M symbol sync mu = %.5f" % self._mu print "M&M omega relative limit = %.5f" % self._omega_relative_limit @@ -317,10 +327,11 @@ class dbpsk_demod(gr.hier_block): gr.file_sink(gr.sizeof_gr_complex, "prescaler.dat")) self._fg.connect(self.agc, gr.file_sink(gr.sizeof_gr_complex, "agc.dat")) - self._fg.connect(self.costas_loop, - gr.file_sink(gr.sizeof_gr_complex, "costas_loop.dat")) - self._fg.connect((self.costas_loop,1), - gr.file_sink(gr.sizeof_gr_complex, "costas_error.dat")) + if self._costas_alpha is not None: + self._fg.connect(self.costas_loop, + gr.file_sink(gr.sizeof_gr_complex, "costas_loop.dat")) + self._fg.connect((self.costas_loop,1), + gr.file_sink(gr.sizeof_gr_complex, "costas_error.dat")) self._fg.connect(self.rrc_filter, gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat")) self._fg.connect(self.clock_recovery, diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py b/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py index 3b60f224..70024f1e 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py @@ -39,7 +39,7 @@ _def_gray_code = True _def_verbose = False _def_log = False -_def_costas_alpha = 0.10 +_def_costas_alpha = None _def_gain_mu = 0.03 _def_mu = 0.05 _def_omega_relative_limit = 0.005 @@ -238,11 +238,15 @@ class dqpsk_demod(gr.hier_block): self.agc = gr.feedforward_agc_cc(16, 1.0) # Costas loop (carrier tracking) - # FIXME: need to decide how to handle this more generally; do we pull it from higher layer? - costas_order = 4 - beta = .25 * self._costas_alpha * self._costas_alpha - #self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.1, -0.1, costas_order) - self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.002, -0.002, costas_order) + if self._costas_alpha is None: # If no alpha value was specified by the user + alpha_dir = {2:0.075, 3:0.09, 4:0.09, 5:0.095, 6:0.10, 7:0.105} + self._costas_alpha = alpha_dir[self._samples_per_symbol] + + costas_order = 4 + # The value of beta is now set to be underdamped; this value can have a huge impact on the + # performance of QPSK. Set to 0.25 for critically damped or higher for underdamped responses. + beta = .35 * self._costas_alpha * self._costas_alpha + self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.02, -0.02, costas_order) # RRC data filter ntaps = 11 * samples_per_symbol diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am index ec91917b..cba76e44 100644 --- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am +++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.am @@ -71,6 +71,7 @@ noinst_PYTHON = \ qa_message.py \ qa_mute.py \ qa_nlog10.py \ + qa_noise.py \ qa_packed_to_unpacked.py \ qa_pipe_fittings.py \ qa_rational_resampler.py \ diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.in b/gnuradio-core/src/python/gnuradio/gr/Makefile.in index 8b322c58..6e525907 100644 --- a/gnuradio-core/src/python/gnuradio/gr/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -380,25 +380,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -453,6 +445,7 @@ noinst_PYTHON = \ qa_message.py \ qa_mute.py \ qa_nlog10.py \ + qa_noise.py \ qa_packed_to_unpacked.py \ qa_pipe_fittings.py \ qa_rational_resampler.py \ diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_noise.py b/gnuradio-core/src/python/gnuradio/gr/qa_noise.py new file mode 100755 index 00000000..9a5007a1 --- /dev/null +++ b/gnuradio-core/src/python/gnuradio/gr/qa_noise.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python +# +# Copyright 2007 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +from gnuradio import gr, gr_unittest + +class test_noise_source(gr_unittest.TestCase): + + def setUp (self): + self.fg = gr.flow_graph () + + def tearDown (self): + self.fg = None + + def test_001(self): + # Just confirm that we can instantiate a noise source + op = gr.noise_source_f(gr.GR_GAUSSIAN, 10, 10) + +if __name__ == '__main__': + gr_unittest.main () + diff --git a/gnuradio-core/src/python/gnuradio/gru/Makefile.in b/gnuradio-core/src/python/gnuradio/gru/Makefile.in index 16509255..6dda71e7 100644 --- a/gnuradio-core/src/python/gnuradio/gru/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/gru/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -380,25 +380,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in index ac131b04..3e7de789 100644 --- a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-core/src/tests/Makefile.am b/gnuradio-core/src/tests/Makefile.am index f347c187..aed3fea9 100644 --- a/gnuradio-core/src/tests/Makefile.am +++ b/gnuradio-core/src/tests/Makefile.am @@ -33,7 +33,7 @@ TESTS = test_all #Test program to test setting up buffers using gr_test which can be run manually EXTRA_DIST = \ test_buffers.py - + noinst_PROGRAMS = \ benchmark_dotprod \ benchmark_dotprod_fsf \ @@ -50,7 +50,7 @@ noinst_PROGRAMS = \ test_vmcircbuf -LIBGNURADIO = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la +LIBGNURADIO = $(GNURADIO_CORE_LA) LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la $(LIBGNURADIO) benchmark_dotprod_SOURCES = benchmark_dotprod.cc diff --git a/gnuradio-core/src/tests/Makefile.in b/gnuradio-core/src/tests/Makefile.in index 3ebbffc9..1dff732e 100644 --- a/gnuradio-core/src/tests/Makefile.in +++ b/gnuradio-core/src/tests/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -144,46 +144,47 @@ am_benchmark_dotprod_OBJECTS = benchmark_dotprod.$(OBJEXT) benchmark_dotprod_OBJECTS = $(am_benchmark_dotprod_OBJECTS) am__DEPENDENCIES_1 = \ $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la -benchmark_dotprod_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +benchmark_dotprod_DEPENDENCIES = $(am__DEPENDENCIES_2) am_benchmark_dotprod_ccc_OBJECTS = benchmark_dotprod_ccc.$(OBJEXT) benchmark_dotprod_ccc_OBJECTS = $(am_benchmark_dotprod_ccc_OBJECTS) -benchmark_dotprod_ccc_DEPENDENCIES = $(am__DEPENDENCIES_1) +benchmark_dotprod_ccc_DEPENDENCIES = $(am__DEPENDENCIES_2) am_benchmark_dotprod_ccf_OBJECTS = benchmark_dotprod_ccf.$(OBJEXT) benchmark_dotprod_ccf_OBJECTS = $(am_benchmark_dotprod_ccf_OBJECTS) -benchmark_dotprod_ccf_DEPENDENCIES = $(am__DEPENDENCIES_1) +benchmark_dotprod_ccf_DEPENDENCIES = $(am__DEPENDENCIES_2) am_benchmark_dotprod_fcc_OBJECTS = benchmark_dotprod_fcc.$(OBJEXT) benchmark_dotprod_fcc_OBJECTS = $(am_benchmark_dotprod_fcc_OBJECTS) -benchmark_dotprod_fcc_DEPENDENCIES = $(am__DEPENDENCIES_1) +benchmark_dotprod_fcc_DEPENDENCIES = $(am__DEPENDENCIES_2) am_benchmark_dotprod_fsf_OBJECTS = benchmark_dotprod_fsf.$(OBJEXT) benchmark_dotprod_fsf_OBJECTS = $(am_benchmark_dotprod_fsf_OBJECTS) -benchmark_dotprod_fsf_DEPENDENCIES = $(am__DEPENDENCIES_1) +benchmark_dotprod_fsf_DEPENDENCIES = $(am__DEPENDENCIES_2) am_benchmark_dotprod_scc_OBJECTS = benchmark_dotprod_scc.$(OBJEXT) benchmark_dotprod_scc_OBJECTS = $(am_benchmark_dotprod_scc_OBJECTS) -benchmark_dotprod_scc_DEPENDENCIES = $(am__DEPENDENCIES_1) +benchmark_dotprod_scc_DEPENDENCIES = $(am__DEPENDENCIES_2) am_benchmark_nco_OBJECTS = benchmark_nco.$(OBJEXT) benchmark_nco_OBJECTS = $(am_benchmark_nco_OBJECTS) -benchmark_nco_DEPENDENCIES = $(am__DEPENDENCIES_1) +benchmark_nco_DEPENDENCIES = $(am__DEPENDENCIES_2) am_benchmark_vco_OBJECTS = benchmark_vco.$(OBJEXT) benchmark_vco_OBJECTS = $(am_benchmark_vco_OBJECTS) -benchmark_vco_DEPENDENCIES = $(am__DEPENDENCIES_1) +benchmark_vco_DEPENDENCIES = $(am__DEPENDENCIES_2) am_test_all_OBJECTS = test_all.$(OBJEXT) test_all_OBJECTS = $(am_test_all_OBJECTS) -am__DEPENDENCIES_2 = \ +am__DEPENDENCIES_3 = \ $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la \ - $(am__DEPENDENCIES_1) -test_all_DEPENDENCIES = $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_2) +test_all_DEPENDENCIES = $(am__DEPENDENCIES_3) am_test_filter_OBJECTS = test_filter.$(OBJEXT) test_filter_OBJECTS = $(am_test_filter_OBJECTS) -test_filter_DEPENDENCIES = $(am__DEPENDENCIES_2) +test_filter_DEPENDENCIES = $(am__DEPENDENCIES_3) am_test_general_OBJECTS = test_general.$(OBJEXT) test_general_OBJECTS = $(am_test_general_OBJECTS) -test_general_DEPENDENCIES = $(am__DEPENDENCIES_2) +test_general_DEPENDENCIES = $(am__DEPENDENCIES_3) am_test_runtime_OBJECTS = test_runtime.$(OBJEXT) test_runtime_OBJECTS = $(am_test_runtime_OBJECTS) -test_runtime_DEPENDENCIES = $(am__DEPENDENCIES_2) +test_runtime_DEPENDENCIES = $(am__DEPENDENCIES_3) am_test_vmcircbuf_OBJECTS = test_vmcircbuf.$(OBJEXT) test_vmcircbuf_OBJECTS = $(am_test_vmcircbuf_OBJECTS) -test_vmcircbuf_DEPENDENCIES = $(am__DEPENDENCIES_2) +test_vmcircbuf_DEPENDENCIES = $(am__DEPENDENCIES_3) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -452,25 +453,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -490,7 +483,7 @@ TESTS = test_all EXTRA_DIST = \ test_buffers.py -LIBGNURADIO = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la +LIBGNURADIO = $(GNURADIO_CORE_LA) LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la $(LIBGNURADIO) benchmark_dotprod_SOURCES = benchmark_dotprod.cc benchmark_dotprod_LDADD = $(LIBGNURADIO) diff --git a/gnuradio-core/src/utils/Makefile.in b/gnuradio-core/src/utils/Makefile.in index 07fa5d57..fabc2fd6 100644 --- a/gnuradio-core/src/utils/Makefile.in +++ b/gnuradio-core/src/utils/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -370,25 +370,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-examples/Makefile.in b/gnuradio-examples/Makefile.in index 9bd7bc68..1c412223 100644 --- a/gnuradio-examples/Makefile.in +++ b/gnuradio-examples/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gnuradio-examples/python/channel-coding/README b/gnuradio-examples/python/channel-coding/README index 13968304..d5bad85f 100644 --- a/gnuradio-examples/python/channel-coding/README +++ b/gnuradio-examples/python/channel-coding/README @@ -14,9 +14,9 @@ If you just want to see what these programs do, run each of the following: ./test_tcm_combined.py fsm_files/awgn1o2_4.fsm 6.0 1000 ./test_tcm_parallel.py fsm_files/awgn1o2_4.fsm 6.0 1000 -./test_sccc_hard.py fsm_files/awgn1o2_4.fsm fsm_files/awgn1o2_4_msb.fsm 10.0 100 -./test_sccc_soft.py fsm_files/awgn1o2_4.fsm fsm_files/awgn1o2_4_msb.fsm 8.0 100 -./test_sccc_turbo.py fsm_files/awgn1o2_4.fsm fsm_files/awgn1o2_4_msb.fsm 5.0 100 +./test_sccc_hard.py fsm_files/awgn1o2_4.fsm fsm_files/awgn2o3_4_msb.fsm 10.0 100 +./test_sccc_soft.py fsm_files/awgn1o2_4.fsm fsm_files/awgn2o3_4_msb.fsm 8.0 100 +./test_sccc_turbo.py fsm_files/awgn1o2_4.fsm fsm_files/awgn2o3_4_msb.fsm 5.0 100 ./test_viterbi_equalization.py 12.0 100 ./test_viterbi_equalization1.py 12.0 100 diff --git a/gnuradio-examples/python/digital/README b/gnuradio-examples/python/digital/README index adc3fe07..9d8a4049 100644 --- a/gnuradio-examples/python/digital/README +++ b/gnuradio-examples/python/digital/README @@ -8,7 +8,7 @@ parameter. The default is 500k. Some machines will do 1M or more. You can select the modulation to use with the -m command line argument. The legal values for are gmsk, dbpsk and dqpsk. -* benchmark_tx.py: the receiver half of benchmark_tx.py. +* benchmark_rx.py: the receiver half of benchmark_tx.py. Command line arguments are pretty much the same as rx. Works well with a USRP and RFX transceiver daughterboards. Will also work with TVRX daugherboard, but you'll need to fiddle with the gain. See diff --git a/gnuradio-examples/python/usrp/Makefile.am b/gnuradio-examples/python/usrp/Makefile.am index 5a8a346a..9000c599 100644 --- a/gnuradio-examples/python/usrp/Makefile.am +++ b/gnuradio-examples/python/usrp/Makefile.am @@ -23,7 +23,6 @@ EXTRA_DIST = \ am_rcv.py \ ayfabtu.py \ benchmark_usb.py \ - dsb_tx.py \ flexrf_debug.py \ flexrf_siggen.py \ fm_tx_2_daughterboards.py \ diff --git a/gnuradio-examples/python/usrp/Makefile.in b/gnuradio-examples/python/usrp/Makefile.in index 242cde35..45f69a5f 100644 --- a/gnuradio-examples/python/usrp/Makefile.in +++ b/gnuradio-examples/python/usrp/Makefile.in @@ -319,7 +319,6 @@ EXTRA_DIST = \ am_rcv.py \ ayfabtu.py \ benchmark_usb.py \ - dsb_tx.py \ flexrf_debug.py \ flexrf_siggen.py \ fm_tx_2_daughterboards.py \ diff --git a/gnuradio-examples/python/usrp/dsb_tx.py b/gnuradio-examples/python/usrp/dsb_tx.py deleted file mode 100755 index df65761c..00000000 --- a/gnuradio-examples/python/usrp/dsb_tx.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python - -from gnuradio import gr, eng_notation -from gnuradio import usrp -from gnuradio import audio -from gnuradio.eng_option import eng_option -from optparse import OptionParser - - -def build_graph (cordic_freq): - - audio_rate = 32000 - sw_interp = 4 - usrp_interp = 1000 - audio_file = "/home/eb/demo/testing-audio.dat" - - fg = gr.flow_graph () - - src = gr.file_source (gr.sizeof_float, audio_file, True) - gain = gr.multiply_const_ff (10000) - - interp = gr.interp_fir_filter_fff (sw_interp, (1, 1, 1, 1)) - - f2c = gr.float_to_complex () - - u = usrp.sink_c (0, usrp_interp) - u.set_tx_freq (0, cordic_freq) - - fg.connect (src, gain) - fg.connect (gain, interp) - fg.connect (interp, (f2c, 0)) - fg.connect (interp, (f2c, 1)) - fg.connect (f2c, u) - - return fg - -def main (): - parser = OptionParser (option_class=eng_option) - parser.add_option ("-c", "--cordic-freq", type="eng_float", default=10e6, - help="set Tx cordic frequency to FREQ", metavar="FREQ") - (options, args) = parser.parse_args () - - print "cordic_freq = %s" % (eng_notation.num_to_str (options.cordic_freq)) - fg = build_graph (options.cordic_freq) - - fg.start () - raw_input ('Press Enter to quit: ') - fg.stop () - -if __name__ == '__main__': - main () diff --git a/gr-audio-alsa/Makefile.in b/gr-audio-alsa/Makefile.in index 0572d3ba..0982e705 100644 --- a/gr-audio-alsa/Makefile.in +++ b/gr-audio-alsa/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -390,25 +390,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index 0f165a0d..a18b9fce 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -74,7 +74,7 @@ swiginclude_HEADERS = \ _audio_alsa_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(ALSA_LIBS) \ -lstdc++ diff --git a/gr-audio-alsa/src/Makefile.in b/gr-audio-alsa/src/Makefile.in index 4776191e..fbf9d6c2 100644 --- a/gr-audio-alsa/src/Makefile.in +++ b/gr-audio-alsa/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -146,8 +146,10 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la _audio_alsa_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) am__audio_alsa_la_OBJECTS = audio_alsa.lo audio_alsa_sink.lo \ audio_alsa_source.lo gri_alsa.lo _audio_alsa_la_OBJECTS = $(am__audio_alsa_la_OBJECTS) @@ -409,25 +411,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -482,7 +476,7 @@ swiginclude_HEADERS = \ _audio_alsa_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(ALSA_LIBS) \ -lstdc++ diff --git a/gr-audio-jack/Makefile.in b/gr-audio-jack/Makefile.in index 7dc8d290..46afa8df 100644 --- a/gr-audio-jack/Makefile.in +++ b/gr-audio-jack/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -389,25 +389,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am index 69078870..bed67ac3 100644 --- a/gr-audio-jack/src/Makefile.am +++ b/gr-audio-jack/src/Makefile.am @@ -76,7 +76,7 @@ swiginclude_HEADERS = \ _audio_jack_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(JACK_LIBS) \ -lstdc++ diff --git a/gr-audio-jack/src/Makefile.in b/gr-audio-jack/src/Makefile.in index b409c390..2332b563 100644 --- a/gr-audio-jack/src/Makefile.in +++ b/gr-audio-jack/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -146,8 +146,10 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la _audio_jack_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) am__audio_jack_la_OBJECTS = audio_jack.lo audio_jack_sink.lo \ audio_jack_source.lo gri_jack.lo _audio_jack_la_OBJECTS = $(am__audio_jack_la_OBJECTS) @@ -409,25 +411,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -482,7 +476,7 @@ swiginclude_HEADERS = \ _audio_jack_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(JACK_LIBS) \ -lstdc++ diff --git a/gr-audio-oss/Makefile.in b/gr-audio-oss/Makefile.in index e01619dd..019ac01e 100644 --- a/gr-audio-oss/Makefile.in +++ b/gr-audio-oss/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -389,25 +389,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am index 2fc0bae2..aebad3f4 100644 --- a/gr-audio-oss/src/Makefile.am +++ b/gr-audio-oss/src/Makefile.am @@ -69,7 +69,7 @@ swiginclude_HEADERS = \ _audio_oss_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(OSS_LIBS) \ -lstdc++ diff --git a/gr-audio-oss/src/Makefile.in b/gr-audio-oss/src/Makefile.in index a63dcad2..3d532c43 100644 --- a/gr-audio-oss/src/Makefile.in +++ b/gr-audio-oss/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -146,8 +146,10 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la _audio_oss_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) am__audio_oss_la_OBJECTS = audio_oss.lo audio_oss_sink.lo \ audio_oss_source.lo _audio_oss_la_OBJECTS = $(am__audio_oss_la_OBJECTS) @@ -408,25 +410,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -477,7 +471,7 @@ swiginclude_HEADERS = \ _audio_oss_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(OSS_LIBS) \ -lstdc++ diff --git a/gr-audio-osx/Makefile.in b/gr-audio-osx/Makefile.in index b1364e76..8d4e1639 100644 --- a/gr-audio-osx/Makefile.in +++ b/gr-audio-osx/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am index 750dd973..de06c507 100644 --- a/gr-audio-osx/src/Makefile.am +++ b/gr-audio-osx/src/Makefile.am @@ -73,7 +73,7 @@ swiginclude_HEADERS = \ _audio_osx_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ -lstdc++ _audio_osx_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version -framework AudioUnit -framework CoreAudio -framework AudioToolbox diff --git a/gr-audio-osx/src/Makefile.in b/gr-audio-osx/src/Makefile.in index bec7125a..d8514e37 100644 --- a/gr-audio-osx/src/Makefile.in +++ b/gr-audio-osx/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -145,8 +145,10 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la _audio_osx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_2) am__audio_osx_la_OBJECTS = audio_osx.lo audio_osx_sink.lo \ audio_osx_source.lo _audio_osx_la_OBJECTS = $(am__audio_osx_la_OBJECTS) @@ -408,25 +410,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -482,7 +476,7 @@ swiginclude_HEADERS = \ _audio_osx_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ -lstdc++ _audio_osx_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version -framework AudioUnit -framework CoreAudio -framework AudioToolbox diff --git a/gr-audio-portaudio/Makefile.in b/gr-audio-portaudio/Makefile.in index 4982a258..56ee4d8b 100644 --- a/gr-audio-portaudio/Makefile.in +++ b/gr-audio-portaudio/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -389,25 +389,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-audio-portaudio/README b/gr-audio-portaudio/README index 6074c0b3..bd6fac64 100644 --- a/gr-audio-portaudio/README +++ b/gr-audio-portaudio/README @@ -1,3 +1,10 @@ +The instructions below are now obsolete. Please see: + +http://gnuradio.org/trac/wiki/PortAudioInstall + +====== +OBSOLETED + These instructions are intended for Linux. On other systems you will have to construct something compatible to build gr-audio-portaudio. diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am index f3a60bc0..6a7d2d8f 100644 --- a/gr-audio-portaudio/src/Makefile.am +++ b/gr-audio-portaudio/src/Makefile.am @@ -49,7 +49,7 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_portaudio.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(PORTAUDIO_CFLAGS) SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) -I/usr/include @@ -75,7 +75,7 @@ swiginclude_HEADERS = \ _audio_portaudio_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(PORTAUDIO_LIBS) \ -lstdc++ diff --git a/gr-audio-portaudio/src/Makefile.in b/gr-audio-portaudio/src/Makefile.in index d9b4b097..803699a2 100644 --- a/gr-audio-portaudio/src/Makefile.in +++ b/gr-audio-portaudio/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -146,8 +146,10 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la _audio_portaudio_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) am__audio_portaudio_la_OBJECTS = audio_portaudio.lo \ audio_portaudio_sink.lo audio_portaudio_source.lo \ gri_portaudio.lo @@ -410,25 +412,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -462,7 +456,7 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_portaudio.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(PORTAUDIO_CFLAGS) SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) -I/usr/include ourlib_LTLIBRARIES = _audio_portaudio.la _audio_portaudio_la_SOURCES = \ @@ -483,7 +477,7 @@ swiginclude_HEADERS = \ _audio_portaudio_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(PORTAUDIO_LIBS) \ -lstdc++ diff --git a/gr-audio-windows/Makefile.in b/gr-audio-windows/Makefile.in index f62981a1..be633fc8 100644 --- a/gr-audio-windows/Makefile.in +++ b/gr-audio-windows/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am index 2de14d5d..36deea36 100644 --- a/gr-audio-windows/src/Makefile.am +++ b/gr-audio-windows/src/Makefile.am @@ -69,7 +69,7 @@ swiginclude_HEADERS = \ _audio_windows_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(WINAUDIO_LIBS) \ -lstdc++ diff --git a/gr-audio-windows/src/Makefile.in b/gr-audio-windows/src/Makefile.in index bcd61d1d..0dd16998 100644 --- a/gr-audio-windows/src/Makefile.in +++ b/gr-audio-windows/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -146,8 +146,10 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la _audio_windows_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) am__audio_windows_la_OBJECTS = audio_windows.lo audio_windows_sink.lo \ audio_windows_source.lo _audio_windows_la_OBJECTS = $(am__audio_windows_la_OBJECTS) @@ -408,25 +410,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -477,7 +471,7 @@ swiginclude_HEADERS = \ _audio_windows_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(WINAUDIO_LIBS) \ -lstdc++ diff --git a/gr-gsm-fr-vocoder/Makefile.in b/gr-gsm-fr-vocoder/Makefile.in index 36034360..400d6038 100644 --- a/gr-gsm-fr-vocoder/Makefile.in +++ b/gr-gsm-fr-vocoder/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -378,25 +378,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index 90159dc9..82078779 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -76,7 +76,7 @@ _gsm_full_rate_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version _gsm_full_rate_la_LIBADD = \ gsm/libgsm.la \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ -lstdc++ gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES) diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.in b/gr-gsm-fr-vocoder/src/lib/Makefile.in index cc259c12..67990389 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.in +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -145,8 +145,10 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la _gsm_full_rate_la_DEPENDENCIES = gsm/libgsm.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_2) am__gsm_full_rate_la_OBJECTS = gsm_fr_decode_ps.lo gsm_fr_encode_sp.lo \ gsm_full_rate.lo _gsm_full_rate_la_OBJECTS = $(am__gsm_full_rate_la_OBJECTS) @@ -414,25 +416,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -491,7 +485,7 @@ _gsm_full_rate_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version _gsm_full_rate_la_LIBADD = \ gsm/libgsm.la \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ -lstdc++ diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in index 1b036a33..ec6dc200 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in +++ b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -393,25 +393,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-gsm-fr-vocoder/src/python/Makefile.in b/gr-gsm-fr-vocoder/src/python/Makefile.in index 61d20029..de15cd57 100644 --- a/gr-gsm-fr-vocoder/src/python/Makefile.in +++ b/gr-gsm-fr-vocoder/src/python/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -372,25 +372,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-radio-astronomy/Makefile.in b/gr-radio-astronomy/Makefile.in index fa124e36..80cb51f4 100644 --- a/gr-radio-astronomy/Makefile.in +++ b/gr-radio-astronomy/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am index 4f6da318..4165e760 100644 --- a/gr-radio-astronomy/src/lib/Makefile.am +++ b/gr-radio-astronomy/src/lib/Makefile.am @@ -65,9 +65,9 @@ _ra_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version # link the library against some comon swig runtime code and the # c++ standard library -_ra_la_LIBADD = \ - $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ +_ra_la_LIBADD = \ + $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LA) \ -lstdc++ ra.cc ra.py: $(ALL_IFILES) diff --git a/gr-radio-astronomy/src/lib/Makefile.in b/gr-radio-astronomy/src/lib/Makefile.in index 18ee1365..a8c2e484 100644 --- a/gr-radio-astronomy/src/lib/Makefile.in +++ b/gr-radio-astronomy/src/lib/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -145,7 +145,9 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = -_ra_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la +_ra_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am__ra_la_OBJECTS = ra.lo _ra_la_OBJECTS = $(am__ra_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -405,25 +407,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -476,8 +470,8 @@ _ra_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version # link the library against some comon swig runtime code and the # c++ standard library _ra_la_LIBADD = \ - $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LA) \ -lstdc++ diff --git a/gr-radio-astronomy/src/python/Makefile.in b/gr-radio-astronomy/src/python/Makefile.in index 3c1bcb05..7044f506 100644 --- a/gr-radio-astronomy/src/python/Makefile.in +++ b/gr-radio-astronomy/src/python/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -386,25 +386,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-trellis/Makefile.in b/gr-trellis/Makefile.in index 20f32bd9..072c48a7 100644 --- a/gr-trellis/Makefile.in +++ b/gr-trellis/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-trellis/doc/Makefile.am b/gr-trellis/doc/Makefile.am index 5881a02a..5ac7487b 100644 --- a/gr-trellis/doc/Makefile.am +++ b/gr-trellis/doc/Makefile.am @@ -44,8 +44,8 @@ BUILT_XML_FILES = # ---------------------------------------------------------------- -%.html : %.xml - xmlto html-nochunks $< +gr-trellis.html : gr-trellis.xml + xmlto html-nochunks $(top_srcdir)/gr-trellis/doc/gr-trellis.xml %.xml : % make_numbered_listing.py ./make_numbered_listing.py $< diff --git a/gr-trellis/doc/Makefile.in b/gr-trellis/doc/Makefile.in index 1c2f4060..ae988038 100644 --- a/gr-trellis/doc/Makefile.in +++ b/gr-trellis/doc/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -373,25 +373,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -577,8 +569,8 @@ all: $(HTML_FILES) # ---------------------------------------------------------------- -%.html : %.xml - xmlto html-nochunks $< +gr-trellis.html : gr-trellis.xml + xmlto html-nochunks $(top_srcdir)/gr-trellis/doc/gr-trellis.xml %.xml : % make_numbered_listing.py ./make_numbered_listing.py $< diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 466ab6bb..9fc78663 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -80,7 +80,7 @@ _trellis_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version # c++ standard library _trellis_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ -lstdc++ trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS) diff --git a/gr-trellis/src/lib/Makefile.in b/gr-trellis/src/lib/Makefile.in index 13ff7d48..4d2b0ccb 100644 --- a/gr-trellis/src/lib/Makefile.in +++ b/gr-trellis/src/lib/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -146,7 +146,9 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = -_trellis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la +_trellis_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am__objects_1 = trellis_encoder_bb.lo trellis_encoder_bi.lo \ trellis_encoder_bs.lo trellis_encoder_ii.lo \ trellis_encoder_si.lo trellis_encoder_ss.lo \ @@ -416,25 +418,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -555,7 +549,7 @@ _trellis_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version # c++ standard library _trellis_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ -lstdc++ diff --git a/gr-trellis/src/python/Makefile.in b/gr-trellis/src/python/Makefile.in index ab491bfd..91db030e 100644 --- a/gr-trellis/src/python/Makefile.in +++ b/gr-trellis/src/python/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -372,25 +372,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-usrp/Makefile.in b/gr-usrp/Makefile.in index 95167df2..1ec8f8fe 100644 --- a/gr-usrp/Makefile.in +++ b/gr-usrp/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 8645ca52..86c9853a 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -94,8 +94,8 @@ _usrp1_la_SOURCES = \ _usrp1_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ - $(USRP_LIBS) \ + $(GNURADIO_CORE_LA) \ + $(USRP_LA) \ -lstdc++ diff --git a/gr-usrp/src/Makefile.in b/gr-usrp/src/Makefile.in index 81e6f9ca..f41a1f60 100644 --- a/gr-usrp/src/Makefile.in +++ b/gr-usrp/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -146,8 +146,11 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = -_usrp1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la +am__DEPENDENCIES_3 = $(top_builddir)/usrp/host/lib/libusrp.la +_usrp1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_3) am__usrp1_la_OBJECTS = usrp1.lo usrp1_sink_base.lo usrp1_sink_c.lo \ usrp1_sink_s.lo usrp1_source_base.lo usrp1_source_c.lo \ usrp1_source_s.lo @@ -409,25 +412,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -501,8 +496,8 @@ _usrp1_la_SOURCES = \ _usrp1_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ - $(USRP_LIBS) \ + $(GNURADIO_CORE_LA) \ + $(USRP_LA) \ -lstdc++ _usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in index 1f8414b8..49e9530c 100644 --- a/gr-usrp/src/run_tests.in +++ b/gr-usrp/src/run_tests.in @@ -4,6 +4,10 @@ # 2nd parameter is absolute path to component build directory # 3rd parameter is path to Python QA directory +# For OS/X +DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib/:@abs_top_builddir@/usrp/host/lib/.libs:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH + # For Win32 PATH=@abs_top_builddir@/usrp/host/lib/.libs:$PATH diff --git a/gr-video-sdl/Makefile.in b/gr-video-sdl/Makefile.in index 069363ca..ac5ab574 100644 --- a/gr-video-sdl/Makefile.in +++ b/gr-video-sdl/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am index 9df1375c..cf760993 100644 --- a/gr-video-sdl/src/Makefile.am +++ b/gr-video-sdl/src/Makefile.am @@ -69,7 +69,7 @@ swiginclude_HEADERS = \ _video_sdl_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(SDL_LIBS) \ -lstdc++ diff --git a/gr-video-sdl/src/Makefile.in b/gr-video-sdl/src/Makefile.in index 5b0ff6f1..2cc6422d 100644 --- a/gr-video-sdl/src/Makefile.in +++ b/gr-video-sdl/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -146,8 +146,10 @@ am__installdirs = "$(DESTDIR)$(ourlibdir)" "$(DESTDIR)$(ourpythondir)" \ ourlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(ourlib_LTLIBRARIES) am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = \ + $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la _video_sdl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) am__video_sdl_la_OBJECTS = video_sdl.lo video_sdl_sink_uc.lo \ video_sdl_sink_s.lo _video_sdl_la_OBJECTS = $(am__video_sdl_la_OBJECTS) @@ -408,25 +410,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -477,7 +471,7 @@ swiginclude_HEADERS = \ _video_sdl_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ + $(GNURADIO_CORE_LA) \ $(SDL_LIBS) \ -lstdc++ diff --git a/gr-video-sdl/src/video_sdl_sink_s.cc b/gr-video-sdl/src/video_sdl_sink_s.cc index dadcb2ff..5bed6068 100644 --- a/gr-video-sdl/src/video_sdl_sink_s.cc +++ b/gr-video-sdl/src/video_sdl_sink_s.cc @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/gr-video-sdl/src/video_sdl_sink_uc.cc b/gr-video-sdl/src/video_sdl_sink_uc.cc index 6aab8811..771bba2f 100644 --- a/gr-video-sdl/src/video_sdl_sink_uc.cc +++ b/gr-video-sdl/src/video_sdl_sink_uc.cc @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/gr-wxgui/Makefile.in b/gr-wxgui/Makefile.in index 6530c084..e6277adb 100644 --- a/gr-wxgui/Makefile.in +++ b/gr-wxgui/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -389,25 +389,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-wxgui/src/Makefile.in b/gr-wxgui/src/Makefile.in index 2af5b243..d059ec06 100644 --- a/gr-wxgui/src/Makefile.in +++ b/gr-wxgui/src/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-wxgui/src/python/Makefile.in b/gr-wxgui/src/python/Makefile.in index 3d297562..848a1b3d 100644 --- a/gr-wxgui/src/python/Makefile.in +++ b/gr-wxgui/src/python/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/gr-wxgui/src/python/powermate.py b/gr-wxgui/src/python/powermate.py index f79e22b1..041a2cd6 100755 --- a/gr-wxgui/src/python/powermate.py +++ b/gr-wxgui/src/python/powermate.py @@ -25,16 +25,24 @@ Handler for Griffin PowerMate, Contour ShuttlePro & ShuttleXpress USB knobs This is Linux and wxPython specific. """ -import select + import os -import fcntl +import sys import struct import exceptions import threading -import sys import wx from gnuradio import gru +imported_ok = True + +try: + import select + import fcntl +except ImportError: + imported_ok = False + + # First a little bit of background: # # The Griffin PowerMate has @@ -157,6 +165,9 @@ class powermate(threading.Thread): def __init__(self, event_receiver=None, filename=None, **kwargs): self.event_receiver = event_receiver self.handle = -1 + if not imported_ok: + raise exceptions.RuntimeError, 'powermate not supported on this platform' + if filename: if not self._open_device(filename): raise exceptions.RuntimeError, 'Unable to find powermate' diff --git a/run_tests.sh.in b/run_tests.sh.in index 1bbd5d8a..5e1cbdc9 100644 --- a/run_tests.sh.in +++ b/run_tests.sh.in @@ -21,7 +21,7 @@ grswigdir=$grswigdir:$grswigdir/.libs grpydir=@abs_top_srcdir@/gnuradio-core/src/python # Where to find core's master library files -grlibdir=@abs_top_srcdir@/gnuradio-core/src/lib +grlibdir=@abs_top_builddir@/gnuradio-core/src/lib grlibdir=$grlibdir:$grlibdir/.libs # Construct search path for python modules @@ -29,7 +29,7 @@ PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$grswigdir:$grpydir:$PYTHONPATH" export PYTHONPATH # For OS/X -DYLD_LIBRARY_PATH=$grlibdir +DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH # For Win32 @@ -44,7 +44,7 @@ export GR_DONT_LOAD_PREFS ok=yes for file in $3/qa_*.py do - if ! $file + if ! @PYTHON@ $file then ok=no fi diff --git a/usrp/doc/Makefile.am b/usrp/doc/Makefile.am index 89f902e3..85f02f32 100644 --- a/usrp/doc/Makefile.am +++ b/usrp/doc/Makefile.am @@ -52,7 +52,7 @@ html/index.html: docbook-html: usrp_guide.html usrp_guide.html: usrp_guide.xml - xmlto html-nochunks $< + xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml install-data-local: $(mkinstalldirs) $(DESTDIR)$(docdir) diff --git a/usrp/doc/Makefile.in b/usrp/doc/Makefile.in index 56c69384..8e8c8b37 100644 --- a/usrp/doc/Makefile.in +++ b/usrp/doc/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -379,25 +379,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -742,7 +734,7 @@ html/index.html: docbook-html: usrp_guide.html usrp_guide.html: usrp_guide.xml - xmlto html-nochunks $< + xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml install-data-local: $(mkinstalldirs) $(DESTDIR)$(docdir) diff --git a/usrp/doc/other/Makefile.in b/usrp/doc/other/Makefile.in index 831c5dd9..37aad452 100644 --- a/usrp/doc/other/Makefile.in +++ b/usrp/doc/other/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -370,25 +370,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/usrp/firmware/include/Makefile.am b/usrp/firmware/include/Makefile.am index 7214820b..f0b082df 100644 --- a/usrp/firmware/include/Makefile.am +++ b/usrp/firmware/include/Makefile.am @@ -53,7 +53,7 @@ EXTRA_DIST = \ $(CODE_GENERATOR) fpga_regs_common.v: fpga_regs_common.h generate_regs.py - PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(srcdir)/generate_regs.py fpga_regs_common.h $@ + PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) $(srcdir)/generate_regs.py fpga_regs_common.h $@ fpga_regs_standard.v: fpga_regs_standard.h generate_regs.py - PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(srcdir)/generate_regs.py fpga_regs_standard.h $@ + PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) $(srcdir)/generate_regs.py fpga_regs_standard.h $@ diff --git a/usrp/firmware/include/Makefile.in b/usrp/firmware/include/Makefile.in index d5451c79..778a741d 100644 --- a/usrp/firmware/include/Makefile.in +++ b/usrp/firmware/include/Makefile.in @@ -586,10 +586,10 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am fpga_regs_common.v: fpga_regs_common.h generate_regs.py - PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(srcdir)/generate_regs.py fpga_regs_common.h $@ + PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) $(srcdir)/generate_regs.py fpga_regs_common.h $@ fpga_regs_standard.v: fpga_regs_standard.h generate_regs.py - PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(srcdir)/generate_regs.py fpga_regs_standard.h $@ + PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) $(srcdir)/generate_regs.py fpga_regs_standard.h $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/usrp/firmware/src/common/Makefile.am b/usrp/firmware/src/common/Makefile.am index b62baf59..701bc48c 100644 --- a/usrp/firmware/src/common/Makefile.am +++ b/usrp/firmware/src/common/Makefile.am @@ -39,7 +39,7 @@ EXTRA_DIST = \ all: usrp_gpif.c usrp_gpif.c usrp_gpif_inline.h : gpif.c - srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h + srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h CLEANFILES = \ *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \ diff --git a/usrp/firmware/src/common/Makefile.in b/usrp/firmware/src/common/Makefile.in index 6ac9185d..edbf412e 100644 --- a/usrp/firmware/src/common/Makefile.in +++ b/usrp/firmware/src/common/Makefile.in @@ -506,7 +506,7 @@ uninstall-am: uninstall-info-am all: usrp_gpif.c usrp_gpif.c usrp_gpif_inline.h : gpif.c - srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h + srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am index 423404a4..de7164b4 100644 --- a/usrp/firmware/src/usrp2/Makefile.am +++ b/usrp/firmware/src/usrp2/Makefile.am @@ -95,10 +95,10 @@ noinst_SCRIPTS = \ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .a51.rel: - test -f `basename '$<'` || ln -s '$<' . + test -f `basename '$<'` || $(LN_S) '$<' . test -f ../common/`basename '$<'` -o \ \! -f `dirname '$<'`/../common/`basename '$<'` \ - || ln -s `dirname '$<'`/../common/`basename '$<'` ../common/. + || $(LN_S) `dirname '$<'`/../common/`basename '$<'` ../common/`basename '$<'` $(XAS) `basename '$<'` @@ -108,11 +108,11 @@ eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP) $(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS) burn-usrp2-eeprom: eeprom_boot.ihx - $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@ + $(PYTHON) $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@ chmod +x $@ burn-usrp4-eeprom: eeprom_boot.ihx - $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@ + $(PYTHON) $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@ chmod +x $@ @@ -159,7 +159,7 @@ DISTCLEANFILES = \ all: usrp_gpif.c usrp_gpif.c usrp_gpif_inline.h : gpif.c - srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h + srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h # dependencies diff --git a/usrp/firmware/src/usrp2/Makefile.in b/usrp/firmware/src/usrp2/Makefile.in index 3c1b0519..e3153372 100644 --- a/usrp/firmware/src/usrp2/Makefile.in +++ b/usrp/firmware/src/usrp2/Makefile.in @@ -621,21 +621,21 @@ uninstall-am: uninstall-firmware2DATA uninstall-firmware4DATA \ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .a51.rel: - test -f `basename '$<'` || ln -s '$<' . + test -f `basename '$<'` || $(LN_S) '$<' . test -f ../common/`basename '$<'` -o \ \! -f `dirname '$<'`/../common/`basename '$<'` \ - || ln -s `dirname '$<'`/../common/`basename '$<'` ../common/. + || $(LN_S) `dirname '$<'`/../common/`basename '$<'` ../common/`basename '$<'` $(XAS) `basename '$<'` eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP) $(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS) burn-usrp2-eeprom: eeprom_boot.ihx - $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@ + $(PYTHON) $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@ chmod +x $@ burn-usrp4-eeprom: eeprom_boot.ihx - $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@ + $(PYTHON) $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@ chmod +x $@ blink_leds.ihx: $(BLINK_LEDS_OBJS) $(LIBDEP) @@ -655,7 +655,7 @@ std.ihx: $(USRP_OBJS) $(LIBDEP) all: usrp_gpif.c usrp_gpif.c usrp_gpif_inline.h : gpif.c - srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h + srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h # dependencies diff --git a/usrp/fpga/Makefile.extra b/usrp/fpga/Makefile.extra index 92178119..0a994962 100644 --- a/usrp/fpga/Makefile.extra +++ b/usrp/fpga/Makefile.extra @@ -59,7 +59,6 @@ EXTRA_DIST = \ models/ssram.v \ sdr_lib/adc_interface.v \ sdr_lib/bidir_reg.v \ - sdr_lib/bus_interface.v \ sdr_lib/cic_decim.v \ sdr_lib/cic_int_shifter.v \ sdr_lib/cic_interp.v \ diff --git a/usrp/fpga/Makefile.in b/usrp/fpga/Makefile.in index 757137fa..32684206 100644 --- a/usrp/fpga/Makefile.in +++ b/usrp/fpga/Makefile.in @@ -387,7 +387,6 @@ EXTRA_DIST = \ models/ssram.v \ sdr_lib/adc_interface.v \ sdr_lib/bidir_reg.v \ - sdr_lib/bus_interface.v \ sdr_lib/cic_decim.v \ sdr_lib/cic_int_shifter.v \ sdr_lib/cic_interp.v \ diff --git a/usrp/fpga/rbf/Makefile.in b/usrp/fpga/rbf/Makefile.in index 2c695368..b45d301d 100644 --- a/usrp/fpga/rbf/Makefile.in +++ b/usrp/fpga/rbf/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -370,25 +370,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf index 44fd06f7..966bae86 100755 Binary files a/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf and b/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf differ diff --git a/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf b/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf index e8a8b6ee..a5a5cf99 100755 Binary files a/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf and b/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf differ diff --git a/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf index 44fd06f7..966bae86 100755 Binary files a/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf and b/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf differ diff --git a/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf b/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf index e8a8b6ee..a5a5cf99 100755 Binary files a/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf and b/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf differ diff --git a/usrp/fpga/sdr_lib/bus_interface.v b/usrp/fpga/sdr_lib/bus_interface.v deleted file mode 100755 index b326889c..00000000 --- a/usrp/fpga/sdr_lib/bus_interface.v +++ /dev/null @@ -1,213 +0,0 @@ -// -*- verilog -*- -// -// USRP - Universal Software Radio Peripheral -// -// Copyright (C) 2003 Matt Ettus -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301 USA -// - -// Interface to Cypress FX2 bus -// A packet is 512 Bytes. Each fifo line is 4 bytes -// Fifo has 1024 or 2048 lines - -module bus_interface - ( input usbclk, - input reset, - inout [15:0] usbdata, // TRISTATE - input wire [5:0] usbctl, - output wire [5:0] usbrdy, - output [31:0] txdata, - input [31:0] rxdata, - input txclk, - input txstrobe, - input rxclk, - input rxstrobe, - output [11:0] debugbus, - input clear_status - ); - - parameter IN_CHANNELS = 1; - parameter OUT_CHANNELS = 1; - parameter bitmask = (IN_CHANNELS*2)-1; - - wire have_space, have_pkt_rdy; - wire WR, RD, OE; - reg tx_underrun, rx_overrun; - - assign WR = usbctl[0]; - assign RD = usbctl[1]; - assign OE = usbctl[2]; - - assign usbrdy[0] = have_space; - assign usbrdy[1] = have_pkt_rdy; - assign usbrdy[2] = tx_underrun; - assign usbrdy[3] = rx_overrun; - - reg [IN_CHANNELS*2*16-1:0] fifo_in; - wire [OUT_CHANNELS*2*16-1:0] fifo_out; - - wire [15:0] usbdata_in = usbdata; - - reg select_out; - reg select_in; - - reg commit; - reg rd_next; - reg [15:0] usbdata_out; - wire [10:0] txfifolevel,rxfifolevel; - reg [8:0] write_count; - wire tx_empty; - wire tx_full; - wire rx_empty; - wire rx_full; - wire [31:0] txd; - wire rdreq; - - // Tri-state bus macro - bustri bustri(.data(usbdata_out), - .enabledt(OE), - .tridata(usbdata) ); - - ////////////////////////////////////////////// - // TX Side (USB --> DAC) - always @(posedge usbclk, posedge reset) - begin - if(reset) - begin - fifo_in <= #1 0; - write_count <= #1 0; - end - else - if(WR & ~write_count[8]) - begin - case(write_count[0]) - 1'b0 : fifo_in[31:16] <= #1 usbdata_in; // I - 1'b1 : fifo_in[15:0] <= #1 usbdata_in; // Q - endcase - write_count <= #1 write_count + 9'd1; - end - else - write_count <= #1 WR ? write_count : 9'b0; - end - - always @(posedge usbclk) - if(reset) - commit <= #1 1'b0; - else - if(write_count[0] && ~write_count[8] && WR) - commit <= #1 1'b1; - else - commit <= #1 1'b0; - - assign rdreq = txstrobe & !tx_empty; - assign txdata = tx_empty ? 32'b0 : txd; - - always @(posedge txclk) - if(reset) - tx_underrun <= 1'b0; - else if(txstrobe & tx_empty) - tx_underrun <= 1'b1; - else if(clear_status) - tx_underrun <= 1'b0; - - fifo_1c_2k txfifo (.data ( fifo_in ), - .wrreq ( commit ), - .wrclk ( usbclk ), - - .q ( txd ), - .rdreq ( rdreq), - .rdclk ( txclk ), - - .aclr ( reset ), - - .rdempty ( tx_empty ), - .rdusedw ( ), - .wrfull ( tx_full ), - .wrusedw ( txfifolevel ) - ); - - assign have_space = (txfifolevel <= (2048-128)); - - ////////////////////////////// - // Receive FIFO (ADC --> USB) - - always @(posedge rxclk) - if(reset) - rx_overrun <= 1'b0; - else if(rxstrobe & rx_full) - rx_overrun <= 1'b1; - else if(clear_status) - rx_overrun <= 1'b0; - - always @(select_out, fifo_out) - case(select_out) - 0 : usbdata_out = fifo_out[31:16]; // I - 1 : usbdata_out = fifo_out[15:0]; // Q - endcase - -/* - always @(posedge usbclk, posedge reset) - if(reset) - usbdata_out <= #1 16'b0; - else - if(select_out) - usbdata_out = fifo_out[31:16]; - else - usbdata_out = fifo_out[15:0]; - */ - - always @(negedge usbclk, posedge reset) - if(reset) - select_out <= #1 1'b0; - else if(~RD) - select_out <= #1 1'b0; - else - select_out <= #1 ~select_out; - - fifo_1c_2k rxfifo (.data ( rxdata ), // counter ), - .wrreq (rxstrobe & ~rx_full ), - .wrclk ( rxclk ), - - .q ( fifo_out ), - .rdreq ( select_out ),// & RD ), // FIXME - .rdclk ( usbclk ), - - .aclr ( reset ), - - .rdempty ( rx_empty ), - .rdusedw ( rxfifolevel ), - .wrfull ( rx_full ), - .wrusedw ( ) - ); - - assign have_pkt_rdy = (rxfifolevel >= 128); - - // Debugging Aids - assign debugbus[0] = tx_underrun; - assign debugbus[1] = rx_overrun; - assign debugbus[2] = tx_empty; - assign debugbus[3] = tx_full; - assign debugbus[4] = rx_empty; - assign debugbus[5] = rx_full; - assign debugbus[6] = txstrobe; - assign debugbus[7] = rxstrobe; - assign debugbus[8] = select_out; - assign debugbus[9] = rxstrobe & ~rx_full; - assign debugbus[10] = have_space; - assign debugbus[11] = have_pkt_rdy; - -endmodule // bus_interface - diff --git a/usrp/fpga/sdr_lib/tx_buffer.v b/usrp/fpga/sdr_lib/tx_buffer.v index ff8fd839..63202c9d 100644 --- a/usrp/fpga/sdr_lib/tx_buffer.v +++ b/usrp/fpga/sdr_lib/tx_buffer.v @@ -66,20 +66,20 @@ module tx_buffer load_next <= #1 4'd0; end else - if((load_next != channels) & !tx_empty) + if(load_next != channels) begin load_next <= #1 load_next + 4'd1; case(load_next) - 4'd0 : tx_i_0 <= #1 fifodata; - 4'd1 : tx_q_0 <= #1 fifodata; - 4'd2 : tx_i_1 <= #1 fifodata; - 4'd3 : tx_q_1 <= #1 fifodata; - 4'd4 : tx_i_2 <= #1 fifodata; - 4'd5 : tx_q_2 <= #1 fifodata; - 4'd6 : tx_i_3 <= #1 fifodata; - 4'd7 : tx_q_3 <= #1 fifodata; + 4'd0 : tx_i_0 <= #1 tx_empty ? 16'd0 : fifodata; + 4'd1 : tx_q_0 <= #1 tx_empty ? 16'd0 : fifodata; + 4'd2 : tx_i_1 <= #1 tx_empty ? 16'd0 : fifodata; + 4'd3 : tx_q_1 <= #1 tx_empty ? 16'd0 : fifodata; + 4'd4 : tx_i_2 <= #1 tx_empty ? 16'd0 : fifodata; + 4'd5 : tx_q_2 <= #1 tx_empty ? 16'd0 : fifodata; + 4'd6 : tx_i_3 <= #1 tx_empty ? 16'd0 : fifodata; + 4'd7 : tx_q_3 <= #1 tx_empty ? 16'd0 : fifodata; endcase // case(load_next) - end // if ((load_next != channels) & !tx_empty) + end // if (load_next != channels) else if(txstrobe & (load_next == channels)) begin load_next <= #1 4'd0; diff --git a/usrp/fpga/toplevel/usrp_std/usrp_std.qsf b/usrp/fpga/toplevel/usrp_std/usrp_std.qsf index 51d7e1ea..8297f0f7 100644 --- a/usrp/fpga/toplevel/usrp_std/usrp_std.qsf +++ b/usrp/fpga/toplevel/usrp_std/usrp_std.qsf @@ -27,7 +27,7 @@ # ======================== set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0 set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04 JULY 13, 2003" -set_global_assignment -name LAST_QUARTUS_VERSION "5.1 SP2" +set_global_assignment -name LAST_QUARTUS_VERSION 6.1 # Pin & Location Assignments # ========================== diff --git a/usrp/host/apps/Makefile.in b/usrp/host/apps/Makefile.in index 09ce317c..b2609142 100644 --- a/usrp/host/apps/Makefile.in +++ b/usrp/host/apps/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -425,25 +425,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc index d7012848..8216d796 100644 --- a/usrp/host/apps/usrper.cc +++ b/usrp/host/apps/usrper.cc @@ -298,7 +298,7 @@ main (int argc, char **argv) else if (strcmp (cmd, "i2c_write") == 0){ CHKARGS (2); int i2c_addr = strtol (argv[optind], 0, 0); - int len; + int len = 0; char *hex_string = argv[optind + 1]; unsigned char *buf = hex_string_to_binary (hex_string, &len); if (buf == 0) diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index be4b4e7f..83f2984e 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -146,7 +146,7 @@ noinst_PYTHON = \ dump_data.py usrp_dbid.py usrp_dbid.h usrp_dbid.cc: gen_usrp_dbid.py usrp_dbid.dat - PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat + PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat MOSTLYCLEANFILES = \ $(BUILT_SOURCES) *~ *.pyc diff --git a/usrp/host/lib/Makefile.in b/usrp/host/lib/Makefile.in index e6498be2..c3269ae9 100644 --- a/usrp/host/lib/Makefile.in +++ b/usrp/host/lib/Makefile.in @@ -36,7 +36,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -437,25 +437,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. @@ -936,7 +928,7 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \ usrp_dbid.py usrp_dbid.h usrp_dbid.cc: gen_usrp_dbid.py usrp_dbid.dat - PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat + PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/usrp/host/lib/fusb_win32.cc b/usrp/host/lib/fusb_win32.cc index 43c2d8ba..c6e3c972 100644 --- a/usrp/host/lib/fusb_win32.cc +++ b/usrp/host/lib/fusb_win32.cc @@ -168,32 +168,32 @@ fusb_ephandle_win32::write (const void *buffer, int nbytes) if (d_output_short == 0) usb_submit_async(d_context[d_curr], &d_buffer[d_curr*d_block_size], d_block_size); - - if (bytes_to_write == 0) - return nbytes; - - assert(d_output_short == 0); } - d_curr = (d_curr+1)%d_nblocks; - buf = &d_buffer[d_curr*d_block_size]; - - if (d_outstanding_write != d_nblocks) { - d_outstanding_write++; - } else { - retval = usb_reap_async(d_context[d_curr], USB_TIMEOUT); - if (retval < 0) { - fprintf(stderr, "%s: usb_reap_async: %s\n", - __FUNCTION__, usb_strerror()); - return retval; - } - } + while (bytes_to_write > 0) { + d_curr = (d_curr+1)%d_nblocks; + buf = &d_buffer[d_curr*d_block_size]; + + if (d_outstanding_write != d_nblocks) { + d_outstanding_write++; + } else { + retval = usb_reap_async(d_context[d_curr], USB_TIMEOUT); + if (retval < 0) { + fprintf(stderr, "%s: usb_reap_async: %s\n", + __FUNCTION__, usb_strerror()); + return retval; + } + } - memcpy(buf, (void *) &(((char*)buffer)[a]), bytes_to_write); + int ncopy = std::min(bytes_to_write, d_block_size); + memcpy(buf, (void *) &(((char*)buffer)[a]), ncopy); + bytes_to_write -= ncopy; + a += ncopy; - d_output_short = d_block_size - bytes_to_write; - if (d_output_short == 0) - usb_submit_async(d_context[d_curr], buf, d_block_size); + d_output_short = d_block_size - ncopy; + if (d_output_short == 0) + usb_submit_async(d_context[d_curr], buf, d_block_size); + } return retval < 0 ? retval : nbytes; } @@ -224,27 +224,27 @@ fusb_ephandle_win32::read (void *buffer, int nbytes) if (d_input_leftover == 0) usb_submit_async(d_context[d_curr], &d_buffer[d_curr*d_block_size], d_block_size); - - if (bytes_to_read == 0) - return nbytes; - - assert(d_input_leftover == 0); } + while (bytes_to_read > 0) { - d_curr = (d_curr+1)%d_nblocks; - buf = &d_buffer[d_curr*d_block_size]; + d_curr = (d_curr+1)%d_nblocks; + buf = &d_buffer[d_curr*d_block_size]; - retval = usb_reap_async(d_context[d_curr], USB_TIMEOUT); - if (retval < 0) - fprintf(stderr, "%s: usb_reap_async: %s\n", - __FUNCTION__, usb_strerror()); + retval = usb_reap_async(d_context[d_curr], USB_TIMEOUT); + if (retval < 0) + fprintf(stderr, "%s: usb_reap_async: %s\n", + __FUNCTION__, usb_strerror()); - memcpy((void *) &(((char*)buffer)[a]), buf, bytes_to_read); + int ncopy = std::min(bytes_to_read, d_block_size); + memcpy((void *) &(((char*)buffer)[a]), buf, ncopy); + bytes_to_read -= ncopy; + a += ncopy; - d_input_leftover = d_block_size - bytes_to_read; - if (d_input_leftover == 0) - usb_submit_async(d_context[d_curr], buf, d_block_size); + d_input_leftover = d_block_size - ncopy; + if (d_input_leftover == 0) + usb_submit_async(d_context[d_curr], buf, d_block_size); + } return retval < 0 ? retval : nbytes; } diff --git a/usrp/host/swig/Makefile.in b/usrp/host/swig/Makefile.in index e3e249b1..55109d9d 100644 --- a/usrp/host/swig/Makefile.in +++ b/usrp/host/swig/Makefile.in @@ -37,7 +37,7 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -403,25 +403,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included.