[Commit-gnuradio] r4484 - in gnuradio/trunk: . gnuradio-core/src/lib/swig omnithread

[jcorgan]

Author: jcorgan
Date: 2007-02-15 11:35:18 -0700 (Thu, 15 Feb 2007)
New Revision: 4484

Modified:
   gnuradio/trunk/Makefile.common
   gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
   gnuradio/trunk/omnithread/Makefile.am
   gnuradio/trunk/run_tests.sh.in
Log:
Merged r4456:4483 from jcorgan/ticket-138 into trunk.  Fixes ticket:138.

Modified: gnuradio/trunk/Makefile.common
===================================================================
--- gnuradio/trunk/Makefile.common      2007-02-15 01:36:24 UTC (rev 4483)
+++ gnuradio/trunk/Makefile.common      2007-02-15 18:35:18 UTC (rev 4484)
@@ -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/trunk/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am       2007-02-15 
01:36:24 UTC (rev 4483)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am       2007-02-15 
18:35:18 UTC (rev 4484)
@@ -118,6 +118,7 @@
 
 
 _gnuradio_swig_py_runtime_la_LIBADD  =                 \
+       $(GNURADIO_CORE_LIBS)                   \
        $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++
@@ -149,6 +150,7 @@
 
 
 _gnuradio_swig_py_general_la_LIBADD  =                 \
+       $(GNURADIO_CORE_LIBS)                   \
        $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++
@@ -180,6 +182,7 @@
 
 
 _gnuradio_swig_py_gengen_la_LIBADD  =          \
+       $(GNURADIO_CORE_LIBS)                   \
        $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++
@@ -211,6 +214,7 @@
 
 
 _gnuradio_swig_py_filter_la_LIBADD  =          \
+       $(GNURADIO_CORE_LIBS)                   \
        $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++
@@ -242,6 +246,7 @@
 
 
 _gnuradio_swig_py_io_la_LIBADD  =              \
+       $(GNURADIO_CORE_LIBS)                   \
        $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++

Modified: gnuradio/trunk/omnithread/Makefile.am
===================================================================
--- gnuradio/trunk/omnithread/Makefile.am       2007-02-15 01:36:24 UTC (rev 
4483)
+++ gnuradio/trunk/omnithread/Makefile.am       2007-02-15 18:35:18 UTC (rev 
4484)
@@ -44,6 +44,8 @@
        nt.cc
 endif
 
+libgromnithread_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version 
+
 libgromnithread_la_LIBADD =            \
        $(PTHREAD_LIBS)
 

Modified: gnuradio/trunk/run_tests.sh.in
===================================================================
--- gnuradio/trunk/run_tests.sh.in      2007-02-15 01:36:24 UTC (rev 4483)
+++ gnuradio/trunk/run_tests.sh.in      2007-02-15 18:35:18 UTC (rev 4484)
@@ -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"