[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7487 - in gnuradio/branches/developers/michaelld/t186
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r7487 - in gnuradio/branches/developers/michaelld/t186: . config gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/io gnuradio-core/src/lib/reed-solomon gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-core/src/tests gnuradio-examples/c++/dial_tone gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gsm-fr-vocoder/src/lib gr-gsm-fr-vocoder/src/lib/gsm gr-howto-write-a-block/doc gr-howto-write-a-block/src/lib gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src mblock mblock/src/lib omnithread pmt pmt/src/lib usrp/host/apps usrp/host/apps-inband usrp/host/lib/inband usrp/host/lib/legacy usrp/host/swig |
|
Date: |
Mon, 21 Jan 2008 21:27:43 -0700 (MST) |
Author: michaelld
Date: 2008-01-21 21:27:41 -0700 (Mon, 21 Jan 2008)
New Revision: 7487
Modified:
gnuradio/branches/developers/michaelld/t186/Makefile.am
gnuradio/branches/developers/michaelld/t186/Makefile.common
gnuradio/branches/developers/michaelld/t186/config/grc_build.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_core.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_radar_mono.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_sounder.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_usrp.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_utils.m4
gnuradio/branches/developers/michaelld/t186/config/grc_mblock.m4
gnuradio/branches/developers/michaelld/t186/config/grc_omnithread.m4
gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
gnuradio/branches/developers/michaelld/t186/configure.ac
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/general/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/io/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/reed-solomon/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/runtime/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/tests/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/c++/dial_tone/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-alsa/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-jack/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-oss/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-osx/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-portaudio/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-windows/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-comedi/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-cvsd-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_1.am
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_2.am
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-pager/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-qtgui/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-radio-astronomy/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-trellis/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-usrp/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-usrp/src/run_tests.in
gnuradio/branches/developers/michaelld/t186/gr-video-sdl/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/mblock/mblock.pc.in
gnuradio/branches/developers/michaelld/t186/mblock/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/omnithread/Makefile.am
gnuradio/branches/developers/michaelld/t186/pmt/pmt.pc.in
gnuradio/branches/developers/michaelld/t186/pmt/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/run_tests.sh.in
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/apps/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/legacy/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/swig/Makefile.am
Log:
Trial / test implentation of the build system to allow for the use of
pre-installed libraries and headers (via pkg-config files).
Modified: gnuradio/branches/developers/michaelld/t186/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/Makefile.am 2008-01-22
00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/Makefile.am 2008-01-22
04:27:41 UTC (rev 7487)
@@ -30,4 +30,4 @@
README.hacking
SUBDIRS = @build_dirs@
-DIST_SUBDIRS = @build_dirs@ @skipped_dirs@
+DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@
Modified: gnuradio/branches/developers/michaelld/t186/Makefile.common
===================================================================
--- gnuradio/branches/developers/michaelld/t186/Makefile.common 2008-01-22
00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/Makefile.common 2008-01-22
04:27:41 UTC (rev 7487)
@@ -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 @@
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)
+GNURADIO_INCLUDES = @gnuradio_core_INCLUDES@
-# 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
-
# 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.
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_build.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_build.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -27,27 +27,75 @@
[[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
])
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_core.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_core.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -19,54 +19,90 @@
AC_DEFUN([GRC_GNURADIO_CORE],[
GRC_ENABLE([gnuradio-core])
+ 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
+ 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/blks/Makefile \
+ gnuradio-core/src/python/gnuradio/blksimpl/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
- 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/blks/Makefile \
- gnuradio-core/src/python/gnuradio/blksimpl/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.])
+ # 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.])
passed=no
- fi
- done
-
+ 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])
@@ -80,4 +116,10 @@
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])
])
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gr_radar_mono.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_radar_mono.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_radar_mono.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -36,13 +36,10 @@
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
+ if test x$usrp_skipped = xyes; then
+ AC_MSG_RESULT([Component gr-radar-mono requires usrp, which is not
being built.])
+ passed=no
+ fi
GRC_BUILD_CONDITIONAL([gr-radar-mono],[
dnl run_tests is created from run_tests.in. Make it executable.
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_sounder.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_sounder.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_sounder.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -35,13 +35,10 @@
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
+ if test x$usrp_skipped = xyes; then
+ AC_MSG_RESULT([Component gr-sounder requires usrp, which is not being
built.])
+ passed=no
+ fi
GRC_BUILD_CONDITIONAL([gr-sounder],[
dnl run_tests is created from run_tests.in. Make it executable.
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_usrp.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_usrp.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_usrp.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -28,14 +28,10 @@
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
+ if test x$usrp_skipped = xyes; then
+ AC_MSG_RESULT([Component gr-usrp requires usrp, which is not being
built.])
+ passed=no
+ fi
GRC_BUILD_CONDITIONAL([gr-usrp],[
dnl run_tests is created from run_tests.in. Make it executable.
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_utils.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_utils.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_utils.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -29,22 +29,18 @@
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.])
+ passed=no
+ fi
+ if test x$usrp_skipped = xyes; then
+ AC_MSG_RESULT([Component gr-utils requires usrp, which is not being
built.])
+ 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.])
+ passed=no
+ fi
GRC_BUILD_CONDITIONAL([gr-utils])
])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_mblock.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_mblock.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_mblock.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -19,46 +19,57 @@
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
+ 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=$MBLOCK_CFLAGS
+ 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.])
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
+ if test x$pmt_skipped = xyes; then
AC_MSG_RESULT([Component mblock requires pmt, which is not being
built.])
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])
])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_omnithread.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_omnithread.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_omnithread.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -19,16 +19,38 @@
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\$(top_srcdir)/omnithread"
+ omnithread_LA="\$(top_builddir)/omnithread/libgromnithread.la"
+
omnithread_LIBDIRPATH="\$(top_builddir)/omnithread:\$(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])
])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -19,26 +19,48 @@
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=$PMT_CFLAGS
+ 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 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])
])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
2008-01-22 04:27:41 UTC (rev 7487)
@@ -19,58 +19,98 @@
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.])
+ passed=yes
+ # Don't do usrp if mblock skipped
+ if test x$mblock_skipped = xyes; then
+ AC_MSG_RESULT([Component usrp requires mblock, which is not being
built.])
+ 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
- done
+ 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)
])
Modified: gnuradio/branches/developers/michaelld/t186/configure.ac
===================================================================
--- gnuradio/branches/developers/michaelld/t186/configure.ac 2008-01-22
00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/configure.ac 2008-01-22
04:27:41 UTC (rev 7487)
@@ -74,7 +74,6 @@
AC_SUBST(autoconf_default_CXXFLAGS)
AC_SUBST(swig_CXXFLAGS)
-
LF_SET_WARNINGS
GR_SET_GPROF
GR_SET_PROF
@@ -248,17 +247,30 @@
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
@@ -287,3 +299,16 @@
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
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/filter/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/filter/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -26,7 +26,7 @@
# 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
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/general/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/general/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/general/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/gengen/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/gengen/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/io/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/io/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/io/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/reed-solomon/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/reed-solomon/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/reed-solomon/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -25,7 +25,7 @@
# 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
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/runtime/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/runtime/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/swig/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/swig/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -28,28 +28,22 @@
grgrpythondir = $(grpythondir)/gr
grgrlibdir = $(grpyexecdir)/gr
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \
+ $(WITH_INCLUDES)
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir)
-
-
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
# 5 smaller pieces. This reduces compile time coupling and
@@ -75,9 +69,9 @@
gnuradio_swig_py_io.h \
gnuradio_swig_bug_workaround.h
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \
+ $(WITH_INCLUDES)
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)
-
# ----------------------------------------------------------------
# We break this up into 5 libraries...
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/tests/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/tests/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/tests/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -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"
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/c++/dial_tone/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/c++/dial_tone/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/c++/dial_tone/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -23,7 +23,8 @@
# 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
Modified:
gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -28,7 +28,8 @@
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 @@
# ------------------------------------------------------------------------
SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) \
- $(STD_DEFINES_AND_INCLUDES)
+ $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES)
ALL_IFILES = \
$(LOCAL_IFILES) \
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-audio-alsa/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-audio-alsa/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -49,9 +49,10 @@
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,16 +64,15 @@
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 @@
$(GNURADIO_CORE_LA) \
$(ALSA_LIBS) \
libgr_audio_alsa.la \
- -lstdc++
+ -lstdc++
libgr_audio_alsa_la_LIBADD = \
$(ALSA_LIBS)
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-audio-jack/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-audio-jack/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -49,28 +49,26 @@
ourpython_PYTHON = \
audio_jack.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_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 @@
$(PYTHON_LDFLAGS) \
$(GNURADIO_CORE_LA) \
$(JACK_LIBS) \
- -lstdc++
+ -lstdc++
_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
@@ -86,7 +84,7 @@
$(SWIG) $(SWIGPYTHONARGS) -module audio_jack -o audio_jack.cc
$(LOCAL_IFILES)
noinst_PYTHON = \
- qa_jack.py
+ qa_jack.py
MOSTLYCLEANFILES = \
$(BUILT_SOURCES) *~ *.pyc
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-audio-oss/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-audio-oss/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -48,21 +48,21 @@
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 @@
$(PYTHON_LDFLAGS) \
$(GNURADIO_CORE_LA) \
$(OSS_LIBS) \
- -lstdc++
+ -lstdc++
_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-osx/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-audio-osx/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-audio-osx/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -48,9 +48,10 @@
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
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-portaudio/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-audio-portaudio/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gr-audio-portaudio/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -49,13 +49,14 @@
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,9 +68,8 @@
audio_portaudio_source.h
noinst_HEADERS = \
- gri_portaudio.h
+ gri_portaudio.h
-
swiginclude_HEADERS = \
$(LOCAL_IFILES)
@@ -77,16 +77,15 @@
$(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
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-windows/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-audio-windows/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gr-audio-windows/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -48,9 +48,10 @@
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
Modified: gnuradio/branches/developers/michaelld/t186/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-comedi/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-comedi/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -49,9 +49,10 @@
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
Modified:
gnuradio/branches/developers/michaelld/t186/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-cvsd-vocoder/src/lib/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gr-cvsd-vocoder/src/lib/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -28,11 +28,11 @@
ourpythondir = $(grpythondir)/vocoder
ourlibdir = $(grpyexecdir)/vocoder
-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) \
$(NON_LOCAL_IFILES)
@@ -40,7 +40,6 @@
NON_LOCAL_IFILES = \
$(GNURADIO_I)
-
LOCAL_IFILES = \
$(top_srcdir)/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i
Modified:
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -30,11 +30,11 @@
ourpythondir = $(grpythondir)/vocoder
ourlibdir = $(grpyexecdir)/vocoder
-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) \
$(NON_LOCAL_IFILES)
@@ -42,9 +42,8 @@
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
Modified:
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -43,7 +43,8 @@
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
Modified:
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_1.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_1.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_1.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -7,7 +7,7 @@
ourpythondir = $(grpythondir)
ourlibdir = $(grpyexecdir)
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
ourlib_LTLIBRARIES = _howto.la
Modified:
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_2.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_2.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_2.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -28,10 +28,10 @@
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) \
Modified:
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/src/lib/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/src/lib/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -28,9 +28,10 @@
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) \
Modified: gnuradio/branches/developers/michaelld/t186/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-pager/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-pager/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -24,7 +24,7 @@
EXTRA_DIST = \
run_tests.in \
$(bin_SCRIPTS)
-
+
TESTS = \
run_tests
@@ -32,7 +32,7 @@
usrp_flex.py \
usrp_flex_all.py \
usrp_flex_band.py
-
+
noinst_PYTHON = \
qa_pager.py
@@ -43,9 +43,10 @@
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) \
Modified:
gnuradio/branches/developers/michaelld/t186/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-qtgui/src/lib/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-qtgui/src/lib/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -23,7 +23,8 @@
INCLUDES = $(STD_DEFINES_AND_INCLUDES) \
$(QT_CFLAGS) \
- $(QWT_CFLAGS)
+ $(QWT_CFLAGS) \
+ $(WITH_INCLUDES)
# This rule lets GNU create any moc_*.cc files from the equivalent *.h
moc_%.cc: %.h
Modified:
gnuradio/branches/developers/michaelld/t186/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-radio-astronomy/src/lib/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/gr-radio-astronomy/src/lib/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -28,9 +28,10 @@
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) \
Modified:
gnuradio/branches/developers/michaelld/t186/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-trellis/src/lib/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-trellis/src/lib/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -28,9 +28,10 @@
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
Modified: gnuradio/branches/developers/michaelld/t186/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-usrp/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-usrp/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -63,11 +63,14 @@
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 \
Modified: gnuradio/branches/developers/michaelld/t186/gr-usrp/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-usrp/src/run_tests.in
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-usrp/src/run_tests.in
2008-01-22 04:27:41 UTC (rev 7487)
@@ -5,11 +5,11 @@
# 3rd parameter is path to Python QA directory
# For OS/X
address@hidden@/usrp/host/lib/legacy/:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH
address@hidden@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$DYLD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
# For Win32
address@hidden@/usrp/host/lib/legacy/.libs:$PATH
address@hidden@/usrp/host/lib/legacy:@abs_top_builddir@/usrp/host/lib/legacy/.libs:$PATH
@top_builddir@/run_tests.sh \
@abs_top_srcdir@/gr-usrp \
Modified:
gnuradio/branches/developers/michaelld/t186/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-video-sdl/src/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/gr-video-sdl/src/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -48,9 +48,10 @@
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
Modified: gnuradio/branches/developers/michaelld/t186/mblock/mblock.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/t186/mblock/mblock.pc.in
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/mblock/mblock.pc.in
2008-01-22 04:27:41 UTC (rev 7487)
@@ -7,5 +7,5 @@
Description: The GNU Radio message block library
Requires:
Version: @VERSION@
-Libs: -L${libdir} -lgromnithread -lpmt
+Libs: -L${libdir} -lmblock -lgromnithread -lpmt
Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
Modified: gnuradio/branches/developers/michaelld/t186/mblock/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/mblock/src/lib/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/mblock/src/lib/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -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
Modified: gnuradio/branches/developers/michaelld/t186/omnithread/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/omnithread/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/omnithread/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -27,7 +27,8 @@
# 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
Modified: gnuradio/branches/developers/michaelld/t186/pmt/pmt.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/t186/pmt/pmt.pc.in 2008-01-22
00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/pmt/pmt.pc.in 2008-01-22
04:27:41 UTC (rev 7487)
@@ -7,5 +7,5 @@
Description: The GNU Radio Polymorphic Type library
Requires:
Version: @VERSION@
-Libs: -L${libdir} -lgromnithread
+Libs: -L${libdir} -lpmt -lgromnithread
Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
Modified: gnuradio/branches/developers/michaelld/t186/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/pmt/src/lib/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/pmt/src/lib/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -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
Modified: gnuradio/branches/developers/michaelld/t186/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/michaelld/t186/run_tests.sh.in 2008-01-22
00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/run_tests.sh.in 2008-01-22
04:27:41 UTC (rev 7487)
@@ -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
address@hidden@
+
+# Absolute path to the top of the build directory
address@hidden@
+
# Where to find my swig generated shared library
mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs
@@ -13,34 +19,107 @@
# Where to find my hand written python modules
mypydir=$1/src:$1/src/python
-# Where to find core's swig generated shared libraries
address@hidden@/gnuradio-core/src/lib/swig
-grswigdir=$grswigdir:$grswigdir/.libs
+# Where to find core's swig generated shared libraries,
+# and hand generated swig glue
address@hidden@
-# Where to find core's hand generated swig glue
address@hidden@/gnuradio-core/src/lib/swig
-
# Where to find core's python modules
address@hidden@/gnuradio-core/src/python
address@hidden@
-# 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
address@hidden@
+
+# 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
address@hidden@/omnithread
-gromnidir=$gromnidir:$gromnidir/.libs
address@hidden@/gnuradio-core/src/lib
-grcoredir=$grcoredir:$grcoredir/.libs
-grlibdir=$gromnidir:$grcoredir
+# Where to find omnithread library files
address@hidden@
-# For OS/X
-DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
+# Where to find gnuradio core's library files
address@hidden@
+
+# 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
+
+# Where to find pre-installed libraries
address@hidden@
+
+# 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
-# For Win32
-PATH=$grlibdir:$PATH
-
# Don't load user or system prefs
GR_DONT_LOAD_PREFS=1
export GR_DONT_LOAD_PREFS
Modified: gnuradio/branches/developers/michaelld/t186/usrp/host/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/usrp/host/apps/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/usrp/host/apps/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -21,9 +21,9 @@
include $(top_srcdir)/Makefile.common
-INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
+ $(WITH_INCLUDES)
-
bin_PROGRAMS = \
usrper \
usrp_cal_dc_offset
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -23,7 +23,8 @@
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 =
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -23,7 +23,7 @@
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
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/legacy/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/legacy/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/legacy/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -32,10 +32,10 @@
# 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
Modified: gnuradio/branches/developers/michaelld/t186/usrp/host/swig/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/usrp/host/swig/Makefile.am
2008-01-22 00:06:28 UTC (rev 7486)
+++ gnuradio/branches/developers/michaelld/t186/usrp/host/swig/Makefile.am
2008-01-22 04:27:41 UTC (rev 7487)
@@ -27,7 +27,8 @@
INCLUDES = $(USRP_INCLUDES) \
$(PYTHON_CPPFLAGS) \
- -I$(srcdir)
+ -I$(srcdir) \
+ $(WITH_INCLUDES)
LOCAL_IFILES = \
prims.i
@@ -52,7 +53,8 @@
usrp_prims.py
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \
+ $(WITH_INCLUDES)
ourlib_LTLIBRARIES = \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7487 - in gnuradio/branches/developers/michaelld/t186: . config gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/io gnuradio-core/src/lib/reed-solomon gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-core/src/tests gnuradio-examples/c++/dial_tone gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gsm-fr-vocoder/src/lib gr-gsm-fr-vocoder/src/lib/gsm gr-howto-write-a-block/doc gr-howto-write-a-block/src/lib gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src mblock mblock/src/lib omnithread pmt pmt/src/lib usrp/host/apps usrp/host/apps-inband usrp/host/lib/inband usrp/host/lib/legacy usrp/host/swig,
michaelld <=