summaryrefslogtreecommitdiff
path: root/usrp/host
diff options
context:
space:
mode:
authoreb2008-08-19 23:09:56 +0000
committereb2008-08-19 23:09:56 +0000
commit2c8ea58e4d76f54c98d71d3fcc64bc29da490908 (patch)
tree2d5021474a22fcea2425903bdc288e1405701f7a /usrp/host
parent6039ba34aee72974b0eacc9408627a0fa038dc81 (diff)
downloadgnuradio-2c8ea58e4d76f54c98d71d3fcc64bc29da490908.tar.gz
gnuradio-2c8ea58e4d76f54c98d71d3fcc64bc29da490908.tar.bz2
gnuradio-2c8ea58e4d76f54c98d71d3fcc64bc29da490908.zip
Merged features/mp-sched -r8915:9335 into the trunk. The trunk now
contains the SMP aware scheduler. This changeset introduces a dependency on boost 1.35 or later. See source:gnuradio/trunk/README.building-boost for additional info. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9336 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp/host')
-rw-r--r--usrp/host/apps-inband/Makefile.am2
-rw-r--r--usrp/host/apps/Makefile.am2
-rw-r--r--usrp/host/lib/inband/Makefile.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/usrp/host/apps-inband/Makefile.am b/usrp/host/apps-inband/Makefile.am
index f231b57f7..663a861ed 100644
--- a/usrp/host/apps-inband/Makefile.am
+++ b/usrp/host/apps-inband/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
- $(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS) \
+ $(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CPPFLAGS) \
$(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am
index b3050a7b0..f4ee5291b 100644
--- a/usrp/host/apps/Makefile.am
+++ b/usrp/host/apps/Makefile.am
@@ -21,7 +21,7 @@
include $(top_srcdir)/Makefile.common
-AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
+AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
$(WITH_INCLUDES)
bin_PROGRAMS = \
diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am
index a41ac18b8..447d0a61d 100644
--- a/usrp/host/lib/inband/Makefile.am
+++ b/usrp/host/lib/inband/Makefile.am
@@ -22,7 +22,7 @@ include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = \
$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
- $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
+ $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
-I$(srcdir)/../../apps-inband $(WITH_INCLUDES)
TESTS = test_inband