diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-02-15 18:35:18 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-02-15 18:35:18 +0000 |
| commit | e10941aa8714b9df39c7159f511cdc4612b59ddb (patch) | |
| tree | e51e1117f6b86f777c9bfff09fdf3cfd5f9c4086 /Makefile.common | |
| parent | 68f156c493d305a6ed185314850273701ac37bb4 (diff) | |
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
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Makefile.common b/Makefile.common index 56d7f5caa0..11bc65abce 100644 --- 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) |