[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3216 - in gnuradio/trunk: . config gr-atsc/src/lib gr
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r3216 - in gnuradio/trunk: . config gr-atsc/src/lib gr-atsc/src/python 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-error-correcting-codes/src/lib gr-error-correcting-codes/src/lib/libecc gr-error-correcting-codes/src/python gr-gsm-fr-vocoder/src/lib gr-gsm-fr-vocoder/src/python gr-radar/src/lib gr-radar/src/python gr-radio-astronomy/src/lib gr-radio-astronomy/src/python gr-usrp/src gr-video-sdl/src usrp/firmware/src/usrp2 |
|
Date: |
Mon, 7 Aug 2006 09:41:20 -0600 (MDT) |
Author: jcorgan
Date: 2006-08-07 09:41:19 -0600 (Mon, 07 Aug 2006)
New Revision: 3216
Added:
gnuradio/trunk/config/grc_pmt.m4
Removed:
gnuradio/trunk/config/grc_gr_pmt.m4
Modified:
gnuradio/trunk/Makefile.common
gnuradio/trunk/config/grc_gr_audio_alsa.m4
gnuradio/trunk/config/grc_gr_audio_jack.m4
gnuradio/trunk/config/grc_gr_audio_portaudio.m4
gnuradio/trunk/config/grc_gr_audio_windows.m4
gnuradio/trunk/config/grc_gr_comedi.m4
gnuradio/trunk/config/grc_gr_video_sdl.m4
gnuradio/trunk/config/grc_gr_wxgui.m4
gnuradio/trunk/configure.ac
gnuradio/trunk/gr-atsc/src/lib/Makefile.am
gnuradio/trunk/gr-atsc/src/python/run_tests.in
gnuradio/trunk/gr-audio-alsa/src/Makefile.am
gnuradio/trunk/gr-audio-alsa/src/run_tests.in
gnuradio/trunk/gr-audio-jack/src/Makefile.am
gnuradio/trunk/gr-audio-jack/src/run_tests.in
gnuradio/trunk/gr-audio-oss/src/Makefile.am
gnuradio/trunk/gr-audio-oss/src/run_tests.in
gnuradio/trunk/gr-audio-osx/src/Makefile.am
gnuradio/trunk/gr-audio-osx/src/run_tests.in
gnuradio/trunk/gr-audio-portaudio/src/Makefile.am
gnuradio/trunk/gr-audio-portaudio/src/run_tests.in
gnuradio/trunk/gr-audio-windows/src/Makefile.am
gnuradio/trunk/gr-audio-windows/src/run_tests.in
gnuradio/trunk/gr-comedi/src/Makefile.am
gnuradio/trunk/gr-comedi/src/run_tests.in
gnuradio/trunk/gr-error-correcting-codes/src/lib/Makefile.am
gnuradio/trunk/gr-error-correcting-codes/src/lib/libecc/Makefile.am
gnuradio/trunk/gr-error-correcting-codes/src/python/Makefile.am
gnuradio/trunk/gr-error-correcting-codes/src/python/run_tests.in
gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/trunk/gr-gsm-fr-vocoder/src/python/run_tests.in
gnuradio/trunk/gr-radar/src/lib/Makefile.am
gnuradio/trunk/gr-radar/src/python/run_tests.in
gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am
gnuradio/trunk/gr-radio-astronomy/src/python/run_tests.in
gnuradio/trunk/gr-usrp/src/run_tests.in
gnuradio/trunk/gr-video-sdl/src/Makefile.am
gnuradio/trunk/gr-video-sdl/src/run_tests.in
gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am
Log:
Fixes for ticket:10, ticket:18, and ticket:19. Merged r3194:3215 from
/gnuradio/branches/developers/jcorgan/ticket-10. 'make distcheck' now
successfully completes on a machine that has never had gnuradio installed
before. In addition, several cleanups and refactoring of build system
code have been applied. NOTE: gr-audio-portaudio, gr-audio-osx, and
gr-audio-windows have not been fully tested and will need verification
by the maintainers of these components.
Modified: gnuradio/trunk/Makefile.common
===================================================================
--- gnuradio/trunk/Makefile.common 2006-08-07 15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/Makefile.common 2006-08-07 15:41:19 UTC (rev 3216)
@@ -37,23 +37,28 @@
SWIGPYTHONFLAGS = -fvirtual -python -modern
# Where to find gnuradio include files in the current build tree
+# top_srcdir for original stuff, top_builddir for generated files
GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
-I$(top_srcdir)/gnuradio-core/src/lib/general \
+ -I$(top_builddir)/gnuradio-core/src/lib/general \
-I$(top_srcdir)/gnuradio-core/src/lib/filter \
- -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
+ -I$(top_builddir)/gnuradio-core/src/lib/filter \
+ -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
-I$(top_srcdir)/gnuradio-core/src/lib/io \
-I$(top_srcdir)/gnuradio-core/src/lib/g72x \
-I$(top_srcdir)/gnuradio-core/src/lib/omnithread \
-I$(top_srcdir)/gnuradio-core/src/lib/swig \
- -I$(top_builddir)/gnuradio-core/src/lib/swig \
+ -I$(top_builddir)/gnuradio-core/src/lib/swig \
$(FFTW3F_CFLAGS)
+
# These used to be set in PKGCONFIG but now point to the current
# build tree.
GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
-lgnuradio-core -lfftw3f -lm
-GNURADIO_I = $(top_builddir)/gnuradio-core/src/lib/swig/gnuradio.i
+# This is a dependency for many swig operations
+GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
# The below used to be set in PKGCONFIG but now point to the current
# build tree.
Modified: gnuradio/trunk/config/grc_gr_audio_alsa.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_audio_alsa.m4 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/config/grc_gr_audio_alsa.m4 2006-08-07 15:41:19 UTC (rev
3216)
@@ -29,7 +29,7 @@
succeeded=yes
PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],[succeeded=no])
if test $succeeded = yes; then
- LIBS="$LIBS $ALSA_LIBS"
+ AC_SUBST(ALSA_LIBS)
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_alsa], [chmod +x
gr-audio-alsa/src/run_tests])
Modified: gnuradio/trunk/config/grc_gr_audio_jack.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_audio_jack.m4 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/config/grc_gr_audio_jack.m4 2006-08-07 15:41:19 UTC (rev
3216)
@@ -29,7 +29,7 @@
succeeded=yes
PKG_CHECK_MODULES(JACK, jack >= 0.8,[],[succeeded=no])
if test $succeeded = yes; then
- LIBS="$LIBS $JACK_LIBS"
+ AC_SUBST(JACK_LIBS)
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x
gr-audio-jack/src/run_tests])
Modified: gnuradio/trunk/config/grc_gr_audio_portaudio.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_audio_portaudio.m4 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/config/grc_gr_audio_portaudio.m4 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -28,9 +28,9 @@
succeeded=yes
PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],[succeeded=no])
- #AC_HAVE_LIBRARY([portaudio], [], [succeeded=no])
- #AC_CHECK_HEADER([portaudio.h], [], [succeeded=no])
+
if test $succeeded = yes; then
+ AC_SUBST(PORTAUDIO_LIBS)
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_portaudio], [chmod +x
gr-audio-portaudio/src/run_tests])
subdirs="$subdirs gr-audio-portaudio"
Modified: gnuradio/trunk/config/grc_gr_audio_windows.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_audio_windows.m4 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/config/grc_gr_audio_windows.m4 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -30,6 +30,9 @@
AC_HAVE_LIBRARY(winmm,[],[succeeded=no])
if test $succeeded = yes; then
+ WINAUDIO_LIBS=-lwinmm
+ AC_SUBST(WINAUDIO_LIBS)
+
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_windows], [chmod +x
gr-audio-windows/src/run_tests])
subdirs="$subdirs gr-audio-windows"
Modified: gnuradio/trunk/config/grc_gr_comedi.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_comedi.m4 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/config/grc_gr_comedi.m4 2006-08-07 15:41:19 UTC (rev
3216)
@@ -29,7 +29,7 @@
succeeded=yes
PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[],[succeeded=no])
if test $succeeded = yes; then
- LIBS="$LIBS $COMEDI_LIBS"
+ AC_SUBST(COMEDI_LIBS)
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_comedi], [chmod +x
gr-comedi/src/run_tests])
Deleted: gnuradio/trunk/config/grc_gr_pmt.m4
Modified: gnuradio/trunk/config/grc_gr_video_sdl.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_video_sdl.m4 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/config/grc_gr_video_sdl.m4 2006-08-07 15:41:19 UTC (rev
3216)
@@ -32,8 +32,11 @@
AM_PATH_SDL($SDL_VERSION,[],[succeeded=no])
if test $succeeded = yes; then
- AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS"
- AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS"
+ #AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS"
+ #AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS"
+ AC_SUBST(SDL_CFLAGS)
+ AC_SUBST(SDL_LIBS)
+
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_sdl], [chmod +x
gr-video-sdl/src/run_tests])
subdirs="$subdirs gr-video-sdl"
Modified: gnuradio/trunk/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/trunk/config/grc_gr_wxgui.m4 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/config/grc_gr_wxgui.m4 2006-08-07 15:41:19 UTC (rev
3216)
@@ -22,7 +22,9 @@
# FIXME: Should we actually check for wxPython, even though
# this is a runtime requirement, not a compile/install time one?
-
+ #
+ # This is logged as ticket 17
+
AC_CONFIG_FILES([ \
gr-wxgui/Makefile \
gr-wxgui/src/Makefile \
Copied: gnuradio/trunk/config/grc_pmt.m4 (from rev 3215,
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_pmt.m4)
===================================================================
--- gnuradio/trunk/config/grc_pmt.m4 (rev 0)
+++ gnuradio/trunk/config/grc_pmt.m4 2006-08-07 15:41:19 UTC (rev 3216)
@@ -0,0 +1,34 @@
+dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl
+dnl This file is part of GNU Radio
+dnl
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING. If not, write to
+dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+dnl Boston, MA 02111-1307, USA.
+
+AC_DEFUN([GRC_PMT],[
+ AC_CONFIG_SRCDIR([pmt/src/lib/pmt.h])
+
+ AC_CONFIG_FILES([\
+ pmt/Makefile \
+ pmt/doc/Makefile \
+ pmt/src/Makefile \
+ pmt/src/lib/Makefile
+ ])
+
+ 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])
+
+ subdirs="$subdirs pmt"
+])
Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2006-08-07 15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/configure.ac 2006-08-07 15:41:19 UTC (rev 3216)
@@ -162,9 +162,9 @@
GRC_GR_GSM_FR_VOCODER
GRC_GR_RADAR
GRC_GR_RADIO_ASTRONOMY
-GRC_GR_PMT
GRC_GR_VIDEO_SDL
GRC_GR_WXGUI
+GRC_PMT
dnl Has list of successfully configured components
AC_SUBST([subdirs],$subdirs)
Modified: gnuradio/trunk/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/Makefile.am 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/gr-atsc/src/lib/Makefile.am 2006-08-07 15:41:19 UTC (rev
3216)
@@ -218,7 +218,7 @@
$(NON_LOCAL_IFILES)
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
LOCAL_IFILES = \
atsc.i
Modified: gnuradio/trunk/gr-atsc/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/run_tests.in 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-atsc/src/python/run_tests.in 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-atsc/src/python
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/src/Makefile.am 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-alsa/src/Makefile.am 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -28,8 +28,6 @@
ourpythondir = $(grpythondir)
ourlibdir = $(grpyexecdir)
-LIBS += $(GNURADIO_CORE_LIBS)
-
EXTRA_DIST = run_tests.in
TESTS = run_tests
@@ -38,7 +36,7 @@
audio_alsa.i
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
ALL_IFILES = \
$(LOCAL_IFILES) \
@@ -76,6 +74,8 @@
_audio_alsa_la_LIBADD = \
$(PYTHON_LDFLAGS) \
+ $(GNURADIO_CORE_LIBS) \
+ $(ALSA_LIBS) \
-lstdc++
_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
Modified: gnuradio/trunk/gr-audio-alsa/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-alsa/src/run_tests.in 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-alsa/src/run_tests.in 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-audio-alsa/src
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-jack/src/Makefile.am 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-jack/src/Makefile.am 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -21,8 +21,6 @@
include $(top_srcdir)/Makefile.common
-LIBS += $(GNURADIO_CORE_LIBS)
-
# Install this stuff so that it ends up as the gnuradio.audio_jack module
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -38,7 +36,7 @@
audio_jack.i
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
ALL_IFILES = \
$(LOCAL_IFILES) \
@@ -78,6 +76,8 @@
_audio_jack_la_LIBADD = \
$(PYTHON_LDFLAGS) \
+ $(GNURADIO_CORE_LIBS) \
+ $(JACK_LIBS) \
-lstdc++
_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
Modified: gnuradio/trunk/gr-audio-jack/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-jack/src/run_tests.in 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-jack/src/run_tests.in 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-audio-jack/src
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-oss/src/Makefile.am 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/gr-audio-oss/src/Makefile.am 2006-08-07 15:41:19 UTC (rev
3216)
@@ -21,8 +21,6 @@
include $(top_srcdir)/Makefile.common
-LIBS += $(GNURADIO_CORE_LIBS)
-
# Install this stuff so that it ends up as the gnuradio.audio_oss module
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -37,7 +35,7 @@
audio_oss.i
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
ALL_IFILES = \
$(LOCAL_IFILES) \
@@ -71,6 +69,7 @@
_audio_oss_la_LIBADD = \
$(PYTHON_LDFLAGS) \
+ $(GNURADIO_CORE_LIBS) \
$(OSS_LIBS) \
-lstdc++
Modified: gnuradio/trunk/gr-audio-oss/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-oss/src/run_tests.in 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-oss/src/run_tests.in 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-audio-oss/src
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-audio-osx/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-osx/src/Makefile.am 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/gr-audio-osx/src/Makefile.am 2006-08-07 15:41:19 UTC (rev
3216)
@@ -35,7 +35,7 @@
audio_osx.i
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
ALL_IFILES = \
$(LOCAL_IFILES) \
Modified: gnuradio/trunk/gr-audio-osx/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-osx/src/run_tests.in 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-osx/src/run_tests.in 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -20,7 +20,9 @@
# Where to look for GNU Radio python modules in current build tree
# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-audio-portaudio/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/Makefile.am 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-portaudio/src/Makefile.am 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -21,8 +21,6 @@
include $(top_srcdir)/Makefile.common
-LIBS += $(GNURADIO_CORE_LIBS)
-
# Install this stuff so that it ends up as the gnuradio.audio_portaudio module
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -38,14 +36,14 @@
audio_portaudio.i
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
ALL_IFILES = \
$(LOCAL_IFILES) \
$(NON_LOCAL_IFILES)
BUILT_SOURCES = \
- audio_portaudio.cc \
+ audio_portaudio.cc \
audio_portaudio.py
ourpython_PYTHON = \
@@ -77,6 +75,7 @@
_audio_portaudio_la_LIBADD = \
$(PYTHON_LDFLAGS) \
+ $(GNURADIO_CORE_LIBS) \
$(PORTAUDIO_LIBS) \
-lstdc++
Modified: gnuradio/trunk/gr-audio-portaudio/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/run_tests.in 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-portaudio/src/run_tests.in 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-audio-portaudio/src
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-audio-windows/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-windows/src/Makefile.am 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-windows/src/Makefile.am 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -35,7 +35,7 @@
audio_windows.i
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
ALL_IFILES = \
$(LOCAL_IFILES) \
@@ -50,8 +50,7 @@
INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
-SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) \
- -I$(swigincludedir) -I$(grincludedir)
+SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES)
ourlib_LTLIBRARIES = _audio_windows.la
@@ -71,7 +70,7 @@
_audio_windows_la_LIBADD = \
$(PYTHON_LDFLAGS) \
$(GNURADIO_CORE_LIBS) \
- -lwinmm \
+ $(WINAUDIO_LIBS) \
-lstdc++
_audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \
Modified: gnuradio/trunk/gr-audio-windows/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-audio-windows/src/run_tests.in 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-audio-windows/src/run_tests.in 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-audio-windows/src
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-comedi/src/Makefile.am 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/gr-comedi/src/Makefile.am 2006-08-07 15:41:19 UTC (rev
3216)
@@ -36,7 +36,7 @@
comedi.i
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
ALL_IFILES = \
$(LOCAL_IFILES) \
@@ -76,6 +76,7 @@
_comedi_la_LIBADD = \
$(PYTHON_LDFLAGS) \
$(GNURADIO_CORE_LIBS) \
+ $(COMEDI_LIBS) \
-lstdc++
_comedi_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
Modified: gnuradio/trunk/gr-comedi/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-comedi/src/run_tests.in 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/gr-comedi/src/run_tests.in 2006-08-07 15:41:19 UTC (rev
3216)
@@ -20,7 +20,9 @@
# Where to look for GNU Radio python modules in current build tree
# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-error-correcting-codes/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-error-correcting-codes/src/lib/Makefile.am
2006-08-07 15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/gr-error-correcting-codes/src/lib/Makefile.am
2006-08-07 15:41:19 UTC (rev 3216)
@@ -39,7 +39,7 @@
$(NON_LOCAL_IFILES)
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
LOCAL_IFILES = \
ecc_syms_to_metrics.i \
Modified: gnuradio/trunk/gr-error-correcting-codes/src/lib/libecc/Makefile.am
===================================================================
--- gnuradio/trunk/gr-error-correcting-codes/src/lib/libecc/Makefile.am
2006-08-07 15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/gr-error-correcting-codes/src/lib/libecc/Makefile.am
2006-08-07 15:41:19 UTC (rev 3216)
@@ -23,7 +23,8 @@
SUBDIRS = mld . tests
-INCLUDES = $(STD_DEFINES_AND_INCLUDES)
-I$(top_srcdir)/gr-error-correcting-codes/src/lib
+INCLUDES = $(STD_DEFINES_AND_INCLUDES) \
+ -I$(top_srcdir)/gr-error-correcting-codes/src/lib
noinst_LTLIBRARIES = libecc.la
@@ -49,6 +50,7 @@
libecc_la_LIBADD = \
mld/libmld.la \
$(PYTHON_LDFLAGS) \
+ $(GNURADIO_CORE_LIBS) \
-lstdc++
MOSTLYCLEANFILES = *.loT *~
Modified: gnuradio/trunk/gr-error-correcting-codes/src/python/Makefile.am
===================================================================
--- gnuradio/trunk/gr-error-correcting-codes/src/python/Makefile.am
2006-08-07 15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/gr-error-correcting-codes/src/python/Makefile.am
2006-08-07 15:41:19 UTC (rev 3216)
@@ -24,7 +24,7 @@
EXTRA_DIST = run_tests.in
# Disable qa checks due to non-standard directory structure (eb)
-#TESTS = run_tests
+# TESTS = run_tests
noinst_PYTHON = qa_test_coding_1.py qa_test_coding_2.py
Modified: gnuradio/trunk/gr-error-correcting-codes/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-error-correcting-codes/src/python/run_tests.in
2006-08-07 15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/gr-error-correcting-codes/src/python/run_tests.in
2006-08-07 15:41:19 UTC (rev 3216)
@@ -20,7 +20,9 @@
# Where to look for GNU Radio python modules in current build tree
# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am 2006-08-07
15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am 2006-08-07
15:41:19 UTC (rev 3216)
@@ -23,8 +23,6 @@
SUBDIRS = gsm .
-LIBS += $(GNURADIO_CORE_LIBS)
-
# Install this stuff so that it ends up as the gnuradio.vocoder module
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder
@@ -42,7 +40,7 @@
$(NON_LOCAL_IFILES)
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
LOCAL_IFILES = \
@@ -78,6 +76,7 @@
_gsm_full_rate_la_LIBADD = \
gsm/libgsm.la \
$(PYTHON_LDFLAGS) \
+ $(GNURADIO_CORE_LIBS) \
-lstdc++
gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/python/run_tests.in 2006-08-07
15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/python/run_tests.in 2006-08-07
15:41:19 UTC (rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-gsm-fr-vocoder/src/python
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-radar/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-radar/src/lib/Makefile.am 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/gr-radar/src/lib/Makefile.am 2006-08-07 15:41:19 UTC (rev
3216)
@@ -21,8 +21,6 @@
include $(top_srcdir)/Makefile.common
-LIBS += $(GNURADIO_CORE_LIBS)
-
# Install this stuff so that it ends up as the gnuradio.radar module
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -39,7 +37,7 @@
$(NON_LOCAL_IFILES)
NON_LOCAL_IFILES = \
- $(top_srcdr)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
LOCAL_IFILES =
@@ -66,16 +64,16 @@
sim-airplane2
xambi_SOURCES = xambi.cc
-xambi_LDADD = libradar.la
+xambi_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
eb_xambi_SOURCES = eb-xambi.cc
-eb_xambi_LDADD = libradar.la
+eb_xambi_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
sim_airplane_SOURCES = sim-airplane.cc
-sim_airplane_LDADD = libradar.la
+sim_airplane_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
sim_airplane2_SOURCES = sim-airplane2.cc
-sim_airplane2_LDADD = libradar.la
+sim_airplane2_LDADD = libradar.la $(GNURADIO_CORE_LIBS)
# This gets howto.py installed in the right place
# ourpython_PYTHON =
Modified: gnuradio/trunk/gr-radar/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-radar/src/python/run_tests.in 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-radar/src/python/run_tests.in 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-radar/src/python
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am 2006-08-07
15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/gr-radio-astronomy/src/lib/Makefile.am 2006-08-07
15:41:19 UTC (rev 3216)
@@ -37,9 +37,8 @@
$(NON_LOCAL_IFILES)
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
-
LOCAL_IFILES = \
ra.i
Modified: gnuradio/trunk/gr-radio-astronomy/src/python/run_tests.in
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/run_tests.in 2006-08-07
15:14:47 UTC (rev 3215)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/run_tests.in 2006-08-07
15:41:19 UTC (rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-radio-astronomy/src/python
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-usrp/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-usrp/src/run_tests.in 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/gr-usrp/src/run_tests.in 2006-08-07 15:41:19 UTC (rev
3216)
@@ -18,10 +18,12 @@
address@hidden@/gr-usrp/src
# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
# Where to look for USRP lib in current build tree
address@hidden@/usrp/host/lib/.libs
address@hidden@/usrp/host/lib
PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$usrpbld:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-video-sdl/src/Makefile.am 2006-08-07 15:14:47 UTC (rev
3215)
+++ gnuradio/trunk/gr-video-sdl/src/Makefile.am 2006-08-07 15:41:19 UTC (rev
3216)
@@ -35,7 +35,7 @@
video_sdl.i
NON_LOCAL_IFILES = \
- $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+ $(GNURADIO_I)
ALL_IFILES = \
$(LOCAL_IFILES) \
Modified: gnuradio/trunk/gr-video-sdl/src/run_tests.in
===================================================================
--- gnuradio/trunk/gr-video-sdl/src/run_tests.in 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/gr-video-sdl/src/run_tests.in 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -18,9 +18,9 @@
address@hidden@/gr-video-sdl/src
# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
export PYTHONPATH
Modified: gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am 2006-08-07 15:14:47 UTC
(rev 3215)
+++ gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am 2006-08-07 15:41:19 UTC
(rev 3216)
@@ -54,7 +54,10 @@
DEFINES=-DHAVE_USRP2
-INCLUDES=-I$(top_srcdir)/usrp/firmware/include
-I$(top_srcdir)/usrp/firmware/src/usrp2
-I$(top_srcdir)/usrp/firmware/src/common -I./ -I../common
+INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
+ -I$(top_srcdir)/usrp/firmware/src/usrp2 \
+ -I$(top_srcdir)/usrp/firmware/src/common \
+ -I$(top_builddir)/usrp/firmware/src/common
# with EA = 0, the FX2 implements a portion of the 8051 "external memory"
# on chip. This memory is mapped like this:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3216 - in gnuradio/trunk: . config gr-atsc/src/lib gr-atsc/src/python 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-error-correcting-codes/src/lib gr-error-correcting-codes/src/lib/libecc gr-error-correcting-codes/src/python gr-gsm-fr-vocoder/src/lib gr-gsm-fr-vocoder/src/python gr-radar/src/lib gr-radar/src/python gr-radio-astronomy/src/lib gr-radio-astronomy/src/python gr-usrp/src gr-video-sdl/src usrp/firmware/src/usrp2,
jcorgan <=