[Commit-gnuradio] r4511 - in gnuradio/branches/developers/n4hy/ofdm2: . pmt/src/lib

[n4hy]

Author: n4hy
Date: 2007-02-19 12:45:12 -0700 (Mon, 19 Feb 2007)
New Revision: 4511

Added:
   gnuradio/branches/developers/n4hy/ofdm2/gnuradio-pkg_chk.conf
Modified:
   gnuradio/branches/developers/n4hy/ofdm2/Makefile.common
   gnuradio/branches/developers/n4hy/ofdm2/README
   gnuradio/branches/developers/n4hy/ofdm2/pmt/src/lib/Makefile.am
   gnuradio/branches/developers/n4hy/ofdm2/run_tests.sh.in
Log:
updating code

Modified: gnuradio/branches/developers/n4hy/ofdm2/Makefile.common
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/Makefile.common     2007-02-19 
19:40:13 UTC (rev 4510)
+++ gnuradio/branches/developers/n4hy/ofdm2/Makefile.common     2007-02-19 
19:45:12 UTC (rev 4511)
@@ -54,12 +54,18 @@
                    -I$(top_builddir)/gnuradio-core/src/lib/swig \
                    $(FFTW3F_CFLAGS)
 
+# How to link in the top-level omnithreads library
+OMNITHREAD_INCLUDES = -I$(top_srcdir)/omnithread
+OMNITHREAD_LIBS = -L$(top_builddir)/omnithread -lgromnithread
 
-# These used to be set in PKGCONFIG but now point to the current
-# build tree.
-# FIXME shouldn't -lfftw3f -lm just be extracted from libgnuradio-core.la ???
-GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
-                     -lgnuradio-core -lfftw3f -lm
+# How to link in GNU Radio core library
+# Note: Win32 libtool cannot extract DLL dependencies already stored in
+# libgnuradio-core, so the core's dependencies must be repeated here
+# This is redundant but harmless on non-Win32 platforms
+GNURADIO_CORE_LIBS = $(OMNITHREAD_LIBS)                                \
+                    $(FFTW3F_LIBS)                             \
+                    -L$(top_builddir)/gnuradio-core/src/lib    \
+                     -lgnuradio-core
 
 # This is a dependency for many swig operations
 GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
@@ -74,9 +80,6 @@
 PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
 PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt
 
-OMNITHREAD_INCLUDES = -I$(top_srcdir)/omnithread
-OMNITHREAD_LIBS = -L$(top_builddir)/omnithread -lgromnithread
-
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
 STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) 
$(GNURADIO_INCLUDES) $(BOOST_CFLAGS)

Modified: gnuradio/branches/developers/n4hy/ofdm2/README
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/README      2007-02-19 19:40:13 UTC 
(rev 4510)
+++ gnuradio/branches/developers/n4hy/ofdm2/README      2007-02-19 19:45:12 UTC 
(rev 4511)
@@ -114,6 +114,8 @@
 pkgsrc is not and instead uses -devel to indicate a package of a
 not-yet-released or unstable version.)
 
+For those using pkgsrc, see gnuradio-pkg_chk.conf.  Those not using
+pkgsrc may also find the list useful.
 
 (1) The "autotools"
 

Copied: gnuradio/branches/developers/n4hy/ofdm2/gnuradio-pkg_chk.conf (from rev 
4505, gnuradio/trunk/gnuradio-pkg_chk.conf)
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/gnuradio-pkg_chk.conf               
                (rev 0)
+++ gnuradio/branches/developers/n4hy/ofdm2/gnuradio-pkg_chk.conf       
2007-02-19 19:45:12 UTC (rev 4511)
@@ -0,0 +1,74 @@
+# Copyright 2007 Free Software Foundation
+
+# pkg_chk -a -k -C gnuradio-pkg_chk.conf
+# pkg_chk -a -k -C gnuradio-pkg_chk.conf -D doc
+
+# This is a control file for pkg_chk, an automatic package manager for
+# pkgsrc.  After installing pkgsrc, install pkgtools/pkg_chk, use the
+# commented-out first line above.  The second addtionally includes
+# packages needed for documentation.  Note that gnuradio is in pkgsrc;
+# this file is useful for those who want dependencies from pkgsrc but
+# want to build GNU Radio itself from svn.  This file should perhaps
+# grow conventions for building minimal vs. expanded dependencies.
+
+# See http://www.netbsd.org/Documentation/software/packages.html for
+# more information about pkgsrc.
+
+# To build against pkgsrc, run configure as
+# LDFLAGS="-L/usr/pkg/lib -R/usr/pkg/lib" CPPFLAGS="-I/usr/pkg/include" 
./configure
+
+# This file may be incorrect; please feel free to correct or mail
+# comments to address@hidden or address@hidden
+
+## Core
+
+devel/autoconf
+devel/automake
+# gmake isn't actually required, but it's helpful to have to separate
+# real build failures from unportable makefiles.
+devel/libtool-base
+devel/gmake
+
+devel/pkg-config
+
+math/fftwf
+
+# python is forced by py-Numeric.  pkgsrc now (200701) defaults to 2.4,
+# which is fine.  We don't include python explicitly since we'd have to
+# specify a version.
+math/py-Numeric
+# numarray is not documented to be needed, but the pkgsrc packages depend on 
it.
+# Include it until this confusion is resolved.
+math/py-numarray
+
+# Smart pointers.
+devel/boost-headers
+# Apparently all of boost is not needed.
+#meta-pkgs/boost
+
+devel/cppunit
+
+devel/swig
+
+## audio
+audio/jack
+audio/portaudio-devel
+devel/SDL
+
+## documentation
+
+devel/doxygen          doc
+textproc/xmlto         doc
+
+## USRP
+
+devel/sdcc
+devel/libusb
+
+## GUI
+
+x11/py-wxWidgets
+
+## gr-radio-astronomy
+
+math/py-ephem

Modified: gnuradio/branches/developers/n4hy/ofdm2/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/pmt/src/lib/Makefile.am     
2007-02-19 19:40:13 UTC (rev 4510)
+++ gnuradio/branches/developers/n4hy/ofdm2/pmt/src/lib/Makefile.am     
2007-02-19 19:45:12 UTC (rev 4511)
@@ -90,8 +90,11 @@
 libpmt_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 # link the library against the c++ standard library
+# Note: Win32 libtool doesn't pull dependencies from the .la file
+# correctly, so we must add $(PMT_LIBS) below
 libpmt_qa_la_LIBADD =                  \
        libpmt.la                       \
+       $(PMT_LIBS)                     \
        $(CPPUNIT_LIBS)                 \
        -lstdc++                        
 

Modified: gnuradio/branches/developers/n4hy/ofdm2/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/run_tests.sh.in     2007-02-19 
19:40:13 UTC (rev 4510)
+++ gnuradio/branches/developers/n4hy/ofdm2/run_tests.sh.in     2007-02-19 
19:45:12 UTC (rev 4511)
@@ -23,9 +23,12 @@
 # Where to find core's python modules
 address@hidden@/gnuradio-core/src/python
 
-# Where to find core's master library files
address@hidden@/gnuradio-core/src/lib
-grlibdir=$grlibdir:$grlibdir/.libs
+# Where to find core's master library files and dependencies
address@hidden@/omnithread
+gromnidir=$gromnidir:$gromnidir/.libs
address@hidden@/gnuradio-core/src/lib
+grcoredir=$grcoredir:$grcoredir/.libs
+grlibdir=$gromnidir:$grcoredir
 
 # Construct search path for python modules
 
PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$grswigdir:$grswigsrcdir:$grpydir:$PYTHONPATH"