diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-01-30 02:12:05 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-01-30 02:12:05 +0000 |
| commit | 6ff1faed9d4c7095ab2d07b99478fe46e35f0e1e (patch) | |
| tree | 033696613d2bd899d9e8178827d2bc0aad609771 /Makefile.common | |
| parent | b8a177591928973eb863cc3690fb381306830bbd (diff) | |
Merged eb/omni -r4315:4327 into trunk.
Extracted omnithread from gnuradio-core and made it a top-level
component. This allows mblock to use it without a dependency on
gnuradio-core. Completes ticket:132
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4328 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index e7d928682c..56d7f5caa0 100644 --- a/Makefile.common +++ b/Makefile.common @@ -50,7 +50,6 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ -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 \ $(FFTW3F_CFLAGS) @@ -58,6 +57,7 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ # 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 @@ -69,15 +69,17 @@ GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp +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) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS) +STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS) # Fix for BSD make not defining $(RM). We define it now in configure.ac # using AM_PATH_PROG, but now here have to add a -f to be like GNU make |