From 0cfd4875e519e2b1ee05d074f72ec67391ed13bf Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 10 Aug 2009 12:09:45 -0600 Subject: [PATCH] Imported Upstream version 3.0.2 --- AUTHORS | 5 +- Makefile.am | 3 +- Makefile.in | 5 +- README.hacking | 203 ++++++++++++++++++ aclocal.m4 | 22 +- config.h.in | 3 + config/Makefile.am | 1 - config/Makefile.in | 3 +- config/gr_as.m4 | 34 --- config/gr_boost.m4 | 4 +- config/grc_gr_video_sdl.m4 | 2 +- config/grc_usrp.m4 | 2 +- configure | 69 +++--- configure.ac | 4 +- gnuradio-core/Makefile.in | 2 +- gnuradio-core/doc/Makefile.am | 4 +- gnuradio-core/doc/Makefile.in | 6 +- gnuradio-core/doc/other/Makefile.in | 2 +- gnuradio-core/doc/xml/Makefile.in | 2 +- gnuradio-core/src/Makefile.in | 2 +- .../src/gen_interpolator_taps/Makefile.in | 2 +- gnuradio-core/src/lib/Makefile.in | 2 +- gnuradio-core/src/lib/filter/Makefile.in | 2 +- gnuradio-core/src/lib/g72x/Makefile.in | 2 +- gnuradio-core/src/lib/general/Makefile.am | 18 +- gnuradio-core/src/lib/general/Makefile.in | 20 +- .../src/lib/general/gr_add_const_vXX.cc.t | 61 ++++++ .../src/lib/general/gr_add_const_vXX.h.t | 55 +++++ .../src/lib/general/gr_add_const_vXX.i.t | 37 ++++ gnuradio-core/src/lib/general/gr_add_vXX.cc.t | 65 ++++++ gnuradio-core/src/lib/general/gr_add_vXX.h.t | 54 +++++ gnuradio-core/src/lib/general/gr_add_vXX.i.t | 33 +++ gnuradio-core/src/lib/general/gr_log2_const.h | 2 +- .../lib/general/gr_multiply_const_vXX.cc.t | 61 ++++++ .../src/lib/general/gr_multiply_const_vXX.h.t | 55 +++++ .../src/lib/general/gr_multiply_const_vXX.i.t | 37 ++++ .../src/lib/general/gr_multiply_vXX.cc.t | 65 ++++++ .../src/lib/general/gr_multiply_vXX.h.t | 54 +++++ .../src/lib/general/gr_multiply_vXX.i.t | 33 +++ .../lib/general/gr_packed_to_unpacked_XX.cc.t | 2 +- .../lib/general/gr_packed_to_unpacked_bb.cc | 2 +- .../lib/general/gr_packed_to_unpacked_ii.cc | 2 +- .../lib/general/gr_packed_to_unpacked_ss.cc | 2 +- .../lib/general/gr_unpacked_to_packed_XX.cc.t | 2 +- .../lib/general/gr_unpacked_to_packed_bb.cc | 2 +- .../lib/general/gr_unpacked_to_packed_ii.cc | 2 +- .../lib/general/gr_unpacked_to_packed_ss.cc | 2 +- gnuradio-core/src/lib/general/gri_agc2_cc.h | 2 +- gnuradio-core/src/lib/io/Makefile.in | 2 +- gnuradio-core/src/lib/missing/Makefile.in | 2 +- gnuradio-core/src/lib/omnithread/Makefile.in | 2 +- gnuradio-core/src/lib/omnithread/nt.cc | 4 +- .../src/lib/reed-solomon/Makefile.in | 2 +- gnuradio-core/src/lib/runtime/Makefile.in | 2 +- gnuradio-core/src/lib/swig/Makefile.in | 2 +- gnuradio-core/src/python/Makefile.in | 2 +- gnuradio-core/src/python/bin/Makefile.in | 2 +- gnuradio-core/src/python/gnuradio/Makefile.in | 2 +- .../src/python/gnuradio/blks/Makefile.in | 2 +- .../src/python/gnuradio/blksimpl/Makefile.in | 2 +- .../src/python/gnuradio/gr/Makefile.in | 2 +- .../python/gnuradio/gr/basic_flow_graph.py | 5 +- .../src/python/gnuradio/gru/Makefile.in | 2 +- .../src/python/gnuradio/gruimpl/Makefile.in | 2 +- gnuradio-core/src/tests/Makefile.in | 2 +- gnuradio-core/src/utils/Makefile.in | 2 +- gnuradio-examples/Makefile.in | 2 +- gnuradio-examples/python/Makefile.in | 2 +- gnuradio-examples/python/apps/Makefile.in | 2 +- .../python/apps/hf_explorer/Makefile.in | 2 +- .../python/apps/hf_radio/Makefile.in | 2 +- gnuradio-examples/python/audio/Makefile.in | 2 +- .../python/channel-coding/Makefile.in | 2 +- .../channel-coding/fsm_files/Makefile.in | 2 +- gnuradio-examples/python/digital/Makefile.in | 2 +- .../python/digital_voice/Makefile.in | 2 +- .../python/multi-antenna/Makefile.in | 2 +- .../python/multi_usrp/Makefile.in | 2 +- .../python/networking/Makefile.in | 2 +- gnuradio-examples/python/usrp/Makefile.in | 2 +- gnuradio-examples/python/usrp/usrp_siggen.py | 8 +- gr-audio-alsa/Makefile.in | 2 +- gr-audio-alsa/src/Makefile.in | 2 +- gr-audio-jack/Makefile.in | 2 +- gr-audio-jack/src/Makefile.in | 2 +- gr-audio-oss/Makefile.in | 2 +- gr-audio-oss/src/Makefile.in | 2 +- gr-audio-osx/Makefile.in | 2 +- gr-audio-osx/src/Makefile.in | 2 +- gr-audio-portaudio/Makefile.in | 2 +- gr-audio-portaudio/src/Makefile.in | 2 +- gr-audio-windows/Makefile.in | 2 +- gr-audio-windows/src/Makefile.in | 2 +- gr-gsm-fr-vocoder/Makefile.in | 2 +- gr-gsm-fr-vocoder/src/Makefile.in | 2 +- gr-gsm-fr-vocoder/src/lib/Makefile.in | 2 +- gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in | 2 +- gr-gsm-fr-vocoder/src/python/Makefile.in | 2 +- gr-radio-astronomy/Makefile.in | 2 +- gr-radio-astronomy/src/Makefile.in | 2 +- gr-radio-astronomy/src/lib/Makefile.in | 2 +- gr-radio-astronomy/src/python/Makefile.in | 2 +- gr-trellis/Makefile.in | 2 +- gr-trellis/doc/Makefile.am | 2 + gr-trellis/doc/Makefile.in | 89 +++++++- gr-trellis/src/Makefile.in | 2 +- gr-trellis/src/lib/Makefile.in | 2 +- gr-trellis/src/python/Makefile.in | 2 +- gr-usrp/Makefile.in | 2 +- gr-usrp/src/Makefile.in | 2 +- gr-video-sdl/Makefile.in | 2 +- gr-video-sdl/src/Makefile.in | 2 +- gr-wxgui/Makefile.in | 2 +- gr-wxgui/src/Makefile.in | 2 +- gr-wxgui/src/python/Makefile.in | 2 +- usrp/ChangeLog | 6 + usrp/Makefile.in | 2 +- usrp/doc/Makefile.in | 2 +- usrp/doc/other/Makefile.in | 2 +- usrp/firmware/Makefile.in | 2 +- usrp/firmware/include/Makefile.am | 4 +- usrp/firmware/include/Makefile.in | 6 +- usrp/firmware/lib/Makefile.in | 2 +- usrp/firmware/src/Makefile.in | 2 +- usrp/firmware/src/common/Makefile.in | 2 +- usrp/firmware/src/usrp2/Makefile.in | 2 +- usrp/fpga/Makefile.in | 2 +- usrp/fpga/rbf/Makefile.in | 2 +- usrp/host/Makefile.in | 2 +- usrp/host/apps/Makefile.in | 2 +- usrp/host/lib/Makefile.in | 2 +- usrp/host/lib/fusb_linux.cc | 2 + usrp/host/lib/usrp_prims.cc | 2 +- usrp/host/misc/Makefile.in | 2 +- usrp/host/swig/Makefile.in | 2 +- 135 files changed, 1133 insertions(+), 203 deletions(-) create mode 100644 README.hacking delete mode 100644 config/gr_as.m4 create mode 100644 gnuradio-core/src/lib/general/gr_add_const_vXX.cc.t create mode 100644 gnuradio-core/src/lib/general/gr_add_const_vXX.h.t create mode 100644 gnuradio-core/src/lib/general/gr_add_const_vXX.i.t create mode 100644 gnuradio-core/src/lib/general/gr_add_vXX.cc.t create mode 100644 gnuradio-core/src/lib/general/gr_add_vXX.h.t create mode 100644 gnuradio-core/src/lib/general/gr_add_vXX.i.t create mode 100644 gnuradio-core/src/lib/general/gr_multiply_const_vXX.cc.t create mode 100644 gnuradio-core/src/lib/general/gr_multiply_const_vXX.h.t create mode 100644 gnuradio-core/src/lib/general/gr_multiply_const_vXX.i.t create mode 100644 gnuradio-core/src/lib/general/gr_multiply_vXX.cc.t create mode 100644 gnuradio-core/src/lib/general/gr_multiply_vXX.h.t create mode 100644 gnuradio-core/src/lib/general/gr_multiply_vXX.i.t diff --git a/AUTHORS b/AUTHORS index d1fb4ddc..610d25be 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,10 +3,11 @@ Matt Ettus ongoing code, ideas, bugfixes, the USRP John Gilmore ideas, bug fixes, financial support Stephane Fillod SIMD speed ups, lots of other good stuff Chuck Swiger hf stuff, enthusiasm ;) -Ramakrishnan Muthukrishnan Debian pkgs + misc stuff +Ramakrishnan Muthukrishnan Debian packages, Misc. stuff Martin Dudok van Heel lots of stuff Bob McGwier N4HY wisdom, code, bugfixes. Krzysztof Kamieniecki bugfixes Andrew Thomas Beck bugfixes Joshua Lackey Original GMSK implementation. -Johnathan Corgan Goertzel, squelch, adaptive filtering, misc. +Johnathan Corgan Build system, Goertzel, squelch, adaptive filtering +Bdale Garbee Debian release packages diff --git a/Makefile.am b/Makefile.am index 1db371bd..8be7a758 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,8 @@ EXTRA_DIST = \ bootstrap \ configure \ config.h.in \ - run_tests.sh.in + run_tests.sh.in \ + README.hacking SUBDIRS = @build_dirs@ DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ diff --git a/Makefile.in b/Makefile.in index adf7f968..76ee18b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ @@ -425,7 +425,8 @@ EXTRA_DIST = \ bootstrap \ configure \ config.h.in \ - run_tests.sh.in + run_tests.sh.in \ + README.hacking SUBDIRS = @build_dirs@ DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ diff --git a/README.hacking b/README.hacking new file mode 100644 index 00000000..1a604395 --- /dev/null +++ b/README.hacking @@ -0,0 +1,203 @@ +# -*- Outline -*- +# +# Copyright 2004 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. +# + + +Random notes on coding conventions, some explanations about why things +aren't done differently, etc, etc, + + +* C++ and Python + +GNU Radio is now a hybrid system. Some parts of the system are built +in C++ and some of it in Python. In general, prefer Python to C++. +Signal processing primitives are still built in C++ for performance. + +It is no longer possible to build user applications entirely in C++. +Essential parts of the runtime system have been moved into Python. + + +* C++ namespaces + +In the cleanup process, I considered putting everything in the +gnuradio namespace and dropping the Gr|gr prefix. In fact, I think +it's probably the right idea, but when I tested it out, I ran into +problems with SWIG's handling of namespaces. Bottom line, SWIG +(1.3.21) got confused and generated bad code when I started playing +around with namespaces in a not particularly convoluted way. I saw +problems using the boost::shared_ptr template in combination with +classes defined in the gnuradio namespace. It wasn't pretty... + + +* Naming conventions + +Death to CamelCaseNames! We've returned to a kinder, gentler era. +We're now using the "STL style" naming convention with a couple of +modifications since we're not using namespaces. + +With the exception of macros and other constant values, all +identifiers shall be lower case with words_separated_like_this. + +Macros and constant values (e.g., enumerated values, +static const int FOO = 23) shall be in UPPER_CASE. + + +** Global names + +All globally visible names (types, functions, variables, consts, etc) +shall begin with a "package prefix", followed by an '_'. The bulk of +the code in GNU Radio logically belongs to the "gr" package, hence +names look like gr_open_file (...). + +Large coherent bodies of code may use other package prefixes, but +let's try to keep them to a well thought out list. See the list +below. + +*** Package prefixes + +These are the current package prefixes: + + gr_ Almost everything + + gri_ Implementation primitives. Sometimes we + have both a gr_ and a gri_. In that case, + gr_ would be derived from gr_block and gri_ + would be the low level guts of the function. + + atsc_ Code related to the Advanced Television + Standards Committee HDTV implementation + + usrp_ Universal Software Radio Peripheral + + qa_ Quality Assurance. Test code. + + +** Class data members (instance variables) + +All class data members shall begin with d_. + +The big win is when you're staring at a block of code it's obvious +which of the things being assigned to persist outside of the block. +This also keeps you from having to be creative with parameter names +for methods and constructors. You just use the same name as the +instance variable, without the d_. + +class gr_wonderfulness { + std::string d_name; + double d_wonderfulness_factor; + +public: + gr_wonderfulness (std::string name, double wonderfulness_factor) + : d_name (name), d_wonderfulness_factor (wonderfulness_factor) + { + ... + } + ... +}; + + +** Class static data members (class variables) + +All class static data members shall begin with s_. + + +** File names + +Each significant class shall be contained in it's own file. The +declaration of class gr_foo shall be in gr_foo.h, the definition in +gr_foo.cc. + + + +* Storage management + +Strongly consider using the boost smart pointer templates, scoped_ptr +and shared_ptr. scoped_ptr should be used for locals that contain +pointers to objects that we need to delete when we exit the current +scope. shared_ptr implements transparent reference counting and is a +major win. You never have to worry about calling delete. The right +thing happens. + +See http://www.boost.org/libs/smart_ptr/smart_ptr.htm + + +* Unit tests + +Build unit tests for everything non-trivial and run them after every +change. Check out Extreme Programming: +http://c2.com/cgi/wiki?ExtremeProgrammingRoadmap + +Unit tests should also be written for all examples. This should kill +off the bit rot we've been plagued with. + +** C++ unit tests + +For C++ we're using the cppunit framework. cppunit has its bad +smells, but it's mostly workable. http://cppunit.sf.net + +Currently each directory contains files qa_.{h,cc} +that bring together all the qa_ test suites in the directory. +We ought to be able to automate this without too much trouble. + +The directory gnuradio-core/src/tests contains programs that run +the tests. test_all runs all of the registered C++ unit tests. + +As far as I can tell, the cppunit TestFactoryRegistry maybe able to be +tricked into doing what we want. As is, I don't think it's enough by +itself, since there's nothing dragging the qa* files out of the +library and into the program. I haven't tested out this idea. + +** Python unit tests + +We use the standard unittest package for unit testing of Python code. + + +* Subversion line ending styles + +All text files in the tree should have the subversion property +'svn:eol-style' set to 'native', with the following exceptions: + +config/*.m4 +configure.ac +gr-howto-write-a-block/config/*.m4 +gr-howto-write-a-block/configure.ac + +The easiest way to ensure this is to add or edit the following lines in +your svn client configuration file (~/.subversion/config): + +enable-auto-props=yes + +[auto-props] +*.c = svn:eol-style=native +*.cc = svn:eol-style=native +*.i = svn:eol-style=native +*.h = svn:eol-style=native +*.am = svn:eol-style=native +*.py = svn:eol-style=native +*.ac = svn:eol-style=LF +*.m4 = svn:eol-style=LF + +* Misc tips + +ccache, a compiler cache, can really speed up your builds. +See http://ccache.samba.org/ + +Be sure to create links for gcc and g++ diff --git a/aclocal.m4 b/aclocal.m4 index ea392ea6..a72a03cc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -6399,6 +6399,27 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.9.6])]) +# Figure out how to run the assembler. -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_PROG_AS +# ---------- +AC_DEFUN([AM_PROG_AS], +[# By default we simply use the C compiler to build assembly code. +AC_REQUIRE([AC_PROG_CC]) +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS +AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) +AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) +]) + # AM_AUX_DIR_EXPAND -*- Autoconf -*- # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. @@ -7395,7 +7416,6 @@ AC_SUBST([am__untar]) m4_include([config/acx_pthread.m4]) m4_include([config/cppunit.m4]) -m4_include([config/gr_as.m4]) m4_include([config/gr_boost.m4]) m4_include([config/gr_check_createfilemapping.m4]) m4_include([config/gr_check_shm_open.m4]) diff --git a/config.h.in b/config.h.in index 816e75f6..df456fc1 100644 --- a/config.h.in +++ b/config.h.in @@ -88,6 +88,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_COMPILER_H + /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_PPDEV_H diff --git a/config/Makefile.am b/config/Makefile.am index 70c4c7a6..c6f87acb 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -29,7 +29,6 @@ m4macros = \ acx_pthread.m4 \ bnv_have_qt.m4 \ cppunit.m4 \ - gr_as.m4 \ gr_boost.m4 \ grc_build.m4 \ grc_gnuradio_core.m4 \ diff --git a/config/Makefile.in b/config/Makefile.in index 2edf31c0..393e0a7b 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = config ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ @@ -406,7 +406,6 @@ m4macros = \ acx_pthread.m4 \ bnv_have_qt.m4 \ cppunit.m4 \ - gr_as.m4 \ gr_boost.m4 \ grc_build.m4 \ grc_gnuradio_core.m4 \ diff --git a/config/gr_as.m4 b/config/gr_as.m4 deleted file mode 100644 index 08e3f930..00000000 --- a/config/gr_as.m4 +++ /dev/null @@ -1,34 +0,0 @@ -# Figure out how to run the assembler. -*- Autoconf -*- - -# serial 2 - -# Copyright 2001 Free Software Foundation, Inc. - -# 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, 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. - -# I just copy and renamed this from automake-1.6.3 so we should work -# under both 1.4-p6 and later. -eb - -# GR_PROG_AS -# ---------- -AC_DEFUN([GR_PROG_AS], -[# By default we simply use the C compiler to build assembly code. -AC_REQUIRE([AC_PROG_CC]) -: ${CCAS='$(CC)'} -# Set ASFLAGS if not already set. -: ${CCASFLAGS='$(CFLAGS)'} -AC_SUBST(CCAS) -AC_SUBST(CCASFLAGS)]) diff --git a/config/gr_boost.m4 b/config/gr_boost.m4 index 41d855d5..7236cbb5 100644 --- a/config/gr_boost.m4 +++ b/config/gr_boost.m4 @@ -43,8 +43,8 @@ AC_DEFUN([GR_REQUIRE_BOOST_INCLUDES], [path to boost c++ include files]), [ # "yes" and "no" are bogus answers - if test x"$with_boost_include_dir" == xyes || - test x"$with_boost_include_dir" == xno; then + if test x"$with_boost_include_dir" = xyes || + test x"$with_boost_include_dir" = xno; then gr_boost_include_dir= else gr_boost_include_dir=$with_boost_include_dir diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4 index 280714aa..52615331 100644 --- a/config/grc_gr_video_sdl.m4 +++ b/config/grc_gr_video_sdl.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_VIDEO_SDL],[ passed=yes SDL_VERSION=1.2.0 AM_PATH_SDL($SDL_VERSION,[], - [passed=no;AC_MSG_RESULT([gr-video-sdl requires library sdl, not found.])]) + [passed=no;AC_MSG_RESULT([gr-video-sdl requires library sdl, not found or failed test.])]) GRC_BUILD_CONDITIONAL([gr-video-sdl],[ AC_SUBST(SDL_CFLAGS) diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4 index 8c1b118b..a7c0cf13 100644 --- a/config/grc_usrp.m4 +++ b/config/grc_usrp.m4 @@ -49,7 +49,7 @@ AC_DEFUN([GRC_USRP],[ # These checks don't fail AC_C_BIGENDIAN - AC_CHECK_HEADERS([byteswap.h]) + AC_CHECK_HEADERS([byteswap.h linux/compiler.h]) AC_CHECK_FUNCS([getrusage sched_setscheduler]) AC_CHECK_FUNCS([sigaction snprintf]) diff --git a/configure b/configure index 6125b7bd..d04da58b 100755 --- a/configure +++ b/configure @@ -970,6 +970,8 @@ CXX CXXFLAGS CCC CXXCPP +CCAS +CCASFLAGS F77 FFLAGS' @@ -1612,6 +1614,8 @@ Some influential environment variables: CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor + CCAS assembler compiler command (defaults to CC) + CCASFLAGS assembler compiler flags (defaults to CFLAGS) F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags @@ -2483,7 +2487,7 @@ fi # Define the identity of the package. PACKAGE=gnuradio - VERSION=3.0 + VERSION=3.0.2 cat >>confdefs.h <<_ACEOF @@ -6044,9 +6048,9 @@ echo "${ECHO_T}no" >&6; } # By default we simply use the C compiler to build assembly code. -: ${CCAS='$(CC)'} -# Set ASFLAGS if not already set. -: ${CCASFLAGS='$(CFLAGS)'} +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS + { echo "$as_me:$LINENO: checking whether ln -s works" >&5 @@ -6751,7 +6755,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6754 "configure"' > conftest.$ac_ext + echo '#line 6758 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8922,11 +8926,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8925: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8929: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8929: \$? = $ac_status" >&5 + echo "$as_me:8933: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9190,11 +9194,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9193: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9197: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9197: \$? = $ac_status" >&5 + echo "$as_me:9201: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9294,11 +9298,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9297: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9301: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9301: \$? = $ac_status" >&5 + echo "$as_me:9305: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11735,7 +11739,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:14210: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14210: \$? = $ac_status" >&5 + echo "$as_me:14214: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14307,11 +14311,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14310: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14314: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14314: \$? = $ac_status" >&5 + echo "$as_me:14318: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15868,11 +15872,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15871: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15875: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15875: \$? = $ac_status" >&5 + echo "$as_me:15879: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15972,11 +15976,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15975: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15979: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15979: \$? = $ac_status" >&5 + echo "$as_me:15983: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18191,11 +18195,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18194: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18198: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18198: \$? = $ac_status" >&5 + echo "$as_me:18202: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18459,11 +18463,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18462: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18466: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18466: \$? = $ac_status" >&5 + echo "$as_me:18470: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18563,11 +18567,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18566: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18570: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18570: \$? = $ac_status" >&5 + echo "$as_me:18574: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -28766,8 +28770,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${with_boost_include_dir+set}" = set; then withval=$with_boost_include_dir; # "yes" and "no" are bogus answers - if test x"$with_boost_include_dir" == xyes || - test x"$with_boost_include_dir" == xno; then + if test x"$with_boost_include_dir" = xyes || + test x"$with_boost_include_dir" = xno; then gr_boost_include_dir= else gr_boost_include_dir=$with_boost_include_dir @@ -30941,7 +30945,8 @@ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} esac -for ac_header in byteswap.h + +for ac_header in byteswap.h linux/compiler.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -33888,8 +33893,8 @@ rm -f core conftest.err conftest.$ac_objext \ fi SDL_CFLAGS="" SDL_LIBS="" - passed=no;{ echo "$as_me:$LINENO: result: gr-video-sdl requires library sdl, not found." >&5 -echo "${ECHO_T}gr-video-sdl requires library sdl, not found." >&6; } + passed=no;{ echo "$as_me:$LINENO: result: gr-video-sdl requires library sdl, not found or failed test." >&5 +echo "${ECHO_T}gr-video-sdl requires library sdl, not found or failed test." >&6; } fi diff --git a/configure.ac b/configure.ac index 18c244dc..4cc03188 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) +AM_INIT_AUTOMAKE(gnuradio,3.0.2) AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc]) GR_X86_64 dnl check for lib64 suffix @@ -31,7 +31,7 @@ LF_CONFIGURE_CXX LF_SET_WARNINGS GR_SET_GPROF GR_SET_PROF -GR_PROG_AS +AM_PROG_AS AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_INSTALL diff --git a/gnuradio-core/Makefile.in b/gnuradio-core/Makefile.in index d847f0d7..8877e101 100644 --- a/gnuradio-core/Makefile.in +++ b/gnuradio-core/Makefile.in @@ -86,7 +86,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gnuradio-core ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/doc/Makefile.am b/gnuradio-core/doc/Makefile.am index 2636d743..96b80239 100644 --- a/gnuradio-core/doc/Makefile.am +++ b/gnuradio-core/doc/Makefile.am @@ -54,14 +54,14 @@ prep: install-data-local: $(mkinstalldirs) $(DESTDIR)$(docdir) - @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking $(top_srcdir)/ChangeLog; do \ + @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ done cp -r html $(DESTDIR)$(docdir) uninstall-local: - @for i in README README.hacking ChangeLog; do \ + @for i in README README.hacking; do \ echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \ $(RM) $(DESTDIR)$(docdir)/$$i; \ done diff --git a/gnuradio-core/doc/Makefile.in b/gnuradio-core/doc/Makefile.in index 9652e5bd..1d9522d2 100644 --- a/gnuradio-core/doc/Makefile.in +++ b/gnuradio-core/doc/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ subdir = gnuradio-core/doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ @@ -744,14 +744,14 @@ prep: install-data-local: $(mkinstalldirs) $(DESTDIR)$(docdir) - @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking $(top_srcdir)/ChangeLog; do \ + @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ done cp -r html $(DESTDIR)$(docdir) uninstall-local: - @for i in README README.hacking ChangeLog; do \ + @for i in README README.hacking; do \ echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \ $(RM) $(DESTDIR)$(docdir)/$$i; \ done diff --git a/gnuradio-core/doc/other/Makefile.in b/gnuradio-core/doc/other/Makefile.in index 7b2cdf2d..89cd3adc 100644 --- a/gnuradio-core/doc/other/Makefile.in +++ b/gnuradio-core/doc/other/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gnuradio-core/doc/other ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/doc/xml/Makefile.in b/gnuradio-core/doc/xml/Makefile.in index 6bccc814..12a4a4eb 100644 --- a/gnuradio-core/doc/xml/Makefile.in +++ b/gnuradio-core/doc/xml/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-core/doc/xml DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/Makefile.in b/gnuradio-core/src/Makefile.in index e675a08c..0ff53bad 100644 --- a/gnuradio-core/src/Makefile.in +++ b/gnuradio-core/src/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gnuradio-core/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/gen_interpolator_taps/Makefile.in b/gnuradio-core/src/gen_interpolator_taps/Makefile.in index fe503892..684a74a6 100644 --- a/gnuradio-core/src/gen_interpolator_taps/Makefile.in +++ b/gnuradio-core/src/gen_interpolator_taps/Makefile.in @@ -87,7 +87,7 @@ DIST_COMMON = README $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \ subdir = gnuradio-core/src/gen_interpolator_taps ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/lib/Makefile.in b/gnuradio-core/src/lib/Makefile.in index 65189779..4507c3fb 100644 --- a/gnuradio-core/src/lib/Makefile.in +++ b/gnuradio-core/src/lib/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gnuradio-core/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/lib/filter/Makefile.in b/gnuradio-core/src/lib/filter/Makefile.in index f5ad4881..c37da6c4 100644 --- a/gnuradio-core/src/lib/filter/Makefile.in +++ b/gnuradio-core/src/lib/filter/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = README $(grinclude_HEADERS) $(noinst_HEADERS) \ subdir = gnuradio-core/src/lib/filter ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/lib/g72x/Makefile.in b/gnuradio-core/src/lib/g72x/Makefile.in index bd3496a8..7b20075d 100644 --- a/gnuradio-core/src/lib/g72x/Makefile.in +++ b/gnuradio-core/src/lib/g72x/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gnuradio-core/src/lib/g72x ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index ace399ab..b8741154 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -37,9 +37,15 @@ CODE_GENERATOR = \ gr_add_const_XX.cc.t \ gr_add_const_XX.h.t \ gr_add_const_XX.i.t \ - gr_chunks_to_symbols_XX.cc.t \ - gr_chunks_to_symbols_XX.h.t \ - gr_chunks_to_symbols_XX.i.t \ + gr_add_vXX.cc.t \ + gr_add_vXX.h.t \ + gr_add_vXX.i.t \ + gr_add_const_vXX.cc.t \ + gr_add_const_vXX.h.t \ + gr_add_const_vXX.i.t \ + gr_chunks_to_symbols_XX.cc.t \ + gr_chunks_to_symbols_XX.h.t \ + gr_chunks_to_symbols_XX.i.t \ gr_divide_XX.cc.t \ gr_divide_XX.h.t \ gr_divide_XX.i.t \ @@ -49,6 +55,12 @@ CODE_GENERATOR = \ gr_multiply_const_XX.cc.t \ gr_multiply_const_XX.h.t \ gr_multiply_const_XX.i.t \ + gr_multiply_vXX.cc.t \ + gr_multiply_vXX.h.t \ + gr_multiply_vXX.i.t \ + gr_multiply_const_vXX.cc.t \ + gr_multiply_const_vXX.h.t \ + gr_multiply_const_vXX.i.t \ gr_mute_XX.cc.t \ gr_mute_XX.h.t \ gr_mute_XX.i.t \ diff --git a/gnuradio-core/src/lib/general/Makefile.in b/gnuradio-core/src/lib/general/Makefile.in index a636e03e..eb55a766 100644 --- a/gnuradio-core/src/lib/general/Makefile.in +++ b/gnuradio-core/src/lib/general/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = README $(grinclude_HEADERS) $(noinst_HEADERS) \ subdir = gnuradio-core/src/lib/general ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ @@ -526,9 +526,15 @@ CODE_GENERATOR = \ gr_add_const_XX.cc.t \ gr_add_const_XX.h.t \ gr_add_const_XX.i.t \ - gr_chunks_to_symbols_XX.cc.t \ - gr_chunks_to_symbols_XX.h.t \ - gr_chunks_to_symbols_XX.i.t \ + gr_add_vXX.cc.t \ + gr_add_vXX.h.t \ + gr_add_vXX.i.t \ + gr_add_const_vXX.cc.t \ + gr_add_const_vXX.h.t \ + gr_add_const_vXX.i.t \ + gr_chunks_to_symbols_XX.cc.t \ + gr_chunks_to_symbols_XX.h.t \ + gr_chunks_to_symbols_XX.i.t \ gr_divide_XX.cc.t \ gr_divide_XX.h.t \ gr_divide_XX.i.t \ @@ -538,6 +544,12 @@ CODE_GENERATOR = \ gr_multiply_const_XX.cc.t \ gr_multiply_const_XX.h.t \ gr_multiply_const_XX.i.t \ + gr_multiply_vXX.cc.t \ + gr_multiply_vXX.h.t \ + gr_multiply_vXX.i.t \ + gr_multiply_const_vXX.cc.t \ + gr_multiply_const_vXX.h.t \ + gr_multiply_const_vXX.i.t \ gr_mute_XX.cc.t \ gr_mute_XX.h.t \ gr_mute_XX.i.t \ diff --git a/gnuradio-core/src/lib/general/gr_add_const_vXX.cc.t b/gnuradio-core/src/lib/general/gr_add_const_vXX.cc.t new file mode 100644 index 00000000..eba855c9 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_add_const_vXX.cc.t @@ -0,0 +1,61 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004,2006 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. + */ + +// @WARNING@ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <@NAME@.h> +#include + +@SPTR_NAME@ +gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k) +{ + return @SPTR_NAME@ (new @NAME@ (k)); +} + +@NAME@::@NAME@ (const std::vector<@I_TYPE@> k) + : gr_sync_block ("@BASE_NAME@", + gr_make_io_signature (1, 1, sizeof(@I_TYPE@)*k.size()), + gr_make_io_signature (1, 1, sizeof(@O_TYPE@)*k.size())) +{ + d_k = k; +} + +int +@NAME@::work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) +{ + @I_TYPE@ *iptr = (@O_TYPE@ *)input_items[0]; + @O_TYPE@ *optr = (@O_TYPE@ *)output_items[0]; + + int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(@I_TYPE@); + + for (int i = 0; i < noutput_items; i++) + for (int j = 0; j < nitems_per_block; j++) + *optr++ = *iptr++ + d_k[j]; + + return noutput_items; +} diff --git a/gnuradio-core/src/lib/general/gr_add_const_vXX.h.t b/gnuradio-core/src/lib/general/gr_add_const_vXX.h.t new file mode 100644 index 00000000..c3bb187c --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_add_const_vXX.h.t @@ -0,0 +1,55 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004,2006 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. + */ + +// @WARNING@ + +#ifndef @GUARD_NAME@ +#define @GUARD_NAME@ + +#include + +class @NAME@; +typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; + +@SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k); + +/*! + * \brief output vector = input vector + constant vector + * \ingroup block + */ +class @NAME@ : public gr_sync_block +{ + friend @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k); + + std::vector<@I_TYPE@> d_k; // the constant + @NAME@ (const std::vector<@I_TYPE@> k); + + public: + const std::vector<@I_TYPE@> k () const { return d_k; } + void set_k (const std::vector<@I_TYPE@> k) { d_k = k; } + + int work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); +}; + +#endif diff --git a/gnuradio-core/src/lib/general/gr_add_const_vXX.i.t b/gnuradio-core/src/lib/general/gr_add_const_vXX.i.t new file mode 100644 index 00000000..ae52a4e6 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_add_const_vXX.i.t @@ -0,0 +1,37 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004,2006 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. + */ + +// @WARNING@ + +GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@) + +@SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k); + +class @NAME@ : public gr_sync_block +{ + private: + @NAME@ (const std::vector<@I_TYPE@> k); + + public: + std::vector<@I_TYPE@> k () const { return d_k; } + void set_k (const std::vector<@I_TYPE@> k) { d_k = k; } +}; diff --git a/gnuradio-core/src/lib/general/gr_add_vXX.cc.t b/gnuradio-core/src/lib/general/gr_add_vXX.cc.t new file mode 100644 index 00000000..dadf81b8 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_add_vXX.cc.t @@ -0,0 +1,65 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004 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. + */ + +// @WARNING@ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <@NAME@.h> +#include + +@SPTR_NAME@ +gr_make_@BASE_NAME@ (size_t nitems_per_block) +{ + return @SPTR_NAME@ (new @NAME@ (nitems_per_block)); +} + +@NAME@::@NAME@ (size_t nitems_per_block) + : gr_sync_block ("@BASE_NAME@", + gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*nitems_per_block), + gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*nitems_per_block)) +{ +} + +int +@NAME@::work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) +{ + @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; + + int ninputs = input_items.size (); + int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(@I_TYPE@); + + for (int i = 0; i < noutput_items; i++){ + for (int j = 0; j < nitems_per_block; j++){ + @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i*nitems_per_block+j]; + for (int k = 1; k < ninputs; k++) + acc += ((@I_TYPE@ *) input_items[k])[i*nitems_per_block+j]; + + *optr++ = (@O_TYPE@) acc; + } + } + return noutput_items; +} diff --git a/gnuradio-core/src/lib/general/gr_add_vXX.h.t b/gnuradio-core/src/lib/general/gr_add_vXX.h.t new file mode 100644 index 00000000..546041e4 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_add_vXX.h.t @@ -0,0 +1,54 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004 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. + */ + +// @WARNING@ + +#ifndef @GUARD_NAME@ +#define @GUARD_NAME@ + +#include + +class @NAME@; +typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; + +@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block); + +/*! + * \brief output = sum (input_0, input_1, ...) + * \ingroup block + * + * Add across all input vectors. + */ +class @NAME@ : public gr_sync_block +{ + friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block); + + @NAME@ (size_t nitems_per_block); + + public: + + int work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); +}; + +#endif diff --git a/gnuradio-core/src/lib/general/gr_add_vXX.i.t b/gnuradio-core/src/lib/general/gr_add_vXX.i.t new file mode 100644 index 00000000..bcae7b75 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_add_vXX.i.t @@ -0,0 +1,33 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004 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. + */ + +// @WARNING@ + +GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@) + +@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block); + +class @NAME@ : public gr_sync_block +{ + private: + @NAME@ (size_t nitems_per_block); +}; diff --git a/gnuradio-core/src/lib/general/gr_log2_const.h b/gnuradio-core/src/lib/general/gr_log2_const.h index eb73983e..0c27bbcc 100644 --- a/gnuradio-core/src/lib/general/gr_log2_const.h +++ b/gnuradio-core/src/lib/general/gr_log2_const.h @@ -29,7 +29,7 @@ #include -template static inline int gr_log2_const() { assert(0); } +template static inline int gr_log2_const() { assert(0); return 0; } template<> static inline int gr_log2_const<1>() { return 0; } template<> static inline int gr_log2_const<2>() { return 1; } diff --git a/gnuradio-core/src/lib/general/gr_multiply_const_vXX.cc.t b/gnuradio-core/src/lib/general/gr_multiply_const_vXX.cc.t new file mode 100644 index 00000000..e9033d7c --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_multiply_const_vXX.cc.t @@ -0,0 +1,61 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004,2006 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. + */ + +// @WARNING@ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <@NAME@.h> +#include + +@SPTR_NAME@ +gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k) +{ + return @SPTR_NAME@ (new @NAME@ (k)); +} + +@NAME@::@NAME@ (const std::vector<@I_TYPE@> k) + : gr_sync_block ("@BASE_NAME@", + gr_make_io_signature (1, 1, sizeof(@I_TYPE@)*k.size()), + gr_make_io_signature (1, 1, sizeof(@O_TYPE@)*k.size())) +{ + d_k = k; +} + +int +@NAME@::work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) +{ + @I_TYPE@ *iptr = (@O_TYPE@ *)input_items[0]; + @O_TYPE@ *optr = (@O_TYPE@ *)output_items[0]; + + int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(@I_TYPE@); + + for (int i = 0; i < noutput_items; i++) + for (int j = 0; j < nitems_per_block; j++) + *optr++ = *iptr++ * d_k[j]; + + return noutput_items; +} diff --git a/gnuradio-core/src/lib/general/gr_multiply_const_vXX.h.t b/gnuradio-core/src/lib/general/gr_multiply_const_vXX.h.t new file mode 100644 index 00000000..feecffc3 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_multiply_const_vXX.h.t @@ -0,0 +1,55 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004,2006 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. + */ + +// @WARNING@ + +#ifndef @GUARD_NAME@ +#define @GUARD_NAME@ + +#include + +class @NAME@; +typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; + +@SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k); + +/*! + * \brief output vector = input vector * constant vector (element-wise) + * \ingroup block + */ +class @NAME@ : public gr_sync_block +{ + friend @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k); + + std::vector<@I_TYPE@> d_k; // the constant + @NAME@ (const std::vector<@I_TYPE@> k); + + public: + const std::vector<@I_TYPE@> k () const { return d_k; } + void set_k (const std::vector<@I_TYPE@> k) { d_k = k; } + + int work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); +}; + +#endif diff --git a/gnuradio-core/src/lib/general/gr_multiply_const_vXX.i.t b/gnuradio-core/src/lib/general/gr_multiply_const_vXX.i.t new file mode 100644 index 00000000..ae52a4e6 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_multiply_const_vXX.i.t @@ -0,0 +1,37 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004,2006 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. + */ + +// @WARNING@ + +GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@) + +@SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> k); + +class @NAME@ : public gr_sync_block +{ + private: + @NAME@ (const std::vector<@I_TYPE@> k); + + public: + std::vector<@I_TYPE@> k () const { return d_k; } + void set_k (const std::vector<@I_TYPE@> k) { d_k = k; } +}; diff --git a/gnuradio-core/src/lib/general/gr_multiply_vXX.cc.t b/gnuradio-core/src/lib/general/gr_multiply_vXX.cc.t new file mode 100644 index 00000000..1df48801 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_multiply_vXX.cc.t @@ -0,0 +1,65 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004 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. + */ + +// @WARNING@ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <@NAME@.h> +#include + +@SPTR_NAME@ +gr_make_@BASE_NAME@ (size_t nitems_per_block) +{ + return @SPTR_NAME@ (new @NAME@ (nitems_per_block)); +} + +@NAME@::@NAME@ (size_t nitems_per_block) + : gr_sync_block ("@BASE_NAME@", + gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*nitems_per_block), + gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*nitems_per_block)) +{ +} + +int +@NAME@::work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) +{ + @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; + + int ninputs = input_items.size (); + int nitems_per_block = output_signature()->sizeof_stream_item(0)/sizeof(@I_TYPE@); + + for (int i = 0; i < noutput_items; i++){ + for (int j = 0; j < nitems_per_block; j++){ + @I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i*nitems_per_block+j]; + for (int k = 1; k < ninputs; k++) + acc *= ((@I_TYPE@ *) input_items[k])[i*nitems_per_block+j]; + + *optr++ = (@O_TYPE@) acc; + } + } + return noutput_items; +} diff --git a/gnuradio-core/src/lib/general/gr_multiply_vXX.h.t b/gnuradio-core/src/lib/general/gr_multiply_vXX.h.t new file mode 100644 index 00000000..107adc50 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_multiply_vXX.h.t @@ -0,0 +1,54 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004 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. + */ + +// @WARNING@ + +#ifndef @GUARD_NAME@ +#define @GUARD_NAME@ + +#include + +class @NAME@; +typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; + +@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block); + +/*! + * \brief output = prod (input_0, input_1, ...) + * \ingroup block + * + * Element-wise multiply across all input vectors. + */ +class @NAME@ : public gr_sync_block +{ + friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block); + + @NAME@ (size_t nitems_per_block); + + public: + + int work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); +}; + +#endif diff --git a/gnuradio-core/src/lib/general/gr_multiply_vXX.i.t b/gnuradio-core/src/lib/general/gr_multiply_vXX.i.t new file mode 100644 index 00000000..bcae7b75 --- /dev/null +++ b/gnuradio-core/src/lib/general/gr_multiply_vXX.i.t @@ -0,0 +1,33 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004 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. + */ + +// @WARNING@ + +GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@) + +@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t nitems_per_block); + +class @NAME@ : public gr_sync_block +{ + private: + @NAME@ (size_t nitems_per_block); +}; diff --git a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t index 15e85902..388def8f 100644 --- a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t +++ b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t @@ -87,7 +87,7 @@ int gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - unsigned int index_tmp; + unsigned int index_tmp = d_index; assert (input_items.size() == output_items.size()); int nstreams = input_items.size(); diff --git a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_bb.cc b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_bb.cc index 69d61ba3..e6029862 100644 --- a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_bb.cc +++ b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_bb.cc @@ -87,7 +87,7 @@ gr_packed_to_unpacked_bb::general_work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - unsigned int index_tmp; + unsigned int index_tmp = d_index; assert (input_items.size() == output_items.size()); int nstreams = input_items.size(); diff --git a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_ii.cc b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_ii.cc index 7a660e64..c6cb00cf 100644 --- a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_ii.cc +++ b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_ii.cc @@ -87,7 +87,7 @@ gr_packed_to_unpacked_ii::general_work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - unsigned int index_tmp; + unsigned int index_tmp = d_index; assert (input_items.size() == output_items.size()); int nstreams = input_items.size(); diff --git a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_ss.cc b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_ss.cc index e3d5d9eb..3ad371f2 100644 --- a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_ss.cc +++ b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_ss.cc @@ -87,7 +87,7 @@ gr_packed_to_unpacked_ss::general_work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - unsigned int index_tmp; + unsigned int index_tmp = d_index; assert (input_items.size() == output_items.size()); int nstreams = input_items.size(); diff --git a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t index 25a6f295..7db6037b 100644 --- a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t +++ b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t @@ -78,7 +78,7 @@ int gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - unsigned int index_tmp; + unsigned int index_tmp = d_index; assert (input_items.size() == output_items.size()); int nstreams = input_items.size(); diff --git a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_bb.cc b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_bb.cc index 9a1f5efc..54dac216 100644 --- a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_bb.cc +++ b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_bb.cc @@ -78,7 +78,7 @@ gr_unpacked_to_packed_bb::general_work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - unsigned int index_tmp; + unsigned int index_tmp = d_index; assert (input_items.size() == output_items.size()); int nstreams = input_items.size(); diff --git a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_ii.cc b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_ii.cc index f5d53038..660f439d 100644 --- a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_ii.cc +++ b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_ii.cc @@ -78,7 +78,7 @@ gr_unpacked_to_packed_ii::general_work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - unsigned int index_tmp; + unsigned int index_tmp = d_index; assert (input_items.size() == output_items.size()); int nstreams = input_items.size(); diff --git a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_ss.cc b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_ss.cc index 3206b7de..bf8d9886 100644 --- a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_ss.cc +++ b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_ss.cc @@ -78,7 +78,7 @@ gr_unpacked_to_packed_ss::general_work (int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - unsigned int index_tmp; + unsigned int index_tmp = d_index; assert (input_items.size() == output_items.size()); int nstreams = input_items.size(); diff --git a/gnuradio-core/src/lib/general/gri_agc2_cc.h b/gnuradio-core/src/lib/general/gri_agc2_cc.h index a8ca699c..14f42395 100644 --- a/gnuradio-core/src/lib/general/gri_agc2_cc.h +++ b/gnuradio-core/src/lib/general/gri_agc2_cc.h @@ -81,8 +81,8 @@ class gri_agc2_cc { } protected: - float _decay_rate; // decay rate for slow changing signals float _attack_rate; // attack rate for fast changing signals + float _decay_rate; // decay rate for slow changing signals float _reference; // reference value float _gain; // current gain float _max_gain; // max allowable gain diff --git a/gnuradio-core/src/lib/io/Makefile.in b/gnuradio-core/src/lib/io/Makefile.in index 88e186de..6a091b4d 100644 --- a/gnuradio-core/src/lib/io/Makefile.in +++ b/gnuradio-core/src/lib/io/Makefile.in @@ -87,7 +87,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(srcdir)/Makefile.am \ subdir = gnuradio-core/src/lib/io ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/lib/missing/Makefile.in b/gnuradio-core/src/lib/missing/Makefile.in index a0d1e8a9..1e669045 100644 --- a/gnuradio-core/src/lib/missing/Makefile.in +++ b/gnuradio-core/src/lib/missing/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gnuradio-core/src/lib/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/lib/omnithread/Makefile.in b/gnuradio-core/src/lib/omnithread/Makefile.in index 6de48a3f..ae89a175 100644 --- a/gnuradio-core/src/lib/omnithread/Makefile.in +++ b/gnuradio-core/src/lib/omnithread/Makefile.in @@ -86,7 +86,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(srcdir)/Makefile.am \ subdir = gnuradio-core/src/lib/omnithread ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/lib/omnithread/nt.cc b/gnuradio-core/src/lib/omnithread/nt.cc index 644501a3..3853f010 100644 --- a/gnuradio-core/src/lib/omnithread/nt.cc +++ b/gnuradio-core/src/lib/omnithread/nt.cc @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -385,7 +386,8 @@ omni_semaphore::trywait(void) void omni_semaphore::post(void) { - if (!ReleaseSemaphore(nt_sem, 1, NULL)) + if (!ReleaseSemaphore(nt_sem, 1, NULL) + && GetLastError() != ERROR_TOO_MANY_POSTS ) // MinGW fix--see ticket:95 in trac throw omni_thread_fatal(GetLastError()); } diff --git a/gnuradio-core/src/lib/reed-solomon/Makefile.in b/gnuradio-core/src/lib/reed-solomon/Makefile.in index 85a2c419..bcd6db21 100644 --- a/gnuradio-core/src/lib/reed-solomon/Makefile.in +++ b/gnuradio-core/src/lib/reed-solomon/Makefile.in @@ -89,7 +89,7 @@ noinst_PROGRAMS = rstest$(EXEEXT) subdir = gnuradio-core/src/lib/reed-solomon ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/lib/runtime/Makefile.in b/gnuradio-core/src/lib/runtime/Makefile.in index 372ebbad..5e0d5e04 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.in +++ b/gnuradio-core/src/lib/runtime/Makefile.in @@ -87,7 +87,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_HEADERS) \ subdir = gnuradio-core/src/lib/runtime ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/lib/swig/Makefile.in b/gnuradio-core/src/lib/swig/Makefile.in index 1da6e2f8..81a9e088 100644 --- a/gnuradio-core/src/lib/swig/Makefile.in +++ b/gnuradio-core/src/lib/swig/Makefile.in @@ -87,7 +87,7 @@ DIST_COMMON = $(grgrpython_PYTHON) $(grinclude_HEADERS) \ subdir = gnuradio-core/src/lib/swig ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/python/Makefile.in b/gnuradio-core/src/python/Makefile.in index bdf9ed34..964b0502 100644 --- a/gnuradio-core/src/python/Makefile.in +++ b/gnuradio-core/src/python/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(noinst_PYTHON) $(srcdir)/Makefile.am \ subdir = gnuradio-core/src/python ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/python/bin/Makefile.in b/gnuradio-core/src/python/bin/Makefile.in index 86195b79..495213b9 100644 --- a/gnuradio-core/src/python/bin/Makefile.in +++ b/gnuradio-core/src/python/bin/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gnuradio-core/src/python/bin ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/python/gnuradio/Makefile.in b/gnuradio-core/src/python/gnuradio/Makefile.in index bf919f2e..e0f0ecd6 100644 --- a/gnuradio-core/src/python/gnuradio/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(grpython_PYTHON) $(srcdir)/Makefile.am \ subdir = gnuradio-core/src/python/gnuradio ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/python/gnuradio/blks/Makefile.in b/gnuradio-core/src/python/gnuradio/blks/Makefile.in index db569249..eb3b87f2 100644 --- a/gnuradio-core/src/python/gnuradio/blks/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/blks/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(grblkspython_PYTHON) $(noinst_PYTHON) \ subdir = gnuradio-core/src/python/gnuradio/blks ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.in b/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.in index d462a078..a793f1cf 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/blksimpl/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(grblkspython_PYTHON) $(noinst_PYTHON) \ subdir = gnuradio-core/src/python/gnuradio/blksimpl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.in b/gnuradio-core/src/python/gnuradio/gr/Makefile.in index 18937400..8b322c58 100644 --- a/gnuradio-core/src/python/gnuradio/gr/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(grgrpython_PYTHON) $(noinst_PYTHON) \ subdir = gnuradio-core/src/python/gnuradio/gr ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/python/gnuradio/gr/basic_flow_graph.py b/gnuradio-core/src/python/gnuradio/gr/basic_flow_graph.py index 1837e93a..01c96f0d 100644 --- a/gnuradio-core/src/python/gnuradio/gr/basic_flow_graph.py +++ b/gnuradio-core/src/python/gnuradio/gr/basic_flow_graph.py @@ -239,7 +239,10 @@ class basic_flow_graph (object): src_size = src_sig.sizeof_stream_item (src_endpoint.port) dst_size = dst_sig.sizeof_stream_item (dst_endpoint.port) if src_size != dst_size: - raise ValueError, 'source and destination data sizes are different' + raise ValueError, ( +' '.join(('source and destination data sizes are different:', +src_endpoint.block.name(), +dst_endpoint.block.name()))) def _check_contiguity (self, m, sig, used_ports, dir): used_ports.sort () diff --git a/gnuradio-core/src/python/gnuradio/gru/Makefile.in b/gnuradio-core/src/python/gnuradio/gru/Makefile.in index 74326623..16509255 100644 --- a/gnuradio-core/src/python/gnuradio/gru/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/gru/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(grblkspython_PYTHON) $(noinst_PYTHON) \ subdir = gnuradio-core/src/python/gnuradio/gru ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in index abbbbb86..ac131b04 100644 --- a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in +++ b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(grupython_PYTHON) $(srcdir)/Makefile.am \ subdir = gnuradio-core/src/python/gnuradio/gruimpl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/tests/Makefile.in b/gnuradio-core/src/tests/Makefile.in index 1c2fbeaa..3ebbffc9 100644 --- a/gnuradio-core/src/tests/Makefile.in +++ b/gnuradio-core/src/tests/Makefile.in @@ -92,7 +92,7 @@ noinst_PROGRAMS = benchmark_dotprod$(EXEEXT) \ subdir = gnuradio-core/src/tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-core/src/utils/Makefile.in b/gnuradio-core/src/utils/Makefile.in index 1651d368..07fa5d57 100644 --- a/gnuradio-core/src/utils/Makefile.in +++ b/gnuradio-core/src/utils/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gnuradio-core/src/utils ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/Makefile.in b/gnuradio-examples/Makefile.in index ef8525eb..9bd7bc68 100644 --- a/gnuradio-examples/Makefile.in +++ b/gnuradio-examples/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gnuradio-examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/Makefile.in b/gnuradio-examples/python/Makefile.in index 3bab98bc..a414fb77 100644 --- a/gnuradio-examples/python/Makefile.in +++ b/gnuradio-examples/python/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/apps/Makefile.in b/gnuradio-examples/python/apps/Makefile.in index a6e97a3b..5d04b531 100644 --- a/gnuradio-examples/python/apps/Makefile.in +++ b/gnuradio-examples/python/apps/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/apps DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/apps/hf_explorer/Makefile.in b/gnuradio-examples/python/apps/hf_explorer/Makefile.in index 60d004dd..fb7469a7 100644 --- a/gnuradio-examples/python/apps/hf_explorer/Makefile.in +++ b/gnuradio-examples/python/apps/hf_explorer/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/apps/hf_explorer DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/apps/hf_radio/Makefile.in b/gnuradio-examples/python/apps/hf_radio/Makefile.in index 3a95c498..fb9f777c 100644 --- a/gnuradio-examples/python/apps/hf_radio/Makefile.in +++ b/gnuradio-examples/python/apps/hf_radio/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/apps/hf_radio DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/audio/Makefile.in b/gnuradio-examples/python/audio/Makefile.in index 67e11db2..168c532a 100644 --- a/gnuradio-examples/python/audio/Makefile.in +++ b/gnuradio-examples/python/audio/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/audio DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/channel-coding/Makefile.in b/gnuradio-examples/python/channel-coding/Makefile.in index 6e0e7c12..a65b41b1 100644 --- a/gnuradio-examples/python/channel-coding/Makefile.in +++ b/gnuradio-examples/python/channel-coding/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/channel-coding DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/channel-coding/fsm_files/Makefile.in b/gnuradio-examples/python/channel-coding/fsm_files/Makefile.in index ce2e607d..e3afbd20 100644 --- a/gnuradio-examples/python/channel-coding/fsm_files/Makefile.in +++ b/gnuradio-examples/python/channel-coding/fsm_files/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/channel-coding/fsm_files DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/digital/Makefile.in b/gnuradio-examples/python/digital/Makefile.in index d17d96a8..eef89859 100644 --- a/gnuradio-examples/python/digital/Makefile.in +++ b/gnuradio-examples/python/digital/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/digital DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/digital_voice/Makefile.in b/gnuradio-examples/python/digital_voice/Makefile.in index bb9199d3..fd1d0361 100644 --- a/gnuradio-examples/python/digital_voice/Makefile.in +++ b/gnuradio-examples/python/digital_voice/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/digital_voice DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/multi-antenna/Makefile.in b/gnuradio-examples/python/multi-antenna/Makefile.in index 24c497f1..6f014420 100644 --- a/gnuradio-examples/python/multi-antenna/Makefile.in +++ b/gnuradio-examples/python/multi-antenna/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/multi-antenna DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/multi_usrp/Makefile.in b/gnuradio-examples/python/multi_usrp/Makefile.in index d155943e..e0826647 100644 --- a/gnuradio-examples/python/multi_usrp/Makefile.in +++ b/gnuradio-examples/python/multi_usrp/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/multi_usrp DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/networking/Makefile.in b/gnuradio-examples/python/networking/Makefile.in index df0deb8e..040ecaa3 100644 --- a/gnuradio-examples/python/networking/Makefile.in +++ b/gnuradio-examples/python/networking/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/networking DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/usrp/Makefile.in b/gnuradio-examples/python/usrp/Makefile.in index 1a4e776a..242cde35 100644 --- a/gnuradio-examples/python/usrp/Makefile.in +++ b/gnuradio-examples/python/usrp/Makefile.in @@ -61,7 +61,7 @@ subdir = gnuradio-examples/python/usrp DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gnuradio-examples/python/usrp/usrp_siggen.py b/gnuradio-examples/python/usrp/usrp_siggen.py index 6a41f74b..7f528588 100755 --- a/gnuradio-examples/python/usrp/usrp_siggen.py +++ b/gnuradio-examples/python/usrp/usrp_siggen.py @@ -118,7 +118,7 @@ def main (): parser.add_option ("-f", "--rf-freq", type="eng_float", default=None, help="set RF center frequency to FREQ") parser.add_option ("-i", "--interp", type="int", default=64, - help="set fgpa interpolation rate to INTERP") + help="set fgpa interpolation rate to INTERP [default=%default]") parser.add_option ("--sine", dest="type", action="store_const", const=gr.GR_SIN_WAVE, help="generate a complex sinusoid [default]", default=gr.GR_SIN_WAVE) @@ -130,11 +130,11 @@ def main (): help="generate Uniform random output") parser.add_option ("-w", "--waveform-freq", type="eng_float", default=100e3, - help="set waveform frequency to FREQ") + help="set waveform frequency to FREQ [default=%default]") parser.add_option ("-a", "--amplitude", type="eng_float", default=16e3, - help="set waveform amplitude to AMPLITUDE", metavar="AMPL") + help="set waveform amplitude to AMPLITUDE [default=%default]", metavar="AMPL") parser.add_option ("-o", "--offset", type="eng_float", default=0, - help="set waveform offset to OFFSET") + help="set waveform offset to OFFSET [default=%default]") (options, args) = parser.parse_args () if len(args) != 0: diff --git a/gr-audio-alsa/Makefile.in b/gr-audio-alsa/Makefile.in index 1e29950b..0572d3ba 100644 --- a/gr-audio-alsa/Makefile.in +++ b/gr-audio-alsa/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-audio-alsa ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-alsa/src/Makefile.in b/gr-audio-alsa/src/Makefile.in index 32f9e208..4776191e 100644 --- a/gr-audio-alsa/src/Makefile.in +++ b/gr-audio-alsa/src/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_HEADERS) $(noinst_PYTHON) \ subdir = gr-audio-alsa/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-jack/Makefile.in b/gr-audio-jack/Makefile.in index c6c7cbd0..7dc8d290 100644 --- a/gr-audio-jack/Makefile.in +++ b/gr-audio-jack/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-audio-jack ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-jack/src/Makefile.in b/gr-audio-jack/src/Makefile.in index 01d6aff5..b409c390 100644 --- a/gr-audio-jack/src/Makefile.in +++ b/gr-audio-jack/src/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_HEADERS) $(noinst_PYTHON) \ subdir = gr-audio-jack/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-oss/Makefile.in b/gr-audio-oss/Makefile.in index 78d51df8..e01619dd 100644 --- a/gr-audio-oss/Makefile.in +++ b/gr-audio-oss/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-audio-oss ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-oss/src/Makefile.in b/gr-audio-oss/src/Makefile.in index 7eba84f0..a63dcad2 100644 --- a/gr-audio-oss/src/Makefile.in +++ b/gr-audio-oss/src/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_PYTHON) \ subdir = gr-audio-oss/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-osx/Makefile.in b/gr-audio-osx/Makefile.in index 74f45e44..b1364e76 100644 --- a/gr-audio-osx/Makefile.in +++ b/gr-audio-osx/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-audio-osx ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-osx/src/Makefile.in b/gr-audio-osx/src/Makefile.in index 4d228433..bec7125a 100644 --- a/gr-audio-osx/src/Makefile.in +++ b/gr-audio-osx/src/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_HEADERS) $(noinst_PYTHON) \ subdir = gr-audio-osx/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-portaudio/Makefile.in b/gr-audio-portaudio/Makefile.in index 6f73c45b..4982a258 100644 --- a/gr-audio-portaudio/Makefile.in +++ b/gr-audio-portaudio/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-audio-portaudio ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-portaudio/src/Makefile.in b/gr-audio-portaudio/src/Makefile.in index 23ea1014..d9b4b097 100644 --- a/gr-audio-portaudio/src/Makefile.in +++ b/gr-audio-portaudio/src/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_HEADERS) $(noinst_PYTHON) \ subdir = gr-audio-portaudio/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-windows/Makefile.in b/gr-audio-windows/Makefile.in index dc478209..f62981a1 100644 --- a/gr-audio-windows/Makefile.in +++ b/gr-audio-windows/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-audio-windows ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-audio-windows/src/Makefile.in b/gr-audio-windows/src/Makefile.in index dfb06a10..bcd61d1d 100644 --- a/gr-audio-windows/src/Makefile.in +++ b/gr-audio-windows/src/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_PYTHON) \ subdir = gr-audio-windows/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-gsm-fr-vocoder/Makefile.in b/gr-gsm-fr-vocoder/Makefile.in index b2bf3032..36034360 100644 --- a/gr-gsm-fr-vocoder/Makefile.in +++ b/gr-gsm-fr-vocoder/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-gsm-fr-vocoder ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-gsm-fr-vocoder/src/Makefile.in b/gr-gsm-fr-vocoder/src/Makefile.in index aab20a24..57c34e4b 100644 --- a/gr-gsm-fr-vocoder/src/Makefile.in +++ b/gr-gsm-fr-vocoder/src/Makefile.in @@ -61,7 +61,7 @@ subdir = gr-gsm-fr-vocoder/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.in b/gr-gsm-fr-vocoder/src/lib/Makefile.in index 33ca3768..cc259c12 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.in +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.in @@ -87,7 +87,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(ourpython_PYTHON) \ subdir = gr-gsm-fr-vocoder/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in index 4e22cb5e..1b036a33 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in +++ b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.in @@ -86,7 +86,7 @@ DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ subdir = gr-gsm-fr-vocoder/src/lib/gsm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-gsm-fr-vocoder/src/python/Makefile.in b/gr-gsm-fr-vocoder/src/python/Makefile.in index c347c7c2..61d20029 100644 --- a/gr-gsm-fr-vocoder/src/python/Makefile.in +++ b/gr-gsm-fr-vocoder/src/python/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(noinst_PYTHON) $(srcdir)/Makefile.am \ subdir = gr-gsm-fr-vocoder/src/python ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-radio-astronomy/Makefile.in b/gr-radio-astronomy/Makefile.in index 611765a4..fa124e36 100644 --- a/gr-radio-astronomy/Makefile.in +++ b/gr-radio-astronomy/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-radio-astronomy ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-radio-astronomy/src/Makefile.in b/gr-radio-astronomy/src/Makefile.in index 269c558c..9757fe9a 100644 --- a/gr-radio-astronomy/src/Makefile.in +++ b/gr-radio-astronomy/src/Makefile.in @@ -61,7 +61,7 @@ subdir = gr-radio-astronomy/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-radio-astronomy/src/lib/Makefile.in b/gr-radio-astronomy/src/lib/Makefile.in index 55cb6bfa..18ee1365 100644 --- a/gr-radio-astronomy/src/lib/Makefile.in +++ b/gr-radio-astronomy/src/lib/Makefile.in @@ -87,7 +87,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(ourpython_PYTHON) \ subdir = gr-radio-astronomy/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-radio-astronomy/src/python/Makefile.in b/gr-radio-astronomy/src/python/Makefile.in index 76596d9b..3c1bcb05 100644 --- a/gr-radio-astronomy/src/python/Makefile.in +++ b/gr-radio-astronomy/src/python/Makefile.in @@ -87,7 +87,7 @@ DIST_COMMON = $(noinst_PYTHON) $(ourpython_PYTHON) \ subdir = gr-radio-astronomy/src/python ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-trellis/Makefile.in b/gr-trellis/Makefile.in index cfa90745..20f32bd9 100644 --- a/gr-trellis/Makefile.in +++ b/gr-trellis/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-trellis ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-trellis/doc/Makefile.am b/gr-trellis/doc/Makefile.am index e042a159..5881a02a 100644 --- a/gr-trellis/doc/Makefile.am +++ b/gr-trellis/doc/Makefile.am @@ -19,6 +19,8 @@ # Boston, MA 02110-1301, USA. # +include $(top_srcdir)/Makefile.common + docdir=$(prefix)/share/doc/@PACKAGE@-@VERSION@ HTML_FILES = diff --git a/gr-trellis/doc/Makefile.in b/gr-trellis/doc/Makefile.in index 4907eb6c..1c2f4060 100644 --- a/gr-trellis/doc/Makefile.in +++ b/gr-trellis/doc/Makefile.in @@ -34,6 +34,28 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. # + +# -*- Makefile -*- +# +# Copyright 2004,2006 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. +# srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -57,14 +79,15 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.common @HAS_XMLTO_TRUE@am__append_1 = \ @HAS_XMLTO_TRUE@ gr-trellis.html subdir = gr-trellis/doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ @@ -318,6 +341,65 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ + +# includes +grincludedir = $(includedir)/gnuradio + +# swig includes +swigincludedir = $(grincludedir)/swig + +# Install this stuff in the appropriate subdirectory +# This usually ends up at: +# ${prefix}/lib/python${python_version}/site-packages/gnuradio +grpythondir = $(pythondir)/gnuradio +grpyexecdir = $(pyexecdir)/gnuradio + +# swig flags +SWIGPYTHONFLAGS = -fvirtual -python -modern + +# Where to find gnuradio include files in the current build tree +# top_srcdir for original stuff, top_builddir for generated files +GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ + -I$(top_srcdir)/gnuradio-core/src/lib/general \ + -I$(top_builddir)/gnuradio-core/src/lib/general \ + -I$(top_srcdir)/gnuradio-core/src/lib/filter \ + -I$(top_builddir)/gnuradio-core/src/lib/filter \ + -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \ + -I$(top_srcdir)/gnuradio-core/src/lib/io \ + -I$(top_srcdir)/gnuradio-core/src/lib/g72x \ + -I$(top_srcdir)/gnuradio-core/src/lib/omnithread \ + -I$(top_srcdir)/gnuradio-core/src/lib/swig \ + -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 + + +# 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. +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 + +# This used to be set in configure.ac but is now defined here for all +# Makefiles when this fragment is included. +STD_DEFINES_AND_INCLUDES = $(DEFINES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS) + +# Fix for BSD make not defining $(RM). We define it now in configure.ac +# using AM_PATH_PROG, but now here have to add a -f to be like GNU make +RM = $(RM_PROG) -f HTML_FILES = $(am__append_1) EXTRA_DIST = \ gr-trellis.xml \ @@ -331,7 +413,7 @@ BUILT_XML_FILES = all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -378,6 +460,7 @@ CTAGS: distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/../.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/gr-trellis/src/Makefile.in b/gr-trellis/src/Makefile.in index 3c68dd09..0107328b 100644 --- a/gr-trellis/src/Makefile.in +++ b/gr-trellis/src/Makefile.in @@ -61,7 +61,7 @@ subdir = gr-trellis/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-trellis/src/lib/Makefile.in b/gr-trellis/src/lib/Makefile.in index a5e5e04a..13ff7d48 100644 --- a/gr-trellis/src/lib/Makefile.in +++ b/gr-trellis/src/lib/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(ourpython_PYTHON) \ subdir = gr-trellis/src/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-trellis/src/python/Makefile.in b/gr-trellis/src/python/Makefile.in index 944a4f49..ab491bfd 100644 --- a/gr-trellis/src/python/Makefile.in +++ b/gr-trellis/src/python/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = $(noinst_PYTHON) $(srcdir)/Makefile.am \ subdir = gr-trellis/src/python ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-usrp/Makefile.in b/gr-usrp/Makefile.in index 674433e8..95167df2 100644 --- a/gr-usrp/Makefile.in +++ b/gr-usrp/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-usrp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-usrp/src/Makefile.in b/gr-usrp/src/Makefile.in index 8821a9c6..81e6f9ca 100644 --- a/gr-usrp/src/Makefile.in +++ b/gr-usrp/src/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_PYTHON) \ subdir = gr-usrp/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-video-sdl/Makefile.in b/gr-video-sdl/Makefile.in index 5b5d50d8..069363ca 100644 --- a/gr-video-sdl/Makefile.in +++ b/gr-video-sdl/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-video-sdl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-video-sdl/src/Makefile.in b/gr-video-sdl/src/Makefile.in index f4392ba9..5b0ff6f1 100644 --- a/gr-video-sdl/src/Makefile.in +++ b/gr-video-sdl/src/Makefile.in @@ -88,7 +88,7 @@ DIST_COMMON = $(grinclude_HEADERS) $(noinst_PYTHON) \ subdir = gr-video-sdl/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-wxgui/Makefile.in b/gr-wxgui/Makefile.in index 36b7dbb8..6530c084 100644 --- a/gr-wxgui/Makefile.in +++ b/gr-wxgui/Makefile.in @@ -85,7 +85,7 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-wxgui ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-wxgui/src/Makefile.in b/gr-wxgui/src/Makefile.in index 13ebbb4d..2af5b243 100644 --- a/gr-wxgui/src/Makefile.in +++ b/gr-wxgui/src/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = gr-wxgui/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/gr-wxgui/src/python/Makefile.in b/gr-wxgui/src/python/Makefile.in index 877dc3bc..3d297562 100644 --- a/gr-wxgui/src/python/Makefile.in +++ b/gr-wxgui/src/python/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(ourpython_PYTHON) $(srcdir)/Makefile.am \ subdir = gr-wxgui/src/python ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/ChangeLog b/usrp/ChangeLog index aa642de8..69da6041 100644 --- a/usrp/ChangeLog +++ b/usrp/ChangeLog @@ -1,3 +1,9 @@ +2006-10-10 Greg Troxel + + * firmware/include/Makefile.am: avoid nonportable use of $< (first + prereq in GNU make, implied source for pattern rule in BSD make) + used in a non-pattern rule. + 2006-06-25 Eric Blossom * firmware/include/fpga_regs_standard.h: doc fix to reflect current reality. diff --git a/usrp/Makefile.in b/usrp/Makefile.in index 47d08444..898c3723 100644 --- a/usrp/Makefile.in +++ b/usrp/Makefile.in @@ -63,7 +63,7 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/usrp.iss.in $(srcdir)/usrp.pc.in AUTHORS ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/doc/Makefile.in b/usrp/doc/Makefile.in index 36ae401f..56c69384 100644 --- a/usrp/doc/Makefile.in +++ b/usrp/doc/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ subdir = usrp/doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/doc/other/Makefile.in b/usrp/doc/other/Makefile.in index 477dcafd..831c5dd9 100644 --- a/usrp/doc/other/Makefile.in +++ b/usrp/doc/other/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = usrp/doc/other ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/firmware/Makefile.in b/usrp/firmware/Makefile.in index 2dc0c8e7..4b35bb7f 100644 --- a/usrp/firmware/Makefile.in +++ b/usrp/firmware/Makefile.in @@ -61,7 +61,7 @@ subdir = usrp/firmware DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/firmware/include/Makefile.am b/usrp/firmware/include/Makefile.am index 9065a0e4..7214820b 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 $< $@ + PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(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 $< $@ + PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(srcdir)/generate_regs.py fpga_regs_standard.h $@ diff --git a/usrp/firmware/include/Makefile.in b/usrp/firmware/include/Makefile.in index cbcebe7a..d5451c79 100644 --- a/usrp/firmware/include/Makefile.in +++ b/usrp/firmware/include/Makefile.in @@ -63,7 +63,7 @@ DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ @@ -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 $< $@ + PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(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 $< $@ + PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(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/lib/Makefile.in b/usrp/firmware/lib/Makefile.in index 80bd9710..57474105 100644 --- a/usrp/firmware/lib/Makefile.in +++ b/usrp/firmware/lib/Makefile.in @@ -61,7 +61,7 @@ subdir = usrp/firmware/lib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/firmware/src/Makefile.in b/usrp/firmware/src/Makefile.in index 2d4526dd..4463cf1d 100644 --- a/usrp/firmware/src/Makefile.in +++ b/usrp/firmware/src/Makefile.in @@ -61,7 +61,7 @@ subdir = usrp/firmware/src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/firmware/src/common/Makefile.in b/usrp/firmware/src/common/Makefile.in index 14c09420..6ac9185d 100644 --- a/usrp/firmware/src/common/Makefile.in +++ b/usrp/firmware/src/common/Makefile.in @@ -61,7 +61,7 @@ subdir = usrp/firmware/src/common DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/firmware/src/usrp2/Makefile.in b/usrp/firmware/src/usrp2/Makefile.in index 4dd26b23..3c1b0519 100644 --- a/usrp/firmware/src/usrp2/Makefile.in +++ b/usrp/firmware/src/usrp2/Makefile.in @@ -63,7 +63,7 @@ subdir = usrp/firmware/src/usrp2 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/fpga/Makefile.in b/usrp/fpga/Makefile.in index 689a7fa1..757137fa 100644 --- a/usrp/fpga/Makefile.in +++ b/usrp/fpga/Makefile.in @@ -62,7 +62,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.extra \ subdir = usrp/fpga ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/fpga/rbf/Makefile.in b/usrp/fpga/rbf/Makefile.in index 0b68a453..2c695368 100644 --- a/usrp/fpga/rbf/Makefile.in +++ b/usrp/fpga/rbf/Makefile.in @@ -84,7 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = usrp/fpga/rbf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/host/Makefile.in b/usrp/host/Makefile.in index 0bd4620e..818f8a90 100644 --- a/usrp/host/Makefile.in +++ b/usrp/host/Makefile.in @@ -61,7 +61,7 @@ subdir = usrp/host DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/host/apps/Makefile.in b/usrp/host/apps/Makefile.in index ed10464d..09ce317c 100644 --- a/usrp/host/apps/Makefile.in +++ b/usrp/host/apps/Makefile.in @@ -89,7 +89,7 @@ noinst_PROGRAMS = check_order_quickly$(EXEEXT) \ subdir = usrp/host/apps ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/host/lib/Makefile.in b/usrp/host/lib/Makefile.in index 05b344aa..e6498be2 100644 --- a/usrp/host/lib/Makefile.in +++ b/usrp/host/lib/Makefile.in @@ -86,7 +86,7 @@ DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) $(noinst_PYTHON) \ subdir = usrp/host/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/host/lib/fusb_linux.cc b/usrp/host/lib/fusb_linux.cc index 8391f66b..1eaba4e5 100644 --- a/usrp/host/lib/fusb_linux.cc +++ b/usrp/host/lib/fusb_linux.cc @@ -27,7 +27,9 @@ #include #include // libusb header #include +#ifdef HAVE_LINUX_COMPILER_H #include +#endif #include // interface to kernel portion of user mode usb driver #include #include diff --git a/usrp/host/lib/usrp_prims.cc b/usrp/host/lib/usrp_prims.cc index 2fd594fa..f666a29f 100644 --- a/usrp/host/lib/usrp_prims.cc +++ b/usrp/host/lib/usrp_prims.cc @@ -1344,7 +1344,7 @@ usrp_write_dboard_offsets (struct usb_dev_handle *udh, int slot_id, std::string usrp_serial_number(struct usb_dev_handle *udh) { - u_int8_t iserial = usb_device(udh)->descriptor.iSerialNumber; + unsigned char iserial = usb_device(udh)->descriptor.iSerialNumber; if (iserial == 0) return ""; diff --git a/usrp/host/misc/Makefile.in b/usrp/host/misc/Makefile.in index 93651f14..c4707e7f 100644 --- a/usrp/host/misc/Makefile.in +++ b/usrp/host/misc/Makefile.in @@ -63,7 +63,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in getopt.c \ gettimeofday.c mkstemp.c tempname.c usleep.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ diff --git a/usrp/host/swig/Makefile.in b/usrp/host/swig/Makefile.in index 53c0928e..e3e249b1 100644 --- a/usrp/host/swig/Makefile.in +++ b/usrp/host/swig/Makefile.in @@ -87,7 +87,7 @@ DIST_COMMON = $(noinst_HEADERS) $(ourpython_PYTHON) \ subdir = usrp/host/swig ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_pthread.m4 \ - $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gr_as.m4 \ + $(top_srcdir)/config/cppunit.m4 \ $(top_srcdir)/config/gr_boost.m4 \ $(top_srcdir)/config/gr_check_createfilemapping.m4 \ $(top_srcdir)/config/gr_check_shm_open.m4 \ -- 2.30.2