[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7497 - in gnuradio/branches/developers/michaelld/t186
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r7497 - in gnuradio/branches/developers/michaelld/t186: . config gnuradio-core gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/io gnuradio-core/src/lib/reed-solomon gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-core/src/tests gnuradio-examples/c++/dial_tone gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gsm-fr-vocoder/src/lib gr-gsm-fr-vocoder/src/lib/gsm gr-howto-write-a-block/doc gr-howto-write-a-block/src/lib gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src gr-wxgui mblock mblock/src/lib omnithread pmt pmt/src/lib usrp usrp/host/apps usrp/host/apps-inband usrp/host/lib/inband usrp/host/lib/legacy usrp/host/swig |
|
Date: |
Wed, 23 Jan 2008 08:35:56 -0700 (MST) |
Author: michaelld
Date: 2008-01-23 08:35:54 -0700 (Wed, 23 Jan 2008)
New Revision: 7497
Modified:
gnuradio/branches/developers/michaelld/t186/Makefile.am
gnuradio/branches/developers/michaelld/t186/Makefile.common
gnuradio/branches/developers/michaelld/t186/config/grc_build.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_core.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_examples.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_atsc.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_alsa.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_jack.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_oss.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_osx.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_portaudio.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_windows.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_comedi.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_cvsd_vocoder.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_gsm_fr_vocoder.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_pager.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_qtgui.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_radar_mono.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_radio_astronomy.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_sounder.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_trellis.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_usrp.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_utils.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_video_sdl.m4
gnuradio/branches/developers/michaelld/t186/config/grc_gr_wxgui.m4
gnuradio/branches/developers/michaelld/t186/config/grc_mblock.m4
gnuradio/branches/developers/michaelld/t186/config/grc_omnithread.m4
gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
gnuradio/branches/developers/michaelld/t186/configure.ac
gnuradio/branches/developers/michaelld/t186/gnuradio-core/gnuradio-core.pc.in
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/general/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/io/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/reed-solomon/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/runtime/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/tests/Makefile.am
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/c++/dial_tone/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-alsa/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-jack/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-oss/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-osx/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-portaudio/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-audio-windows/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-comedi/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-cvsd-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_2.am
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-pager/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-qtgui/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-radio-astronomy/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-trellis/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-usrp/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-video-sdl/src/Makefile.am
gnuradio/branches/developers/michaelld/t186/gr-wxgui/Makefile.am
gnuradio/branches/developers/michaelld/t186/mblock/mblock.pc.in
gnuradio/branches/developers/michaelld/t186/mblock/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/omnithread/Makefile.am
gnuradio/branches/developers/michaelld/t186/pmt/Makefile.am
gnuradio/branches/developers/michaelld/t186/pmt/pmt.pc.in
gnuradio/branches/developers/michaelld/t186/pmt/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/apps/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/legacy/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/host/swig/Makefile.am
gnuradio/branches/developers/michaelld/t186/usrp/usrp-inband.pc.in
gnuradio/branches/developers/michaelld/t186/usrp/usrp.pc.in
Log:
Updated Copyright date on all modified files.
Added .pc file for gr-wxgui.
Added and/or Corrected dependencies in config/grc_*.m4 files as well as *.pc
files.
Modified: gnuradio/branches/developers/michaelld/t186/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/Makefile.am 2008-01-23
04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/Makefile.am 2008-01-23
15:35:54 UTC (rev 7497)
@@ -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
#
Modified: gnuradio/branches/developers/michaelld/t186/Makefile.common
===================================================================
--- gnuradio/branches/developers/michaelld/t186/Makefile.common 2008-01-23
04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/Makefile.common 2008-01-23
15:35:54 UTC (rev 7497)
@@ -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
#
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_build.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_build.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_build.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_core.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_core.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
@@ -81,7 +81,7 @@
# 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.])
+ 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 \
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_examples.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gnuradio_examples.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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])
])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_atsc.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_atsc.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_atsc.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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])
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_alsa.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_alsa.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_alsa.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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.])])
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_jack.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_jack.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_jack.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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.])])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_oss.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_oss.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_oss.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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,[],
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_osx.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_osx.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_osx.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
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])
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_portaudio.m4
===================================================================
---
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_portaudio.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_portaudio.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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.])])
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_windows.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_windows.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_audio_windows.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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.])])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_comedi.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_comedi.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_comedi.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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.])])
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gr_cvsd_vocoder.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_cvsd_vocoder.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_cvsd_vocoder.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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])
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gr_gsm_fr_vocoder.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_gsm_fr_vocoder.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_gsm_fr_vocoder.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_pager.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_pager.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_pager.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_qtgui.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_qtgui.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
gr-qtgui/src/lib/Makefile \
])
+ 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
- passed=yes
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])])
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gr_radar_mono.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_radar_mono.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_radar_mono.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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,11 +35,15 @@
])
passed=yes
- # Don't do gr-radar-mono if usrp skipped
+ # 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.])
+ 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.
Modified:
gnuradio/branches/developers/michaelld/t186/config/grc_gr_radio_astronomy.m4
===================================================================
---
gnuradio/branches/developers/michaelld/t186/config/grc_gr_radio_astronomy.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/config/grc_gr_radio_astronomy.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_sounder.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_sounder.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_sounder.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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,11 +34,15 @@
])
passed=yes
- # Don't do gr-sounder if usrp skipped
+ # 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.])
+ 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.
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_trellis.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_trellis.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_trellis.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_usrp.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_usrp.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_usrp.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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,11 +27,15 @@
])
passed=yes
- # Don't do gr-usrp if usrp skipped
+ # 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.])
+ 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.
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_utils.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_utils.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_utils.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,4 +1,4 @@
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -30,15 +30,15 @@
passed=yes
# Don't do gr-utils if gnuradio-core, usrp, or gr-wxgui skipped
if test x$gnuradio_core_skipped = xyes; then
- AC_MSG_RESULT([Component gr-utils requires gnuradio-core, which is not
being built.])
+ 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.])
+ 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.])
+ AC_MSG_RESULT([Component gr-utils requires gr-wxgui, which is not
being built or specified via pre-installed files.])
passed=no
fi
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_video_sdl.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_video_sdl.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_video_sdl.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
])
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.])])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_gr_wxgui.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_gr_wxgui.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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 @@
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])
])
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_mblock.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_mblock.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_mblock.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
@@ -48,11 +48,11 @@
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.])
+ AC_MSG_RESULT([Component mblock requires omnithread, 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 mblock requires pmt, which is not being
built.])
+ AC_MSG_RESULT([Component mblock requires pmt, which is not being
built or specified via pre-installed files.])
passed=no
fi
# Don't do mblock if guile not available
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_omnithread.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_omnithread.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_omnithread.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
@@ -42,9 +42,9 @@
omnithread/gnuradio-omnithread.pc
])
passed=yes
- omnithread_INCLUDES="-I\$(top_srcdir)/omnithread"
- omnithread_LA="\$(top_builddir)/omnithread/libgromnithread.la"
-
omnithread_LIBDIRPATH="\$(top_builddir)/omnithread:\$(top_builddir)/omnithread/.libs"
+ 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.
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_pmt.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
@@ -46,6 +46,11 @@
pmt/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
# Don't do pmt if guile not available
AC_PATH_PROG(GUILE,guile)
if test "$GUILE" = "" ; then
Modified: gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/config/grc_usrp.m4
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
@@ -85,9 +85,26 @@
AC_CHECK_FUNCS([sigaction snprintf])
passed=yes
- # Don't do usrp if mblock skipped
+ case "$host_os" in
+ darwin*)
+ # for usrp.pc.in
+ usrp_darwin_omnithread_pc_requires="gnuradio-omnithread"
+ usrp_darwin_omnithread_pc_la="-lgromnithread"
+ # Don't do usrp if omnithread skipped on darwin only
+ if test x$omnithread_skipped = xyes; then
+ AC_MSG_RESULT([Component usrp requires omnithread when
running on Darwin (e.g. MacOS X), which is not being built or specified via
pre-installed files.])
+ passed=no
+ fi
+ ;;
+ *)
+ # for usrp.pc.in (blanks)
+ usrp_darwin_omnithread_pc_requires=""
+ usrp_darwin_omnithread_pc_la=""
+ ;;
+ esac
+ # Don't do usrp if mblock skipped
if test x$mblock_skipped = xyes; then
- AC_MSG_RESULT([Component usrp requires mblock, which is not being
built.])
+ AC_MSG_RESULT([Component usrp requires mblock, 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)
@@ -113,4 +130,6 @@
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)
])
Modified: gnuradio/branches/developers/michaelld/t186/configure.ac
===================================================================
--- gnuradio/branches/developers/michaelld/t186/configure.ac 2008-01-23
04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/configure.ac 2008-01-23
15:35:54 UTC (rev 7497)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/gnuradio-core.pc.in
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/gnuradio-core.pc.in
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/gnuradio-core.pc.in
2008-01-23 15:35:54 UTC (rev 7497)
@@ -5,7 +5,7 @@
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@
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/filter/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/filter/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/general/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/general/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/general/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/gengen/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/gengen/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/io/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/io/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/io/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/reed-solomon/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/reed-solomon/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/reed-solomon/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2002 Free Software Foundation, Inc.
+# Copyright 2002,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/runtime/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/runtime/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/swig/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/lib/swig/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/tests/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/tests/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-core/src/tests/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright 2001,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/c++/dial_tone/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/c++/dial_tone/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gnuradio-examples/c++/dial_tone/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-atsc/src/lib/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-audio-alsa/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-audio-alsa/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-audio-jack/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-audio-jack/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-audio-oss/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-audio-oss/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-osx/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-audio-osx/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-audio-osx/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio.
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-portaudio/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-audio-portaudio/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gr-audio-portaudio/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-audio-windows/src/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-audio-windows/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gr-audio-windows/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified: gnuradio/branches/developers/michaelld/t186/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-comedi/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-comedi/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-cvsd-vocoder/src/lib/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gr-cvsd-vocoder/src/lib/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_2.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_2.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/doc/src_lib_Makefile_2.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/src/lib/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gr-howto-write-a-block/src/lib/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified: gnuradio/branches/developers/michaelld/t186/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-pager/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-pager/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-qtgui/src/lib/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-qtgui/src/lib/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005,2007 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/gr-radio-astronomy/src/lib/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/gr-radio-astronomy/src/lib/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-trellis/src/lib/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-trellis/src/lib/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified: gnuradio/branches/developers/michaelld/t186/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-usrp/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-usrp/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-video-sdl/src/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-video-sdl/src/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified: gnuradio/branches/developers/michaelld/t186/gr-wxgui/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/gr-wxgui/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/gr-wxgui/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,8 +21,11 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = gr-wxgui.conf
+EXTRA_DIST = gr-wxgui.conf gr-wxgui.pc.in
SUBDIRS = src
etcdir = $(sysconfdir)/gnuradio/conf.d
etc_DATA = gr-wxgui.conf
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gr-wxgui.pc
Modified: gnuradio/branches/developers/michaelld/t186/mblock/mblock.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/t186/mblock/mblock.pc.in
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/mblock/mblock.pc.in
2008-01-23 15:35:54 UTC (rev 7497)
@@ -5,7 +5,7 @@
Name: mblock
Description: The GNU Radio message block library
-Requires:
+Requires: gnuradio-omnithread pmt
Version: @VERSION@
Libs: -L${libdir} -lmblock -lgromnithread -lpmt
Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
Modified: gnuradio/branches/developers/michaelld/t186/mblock/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/mblock/src/lib/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/mblock/src/lib/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified: gnuradio/branches/developers/michaelld/t186/omnithread/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/omnithread/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/omnithread/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2003 Free Software Foundation, Inc.
+# Copyright 2003,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified: gnuradio/branches/developers/michaelld/t186/pmt/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/pmt/Makefile.am 2008-01-23
04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/pmt/Makefile.am 2008-01-23
15:35:54 UTC (rev 7497)
@@ -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
Modified: gnuradio/branches/developers/michaelld/t186/pmt/pmt.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/t186/pmt/pmt.pc.in 2008-01-23
04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/pmt/pmt.pc.in 2008-01-23
15:35:54 UTC (rev 7497)
@@ -5,7 +5,7 @@
Name: pmt
Description: The GNU Radio Polymorphic Type library
-Requires:
+Requires: gnuradio-omnithread
Version: @VERSION@
Libs: -L${libdir} -lpmt -lgromnithread
Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
Modified: gnuradio/branches/developers/michaelld/t186/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/pmt/src/lib/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/pmt/src/lib/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
Modified: gnuradio/branches/developers/michaelld/t186/usrp/host/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/usrp/host/apps/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/usrp/host/apps/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/apps-inband/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/inband/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,7 +21,7 @@
include $(top_srcdir)/Makefile.common
INCLUDES = \
- $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
+ $(DEFINES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
$(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
-I$(srcdir)/../../apps-inband $(WITH_INCLUDES)
Modified:
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/legacy/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/legacy/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++
gnuradio/branches/developers/michaelld/t186/usrp/host/lib/legacy/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
Modified: gnuradio/branches/developers/michaelld/t186/usrp/host/swig/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/t186/usrp/host/swig/Makefile.am
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/usrp/host/swig/Makefile.am
2008-01-23 15:35:54 UTC (rev 7497)
@@ -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
#
Modified: gnuradio/branches/developers/michaelld/t186/usrp/usrp-inband.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/t186/usrp/usrp-inband.pc.in
2008-01-23 04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/usrp/usrp-inband.pc.in
2008-01-23 15:35:54 UTC (rev 7497)
@@ -5,7 +5,7 @@
Name: usrp
Description: USRP C++ Interface with in-band signaling
-Requires:
+Requires: libusb mblock pmt usrp
Version: @VERSION@
-Libs: -L${libdir} -lusrp-inband -lusrp -lmblock -lgromnithread -lpmt -lusb
+Libs: -L${libdir} -lusrp-inband -lusrp -lmblock -lpmt -lusb
Cflags: -I${includedir} @DEFINES@
Modified: gnuradio/branches/developers/michaelld/t186/usrp/usrp.pc.in
===================================================================
--- gnuradio/branches/developers/michaelld/t186/usrp/usrp.pc.in 2008-01-23
04:43:53 UTC (rev 7496)
+++ gnuradio/branches/developers/michaelld/t186/usrp/usrp.pc.in 2008-01-23
15:35:54 UTC (rev 7497)
@@ -5,7 +5,7 @@
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@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7497 - in gnuradio/branches/developers/michaelld/t186: . config gnuradio-core gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/io gnuradio-core/src/lib/reed-solomon gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-core/src/tests gnuradio-examples/c++/dial_tone gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src/lib gr-gsm-fr-vocoder/src/lib gr-gsm-fr-vocoder/src/lib/gsm gr-howto-write-a-block/doc gr-howto-write-a-block/src/lib gr-pager/src gr-qtgui/src/lib gr-radio-astronomy/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src gr-wxgui mblock mblock/src/lib omnithread pmt pmt/src/lib usrp usrp/host/apps usrp/host/apps-inband usrp/host/lib/inband usrp/host/lib/legacy usrp/host/swig,
michaelld <=