summaryrefslogtreecommitdiff
path: root/usrp/host
diff options
context:
space:
mode:
Diffstat (limited to 'usrp/host')
-rw-r--r--usrp/host/apps-inband/Makefile.am5
-rw-r--r--usrp/host/apps-inband/gmac.cc1
-rw-r--r--usrp/host/apps-inband/test_gmac_tx.cc2
-rw-r--r--usrp/host/apps-inband/test_usrp_inband_cs.cc2
-rw-r--r--usrp/host/apps-inband/test_usrp_inband_overrun.cc2
-rw-r--r--usrp/host/apps-inband/test_usrp_inband_ping.cc2
-rw-r--r--usrp/host/apps-inband/test_usrp_inband_registers.cc3
-rw-r--r--usrp/host/apps-inband/test_usrp_inband_rx.cc2
-rw-r--r--usrp/host/apps-inband/test_usrp_inband_timestamps.cc2
-rw-r--r--usrp/host/apps-inband/test_usrp_inband_tx.cc2
-rw-r--r--usrp/host/apps-inband/test_usrp_inband_underrun.cc2
-rw-r--r--usrp/host/apps/Makefile.am6
-rw-r--r--usrp/host/lib/inband/Makefile.am14
-rw-r--r--usrp/host/lib/legacy/Makefile.am6
-rw-r--r--usrp/host/swig/Makefile.am8
15 files changed, 20 insertions, 39 deletions
diff --git a/usrp/host/apps-inband/Makefile.am b/usrp/host/apps-inband/Makefile.am
index c05f04af0..d4ca6607b 100644
--- a/usrp/host/apps-inband/Makefile.am
+++ b/usrp/host/apps-inband/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2003,2006 Free Software Foundation, Inc.
+# Copyright 2003,2006,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -23,7 +23,8 @@ include $(top_srcdir)/Makefile.common
INCLUDES = \
$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
- $(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+ $(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS) \
+ $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
bin_PROGRAMS =
diff --git a/usrp/host/apps-inband/gmac.cc b/usrp/host/apps-inband/gmac.cc
index 153979162..107582e12 100644
--- a/usrp/host/apps-inband/gmac.cc
+++ b/usrp/host/apps-inband/gmac.cc
@@ -31,7 +31,6 @@
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps-inband/test_gmac_tx.cc b/usrp/host/apps-inband/test_gmac_tx.cc
index dd16c3fa1..74f16c669 100644
--- a/usrp/host/apps-inband/test_gmac_tx.cc
+++ b/usrp/host/apps-inband/test_gmac_tx.cc
@@ -25,12 +25,10 @@
#include <mb_mblock.h>
#include <mb_runtime.h>
-#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_cs.cc b/usrp/host/apps-inband/test_usrp_inband_cs.cc
index 560b81aeb..2497f8d5c 100644
--- a/usrp/host/apps-inband/test_usrp_inband_cs.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_cs.cc
@@ -25,12 +25,10 @@
#include <mb_mblock.h>
#include <mb_runtime.h>
-#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_overrun.cc b/usrp/host/apps-inband/test_usrp_inband_overrun.cc
index 343720c28..9041a0984 100644
--- a/usrp/host/apps-inband/test_usrp_inband_overrun.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_overrun.cc
@@ -25,12 +25,10 @@
#include <mb_mblock.h>
#include <mb_runtime.h>
-#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_ping.cc b/usrp/host/apps-inband/test_usrp_inband_ping.cc
index 5a82f0c3c..6b1347ccc 100644
--- a/usrp/host/apps-inband/test_usrp_inband_ping.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_ping.cc
@@ -25,12 +25,10 @@
#include <mb_mblock.h>
#include <mb_runtime.h>
-#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_registers.cc b/usrp/host/apps-inband/test_usrp_inband_registers.cc
index 2ff42a052..017ccdbf5 100644
--- a/usrp/host/apps-inband/test_usrp_inband_registers.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_registers.cc
@@ -25,12 +25,11 @@
#include <mb_mblock.h>
#include <mb_runtime.h>
-#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
+//#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_rx.cc b/usrp/host/apps-inband/test_usrp_inband_rx.cc
index c37c19c00..0429951f3 100644
--- a/usrp/host/apps-inband/test_usrp_inband_rx.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_rx.cc
@@ -25,12 +25,10 @@
#include <mb_mblock.h>
#include <mb_runtime.h>
-#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
index d24f5efc6..8824a72fe 100644
--- a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
@@ -25,12 +25,10 @@
#include <mb_mblock.h>
#include <mb_runtime.h>
-#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_tx.cc b/usrp/host/apps-inband/test_usrp_inband_tx.cc
index 6d269a4df..7118d2d0f 100644
--- a/usrp/host/apps-inband/test_usrp_inband_tx.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_tx.cc
@@ -25,12 +25,10 @@
#include <mb_mblock.h>
#include <mb_runtime.h>
-#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_underrun.cc b/usrp/host/apps-inband/test_usrp_inband_underrun.cc
index 411e88777..0404208b4 100644
--- a/usrp/host/apps-inband/test_usrp_inband_underrun.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_underrun.cc
@@ -25,12 +25,10 @@
#include <mb_mblock.h>
#include <mb_runtime.h>
-#include <mb_runtime_nop.h> // QA only
#include <mb_protocol_class.h>
#include <mb_exception.h>
#include <mb_msg_queue.h>
#include <mb_message.h>
-#include <mb_mblock_impl.h>
#include <mb_msg_accepter.h>
#include <mb_class_registry.h>
#include <pmt.h>
diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am
index 971388406..cc93d0d3c 100644
--- a/usrp/host/apps/Makefile.am
+++ b/usrp/host/apps/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2003,2006 Free Software Foundation, Inc.
+# Copyright 2003,2006,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,8 +21,8 @@
include $(top_srcdir)/Makefile.common
-INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
-
+INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
+ $(WITH_INCLUDES)
bin_PROGRAMS = \
usrper \
diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am
index e67d8287e..3a59fd618 100644
--- a/usrp/host/lib/inband/Makefile.am
+++ b/usrp/host/lib/inband/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common
INCLUDES = \
$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
$(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
- -I$(srcdir)/../../apps-inband
+ -I$(srcdir)/../../apps-inband $(WITH_INCLUDES)
TESTS = test_inband
@@ -31,12 +31,10 @@ EXTRA_DIST = \
usrp_server.mbh \
usrp_interface.mbh
-
lib_LTLIBRARIES = \
libusrp_inband.la \
libusrp_inband-qa.la
-
# ------------------------------------------------------------------------
# Build the inband library
@@ -75,7 +73,7 @@ include_HEADERS = \
usrp_server.h \
usrp_tx.h \
usrp_tx_stub.h \
- usrp_usb_interface.h
+ usrp_usb_interface.h
noinst_HEADERS = \
fake_usrp.h \
@@ -89,8 +87,7 @@ noinst_HEADERS = \
symbols_usrp_rx_cs.h \
symbols_usrp_server_cs.h \
symbols_usrp_tx.h \
- symbols_usrp_tx_cs.h
-
+ symbols_usrp_tx_cs.h
# ------------------------------------------------------------------------
# Build the qa code in its own library
@@ -98,7 +95,7 @@ noinst_HEADERS = \
libusrp_inband_qa_la_SOURCES = \
qa_inband.cc \
qa_inband_packet_prims.cc \
- qa_inband_usrp_server.cc
+ qa_inband_usrp_server.cc
# magic flags
libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
@@ -121,6 +118,5 @@ test_inband_LDADD = libusrp_inband-qa.la
test_usrp_inband_SOURCES = test_usrp_inband.cc
test_usrp_inband_LDADD = libusrp_inband-qa.la
-
MOSTLYCLEANFILES = \
$(BUILT_SOURCES) *~ *.pyc
diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am
index 3d1e5a6bc..17b5935e3 100644
--- a/usrp/host/lib/legacy/Makefile.am
+++ b/usrp/host/lib/legacy/Makefile.am
@@ -1,7 +1,7 @@
#
# USRP - Universal Software Radio Peripheral
#
-# Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc.
+# Copyright (C) 2003,2004,2006,2007,2008 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,10 +32,10 @@ libusrp_la_common_LIBADD = \
# darwin fusb requires omnithreads
if FUSB_TECH_darwin
-INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES)
+INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(WITH_INCLUDES)
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
else
-INCLUDES = $(common_INCLUDES)
+INCLUDES = $(common_INCLUDES) $(WITH_INCLUDES)
libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
endif
diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index c5e4bc567..a7c8b08df 100644
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2003,2004,2006,2007 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006,2007,2008 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -27,7 +27,8 @@ ourlibdir = $(usrppyexecdir)
INCLUDES = $(USRP_INCLUDES) \
$(PYTHON_CPPFLAGS) \
- -I$(srcdir)
+ -I$(srcdir) \
+ $(WITH_INCLUDES)
LOCAL_IFILES = \
prims.i
@@ -52,7 +53,8 @@ ourpython_PYTHON = \
usrp_prims.py
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \
+ $(WITH_INCLUDES)
ourlib_LTLIBRARIES = \
generated by cgit (git 2.34.1) at 2025-01-23 20:36:57 +0000