Merged r4456:4483 from jcorgan/ticket-138 into trunk. Fixes ticket:138.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4484 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/Makefile.common b/Makefile.common
index 56d7f5caa0d9c07d93681354b1e6ef1513921a69..11bc65abce009558160f67a1fde33f04c0cbe7ed 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -54,12 +54,18 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
                    -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 @@ USRP_LIBS = -L$(top_builddir)/usrp/host/lib -lusrp
 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)

diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index ed141902827de4bb6df994a479e334436904e03e..f0d1615143960afe05d77361b0ead6746a64f75a 100644 (file)
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -118,6 +118,7 @@ _gnuradio_swig_py_runtime_la_SOURCES =              \
 
 
 _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_SOURCES =              \
 
 
 _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_SOURCES =               \
 
 
 _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_SOURCES =               \
 
 
 _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_SOURCES =           \
 
 
 _gnuradio_swig_py_io_la_LIBADD  =              \
+       $(GNURADIO_CORE_LIBS)                   \
        $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
        $(PYTHON_LDFLAGS)                       \
        -lstdc++

diff --git a/omnithread/Makefile.am b/omnithread/Makefile.am
index 2eac4c920c267ac08cd43e38f0b50fe895533c8f..edf9c3c24699ad6a1a4c6f249e9a70cdfcc5b5e4 100644 (file)
--- a/omnithread/Makefile.am
+++ b/omnithread/Makefile.am
@@ -44,6 +44,8 @@ libgromnithread_la_SOURCES =          \
        nt.cc
 endif
 
+libgromnithread_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version 
+
 libgromnithread_la_LIBADD =            \
        $(PTHREAD_LIBS)
 

diff --git a/run_tests.sh.in b/run_tests.sh.in
index faec6d1667b6b0b38bcba63c16603d57fc2788e1..8a7681c3243cfb75f2bab2d0d8e4354ef3466dbe 100644 (file)
--- a/run_tests.sh.in
+++ b/run_tests.sh.in
@@ -23,9 +23,12 @@ grswigsrcdir=@abs_top_srcdir@/gnuradio-core/src/lib/swig
 # Where to find core's python modules
 grpydir=@abs_top_srcdir@/gnuradio-core/src/python
 
-# Where to find core's master library files
-grlibdir=@abs_top_builddir@/gnuradio-core/src/lib
-grlibdir=$grlibdir:$grlibdir/.libs
+# Where to find core's master library files and dependencies
+gromnidir=@abs_top_builddir@/omnithread
+gromnidir=$gromnidir:$gromnidir/.libs
+grcoredir=@abs_top_builddir@/gnuradio-core/src/lib
+grcoredir=$grcoredir:$grcoredir/.libs
+grlibdir=$gromnidir:$grcoredir
 
 # Construct search path for python modules
 PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$grswigdir:$grswigsrcdir:$grpydir:$PYTHONPATH"