diff options
88 files changed, 901 insertions, 475 deletions
diff --git a/Makefile.am b/Makefile.am index 8c7d1bb1b..89ad013c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2006 Free Software Foundation, Inc. +# Copyright 2001,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -30,4 +30,4 @@ EXTRA_DIST = \ README.hacking SUBDIRS = @build_dirs@ -DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ +DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@ diff --git a/Makefile.common b/Makefile.common index fd14144b3..300e92fc4 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1,6 +1,6 @@ # -*- Makefile -*- # -# Copyright 2004,2006,2007 Free Software Foundation, Inc. +# Copyright 2004,2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,9 +23,9 @@ AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ # includes -grincludedir = $(includedir)/gnuradio +grincludedir = $(includedir)/gnuradio -# swig includes +# swig includes swigincludedir = $(grincludedir)/swig # Install the gnuradio stuff in the appropriate subdirectory @@ -42,52 +42,43 @@ grpyexecdir = $(pyexecdir)/gnuradio usrppythondir = $(pythondir)/usrpm usrppyexecdir = $(pyexecdir)/usrpm +# when including for compilation from pre-installed libraries and such, +# need to make sure those are put last on the compile command +WITH_INCLUDES = @with_INCLUDES@ +WITH_SWIG_INCLUDES = @with_SWIG_INCLUDES@ # swig flags SWIGPYTHONFLAGS = -fvirtual -python -modern +# How to link in the top-level omnithreads library from inside the tree +OMNITHREAD_INCLUDES = @omnithread_INCLUDES@ +OMNITHREAD_LA = @omnithread_LA@ + # 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/gengen \ - -I$(top_builddir)/gnuradio-core/src/lib/gengen \ - -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/swig \ - -I$(top_builddir)/gnuradio-core/src/lib/swig \ - $(FFTW3F_CFLAGS) - -# How to link in the top-level omnithreads library from inside the tree -OMNITHREAD_INCLUDES = -I$(top_srcdir)/omnithread -OMNITHREAD_LA = $(top_builddir)/omnithread/libgromnithread.la +GNURADIO_INCLUDES = @gnuradio_core_INCLUDES@ # How to link in GNU Radio core library from inside the tree -GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la +GNURADIO_CORE_LA = @gnuradio_core_LA@ # This is a dependency for many swig operations -GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i +GNURADIO_I = @gnuradio_core_I@ # How to link in the USRP library from inside the tree -USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib/legacy \ - -I$(top_srcdir)/usrp/firmware/include -USRP_LA = $(top_builddir)/usrp/host/lib/legacy/libusrp.la +USRP_INCLUDES = @usrp_INCLUDES@ +USRP_LA = @usrp_LA@ # How to link in usrp-inband library from inside the tree -USRP_INBAND_INCLUDES = -I$(top_srcdir)/usrp/host/lib/inband -USRP_INBAND_LA = $(top_builddir)/usrp/host/lib/inband/libusrp_inband.la +USRP_INBAND_INCLUDES = @usrp_inband_INCLUDES@ +USRP_INBAND_LA = @usrp_inband_LA@ # How to link the PMT library from inside the tree -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LA = $(top_builddir)/pmt/src/lib/libpmt.la +PMT_INCLUDES = @pmt_INCLUDES@ +PMT_LA = @pmt_LA@ # How to link the mblock library from inside the tree -MBLOCK_INCLUDES = -I$(top_srcdir)/mblock/src/lib -MBLOCK_LA = $(top_builddir)/mblock/src/lib/libmblock.la +MBLOCK_INCLUDES = @mblock_INCLUDES@ +MBLOCK_LA = @mblock_LA@ # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. diff --git a/config/grc_build.m4 b/config/grc_build.m4 index 7c060c2be..a43988f29 100644 --- a/config/grc_build.m4 +++ b/config/grc_build.m4 @@ -1,4 +1,4 @@ -dnl 2006 Free Software Foundation, Inc. +dnl Copyright 2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,27 +27,75 @@ AC_DEFUN([GRC_ENABLE],[ [[enable_]m4_bpatsubst($1,-,_)=$enable_all_components]) ]) +# Create --with-foo argument for named compoment, create variables as needed +# $1 is component name +AC_DEFUN([GRC_WITH],[ + AC_ARG_WITH([$1], + AC_HELP_STRING([--with-$1], + [Use package $1 if installed in $prefix/lib/pkgconfig; otherwise revert back to --enable-$1]), + [], + []) +]) + +# Add the specified "with" list; clear the provided variable +# $1 is the component name +# $2 is the path list name suffix +# $3 is the separator (for paths, ":"; for includes " ") +AC_DEFUN([GRC_ADD_TO_LIST],[ + if test "x${$1_$2}" != "x"; then + if test "x$with_$2" = "x"; then + with_$2="${$1_$2}" + else + with_$2="${$1_$2}"$3"$with_$2" + fi + $1_$2= + fi +]) + # Conditionally build named component. # $1 is component name # $2 is executed if configuration passes and build is desired +AC_DEFUN([GRC_BUILD_CONDITIONAL],[ + _GRC_BUILD_CONDITIONAL($1, m4_bpatsubst($1,-,_), $2) +]) + +# $1 is the component name +# $2=m4_bpatsubst($1,-,_) +# $3 is executed if configuration passes and build is desired # Use $passed=no to indicate configuration failure +# Use $passed=with to indicate the use of pre-installed libraries and headers # Any other value of $passed, including blank, assumes success -AC_DEFUN([GRC_BUILD_CONDITIONAL],[ +AC_DEFUN([_GRC_BUILD_CONDITIONAL],[ if test x$passed = xno; then - skipped_dirs="$skipped_dirs $1" - if test x$[enable_]m4_bpatsubst($1,-,_) = xyes; then + if test x$enable_$2 = xyes; then AC_MSG_ERROR([Component $1 has errors, stopping.]) else AC_MSG_RESULT([Not building component $1.]) - fi + fi else - if test x$[enable_]m4_bpatsubst($1,-,_) != xno; then - $2 - build_dirs="$build_dirs $1" - AC_MSG_RESULT([Component $1 passed configuration checks, building.]) + if test x$passed = xwith; then + with_dirs="$with_dirs $1" + GRC_ADD_TO_LIST($2, INCLUDES, " ") + GRC_ADD_TO_LIST($2, SWIG_INCLUDES, " ") + GRC_ADD_TO_LIST($2, PYDIRPATH, ":") + GRC_ADD_TO_LIST($2, SWIGDIRPATH, ":") + GRC_ADD_TO_LIST($2, LIBDIRPATH, ":") + AC_MSG_RESULT([Component $1 will be included from a pre-installed library and includes, and will not be built.]) else - skipped_dirs="$skipped_dirs $1" - AC_MSG_RESULT([Component $1 passed configuration checks, but not building.]) + if test x$enable_$2 != xno; then + $3 + build_dirs="$build_dirs $1" + AC_MSG_RESULT([Component $1 passed configuration checks, building.]) + else + passed=no + AC_MSG_RESULT([Component $1 passed configuration checks, but not building.]) + fi fi fi + if test x$passed = xno; then + skipped_dirs="$skipped_dirs $1" + $2_skipped=yes + else + $2_skipped=no + fi ]) diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 37849929f..30a8dafff 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -19,52 +19,88 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GNURADIO_CORE],[ GRC_ENABLE([gnuradio-core]) - - AC_CONFIG_FILES([ \ - gnuradio-core/Makefile - gnuradio-core/gnuradio-core.pc \ - gnuradio-core/doc/Doxyfile \ - gnuradio-core/doc/Makefile \ - gnuradio-core/doc/other/Makefile \ - gnuradio-core/doc/xml/Makefile \ - gnuradio-core/src/Makefile \ - gnuradio-core/src/gen_interpolator_taps/Makefile \ - gnuradio-core/src/lib/Makefile \ - gnuradio-core/src/lib/filter/Makefile \ - gnuradio-core/src/lib/g72x/Makefile \ - gnuradio-core/src/lib/general/Makefile \ - gnuradio-core/src/lib/general/gr_prefix.cc \ - gnuradio-core/src/lib/gengen/Makefile \ - gnuradio-core/src/lib/io/Makefile \ - gnuradio-core/src/lib/missing/Makefile \ - gnuradio-core/src/lib/reed-solomon/Makefile \ - gnuradio-core/src/lib/runtime/Makefile \ - gnuradio-core/src/lib/swig/Makefile \ - gnuradio-core/src/python/Makefile \ - gnuradio-core/src/python/bin/Makefile \ - gnuradio-core/src/python/gnuradio/Makefile \ - gnuradio-core/src/python/gnuradio/blks2/Makefile \ - gnuradio-core/src/python/gnuradio/blks2impl/Makefile \ - gnuradio-core/src/python/gnuradio/gr/Makefile \ - gnuradio-core/src/python/gnuradio/gr/run_tests \ - gnuradio-core/src/python/gnuradio/gru/Makefile \ - gnuradio-core/src/python/gnuradio/gruimpl/Makefile \ - gnuradio-core/src/python/gnuradio/vocoder/Makefile \ - gnuradio-core/src/tests/Makefile \ - gnuradio-core/src/utils/Makefile \ - ]) - - passed=yes - # Don't do gnuradio-core if omnithread skipped - # There *has* to be a better way to check if a value is in a string - for dir in $skipped_dirs - do - if test x$dir = xomnithread; then - AC_MSG_RESULT([Component gnuradio-core requires omnithread, which is not being built.]) - passed=no + GRC_WITH([gnuradio-core]) + passed=no + if test x$with_gnuradio_core = xyes; then + if test x$enable_gnuradio_core = xyes; then + AC_MSG_ERROR([Component gnuradio-core: Cannot use both --enable and --with]) + else + PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core, passed=with, + AC_MSG_RESULT([Component gnuradio-core: PKGCONFIG cannot find info])) + if test x$passed = xwith; then + gnuradio_core_INCLUDES=`$PKG_CONFIG --cflags-only-I gnuradio-core` + gnuradio_core_LA=$GNURADIO_CORE_LIBS + gnuradio_core_INCLUDEDIR=`$PKG_CONFIG --variable=includedir gnuradio-core` + gnuradio_core_SWIGDIRPATH="$gnuradio_core_INCLUDEDIR/swig" + gnuradio_core_I="$gnuradio_core_SWIGDIRPATH/gnuradio.i" + gnuradio_core_SWIG_INCLUDES="-I$gnuradio_core_SWIGDIRPATH" + gnuradio_core_LIBDIRPATH=`$PKG_CONFIG --variable=libdir gnuradio-core` + gnuradio_core_PYDIRPATH=$pythondir + fi fi - done + fi + dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff + dnl otherwise, $passed = no; check the "--enable" stuff + if test x$passed = xno; then + AC_CONFIG_FILES([ \ + gnuradio-core/Makefile + gnuradio-core/gnuradio-core.pc \ + gnuradio-core/doc/Doxyfile \ + gnuradio-core/doc/Makefile \ + gnuradio-core/doc/other/Makefile \ + gnuradio-core/doc/xml/Makefile \ + gnuradio-core/src/Makefile \ + gnuradio-core/src/gen_interpolator_taps/Makefile \ + gnuradio-core/src/lib/Makefile \ + gnuradio-core/src/lib/filter/Makefile \ + gnuradio-core/src/lib/g72x/Makefile \ + gnuradio-core/src/lib/general/Makefile \ + gnuradio-core/src/lib/general/gr_prefix.cc \ + gnuradio-core/src/lib/gengen/Makefile \ + gnuradio-core/src/lib/io/Makefile \ + gnuradio-core/src/lib/missing/Makefile \ + gnuradio-core/src/lib/reed-solomon/Makefile \ + gnuradio-core/src/lib/runtime/Makefile \ + gnuradio-core/src/lib/swig/Makefile \ + gnuradio-core/src/python/Makefile \ + gnuradio-core/src/python/bin/Makefile \ + gnuradio-core/src/python/gnuradio/Makefile \ + gnuradio-core/src/python/gnuradio/blks2/Makefile \ + gnuradio-core/src/python/gnuradio/blks2impl/Makefile \ + gnuradio-core/src/python/gnuradio/gr/Makefile \ + gnuradio-core/src/python/gnuradio/gr/run_tests \ + gnuradio-core/src/python/gnuradio/gru/Makefile \ + gnuradio-core/src/python/gnuradio/gruimpl/Makefile \ + gnuradio-core/src/python/gnuradio/vocoder/Makefile \ + gnuradio-core/src/tests/Makefile \ + gnuradio-core/src/utils/Makefile \ + ]) + passed=yes + # Don't do gnuradio-core if omnithread skipped + if test x$omnithread_skipped = xyes; then + AC_MSG_RESULT([Component gnuradio-core requires omnithread, which is not being built or specified via pre-installed files.]) + passed=no + fi + gnuradio_core_INCLUDES="-I\${abs_top_srcdir}/gnuradio-core/src/lib/runtime \ + -I\${abs_top_srcdir}/gnuradio-core/src/lib/general \ + -I\${abs_top_builddir}/gnuradio-core/src/lib/general \ + -I\${abs_top_srcdir}/gnuradio-core/src/lib/gengen \ + -I\${abs_top_builddir}/gnuradio-core/src/lib/gengen \ + -I\${abs_top_srcdir}/gnuradio-core/src/lib/filter \ + -I\${abs_top_builddir}/gnuradio-core/src/lib/filter \ + -I\${abs_top_srcdir}/gnuradio-core/src/lib/reed-solomon \ + -I\${abs_top_srcdir}/gnuradio-core/src/lib/io \ + -I\${abs_top_srcdir}/gnuradio-core/src/lib/g72x \ + -I\${abs_top_srcdir}/gnuradio-core/src/lib/swig \ + -I\${abs_top_builddir}/gnuradio-core/src/lib/swig \ + \$(FFTW3F_CFLAGS)" + gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la" + gnuradio_core_I="\${abs_top_srcdir}/gnuradio-core/src/lib/swig/gnuradio.i" + gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs" + gnuradio_core_SWIGDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib/swig:\${abs_top_builddir}/gnuradio-core/src/lib/swig/.libs:\${abs_top_srcdir}/gnuradio-core/src/lib/swig" + gnuradio_core_PYDIRPATH="\${abs_top_srcdir}/gnuradio-core/src/python" + fi GRC_BUILD_CONDITIONAL([gnuradio-core],[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_core], [chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests]) @@ -78,4 +114,10 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ touch gnuradio-core/src/lib/swig/gnuradio_swig_py_io.d ]) ]) + AC_SUBST([gnuradio_core_INCLUDES]) + AC_SUBST([gnuradio_core_LA]) + AC_SUBST([gnuradio_core_I]) + AC_SUBST([gnuradio_core_LIBDIRPATH]) + AC_SUBST([gnuradio_core_SWIGDIRPATH]) + AC_SUBST([gnuradio_core_PYDIRPATH]) ]) diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index fc758e893..5dc6caf0a 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -1,4 +1,4 @@ -# Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -39,5 +39,11 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ ]) passed=yes + # Don't do gnuradio-examples if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gnuradio-examples requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + GRC_BUILD_CONDITIONAL([gnuradio-examples]) ]) diff --git a/config/grc_gr_atsc.m4 b/config/grc_gr_atsc.m4 index ed237fa2f..a0b394ead 100644 --- a/config/grc_gr_atsc.m4 +++ b/config/grc_gr_atsc.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -30,6 +30,12 @@ AC_DEFUN([GRC_GR_ATSC],[ ]) passed=yes + # Don't do gr-atsc if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-atsc requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + GRC_BUILD_CONDITIONAL([gr-atsc],[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_atsc], [chmod +x gr-atsc/src/python/run_tests]) diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4 index dad8c21b7..471d33b07 100644 --- a/config/grc_gr_audio_alsa.m4 +++ b/config/grc_gr_audio_alsa.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,6 +27,12 @@ AC_DEFUN([GRC_GR_AUDIO_ALSA],[ ]) passed=yes + # Don't do gr-audio-alsa if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Don't do gr-audio-alsa if the 'alsa' package is not installed. PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[], [passed=no;AC_MSG_RESULT([gr-audio-alsa requires package alsa, not found.])]) diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4 index 025c25e9c..5cd59e23d 100644 --- a/config/grc_gr_audio_jack.m4 +++ b/config/grc_gr_audio_jack.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,6 +27,12 @@ AC_DEFUN([GRC_GR_AUDIO_JACK],[ ]) passed=yes + # Don't do gr-audio-jack if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-audio-jack requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Don't do gr-audio-jack if in 'jack' isn't installed PKG_CHECK_MODULES(JACK, jack >= 0.8,[], [passed=no;AC_MSG_RESULT([gr-audio-jack requires package jack, not found.])]) diff --git a/config/grc_gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4 index 12190bed0..386df51d8 100644 --- a/config/grc_gr_audio_oss.m4 +++ b/config/grc_gr_audio_oss.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,6 +27,12 @@ AC_DEFUN([GRC_GR_AUDIO_OSS],[ ]) passed=yes + # Don't do gr-audio-oss if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-audio-oss requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Make sure the correct library and/or headers are available. case $host in *-*-netbsd*) AC_HAVE_LIBRARY(ossaudio,[], diff --git a/config/grc_gr_audio_osx.m4 b/config/grc_gr_audio_osx.m4 index 1d7f453a3..a42ecd5c5 100644 --- a/config/grc_gr_audio_osx.m4 +++ b/config/grc_gr_audio_osx.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -19,17 +19,28 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GR_AUDIO_OSX],[ GRC_ENABLE([gr-audio-osx]) - + AC_CONFIG_FILES([ \ gr-audio-osx/Makefile \ gr-audio-osx/src/Makefile \ gr-audio-osx/src/run_tests \ ]) - + passed=yes MACOSX_AUDIOUNIT([], [passed=no;AC_MSG_RESULT([gr-audio-osx requires AudioUnit, not found.])]) + # Don't do gr-audio-osx if omnithread skipped + if test x$omnithread_skipped = xyes; then + AC_MSG_RESULT([Component gr-audio-osx requires omnithread, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Don't do gr-audio-osx if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-audio-osx requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + GRC_BUILD_CONDITIONAL([gr-audio-osx],[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_osx], [chmod +x gr-audio-osx/src/run_tests]) diff --git a/config/grc_gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4 index 31ab07aab..490d9395c 100644 --- a/config/grc_gr_audio_portaudio.m4 +++ b/config/grc_gr_audio_portaudio.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,6 +27,12 @@ AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[ ]) passed=yes + # Don't do gr-audio-portaudio if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-audio-portaudio requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Don't do gr-audio-portaudio if the 'portaudio' library is unavailable. PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[], [passed=no;AC_MSG_RESULT([gr-audio-portaudio requires package portaudio, not found.])]) diff --git a/config/grc_gr_audio_windows.m4 b/config/grc_gr_audio_windows.m4 index 320c5d315..c34651eda 100644 --- a/config/grc_gr_audio_windows.m4 +++ b/config/grc_gr_audio_windows.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,6 +27,13 @@ AC_DEFUN([GRC_GR_AUDIO_WINDOWS],[ ]) passed=yes + # Don't do gr-audio-windows if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-audio-windows requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + + # Don't do gr-audio-windows if the 'winmm' library isn't available. AC_HAVE_LIBRARY(winmm,[], [passed=no;AC_MSG_RESULT([gr-audio-windows requires library winmm, not found.])]) diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4 index 7d6a674e3..b27b7d70a 100644 --- a/config/grc_gr_comedi.m4 +++ b/config/grc_gr_comedi.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,6 +27,12 @@ AC_DEFUN([GRC_GR_COMEDI],[ ]) passed=yes + # Don't do gr-comedi if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-comedi requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Don't do gr-comedi if the 'comedi' library is unavailable. PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[], [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])]) diff --git a/config/grc_gr_cvsd_vocoder.m4 b/config/grc_gr_cvsd_vocoder.m4 index 703c617a7..12b83354c 100644 --- a/config/grc_gr_cvsd_vocoder.m4 +++ b/config/grc_gr_cvsd_vocoder.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -29,6 +29,12 @@ AC_DEFUN([GRC_GR_CVSD_VOCODER],[ ]) passed=yes + # Don't do gr-cvsd-vocoder if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-cvsd-vocoder requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + GRC_BUILD_CONDITIONAL([gr-cvsd-vocoder],[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_cvsd], [chmod +x gr-cvsd-vocoder/src/python/run_tests]) diff --git a/config/grc_gr_gsm_fr_vocoder.m4 b/config/grc_gr_gsm_fr_vocoder.m4 index a5ca28190..b8ccc4840 100644 --- a/config/grc_gr_gsm_fr_vocoder.m4 +++ b/config/grc_gr_gsm_fr_vocoder.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -30,6 +30,12 @@ AC_DEFUN([GRC_GR_GSM_FR_VOCODER],[ ]) passed=yes + # Don't do gr-gsm-fr-vocoder if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-gsm-fr-vocoder requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + GRC_BUILD_CONDITIONAL([gr-gsm-fr-vocoder],[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_gsm], [chmod +x gr-gsm-fr-vocoder/src/python/run_tests]) diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4 index 80106526c..cfd0d25b4 100644 --- a/config/grc_gr_pager.m4 +++ b/config/grc_gr_pager.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,6 +27,12 @@ AC_DEFUN([GRC_GR_PAGER],[ ]) passed=yes + # Don't do gr-pager if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-pager requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + GRC_BUILD_CONDITIONAL([gr-pager],[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x gr-pager/src/run_tests]) diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index 05f8b02c2..4dd6ce68e 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -26,8 +26,14 @@ AC_DEFUN([GRC_GR_QTGUI],[ gr-qtgui/src/lib/Makefile \ ]) - # Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS passed=yes + # Don't do gr-qtgui if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-qtgui requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + + # Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS PKG_CHECK_MODULES(QT, qt >= 3.3,[], [passed=no;AC_MSG_RESULT([gr-qtgui requires libqt or libqt-mt, libqt not found. Checking for libqt-mt])]) diff --git a/config/grc_gr_radar_mono.m4 b/config/grc_gr_radar_mono.m4 index cbc2f8de4..40041dd88 100644 --- a/config/grc_gr_radar_mono.m4 +++ b/config/grc_gr_radar_mono.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2007 Free Software Foundation, Inc. +dnl Copyright 2007,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -35,14 +35,15 @@ AC_DEFUN([GRC_GR_RADAR_MONO],[ ]) passed=yes - # Don't do gr-radar-mono if usrp skipped - for dir in $skipped_dirs - do - if test x$dir = xusrp; then - AC_MSG_RESULT([Component gr-radar-mono requires usrp, which is not being built.]) - passed=no - fi - done + # Don't do gr-radar-mono if usrp or gnuradio-core skipped + if test x$usrp_skipped = xyes; then + AC_MSG_RESULT([Component gr-radar-mono requires usrp, which is not being built or specified via pre-installed files.]) + passed=no + fi + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-radar-mono requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi GRC_BUILD_CONDITIONAL([gr-radar-mono],[ dnl run_tests is created from run_tests.in. Make it executable. diff --git a/config/grc_gr_radio_astronomy.m4 b/config/grc_gr_radio_astronomy.m4 index 724ff8a65..cc966295b 100644 --- a/config/grc_gr_radio_astronomy.m4 +++ b/config/grc_gr_radio_astronomy.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -29,6 +29,12 @@ AC_DEFUN([GRC_GR_RADIO_ASTRONOMY],[ ]) passed=yes + # Don't do gr-radio-astronomy if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-radio-astronomy requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + GRC_BUILD_CONDITIONAL([gr-radio-astronomy],[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_astronomy], [chmod +x gr-radio-astronomy/src/python/run_tests]) diff --git a/config/grc_gr_sounder.m4 b/config/grc_gr_sounder.m4 index f716a324c..0553bb277 100644 --- a/config/grc_gr_sounder.m4 +++ b/config/grc_gr_sounder.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2007 Free Software Foundation, Inc. +dnl Copyright 2007,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -34,14 +34,15 @@ AC_DEFUN([GRC_GR_SOUNDER],[ ]) passed=yes - # Don't do gr-sounder if usrp skipped - for dir in $skipped_dirs - do - if test x$dir = xusrp; then - AC_MSG_RESULT([Component gr-sounder requires usrp, which is not being built.]) - passed=no - fi - done + # Don't do gr-sounder if usrp or gnuradio-core skipped + if test x$usrp_skipped = xyes; then + AC_MSG_RESULT([Component gr-sounder requires usrp, which is not being built or specified via pre-installed files.]) + passed=no + fi + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-sounder requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi GRC_BUILD_CONDITIONAL([gr-sounder],[ dnl run_tests is created from run_tests.in. Make it executable. diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4 index cde1f1cca..6fbaa1ac8 100644 --- a/config/grc_gr_trellis.m4 +++ b/config/grc_gr_trellis.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -32,6 +32,12 @@ AC_DEFUN([GRC_GR_TRELLIS],[ ]) passed=yes + # Don't do gr-trellis if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-trellis requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + GRC_BUILD_CONDITIONAL([gr-trellis],[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_gr_trellis], [chmod +x gr-trellis/src/python/run_tests]) diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4 index c247e5ded..576ef85e4 100644 --- a/config/grc_gr_usrp.m4 +++ b/config/grc_gr_usrp.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,15 +27,15 @@ AC_DEFUN([GRC_GR_USRP],[ ]) passed=yes - # Don't do gr-usrp if usrp skipped - # There *has* to be a better way to check if a value is in a string - for dir in $skipped_dirs - do - if test x$dir = xusrp; then - AC_MSG_RESULT([Component gr-usrp requires usrp, which is not being built.]) - passed=no - fi - done + # Don't do gr-usrp if usrp or gnuradio-core skipped + if test x$usrp_skipped = xyes; then + AC_MSG_RESULT([Component gr-usrp requires usrp, which is not being built or specified via pre-installed files.]) + passed=no + fi + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-usrp requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi GRC_BUILD_CONDITIONAL([gr-usrp],[ dnl run_tests is created from run_tests.in. Make it executable. diff --git a/config/grc_gr_utils.m4 b/config/grc_gr_utils.m4 index e5b3a6afb..34f56da1e 100644 --- a/config/grc_gr_utils.m4 +++ b/config/grc_gr_utils.m4 @@ -1,4 +1,4 @@ -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -29,22 +29,18 @@ AC_DEFUN([GRC_GR_UTILS],[ passed=yes # Don't do gr-utils if gnuradio-core, usrp, or gr-wxgui skipped - # There *has* to be a better way to check if a value is in a string - for dir in $skipped_dirs - do - if test x$dir = xusrp; then - AC_MSG_RESULT([Component gr-utils requires usrp, which is not being built.]) - passed=no - fi - if test x$dir = xgnuradio-core; then - AC_MSG_RESULT([Component gr-utils requires gnuradio-core, which is not being built.]) - passed=no - fi - if test x$dir = xgr-wxgui; then - AC_MSG_RESULT([Component gr-utils requires gr-wxgui, which is not being built.]) - passed=no - fi - done + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-utils requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + if test x$usrp_skipped = xyes; then + AC_MSG_RESULT([Component gr-utils requires usrp, which is not being built or specified via pre-installed files.]) + passed=no + fi + if test x$gr_wxgui_skipped = xyes; then + AC_MSG_RESULT([Component gr-utils requires gr-wxgui, which is not being built or specified via pre-installed files.]) + passed=no + fi GRC_BUILD_CONDITIONAL([gr-utils]) ]) diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4 index 405feb0ea..74aa5c046 100644 --- a/config/grc_gr_video_sdl.m4 +++ b/config/grc_gr_video_sdl.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,6 +27,12 @@ AC_DEFUN([GRC_GR_VIDEO_SDL],[ ]) passed=yes + # Don't do gr-video-sdl if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-video-sdl requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Don't do gr-video-sdl if the SDL library is unavailable. SDL_VERSION=1.2.0 AM_PATH_SDL($SDL_VERSION,[], [passed=no;AC_MSG_RESULT([gr-video-sdl requires library sdl, not found or failed test.])]) diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4 index 22f0a90e2..f3104a37e 100644 --- a/config/grc_gr_wxgui.m4 +++ b/config/grc_gr_wxgui.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -19,18 +19,36 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GR_WXGUI],[ GRC_ENABLE([gr-wxgui]) + GRC_WITH([gr-wxgui]) + passed=no + if test x$with_gr_wxgui = xyes; then + if test x$enable_gr_wxgui = xyes; then + AC_MSG_ERROR([Component gr-wxgui: Cannot use both --enable and --with]) + else + PKG_CHECK_MODULES(GR_WXGUI, gr-wxgui, passed=with, + AC_MSG_RESULT([Component gr-wxgui: PKGCONFIG cannot find info])) + fi + fi + dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff + dnl otherwise, $passed = no; check the "--enable" stuff + if test x$passed = xno; then + AC_CONFIG_FILES([ \ + gr-wxgui/Makefile \ + gr-wxgui/gr-wxgui.pc \ + gr-wxgui/src/Makefile \ + gr-wxgui/src/python/Makefile \ + ]) - AC_CONFIG_FILES([ \ - gr-wxgui/Makefile \ - gr-wxgui/src/Makefile \ - gr-wxgui/src/python/Makefile \ - ]) - - if ${PYTHON} -c 'import wx'; then - passed=yes - else - passed=no + passed=yes + # Don't do gr-wxgui if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-wxgui requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Don't do gr-wxgui if wxPython is not available + if ! ${PYTHON} -c 'import wx'; then + passed=no + fi fi - GRC_BUILD_CONDITIONAL([gr-wxgui]) ]) diff --git a/config/grc_mblock.m4 b/config/grc_mblock.m4 index a96348fb4..ec985e053 100644 --- a/config/grc_mblock.m4 +++ b/config/grc_mblock.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -19,46 +19,57 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_MBLOCK],[ GRC_ENABLE([mblock]) - - AC_CONFIG_FILES([\ - mblock/Makefile \ - mblock/mblock.pc \ - mblock/doc/Makefile \ - mblock/src/Makefile \ - mblock/src/lib/Makefile \ - mblock/src/scheme/Makefile \ - mblock/src/scheme/gnuradio/Makefile \ - ]) - - passed=yes - # Don't do mblock if omnithread skipped - # There *has* to be a better way to check if a value is in a string - for dir in $skipped_dirs - do - if test x$dir = xomnithread; then - AC_MSG_RESULT([Component mblock requires omnithread, which is not being built.]) + GRC_WITH([mblock]) + passed=no + if test x$with_mblock = xyes; then + if test x$enable_mblock = xyes; then + AC_MSG_ERROR([Component mblock: Cannot use both --enable and --with]) + else + PKG_CHECK_MODULES(MBLOCK, mblock, passed=with, + AC_MSG_RESULT([Component mblock: PKGCONFIG cannot find info])) + if test x$passed = xwith; then + mblock_INCLUDES=`$PKG_CONFIG --cflags-only-I mblock` + mblock_LA=$MBLOCK_LIBS + fi + fi + fi + dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff + dnl otherwise, $passed = no; check the "--enable" stuff + if test x$passed = xno; then + AC_CONFIG_FILES([\ + mblock/Makefile \ + mblock/mblock.pc \ + mblock/doc/Makefile \ + mblock/src/Makefile \ + mblock/src/lib/Makefile \ + mblock/src/scheme/Makefile \ + mblock/src/scheme/gnuradio/Makefile \ + ]) + passed=yes + # Don't do mblock if omnithread or pmt skipped + if test x$omnithread_skipped = xyes; then + AC_MSG_RESULT([Component mblock requires omnithread, which is not being built or specified via pre-installed files.]) passed=no fi - done - - # Don't do mblock if pmt skipped - # There *has* to be a better way to check if a value is in a string - for dir in $skipped_dirs - do - if test x$dir = xpmt; then - AC_MSG_RESULT([Component mblock requires pmt, which is not being built.]) + if test x$pmt_skipped = xyes; then + AC_MSG_RESULT([Component mblock requires pmt, which is not being built or specified via pre-installed files.]) passed=no fi - done - - AC_PATH_PROG(GUILE,guile) - if test "$GUILE" = "" ; then - AC_MSG_RESULT([Component mblock requires guile, which was not found.]) - passed=no + # Don't do mblock if guile not available + AC_PATH_PROG(GUILE,guile) + if test "$GUILE" = "" ; then + AC_MSG_RESULT([Component mblock requires guile, which was not found.]) + passed=no + fi + mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/lib" + mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la" fi GRC_BUILD_CONDITIONAL([mblock],[ dnl run_tests is created from run_tests.in. Make it executable. dnl AC_CONFIG_COMMANDS([run_tests_mblock], [chmod +x mblock/src/python/run_tests]) ]) + + AC_SUBST([mblock_INCLUDES], [$mblock_INCLUDES]) + AC_SUBST([mblock_LA], [$mblock_LA]) ]) diff --git a/config/grc_omnithread.m4 b/config/grc_omnithread.m4 index f38a312cb..77618e902 100644 --- a/config/grc_omnithread.m4 +++ b/config/grc_omnithread.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -19,16 +19,38 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_OMNITHREAD],[ GRC_ENABLE([omnithread]) - - AC_CONFIG_FILES([ \ - omnithread/Makefile \ - omnithread/gnuradio-omnithread.pc - ]) - - passed=yes + GRC_WITH([omnithread]) + passed=no + if test x$with_omnithread = xyes; then + if test x$enable_omnithread = xyes; then + AC_MSG_ERROR([Component omnithread: Cannot use both --enable and --with]) + else + PKG_CHECK_MODULES(OMNITHREAD, gnuradio-omnithread, passed=with, + AC_MSG_RESULT([Component omnithread: PKGCONFIG cannot find info])) + if test x$passed = xwith; then + omnithread_INCLUDES=`$PKG_CONFIG --cflags-only-I gnuradio-omnithread` + omnithread_LA=$OMNITHREAD_LIBS + omnithread_LIBDIRPATH=`$PKG_CONFIG --variable=libdir gnuradio-omnithread` + fi + fi + fi + dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff + dnl otherwise, $passed = no; check the "--enable" stuff + if test x$passed = xno; then + AC_CONFIG_FILES([ \ + omnithread/Makefile \ + omnithread/gnuradio-omnithread.pc + ]) + passed=yes + omnithread_INCLUDES="-I\${abs_top_srcdir}/omnithread" + omnithread_LA="\${abs_top_builddir}/omnithread/libgromnithread.la" + omnithread_LIBDIRPATH="\${abs_top_builddir}/omnithread:\${abs_top_builddir}/omnithread/.libs" + fi GRC_BUILD_CONDITIONAL([omnithread],[ dnl run_tests is created from run_tests.in. Make it executable. - dnl AC_CONFIG_COMMANDS([run_tests_omnithread], [chmod +x omnithread/run_tests]) - + dnl AC_CONFIG_COMMANDS([run_tests_omnithread], [chmod +x omnithread/run_tests]) ]) + AC_SUBST([omnithread_INCLUDES]) + AC_SUBST([omnithread_LA]) + AC_SUBST([omnithread_LIBDIRPATH]) ]) diff --git a/config/grc_pmt.m4 b/config/grc_pmt.m4 index 1c1819e50..2a512273e 100644 --- a/config/grc_pmt.m4 +++ b/config/grc_pmt.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -19,26 +19,53 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_PMT],[ GRC_ENABLE([pmt]) - - AC_CONFIG_FILES([\ - pmt/Makefile \ - pmt/pmt.pc - pmt/doc/Makefile \ - pmt/src/Makefile \ - pmt/src/lib/Makefile \ - pmt/src/scheme/Makefile \ - pmt/src/scheme/gnuradio/Makefile \ - ]) - - passed=yes - AC_PATH_PROG(GUILE,guile) - if test "$GUILE" = "" ; then - AC_MSG_RESULT([Component pmt requires guile, which was not found.]) - passed=no + GRC_WITH([pmt]) + passed=no + if test x$with_pmt = xyes; then + if test x$enable_pmt = xyes; then + AC_MSG_ERROR([Component pmt: Cannot use both --enable and --with]) + else + PKG_CHECK_MODULES(PMT, pmt, passed=with, + AC_MSG_RESULT([Component pmt: PKGCONFIG cannot find info])) + if test x$passed = xwith; then + pmt_INCLUDES=`$PKG_CONFIG --cflags-only-I pmt` + pmt_LA=$PMT_LIBS + fi + fi + fi + dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff + dnl otherwise, $passed = no; check the "--enable" stuff + if test x$passed = xno; then + AC_CONFIG_FILES([\ + pmt/Makefile \ + pmt/pmt.pc \ + pmt/doc/Makefile \ + pmt/src/Makefile \ + pmt/src/lib/Makefile \ + pmt/src/scheme/Makefile \ + pmt/src/scheme/gnuradio/Makefile \ + ]) + passed=yes + # Don't do pmt if omnithread skipped + if test x$omnithread_skipped = xyes; then + AC_MSG_RESULT([Component pmt requires omnithread, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Don't do pmt if guile not available + AC_PATH_PROG(GUILE,guile) + if test "$GUILE" = "" ; then + AC_MSG_RESULT([Component pmt requires guile, which was not found.]) + passed=no + fi + pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib" + pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la" fi GRC_BUILD_CONDITIONAL([pmt],[ dnl run_tests is created from run_tests.in. Make it executable. dnl AC_CONFIG_COMMANDS([run_tests_pmt], [chmod +x pmt/src/python/run_tests]) ]) + + AC_SUBST([pmt_INCLUDES], [$pmt_INCLUDES]) + AC_SUBST([pmt_LA], [$pmt_LA]) ]) diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4 index e28e6c28d..34acee818 100644 --- a/config/grc_usrp.m4 +++ b/config/grc_usrp.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -19,58 +19,122 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_USRP],[ GRC_ENABLE([usrp]) + GRC_WITH([usrp]) + passed=no + if test x$with_usrp = xyes; then + if test x$enable_usrp = xyes; then + AC_MSG_ERROR([Component usrp: Cannot use both --enable and --with]) + else + # the following is required, for whatever reason; ignore the output + USRP_SET_FUSB_TECHNIQUE([],[passed=no;AC_MSG_RESULT([Unable to set fast USB technique.])]) + passed=no + # on to the regular routine + PKG_CHECK_MODULES(USRP, usrp, passed=with, + AC_MSG_RESULT([Component usrp: PKGCONFIG cannot find info])) + if test x$passed = xwith; then + usrp_INCLUDES=`$PKG_CONFIG --cflags-only-I usrp` + usrp_LA=$USRP_LIBS + passed=no + PKG_CHECK_MODULES(USRP_INBAND, usrp-inband, passed=with, + AC_MSG_RESULT([Component usrp-inband: PKGCONFIG cannot find info])) + if test x$passed = xwith; then + usrp_inband_INCLUDES=`$PKG_CONFIG --cflags-only-I usrp-inband` + usrp_inband_LA=$USRP_INBAND_LIBS + fi + fi + fi + fi + dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff + dnl otherwise, $passed = no; check the "--enable" stuff + if test x$passed = xno; then + AC_CONFIG_FILES([ \ + usrp/Makefile \ + usrp/usrp.pc \ + usrp/usrp-inband.pc \ + usrp/usrp.iss \ + usrp/doc/Doxyfile \ + usrp/doc/Makefile \ + usrp/doc/other/Makefile \ + usrp/host/Makefile \ + usrp/host/misc/Makefile \ + usrp/host/lib/Makefile \ + usrp/host/lib/inband/Makefile \ + usrp/host/lib/legacy/Makefile \ + usrp/host/lib/legacy/std_paths.h \ + usrp/host/swig/Makefile \ + usrp/host/apps/Makefile \ + usrp/host/apps-inband/Makefile \ + usrp/firmware/Makefile \ + usrp/firmware/include/Makefile \ + usrp/firmware/lib/Makefile \ + usrp/firmware/src/Makefile \ + usrp/firmware/src/common/Makefile \ + usrp/firmware/src/usrp2/Makefile \ + usrp/fpga/Makefile \ + usrp/fpga/rbf/Makefile \ + ]) - AC_CONFIG_FILES([ \ - usrp/Makefile \ - usrp/usrp.pc \ - usrp/usrp-inband.pc \ - usrp/usrp.iss \ - usrp/doc/Doxyfile \ - usrp/doc/Makefile \ - usrp/doc/other/Makefile \ - usrp/host/Makefile \ - usrp/host/misc/Makefile \ - usrp/host/lib/Makefile \ - usrp/host/lib/inband/Makefile \ - usrp/host/lib/legacy/Makefile \ - usrp/host/lib/legacy/std_paths.h \ - usrp/host/swig/Makefile \ - usrp/host/apps/Makefile \ - usrp/host/apps-inband/Makefile \ - usrp/firmware/Makefile \ - usrp/firmware/include/Makefile \ - usrp/firmware/lib/Makefile \ - usrp/firmware/src/Makefile \ - usrp/firmware/src/common/Makefile \ - usrp/firmware/src/usrp2/Makefile \ - usrp/fpga/Makefile \ - usrp/fpga/rbf/Makefile \ - ]) - - # gnulib. - # FIXME: this needs to fail gracefully and continue, not implemented yet - UTILS_FUNC_MKSTEMP + # gnulib. + # FIXME: this needs to fail gracefully and continue, not implemented yet + UTILS_FUNC_MKSTEMP - # These checks don't fail - AC_C_BIGENDIAN - AC_CHECK_HEADERS([byteswap.h linux/compiler.h]) - AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam]) - AC_CHECK_FUNCS([sigaction snprintf]) + # These checks don't fail + AC_C_BIGENDIAN + AC_CHECK_HEADERS([byteswap.h linux/compiler.h]) + AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam]) + AC_CHECK_FUNCS([sigaction snprintf]) - passed=yes - # Don't do usrp if mblock skipped - # There *has* to be a better way to check if a value is in a string - for dir in $skipped_dirs - do - if test "$dir" = "mblock"; then - AC_MSG_RESULT([Component usrp requires mblock, which is not being built.]) + # There are 2 pkg-config files; the one for usrp requires omnithread + # for Darwin only. + case "$host_os" in + darwin*) + # for usrp.pc.in + usrp_darwin_omnithread_pc_requires="gnuradio-omnithread" + usrp_darwin_omnithread_pc_la="-lgromnithread" + ;; + *) + # for usrp.pc.in (blanks) + usrp_darwin_omnithread_pc_requires="" + usrp_darwin_omnithread_pc_la="" + ;; + esac + passed=yes + # Don't do usrp if omnithread, mblock, or pmt skipped + if test x$omnithread_skipped = xyes; then + AC_MSG_RESULT([Component usrp requires omnithread, which is not being built or specified via pre-installed files.]) passed=no fi - done + if test x$mblock_skipped = xyes; then + AC_MSG_RESULT([Component usrp requires mblock, which is not being built or specified via pre-installed files.]) + passed=no + fi + if test x$pmt_skipped = xyes; then + AC_MSG_RESULT([Component usrp requires pmt, which is not being built or specified via pre-installed files.]) + passed=no + fi + # Don't do mblock if guile not available (inband requires it) + AC_PATH_PROG(GUILE,guile) + if test "$GUILE" = "" ; then + AC_MSG_RESULT([Component mblock requires guile, which was not found.]) + passed=no + fi + USRP_LIBUSB([],[passed=no;AC_MSG_RESULT([Unable to configure USB dependency.])]) + USRP_SET_FUSB_TECHNIQUE([],[passed=no;AC_MSG_RESULT([Unable to set fast USB technique.])]) + USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler.])]) - USRP_LIBUSB([],[passed=no;AC_MSG_RESULT([Unable to configure USB dependency.])]) - USRP_SET_FUSB_TECHNIQUE([],[passed=no;AC_MSG_RESULT([Unable to set fast USB technique.])]) - USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler.])]) + usrp_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/legacy \ + -I\${abs_top_srcdir}/usrp/firmware/include" + usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la" + usrp_inband_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/inband" + usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp_inband.la" + fi GRC_BUILD_CONDITIONAL([usrp]) + + AC_SUBST(usrp_INCLUDES) + AC_SUBST(usrp_LA) + AC_SUBST(usrp_inband_INCLUDES) + AC_SUBST(usrp_inband_LA) + AC_SUBST(usrp_darwin_omnithread_pc_requires) + AC_SUBST(usrp_darwin_omnithread_pc_la) ]) diff --git a/configure.ac b/configure.ac index 1c3c243da..f8ba7f41b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -74,7 +74,6 @@ fi AC_SUBST(autoconf_default_CXXFLAGS) AC_SUBST(swig_CXXFLAGS) - LF_SET_WARNINGS GR_SET_GPROF GR_SET_PROF @@ -247,17 +246,30 @@ GRC_GR_SOUNDER dnl this must come after GRC_USRP GRC_GR_UTILS GRC_GNURADIO_EXAMPLES dnl must come last -# Each component is now either to be built, was skipped, or failed dependencies +# Each component is now either to be built, was skipped, will be +# included from pre-installed libraries and includes, or failed +# dependencies. AC_SUBST([build_dirs], [$build_dirs]) AC_SUBST([skipped_dirs], [$skipped_dirs]) - +AC_SUBST([with_dirs], [$with_dirs]) + +# 'with' variables - the pre-installed libraries, includes, and paths +# - must always come last in the lists, so they require special +# treatment. +AC_SUBST(with_INCLUDES) +AC_SUBST(with_SWIG_INCLUDES) +AC_SUBST(with_PYDIRPATH) +AC_SUBST(with_SWIGDIRPATH) +AC_SUBST(with_LIBDIRPATH) + +# Local files tweaked by AC AC_CONFIG_FILES([\ Makefile \ - run_tests.sh - config/Makefile + run_tests.sh \ + config/Makefile \ ]) -dnl run_tests.sh is created from run_tests.in.sh. Make it executable. +dnl run_tests.sh is created from run_tests.sh.in . Make it executable. AC_CONFIG_COMMANDS([run_tests_build], [chmod +x run_tests.sh]) AC_OUTPUT @@ -286,3 +298,16 @@ if test "$skipped_dirs" != ""; then echo These components will not be built. echo fi +if test "$with_dirs" != ""; then + echo "*********************************************************************" + echo The following components will be included from pre-installed + echo libraries and includes: + echo + for dir in $with_dirs + do + echo $dir + done + echo + echo These components will not be built. + echo +fi diff --git a/gnuradio-core/gnuradio-core.pc.in b/gnuradio-core/gnuradio-core.pc.in index a317912c7..22d63720c 100644 --- a/gnuradio-core/gnuradio-core.pc.in +++ b/gnuradio-core/gnuradio-core.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@/gnuradio Name: gnuradio-core Description: GNU Software Radio toolkit -Requires: +Requires: gnuradio-omnithread fftw3f Version: @VERSION@ Libs: -L${libdir} -lgnuradio-core @FFTW3F_LIBS@ -lgromnithread Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@ diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am index 83474ffff..22d5aa071 100644 --- a/gnuradio-core/src/lib/filter/Makefile.am +++ b/gnuradio-core/src/lib/filter/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2002,2004,2005,2006,2007 Free Software Foundation, Inc. +# Copyright 2001,2002,2004,2005,2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -26,7 +26,7 @@ include $(top_srcdir)/Makefile.common # other performance critical items # -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libfilter.la libfilter-qa.la diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index 238c56d84..bc94d3b0b 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2002,2004,2006,2007 Free Software Foundation, Inc. +# Copyright 2001,2002,2004,2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libgeneral.la libgeneral-qa.la diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am index 92fd66803..f4418660c 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.am +++ b/gnuradio-core/src/lib/gengen/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2002,2004,2006,2007 Free Software Foundation, Inc. +# Copyright 2001,2002,2004,2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) #noinst_LTLIBRARIES = libgengen.la libgengen-qa.la noinst_LTLIBRARIES = libgengen.la diff --git a/gnuradio-core/src/lib/io/Makefile.am b/gnuradio-core/src/lib/io/Makefile.am index 626ddb07a..fb527da73 100644 --- a/gnuradio-core/src/lib/io/Makefile.am +++ b/gnuradio-core/src/lib/io/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2003,2004,2006,2007 Free Software Foundation, Inc. +# Copyright 2001,2003,2004,2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -22,7 +22,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libio.la diff --git a/gnuradio-core/src/lib/reed-solomon/Makefile.am b/gnuradio-core/src/lib/reed-solomon/Makefile.am index 93b8fc934..182081882 100644 --- a/gnuradio-core/src/lib/reed-solomon/Makefile.am +++ b/gnuradio-core/src/lib/reed-solomon/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2002 Free Software Foundation, Inc. +# Copyright 2002,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -25,7 +25,7 @@ include $(top_srcdir)/Makefile.common # If you need the int versions too, please figure out how to add them *cleanly* to # this Makefile.am. -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) TESTS = rstest diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am index 4b51f7f4d..f6b744e48 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.am +++ b/gnuradio-core/src/lib/runtime/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2003,2004,2007 Free Software Foundation, Inc. +# Copyright 2003,2004,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libruntime.la libruntime-qa.la diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 2c3494cc1..8c77d39b2 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2003,2004,2005,2006,2007 Free Software Foundation, Inc. +# Copyright 2001,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,27 +28,21 @@ include $(top_srcdir)/Makefile.common grgrpythondir = $(grpythondir)/gr grgrlibdir = $(grpyexecdir)/gr - -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) - +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \ + $(WITH_INCLUDES) EXTRA_DIST = gen-swig-bug-fix - LOCAL_IFILES = \ gnuradio.i \ shared_ptr.i \ sw_general.i \ sw_gengen.i \ sw_filter.i \ - sw_io.i - + sw_io.i ALL_IFILES = \ - $(LOCAL_IFILES) - - - + $(LOCAL_IFILES) # ---------------------------------------------------------------- # We've split the previously monstrous gnuradio_swig_python into @@ -75,8 +69,8 @@ BUILT_SOURCES = \ gnuradio_swig_py_io.h \ gnuradio_swig_bug_workaround.h - -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \ + $(WITH_INCLUDES) # ---------------------------------------------------------------- # We break this up into 5 libraries... diff --git a/gnuradio-core/src/tests/Makefile.am b/gnuradio-core/src/tests/Makefile.am index e120ae3f9..b3bd86883 100644 --- a/gnuradio-core/src/tests/Makefile.am +++ b/gnuradio-core/src/tests/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001 Free Software Foundation, Inc. +# Copyright 2001,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) # list of programs run by "make check" and "make distcheck" diff --git a/gnuradio-examples/c++/dial_tone/Makefile.am b/gnuradio-examples/c++/dial_tone/Makefile.am index 76a95ada3..d1ac268d2 100644 --- a/gnuradio-examples/c++/dial_tone/Makefile.am +++ b/gnuradio-examples/c++/dial_tone/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,7 +23,8 @@ include $(top_srcdir)/Makefile.common # For compiling within the GNU Radio build tree INCLUDES=$(STD_DEFINES_AND_INCLUDES) \ - -I$(top_srcdir)/gr-audio-alsa/src + -I$(top_srcdir)/gr-audio-alsa/src \ + $(WITH_INCLUDES) GR_AUDIO_ALSA_LA=$(top_builddir)/gr-audio-alsa/src/libgr_audio_alsa.la diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index a114e6d9b..96e55a636 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2001,2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,7 +28,8 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(CPPUNIT_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) EXTRA_DIST = \ atsci_viterbi_gen.cc \ @@ -214,7 +215,7 @@ test_atsci_LDADD = \ # ------------------------------------------------------------------------ SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) \ - $(STD_DEFINES_AND_INCLUDES) + $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am index ffc7780df..80e4de183 100644 --- a/gr-atsc/src/python/Makefile.am +++ b/gr-atsc/src/python/Makefile.am @@ -28,7 +28,6 @@ EXAMPLE_FILES = \ interp.py \ xlate.py \ viterbi-out.py - EXTRA_DIST = run_tests.in \ $(EXAMPLE_FILES) @@ -46,7 +45,7 @@ noinst_PYTHON = \ qa_atsc.py # Make example scripts with #! executable -install-data-local: +install-data-local: install-ourdataDATA for i in `find $(ourdatadir) -type f ! -perm 755`; do \ if head -1 $$i | grep -q '^#!'; then \ chmod 755 $$i; \ diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index d6c5c9edb..e82eda4fe 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004 Free Software Foundation, Inc. +# Copyright 2004,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -49,9 +49,10 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_alsa.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ourlib_LTLIBRARIES = _audio_alsa.la @@ -63,15 +64,14 @@ _audio_alsa_la_SOURCES = \ libgr_audio_alsa_la_SOURCES = \ audio_alsa_sink.cc \ audio_alsa_source.cc \ - gri_alsa.cc + gri_alsa.cc grinclude_HEADERS = \ audio_alsa_sink.h \ - audio_alsa_source.h + audio_alsa_source.h noinst_HEADERS = \ - gri_alsa.h - + gri_alsa.h swiginclude_HEADERS = \ $(LOCAL_IFILES) @@ -81,7 +81,7 @@ _audio_alsa_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(ALSA_LIBS) \ libgr_audio_alsa.la \ - -lstdc++ + -lstdc++ libgr_audio_alsa_la_LIBADD = \ $(ALSA_LIBS) diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am index 12bdf08c5..2c13a835f 100644 --- a/gr-audio-jack/src/Makefile.am +++ b/gr-audio-jack/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005 Free Software Foundation, Inc. +# Copyright 2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -49,27 +49,25 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_jack.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) - -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ourlib_LTLIBRARIES = _audio_jack.la - _audio_jack_la_SOURCES = \ audio_jack.cc \ audio_jack_sink.cc \ audio_jack_source.cc \ - gri_jack.cc + gri_jack.cc grinclude_HEADERS = \ audio_jack_sink.h \ - audio_jack_source.h + audio_jack_source.h noinst_HEADERS = \ - gri_jack.h - + gri_jack.h swiginclude_HEADERS = \ $(LOCAL_IFILES) @@ -78,7 +76,7 @@ _audio_jack_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LA) \ $(JACK_LIBS) \ - -lstdc++ + -lstdc++ _audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version @@ -86,7 +84,7 @@ audio_jack.cc audio_jack.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES) $(SWIG) $(SWIGPYTHONARGS) -module audio_jack -o audio_jack.cc $(LOCAL_IFILES) noinst_PYTHON = \ - qa_jack.py + qa_jack.py MOSTLYCLEANFILES = \ $(BUILT_SOURCES) *~ *.pyc diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am index 72707d995..f2f173b59 100644 --- a/gr-audio-oss/src/Makefile.am +++ b/gr-audio-oss/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -48,21 +48,21 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_oss.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ourlib_LTLIBRARIES = _audio_oss.la _audio_oss_la_SOURCES = \ audio_oss.cc \ audio_oss_sink.cc \ - audio_oss_source.cc - + audio_oss_source.cc grinclude_HEADERS = \ audio_oss_sink.h \ - audio_oss_source.h + audio_oss_source.h swiginclude_HEADERS = \ $(LOCAL_IFILES) @@ -71,7 +71,7 @@ _audio_oss_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LA) \ $(OSS_LIBS) \ - -lstdc++ + -lstdc++ _audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am index 5898a3687..b9ac0cb69 100644 --- a/gr-audio-osx/src/Makefile.am +++ b/gr-audio-osx/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio. # @@ -48,9 +48,10 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_osx.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) +SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ourlib_LTLIBRARIES = _audio_osx.la diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am index b6d443ae6..3b55969a3 100644 --- a/gr-audio-portaudio/src/Makefile.am +++ b/gr-audio-portaudio/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004 Free Software Foundation, Inc. +# Copyright 2004,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -49,13 +49,14 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_portaudio.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(PORTAUDIO_CFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) -I/usr/include +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + -I/usr/include $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ourlib_LTLIBRARIES = _audio_portaudio.la - _audio_portaudio_la_SOURCES = \ audio_portaudio.cc \ audio_portaudio_sink.cc \ @@ -67,8 +68,7 @@ grinclude_HEADERS = \ audio_portaudio_source.h noinst_HEADERS = \ - gri_portaudio.h - + gri_portaudio.h swiginclude_HEADERS = \ $(LOCAL_IFILES) @@ -77,16 +77,15 @@ _audio_portaudio_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LA) \ $(PORTAUDIO_LIBS) \ - -lstdc++ + -lstdc++ _audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version audio_portaudio.cc audio_portaudio.py: $(ALL_IFILES) audio_portaudio_sink.h audio_portaudio_source.h $(SWIG) $(SWIGPYTHONARGS) -module audio_portaudio -o audio_portaudio.cc $(LOCAL_IFILES) - noinst_PYTHON = \ - qa_portaudio.py + qa_portaudio.py MOSTLYCLEANFILES = \ $(BUILT_SOURCES) *~ *.pyc diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am index 83915656d..7b610440c 100644 --- a/gr-audio-windows/src/Makefile.am +++ b/gr-audio-windows/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005 Free Software Foundation, Inc. +# Copyright 2004,2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -48,9 +48,10 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_windows.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) +SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) ourlib_LTLIBRARIES = _audio_windows.la diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index b647f92fa..c09ec8b87 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005 Free Software Foundation, Inc. +# Copyright 2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -49,9 +49,10 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ comedi.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGCPPPYTHONARGS = -c++ -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) +SWIGCPPPYTHONARGS = -c++ -python $(PYTHON_CPPFLAGS) \ + $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) # -I$(swigincludedir) $(S-I$(grincludedir) -I$(comediincludedir) ourlib_LTLIBRARIES = _comedi.la diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am index f4531afcb..67126db77 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.am +++ b/gr-cvsd-vocoder/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005 Free Software Foundation, Inc. +# Copyright 2004,2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,10 +28,10 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir)/vocoder ourlibdir = $(grpyexecdir)/vocoder -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) - -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -40,7 +40,6 @@ ALL_IFILES = \ NON_LOCAL_IFILES = \ $(GNURADIO_I) - LOCAL_IFILES = \ $(top_srcdir)/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index 254855bce..bbfbf8f80 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005 Free Software Foundation, Inc. +# Copyright 2004,2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -30,10 +30,10 @@ SUBDIRS = gsm . ourpythondir = $(grpythondir)/vocoder ourlibdir = $(grpyexecdir)/vocoder -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) - -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -42,9 +42,8 @@ ALL_IFILES = \ NON_LOCAL_IFILES = \ $(GNURADIO_I) - LOCAL_IFILES = \ - $(top_srcdir)/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i + $(top_srcdir)/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i # These files are built by SWIG. The first is the C++ glue. # The second is the python wrapper that loads the _howto shared library diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am index b8c946c90..d72eb896e 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005 Free Software Foundation, Inc. +# Copyright 2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -43,7 +43,8 @@ LTP_CUT = OPTIONS = $(SASR) $(MULHACK) $(FAST) $(LTP_CUT) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) -DNeedFunctionPrototypes=1 $(OPTIONS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) -DNeedFunctionPrototypes=1 \ + $(OPTIONS) $(WITH_INCLUDES) noinst_LTLIBRARIES = libgsm.la diff --git a/gr-howto-write-a-block/doc/src_lib_Makefile_1.am b/gr-howto-write-a-block/doc/src_lib_Makefile_1.am index 846dd7c69..e97d70d1c 100644 --- a/gr-howto-write-a-block/doc/src_lib_Makefile_1.am +++ b/gr-howto-write-a-block/doc/src_lib_Makefile_1.am @@ -7,7 +7,7 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) ourlib_LTLIBRARIES = _howto.la diff --git a/gr-howto-write-a-block/doc/src_lib_Makefile_2.am b/gr-howto-write-a-block/doc/src_lib_Makefile_2.am index 5ca24385f..dca236e20 100644 --- a/gr-howto-write-a-block/doc/src_lib_Makefile_2.am +++ b/gr-howto-write-a-block/doc/src_lib_Makefile_2.am @@ -1,5 +1,5 @@ # -# Copyright 2004 Free Software Foundation, Inc. +# Copyright 2004,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,10 +28,10 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) SWIGCPPPYTHONARGS = -noruntime -c++ -python $(PYTHON_CPPFLAGS) \ - -I$(swigincludedir) -I$(grincludedir) + -I$(swigincludedir) -I$(grincludedir) $(WITH_SWIG_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ diff --git a/gr-howto-write-a-block/src/lib/Makefile.am b/gr-howto-write-a-block/src/lib/Makefile.am index 5b0c57a41..942bd5044 100644 --- a/gr-howto-write-a-block/src/lib/Makefile.am +++ b/gr-howto-write-a-block/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,9 +28,10 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(SWIGGRFLAGS) $(WITH_SWIG_INCLUDES) \ + $(WITH_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ diff --git a/gr-pager/src/Makefile.am b/gr-pager/src/Makefile.am index fdf30d4c3..f9575262d 100644 --- a/gr-pager/src/Makefile.am +++ b/gr-pager/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = \ run_tests.in \ $(bin_SCRIPTS) - + TESTS = \ run_tests @@ -32,7 +32,7 @@ bin_SCRIPTS = \ usrp_flex.py \ usrp_flex_all.py \ usrp_flex_band.py - + noinst_PYTHON = \ qa_pager.py @@ -43,9 +43,10 @@ noinst_PYTHON = \ ourpythondir = $(grpythondir)/pager ourlibdir = $(grpyexecdir)/pager -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am index 59a474df3..a06d1e645 100644 --- a/gr-radio-astronomy/src/lib/Makefile.am +++ b/gr-radio-astronomy/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,9 +28,10 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ diff --git a/gr-trellis/src/examples/Makefile.am b/gr-trellis/src/examples/Makefile.am index 21003991f..d1da52fbb 100644 --- a/gr-trellis/src/examples/Makefile.am +++ b/gr-trellis/src/examples/Makefile.am @@ -45,7 +45,7 @@ ourdatadir = $(exampledir)/trellis ourdata_DATA = $(EXTRA_DIST) # Make example scripts with #! executable -install-data-local: +install-data-local: install-ourdataDATA for i in `find $(ourdatadir) -type f ! -perm 755`; do \ if head -1 $$i | grep -q '^#!'; then \ chmod 755 $$i; \ diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 7df176993..a7cfbc325 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2007 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,9 +28,10 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) # ---------------------------------------------------------------- # these scripts generate trellis codes from template files diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 351ac61d9..26b7043a9 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -63,11 +63,14 @@ ourpython_PYTHON = \ INCLUDES = $(STD_DEFINES_AND_INCLUDES) \ $(PYTHON_CPPFLAGS) \ - $(USRP_INCLUDES) + $(USRP_INCLUDES) \ + $(WITH_INCLUDES) SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) \ $(STD_DEFINES_AND_INCLUDES) \ - $(USRP_INCLUDES) + $(USRP_INCLUDES) \ + $(WITH_INCLUDES) \ + $(WITH_SWIG_INCLUDES) grinclude_HEADERS = \ usrp1_sink_base.h \ diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in index 84ae973f4..f9bdc78b6 100644 --- a/gr-usrp/src/run_tests.in +++ b/gr-usrp/src/run_tests.in @@ -5,11 +5,11 @@ # 3rd parameter is path to Python QA directory # For OS/X -DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib/legacy/:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH +DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH # For Win32 -PATH=@abs_top_builddir@/usrp/host/lib/legacy/.libs:$PATH +PATH=@abs_top_builddir@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$PATH @top_builddir@/run_tests.sh \ @abs_top_srcdir@/gr-usrp \ diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am index b69af586f..4e64ae2e7 100644 --- a/gr-video-sdl/src/Makefile.am +++ b/gr-video-sdl/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -48,9 +48,10 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ video_sdl.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \ + $(WITH_INCLUDES) -SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) +SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ourlib_LTLIBRARIES = _video_sdl.la diff --git a/gr-wxgui/Makefile.am b/gr-wxgui/Makefile.am index c59485701..f347cc691 100644 --- a/gr-wxgui/Makefile.am +++ b/gr-wxgui/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,8 +21,11 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = gr-wxgui.conf +EXTRA_DIST = gr-wxgui.conf gr-wxgui.pc.in SUBDIRS = src etcdir = $(sysconfdir)/gnuradio/conf.d etc_DATA = gr-wxgui.conf + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gr-wxgui.pc diff --git a/gr-wxgui/gr-wxgui.pc.in b/gr-wxgui/gr-wxgui.pc.in new file mode 100644 index 000000000..a3e352f0f --- /dev/null +++ b/gr-wxgui/gr-wxgui.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gr-wxgui +Description: A simple wx gui for GNU Radio applications +Requires: gnuradio-core +Version: @VERSION@ +Libs: +Cflags: diff --git a/mblock/mblock.pc.in b/mblock/mblock.pc.in index 2e38483b6..998f4b0d5 100644 --- a/mblock/mblock.pc.in +++ b/mblock/mblock.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: mblock Description: The GNU Radio message block library -Requires: +Requires: gnuradio-omnithread pmt Version: @VERSION@ -Libs: -L${libdir} -lgromnithread -lpmt +Libs: -L${libdir} -lmblock -lgromnithread -lpmt Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@ diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am index 86cacb1ad..17f421d94 100644 --- a/mblock/src/lib/Makefile.am +++ b/mblock/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2006,2007 Free Software Foundation, Inc. +# Copyright 2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,8 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) +INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) \ + $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) # disable test until we fix ticket:180 # TESTS = test_mblock diff --git a/omnithread/Makefile.am b/omnithread/Makefile.am index dfbb3b3d3..59ba971a4 100644 --- a/omnithread/Makefile.am +++ b/omnithread/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2003 Free Software Foundation, Inc. +# Copyright 2003,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -27,7 +27,8 @@ include $(top_srcdir)/Makefile.common # we should do some configure hacking to determine these on the fly OMNITHREAD_DEFINES = -DPthreadDraftVersion=10 -INCLUDES = $(DEFINES) $(OMNITHREAD_DEFINES) $(OMNITHREAD_INCLUDES) +INCLUDES = $(DEFINES) $(OMNITHREAD_DEFINES) $(OMNITHREAD_INCLUDES) \ + $(WITH_INCLUDES) # we call it libgromnithread to avoid a collision with libomnithread on Debian lib_LTLIBRARIES = libgromnithread.la diff --git a/pmt/Makefile.am b/pmt/Makefile.am index 2c3de669f..758eb1d98 100644 --- a/pmt/Makefile.am +++ b/pmt/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004 Free Software Foundation, Inc. +# Copyright 2004,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,8 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ - pmt.pc.in +EXTRA_DIST = pmt.pc.in SUBDIRS = src DIST_SUBDIRS = src doc diff --git a/pmt/pmt.pc.in b/pmt/pmt.pc.in index e4a5e640c..6ca31ad49 100644 --- a/pmt/pmt.pc.in +++ b/pmt/pmt.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: pmt Description: The GNU Radio Polymorphic Type library -Requires: +Requires: gnuradio-omnithread Version: @VERSION@ -Libs: -L${libdir} -lgromnithread +Libs: -L${libdir} -lpmt -lgromnithread Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@ diff --git a/pmt/src/lib/Makefile.am b/pmt/src/lib/Makefile.am index 692860408..cb1a907f0 100644 --- a/pmt/src/lib/Makefile.am +++ b/pmt/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,8 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) +INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(BOOST_CFLAGS) \ + $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) TESTS = test_pmt diff --git a/run_tests.sh.in b/run_tests.sh.in index d32d3653a..1562eeec6 100644 --- a/run_tests.sh.in +++ b/run_tests.sh.in @@ -4,6 +4,12 @@ # Second argument is absolute path to top of component build directory # Third argument is component source directory for qa tests +# Absolute path to the top of the source directory +abs_top_srcdir=@abs_top_srcdir@ + +# Absolute path to the top of the build directory +abs_top_builddir=@abs_top_builddir@ + # Where to find my swig generated shared library mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs @@ -13,33 +19,106 @@ mysrcdir=$1/src:$1/src/lib # Where to find my hand written python modules mypydir=$1/src:$1/src/python -# Where to find core's swig generated shared libraries -grswigdir=@abs_top_builddir@/gnuradio-core/src/lib/swig -grswigdir=$grswigdir:$grswigdir/.libs - -# Where to find core's hand generated swig glue -grswigsrcdir=@abs_top_srcdir@/gnuradio-core/src/lib/swig +# Where to find core's swig generated shared libraries, +# and hand generated swig glue +grswigdir=@gnuradio_core_SWIGDIRPATH@ # Where to find core's python modules -grpydir=@abs_top_srcdir@/gnuradio-core/src/python +grpydir=@gnuradio_core_PYDIRPATH@ -# Construct search path for python modules -PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$grswigdir:$grswigsrcdir:$grpydir:$PYTHONPATH" +# Construct search path for python modules, if each exists +for dir in $grswigdir $grpydir +do + if [ "$dir" != "" ] + then + if [ "$PYTHONPATH" = "" ] + then + PYTHONPATH="$dir" + else + PYTHONPATH="$dir:$PYTHONPATH" + fi + fi +done + +# Where to find pre-installed python modules +withpydirs=@with_PYDIRPATH@ + +# Add the 'with' dirs to the end of the python search path, if it exists +if [ "$withpydirs" != "" ] +then + PYTHONPATH="$PYTHONPATH:$withpydirs" +fi + +# Add the "my" dirs to the absolute front of the python search path +PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$PYTHONPATH" export PYTHONPATH -# Where to find core's master library files and dependencies -gromnidir=@abs_top_builddir@/omnithread -gromnidir=$gromnidir:$gromnidir/.libs -grcoredir=@abs_top_builddir@/gnuradio-core/src/lib -grcoredir=$grcoredir:$grcoredir/.libs -grlibdir=$gromnidir:$grcoredir +# Where to find omnithread library files +gromnidir=@omnithread_LIBDIRPATH@ -# For OS/X -DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH -export DYLD_LIBRARY_PATH +# Where to find gnuradio core's library files +grcoredir=@gnuradio_core_LIBDIRPATH@ + +# Construct search path for python modules +# Check each one to make sure it's not "" before adding +grlibdir="" +for dir in $gromnidir $grcoredir +do + if [ "$dir" != "" ] + then + if [ "$grlibdir" = "" ] + then + grlibdir="$dir" + else + grlibdir="$dir:$grlibdir" + fi + fi +done + +# Add the grlibdir paths to the front of any PATH variable +if [ "$grlibdir" != "" ] +then + # For OS/X + if [ "$DYLD_LIBRARY_PATH" = "" ] + then + DYLD_LIBRARY_PATH=$grlibdir + else + DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH + fi + + # For Win32 + if [ "$PATH" = "" ] + then + PATH=$grlibdir + else + PATH=$grlibdir:$PATH + fi +fi -# For Win32 -PATH=$grlibdir:$PATH +# Where to find pre-installed libraries +withlibdirs=@with_LIBDIRPATH@ + +# Add the withdirs paths to the end of any PATH variable +if [ "$withlibdirs" != "" ] +then + # For OS/X + if [ "$DYLD_LIBRARY_PATH" = "" ] + then + DYLD_LIBRARY_PATH=$withlibdirs + else + DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs + fi + + # For Win32 + if [ "$PATH" = "" ] + then + PATH=$withlibdirs + else + PATH=$PATH:$withlibdirs + fi +fi + +export DYLD_LIBRARY_PATH # Don't load user or system prefs GR_DONT_LOAD_PREFS=1 diff --git a/usrp/host/apps-inband/Makefile.am b/usrp/host/apps-inband/Makefile.am index c05f04af0..d4ca6607b 100644 --- a/usrp/host/apps-inband/Makefile.am +++ b/usrp/host/apps-inband/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2003,2006 Free Software Foundation, Inc. +# Copyright 2003,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,7 +23,8 @@ include $(top_srcdir)/Makefile.common INCLUDES = \ $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \ - $(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) + $(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS) \ + $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) bin_PROGRAMS = diff --git a/usrp/host/apps-inband/gmac.cc b/usrp/host/apps-inband/gmac.cc index 153979162..107582e12 100644 --- a/usrp/host/apps-inband/gmac.cc +++ b/usrp/host/apps-inband/gmac.cc @@ -31,7 +31,6 @@ #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps-inband/test_gmac_tx.cc b/usrp/host/apps-inband/test_gmac_tx.cc index dd16c3fa1..74f16c669 100644 --- a/usrp/host/apps-inband/test_gmac_tx.cc +++ b/usrp/host/apps-inband/test_gmac_tx.cc @@ -25,12 +25,10 @@ #include <mb_mblock.h> #include <mb_runtime.h> -#include <mb_runtime_nop.h> // QA only #include <mb_protocol_class.h> #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_cs.cc b/usrp/host/apps-inband/test_usrp_inband_cs.cc index 560b81aeb..2497f8d5c 100644 --- a/usrp/host/apps-inband/test_usrp_inband_cs.cc +++ b/usrp/host/apps-inband/test_usrp_inband_cs.cc @@ -25,12 +25,10 @@ #include <mb_mblock.h> #include <mb_runtime.h> -#include <mb_runtime_nop.h> // QA only #include <mb_protocol_class.h> #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_overrun.cc b/usrp/host/apps-inband/test_usrp_inband_overrun.cc index 343720c28..9041a0984 100644 --- a/usrp/host/apps-inband/test_usrp_inband_overrun.cc +++ b/usrp/host/apps-inband/test_usrp_inband_overrun.cc @@ -25,12 +25,10 @@ #include <mb_mblock.h> #include <mb_runtime.h> -#include <mb_runtime_nop.h> // QA only #include <mb_protocol_class.h> #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_ping.cc b/usrp/host/apps-inband/test_usrp_inband_ping.cc index 5a82f0c3c..6b1347ccc 100644 --- a/usrp/host/apps-inband/test_usrp_inband_ping.cc +++ b/usrp/host/apps-inband/test_usrp_inband_ping.cc @@ -25,12 +25,10 @@ #include <mb_mblock.h> #include <mb_runtime.h> -#include <mb_runtime_nop.h> // QA only #include <mb_protocol_class.h> #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_registers.cc b/usrp/host/apps-inband/test_usrp_inband_registers.cc index 2ff42a052..017ccdbf5 100644 --- a/usrp/host/apps-inband/test_usrp_inband_registers.cc +++ b/usrp/host/apps-inband/test_usrp_inband_registers.cc @@ -25,12 +25,11 @@ #include <mb_mblock.h> #include <mb_runtime.h> -#include <mb_runtime_nop.h> // QA only #include <mb_protocol_class.h> #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> +//#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_rx.cc b/usrp/host/apps-inband/test_usrp_inband_rx.cc index c37c19c00..0429951f3 100644 --- a/usrp/host/apps-inband/test_usrp_inband_rx.cc +++ b/usrp/host/apps-inband/test_usrp_inband_rx.cc @@ -25,12 +25,10 @@ #include <mb_mblock.h> #include <mb_runtime.h> -#include <mb_runtime_nop.h> // QA only #include <mb_protocol_class.h> #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc index d24f5efc6..8824a72fe 100644 --- a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc +++ b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc @@ -25,12 +25,10 @@ #include <mb_mblock.h> #include <mb_runtime.h> -#include <mb_runtime_nop.h> // QA only #include <mb_protocol_class.h> #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_tx.cc b/usrp/host/apps-inband/test_usrp_inband_tx.cc index 6d269a4df..7118d2d0f 100644 --- a/usrp/host/apps-inband/test_usrp_inband_tx.cc +++ b/usrp/host/apps-inband/test_usrp_inband_tx.cc @@ -25,12 +25,10 @@ #include <mb_mblock.h> #include <mb_runtime.h> -#include <mb_runtime_nop.h> // QA only #include <mb_protocol_class.h> #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps-inband/test_usrp_inband_underrun.cc b/usrp/host/apps-inband/test_usrp_inband_underrun.cc index 411e88777..0404208b4 100644 --- a/usrp/host/apps-inband/test_usrp_inband_underrun.cc +++ b/usrp/host/apps-inband/test_usrp_inband_underrun.cc @@ -25,12 +25,10 @@ #include <mb_mblock.h> #include <mb_runtime.h> -#include <mb_runtime_nop.h> // QA only #include <mb_protocol_class.h> #include <mb_exception.h> #include <mb_msg_queue.h> #include <mb_message.h> -#include <mb_mblock_impl.h> #include <mb_msg_accepter.h> #include <mb_class_registry.h> #include <pmt.h> diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am index 971388406..cc93d0d3c 100644 --- a/usrp/host/apps/Makefile.am +++ b/usrp/host/apps/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2003,2006 Free Software Foundation, Inc. +# Copyright 2003,2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,8 +21,8 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) - +INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \ + $(WITH_INCLUDES) bin_PROGRAMS = \ usrper \ diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am index e67d8287e..3a59fd618 100644 --- a/usrp/host/lib/inband/Makefile.am +++ b/usrp/host/lib/inband/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common INCLUDES = \ $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \ $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \ - -I$(srcdir)/../../apps-inband + -I$(srcdir)/../../apps-inband $(WITH_INCLUDES) TESTS = test_inband @@ -31,12 +31,10 @@ EXTRA_DIST = \ usrp_server.mbh \ usrp_interface.mbh - lib_LTLIBRARIES = \ libusrp_inband.la \ libusrp_inband-qa.la - # ------------------------------------------------------------------------ # Build the inband library @@ -75,7 +73,7 @@ include_HEADERS = \ usrp_server.h \ usrp_tx.h \ usrp_tx_stub.h \ - usrp_usb_interface.h + usrp_usb_interface.h noinst_HEADERS = \ fake_usrp.h \ @@ -89,8 +87,7 @@ noinst_HEADERS = \ symbols_usrp_rx_cs.h \ symbols_usrp_server_cs.h \ symbols_usrp_tx.h \ - symbols_usrp_tx_cs.h - + symbols_usrp_tx_cs.h # ------------------------------------------------------------------------ # Build the qa code in its own library @@ -98,7 +95,7 @@ noinst_HEADERS = \ libusrp_inband_qa_la_SOURCES = \ qa_inband.cc \ qa_inband_packet_prims.cc \ - qa_inband_usrp_server.cc + qa_inband_usrp_server.cc # magic flags libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version @@ -121,6 +118,5 @@ test_inband_LDADD = libusrp_inband-qa.la test_usrp_inband_SOURCES = test_usrp_inband.cc test_usrp_inband_LDADD = libusrp_inband-qa.la - MOSTLYCLEANFILES = \ $(BUILT_SOURCES) *~ *.pyc diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am index 3d1e5a6bc..17b5935e3 100644 --- a/usrp/host/lib/legacy/Makefile.am +++ b/usrp/host/lib/legacy/Makefile.am @@ -1,7 +1,7 @@ # # USRP - Universal Software Radio Peripheral # -# Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc. +# Copyright (C) 2003,2004,2006,2007,2008 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 @@ -32,10 +32,10 @@ libusrp_la_common_LIBADD = \ # darwin fusb requires omnithreads if FUSB_TECH_darwin -INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) +INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(WITH_INCLUDES) libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA) else -INCLUDES = $(common_INCLUDES) +INCLUDES = $(common_INCLUDES) $(WITH_INCLUDES) libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) endif diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am index c5e4bc567..a7c8b08df 100644 --- a/usrp/host/swig/Makefile.am +++ b/usrp/host/swig/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2003,2004,2006,2007 Free Software Foundation, Inc. +# Copyright 2001,2003,2004,2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -27,7 +27,8 @@ ourlibdir = $(usrppyexecdir) INCLUDES = $(USRP_INCLUDES) \ $(PYTHON_CPPFLAGS) \ - -I$(srcdir) + -I$(srcdir) \ + $(WITH_INCLUDES) LOCAL_IFILES = \ prims.i @@ -52,7 +53,8 @@ ourpython_PYTHON = \ usrp_prims.py -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \ + $(WITH_INCLUDES) ourlib_LTLIBRARIES = \ diff --git a/usrp/usrp-inband.pc.in b/usrp/usrp-inband.pc.in index 35afde39a..c9aeeb525 100644 --- a/usrp/usrp-inband.pc.in +++ b/usrp/usrp-inband.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: usrp Description: USRP C++ Interface with in-band signaling -Requires: +Requires: libusb mblock pmt usrp gnuradio-omnithread Version: @VERSION@ -Libs: -L${libdir} -lusrp-inband -lusrp -lmblock -lgromnithread -lpmt -lusb +Libs: -L${libdir} -lusrp-inband -lusrp -lmblock -lpmt -lgromnithread -lusb Cflags: -I${includedir} @DEFINES@ diff --git a/usrp/usrp.pc.in b/usrp/usrp.pc.in index 4f8ec6f23..6eaab67c3 100644 --- a/usrp/usrp.pc.in +++ b/usrp/usrp.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: usrp Description: USRP Client Side C++ interface -Requires: +Requires: libusb @usrp_darwin_omnithread_pc_requires@ Version: @VERSION@ -Libs: -L${libdir} -lusrp -lusb +Libs: -L${libdir} -lusrp -lusb @usrp_darwin_omnithread_pc_la@ Cflags: -I${includedir} @DEFINES@ |