Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio...
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Fri, 8 Feb 2008 23:32:10 +0000 (23:32 +0000)
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Fri, 8 Feb 2008 23:32:10 +0000 (23:32 +0000)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5

88 files changed:
Makefile.am
Makefile.common
config/grc_build.m4
config/grc_gnuradio_core.m4
config/grc_gnuradio_examples.m4
config/grc_gr_atsc.m4
config/grc_gr_audio_alsa.m4
config/grc_gr_audio_jack.m4
config/grc_gr_audio_oss.m4
config/grc_gr_audio_osx.m4
config/grc_gr_audio_portaudio.m4
config/grc_gr_audio_windows.m4
config/grc_gr_comedi.m4
config/grc_gr_cvsd_vocoder.m4
config/grc_gr_gsm_fr_vocoder.m4
config/grc_gr_pager.m4
config/grc_gr_qtgui.m4
config/grc_gr_radar_mono.m4
config/grc_gr_radio_astronomy.m4
config/grc_gr_sounder.m4
config/grc_gr_trellis.m4
config/grc_gr_usrp.m4
config/grc_gr_utils.m4
config/grc_gr_video_sdl.m4
config/grc_gr_wxgui.m4
config/grc_mblock.m4
config/grc_omnithread.m4
config/grc_pmt.m4
config/grc_usrp.m4
configure.ac
gnuradio-core/gnuradio-core.pc.in
gnuradio-core/src/lib/filter/Makefile.am
gnuradio-core/src/lib/general/Makefile.am
gnuradio-core/src/lib/gengen/Makefile.am
gnuradio-core/src/lib/io/Makefile.am
gnuradio-core/src/lib/reed-solomon/Makefile.am
gnuradio-core/src/lib/runtime/Makefile.am
gnuradio-core/src/lib/swig/Makefile.am
gnuradio-core/src/tests/Makefile.am
gnuradio-examples/c++/dial_tone/Makefile.am
gr-atsc/src/lib/Makefile.am
gr-atsc/src/python/Makefile.am
gr-audio-alsa/src/Makefile.am
gr-audio-jack/src/Makefile.am
gr-audio-oss/src/Makefile.am
gr-audio-osx/src/Makefile.am
gr-audio-portaudio/src/Makefile.am
gr-audio-windows/src/Makefile.am
gr-comedi/src/Makefile.am
gr-cvsd-vocoder/src/lib/Makefile.am
gr-gsm-fr-vocoder/src/lib/Makefile.am
gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
gr-howto-write-a-block/doc/src_lib_Makefile_1.am
gr-howto-write-a-block/doc/src_lib_Makefile_2.am
gr-howto-write-a-block/src/lib/Makefile.am
gr-pager/src/Makefile.am
gr-radio-astronomy/src/lib/Makefile.am
gr-trellis/src/examples/Makefile.am
gr-trellis/src/lib/Makefile.am
gr-usrp/src/Makefile.am
gr-usrp/src/run_tests.in
gr-video-sdl/src/Makefile.am
gr-wxgui/Makefile.am
gr-wxgui/gr-wxgui.pc.in [new file with mode: 0644]
mblock/mblock.pc.in
mblock/src/lib/Makefile.am
omnithread/Makefile.am
pmt/Makefile.am
pmt/pmt.pc.in
pmt/src/lib/Makefile.am
run_tests.sh.in
usrp/host/apps-inband/Makefile.am
usrp/host/apps-inband/gmac.cc
usrp/host/apps-inband/test_gmac_tx.cc
usrp/host/apps-inband/test_usrp_inband_cs.cc
usrp/host/apps-inband/test_usrp_inband_overrun.cc
usrp/host/apps-inband/test_usrp_inband_ping.cc
usrp/host/apps-inband/test_usrp_inband_registers.cc
usrp/host/apps-inband/test_usrp_inband_rx.cc
usrp/host/apps-inband/test_usrp_inband_timestamps.cc
usrp/host/apps-inband/test_usrp_inband_tx.cc
usrp/host/apps-inband/test_usrp_inband_underrun.cc
usrp/host/apps/Makefile.am
usrp/host/lib/inband/Makefile.am
usrp/host/lib/legacy/Makefile.am
usrp/host/swig/Makefile.am
usrp/usrp-inband.pc.in
usrp/usrp.pc.in

index 8c7d1bb1bbad69108f109a3f14fcbbd8f7d06630..89ad013c8ab966ec000d9c15f5e21b29eb166e82 100644 (file)
@@ -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@
index fd14144b3924fbc8c7524a6bb542143a387f0c7b..300e92fc47035cc2092aaf809315bfe302ae7d51 100644 (file)
@@ -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.
index 7c060c2bede194bb581cec051b745f41803f46d1..a43988f293d40797b81b9d6fe19fd038e15c4977 100644 (file)
@@ -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
 ])
index 37849929f3b394861daa54ca8f65b328e7a42e59..30a8dafff9b413958c2a28877c13a540a5a3c49a 100644 (file)
@@ -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])
 ])
index fc758e893378fb8e6ab48b6fd60c968e950ef755..5dc6caf0a25bf2ad8eec021dfe7034553b80c8a3 100644 (file)
@@ -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])
 ])
index ed237fa2f1ac7483e62c3680ebe4a3339af21ac7..a0b394eade98793445c9a3364c9214329fd76a2f 100644 (file)
@@ -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])
index dad8c21b7e18a546ca5344069cf990d533f1cfde..471d33b072621629e6a09a73c0720197cc609b83 100644 (file)
@@ -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.])])
 
index 025c25e9c3d6e39fb89f9e3fb8fe75141292b1f6..5cd59e23d3e98820b8ceca4a278f987208579c86 100644 (file)
@@ -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.])])
 
index 12190bed0ee023ad3e1c8e7a2c15fab7605430d7..386df51d875629b88678dd27a0c70df05736ff22 100644 (file)
@@ -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,[],
index 1d7f453a3de51fc72064ec02ad35261f352fc135..a42ecd5c5cda17b9650722948a17f2085b107509 100644 (file)
@@ -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])
index 31ab07aab7be8beb9419fcaf4c2ae33b3ae591e0..490d9395c7df6ced9da6b704991721fd128ce058 100644 (file)
@@ -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.])])
 
index 320c5d315ee5990fe720d9645b4f9aaaad60b72e..c34651eda8e102cd58e14a51badd88998aab02da 100644 (file)
@@ -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.])])
 
index 7d6a674e35b40b3f0e2451336258d4f7d3d2adb3..b27b7d70a524697d20cbea02efd446834dfd6e34 100644 (file)
@@ -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.])])
 
index 703c617a76aceace45baf8414541e2e9f61a958e..12b83354cd938a2cc7a51b894139490609c13199 100644 (file)
@@ -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])
index a5ca2819050d1a75ec306ee11de184ac152a4e3a..b8ccc484049bad1a8f671af15ad5770707811e30 100644 (file)
@@ -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])
index 80106526cc2f93e21fdffc1c308678f358b65e7c..cfd0d25b4d71484c0e7baf516adfea6253662240 100644 (file)
@@ -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])
index 05f8b02c2b157371e91eeaceb44d564fbacf616d..4dd6ce68e79b4f0cd01d067c2de75857628c2330 100644 (file)
@@ -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])])
 
index cbc2f8de4818a8640a9358b759ec62628908cc0e..40041dd88bef0ca7c56b35bc6f7edf67ba60738e 100644 (file)
@@ -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.
index 724ff8a65823c5ee9c2374ea73a4b768b240f2cb..cc966295b19c7efd7313b64692ed82241413d2ee 100644 (file)
@@ -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])
index f716a324c79a21e75f435f7f451231a79029da88..0553bb27708b35a8faa4c8abfe1e10559d7f453e 100644 (file)
@@ -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.
index cde1f1cca81d729d66f722197353aacdff68f032..6fbaa1ac8147d6367315e6f36cede633399a1256 100644 (file)
@@ -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])
index c247e5deda425fffbffb58f48841e85dee980f28..576ef85e437fb4eea82b23410f345742b766da3e 100644 (file)
@@ -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.
index e5b3a6afbacf53eb58031e1ec42e3613e1fba684..34f56da1e210fb31bd6e4d296fe2375b4642ed52 100644 (file)
@@ -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])
 ])
index 405feb0ea2016dba01e6e3f1550683874ec66f94..74aa5c046c9b7f2e09b1114c2f348db923d6e4f7 100644 (file)
@@ -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.])])
index 22f0a90e28b52903d2b72d87b3e8b124599f240a..f3104a37e36f67f3d3bf924101ebfe55b17f7589 100644 (file)
@@ -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])
 ])
index a96348fb4572ad972ca91f1d21b8abe893b24b5e..ec985e0530d4c13afe6e1601482304c0664022b8 100644 (file)
@@ -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])
 ])
index f38a312cbe1b24009f6cd22b8f59639170ba7938..77618e9023c74bf0e4ab291a70388812e0ca1b65 100644 (file)
@@ -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])
 ])
index 1c1819e50c78c56209d5f8108e7893aba8a7bc69..2a512273e7aba07f7b175ddb05a24fd719cd679c 100644 (file)
@@ -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])
 ])
index e28e6c28dcc5a4f540c4ff7ff37cf65930f26f23..34acee818f7ee142887b835ea6df4af3505f5037 100644 (file)
@@ -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)
 ])
index 1c3c243da464019b9459b41048cfd67f55fc14cd..f8ba7f41b990bb9df4beb6bd535824db5d352319 100644 (file)
@@ -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
index a317912c72ffd929c408e216641234b05bbf74d2..22d63720c799f94ec2807401e618d5e038625379 100644 (file)
@@ -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@
index 83474ffff8ae4ca958b44f38df421956ee83d533..22d5aa071f580b4dc75db171ab1558162d3f6107 100644 (file)
@@ -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
 
index 238c56d848e0fdd42ecd1ff436d19e8063c25e6b..bc94d3b0b282ba68158e31c8c3d1d3a410db4ccb 100644 (file)
@@ -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
 
index 92fd66803f9b54cc3ec0e6a0bda339df9c6ec0a1..f4418660c18292541265fb68def0aba49d25246c 100644 (file)
@@ -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
index 626ddb07ac95716cbdf798088902b73396e9b4f6..fb527da73bc532511b94d60febf9f55207b98fb5 100644 (file)
@@ -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
 
index 93b8fc934aca1f932f51f9586eb69a98310c471a..1820818823f4e77d9a3c95eca8580bf144473990 100644 (file)
@@ -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
 
index 4b51f7f4de4db8bbd0ae8c3d90b6a42fcf8cce8e..f6b744e4807287d8f598b48d87944c3f51ad61de 100644 (file)
@@ -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
 
index 2c3494cc1b8127c005cab48aca42275e14025281..8c77d39b270b60a32b78cfe55a0b48838452059f 100644 (file)
@@ -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...
index e120ae3f9113a9b6c788b033ab650e296efed880..b3bd86883faef7e6210b8e5b7fbbf8eda6b0883f 100644 (file)
@@ -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"
 
index 76a95ada364256c8dbe99a0a1edd892305152a33..d1ac268d29a57aea238d66d6ea4a3bd1db05f0bd 100644 (file)
@@ -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
 
index a114e6d9bcd42df4583fa91c8628099c3d127694..96e55a636541e70e849a5ef7ce72692695ffc4bd 100644 (file)
@@ -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)                 \
index ffc7780df3d6e724a29b9a08000d7a249057d4ee..80e4de1835e70d0e009c803517db1909e417512a 100644 (file)
@@ -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; \
index d6c5c9edbd9f1c4226d274950f6bfbcdadb7480b..e82eda4fee538fd6b56d451806417b5224832f4d 100644 (file)
@@ -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)
index 12bdf08c547e8df0048a62be42e3e6258f6c573d..2c13a835fae89fd0bdeee40c4d48f7304751797f 100644 (file)
@@ -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
index 72707d99518404184dcc16dd8c863e9bebd51ade..f2f173b5963d07a96299e5c5f21213ffc234ad35 100644 (file)
@@ -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
 
index 5898a3687f3855116b43a163432fef509b9c8f8b..b9ac0cb695e91a29a7cd4bed63e4bfad224fb070 100644 (file)
@@ -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
 
index b6d443ae6dac3d8729decfcf2983702dee2d5919..3b55969a38d6f3c256a17aa84b572e1540d529bd 100644 (file)
@@ -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
index 83915656def18b39dabefb433c76fd5605283520..7b610440c8597d2e748da8825a8ddd53b9ce3521 100644 (file)
@@ -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
 
index b647f92fa4596f8a91a6d8192eac074324e8c786..c09ec8b8733b3be433e5889645750d656861685f 100644 (file)
@@ -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
index f4531afcbd53b95a37636c72311b3db8dbb30864..67126db77a058cab7fef9e01540a2e6168b8c8ca 100644 (file)
@@ -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
 
index 254855bce5f95cf7507f65ed5644286e2850aa8c..bbfbf8f807936caa78c4210f289307982e394a44 100644 (file)
@@ -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
index b8c946c90e85d26f140101852676db6de02ba361..d72eb896e07f3b9cbc1c8a734188e5cfadc03e86 100644 (file)
@@ -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
 
index 846dd7c6934d87d136da56c2c121cdebbc352902..e97d70d1c2bdeddc5a851508f235159501b7d3db 100644 (file)
@@ -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
 
index 5ca24385fcbbeee8506cb1d7677055bbf4c2ada8..dca236e20c5319a41803fd3eac2cdb64ed4927ec 100644 (file)
@@ -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)                 \
index 5b0c57a4121b45dacf654c096f97094a6840d0ac..942bd5044a82fbdcbc1668e6b7ad82013ccea81e 100644 (file)
@@ -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)                 \
index fdf30d4c3098a7736fc1925883ab6b74443c489e..f9575262db6b638658e1a8c79b883f18aaee7996 100644 (file)
@@ -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) \
index 59a474df3661be42a3a8fb0fea1d8a8bc9fe1b3c..a06d1e645acbfb57d9d8e14b9fe9a0b12d8e8cc4 100644 (file)
@@ -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)                 \
index 21003991fb62e52adbb63f1a3a999180e5b7a956..d1da52fbb221bd910ec6765b464964b135a5c61f 100644 (file)
@@ -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; \
index 7df1769936c22cb1bd930926945f343e7e2abe39..a7cfbc32538890fa2da7d3a678779be79e17b8e0 100644 (file)
@@ -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
index 351ac61d957627c2a56a7cd755587b71e15d39ea..26b7043a977ddaef0f866d96bcc50b30deeeee7a 100644 (file)
@@ -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               \
index 84ae973f440191ef6d0f3b8d66f5777b7d1f347f..f9bdc78b6d844d6cb0fd84b0eb2a3ba3a90f4330 100644 (file)
@@ -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 \
index b69af586f42cfb3b78cf9cac64934a6f36a66c89..4e64ae2e71ed6a9614c348908f20f0bae4319b29 100644 (file)
@@ -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
 
index c59485701735e91e597760897f6c0f49dc84236f..f347cc691c4c8a9ff29ba1b9c956332d484c1cb3 100644 (file)
@@ -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
 # 
 
 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 (file)
index 0000000..a3e352f
--- /dev/null
@@ -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:
index 2e38483b61e01034367e22fb1e93b502d894c377..998f4b0d5a1ff7fae474ba8475957c40149d1ee0 100644 (file)
@@ -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@
index 86cacb1ad994849e514bf08c117f2eb0386a41ff..17f421d947abf7341d9a00823a6df81e98ec5fa9 100644 (file)
@@ -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
index dfbb3b3d3566709c6aad5f26ec24bb04bcd84451..59ba971a445220d1930116def0122c55247edf04 100644 (file)
@@ -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
index 2c3de669fd251fbf9408501ae3e27863cffa971b..758eb1d9865b2936de8e29ac3db36623ed076309 100644 (file)
@@ -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
index e4a5e640cc6728b9f63883a888448b9315078ed2..6ca31ad492e3074301dab7467e72b639d0a02e9f 100644 (file)
@@ -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@
index 69286040800f5d9e79ea247986fd9beabca6a45d..cb1a907f071980cf34d4cd5fa1f53b3bab619aa4 100644 (file)
@@ -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
 
index d32d3653ab6e0c6003f709ef3b02545c4e5e8c8d..1562eeec6dc3ca2cfac9365c2759f45ea981013c 100644 (file)
@@ -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
index c05f04af00ae10daa98d16388e731bf1e8dc6bb3..d4ca6607b595d5e5b3de5318d7058cf2ca40c889 100644 (file)
@@ -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 =                         
index 153979162f7ee26f4e38a83ceb000fcf86a09153..107582e121804d22e753a07cc9e98bf959152f54 100644 (file)
@@ -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>
index dd16c3fa1817b6ebe9a5cddfcb2d8f6cc08e6f23..74f16c669ac28ed6df22d7e5e644250909b87a24 100644 (file)
 
 #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>
index 560b81aebb2d5e472068808eb92fe11f325bd34f..2497f8d5c49d37921e819fbde9e02723855abf84 100644 (file)
 
 #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>
index 343720c28a02b68f3a97ab2d7a3fae5c964a57d3..9041a0984553d371c5010401776f6698c39c10f6 100644 (file)
 
 #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>
index 5a82f0c3cd13efaeb1a667eca20c0d0d765fb3c5..6b1347ccca2b68137051e08b36e00614873f941d 100644 (file)
 
 #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>
index 2ff42a052d22ef460b134b5d83d791cd50cf7e34..017ccdbf50015138749612b9997870fcaf411d31 100644 (file)
 
 #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>
index c37c19c005d86ed62c698c5fba57f4484f0526ae..0429951f3cb4552ec6144c3b71316bd29c24cd14 100644 (file)
 
 #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>
index d24f5efc615f2537d33b8246d554136423026548..8824a72feccdd536738bfe987852a7c15c7ac219 100644 (file)
 
 #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>
index 6d269a4df54e21420a26c51086e0889bb20fbcff..7118d2d0f4a7e9725893182fc2b3d42346989bf9 100644 (file)
 
 #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>
index 411e88777bd1056ade134c96a4528c72c1d3bf72..0404208b432c99032802dfe0dd92619e48db7182 100644 (file)
 
 #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>
index 97138840695032a29601db66f6487f87fc9f4fdc..cc93d0d3c3cbf3fe345cb1ae613962545911eca0 100644 (file)
@@ -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                          \
index e67d8287ef9ac367be71ee3d2a8b657465a1d1e8..3a59fd61803367174717f6f0d970deea744c948c 100644 (file)
@@ -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
index 3d1e5a6bcbdd6d9e76456736097aa7dd113ba254..17b5935e3494628b5432b29ff46168ce72f591d4 100644 (file)
@@ -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
 
index c5e4bc567b25bdc636a4f9d11146e865e998ad40..a7c8b08dfd42f9ca9ff50e30415305669ee5795f 100644 (file)
@@ -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 =                   \
index 35afde39a1f0d47dbb33563c2e7c3639610e827a..c9aeeb5253da13dddba4bb0ee2364f91cb6a0302 100644 (file)
@@ -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@
index 4f8ec6f235a8d9911118bb646ff7d2d1afc1b994..6eaab67c30b3ee45f9bebe34dd814da3cc806b90 100644 (file)
@@ -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@