summaryrefslogtreecommitdiffstats
path: root/usrp_uhd
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-01-08 19:11:58 -0800
committerJosh Blum <josh@joshknows.com>2010-01-08 19:11:58 -0800
commit4e94574aeaa46c671bba0a6fc83cb967d228c880 (patch)
treedbc3ef97a3170875d07d9e0ab510d635c036edd6 /usrp_uhd
parenta478ffe79757f82ce16b6694d860a53dac60849c (diff)
downloaduhd-4e94574aeaa46c671bba0a6fc83cb967d228c880.tar.gz
uhd-4e94574aeaa46c671bba0a6fc83cb967d228c880.tar.bz2
uhd-4e94574aeaa46c671bba0a6fc83cb967d228c880.zip
Created subcomponent for usrp dboards.
Only populated the interface though.
Diffstat (limited to 'usrp_uhd')
-rw-r--r--usrp_uhd/include/Makefile.am6
-rw-r--r--usrp_uhd/lib/Makefile.am3
2 files changed, 6 insertions, 3 deletions
diff --git a/usrp_uhd/include/Makefile.am b/usrp_uhd/include/Makefile.am
index b5d09b431..1ec431648 100644
--- a/usrp_uhd/include/Makefile.am
+++ b/usrp_uhd/include/Makefile.am
@@ -6,9 +6,11 @@ include $(top_srcdir)/Makefile.common
SUBDIRS =
-usrp_uhd_includedir = $(includedir)
+this_includedir = $(includedir)
+this_include_HEADERS = \
+ usrp_uhd.hpp
+usrp_uhd_includedir = $(includedir)/usrp_uhd
usrp_uhd_include_HEADERS = \
- usrp_uhd.hpp \
usrp_uhd/usrp_addr.hpp \
usrp_uhd/wax.hpp
diff --git a/usrp_uhd/lib/Makefile.am b/usrp_uhd/lib/Makefile.am
index 09e15301b..2b744b4fc 100644
--- a/usrp_uhd/lib/Makefile.am
+++ b/usrp_uhd/lib/Makefile.am
@@ -20,6 +20,7 @@ libusrp_uhd_la_SOURCES = \
libusrp_uhd_la_LIBADD = \
$(BOOST_LDFLAGS) \
- $(BOOST_THREAD_LIB)
+ $(BOOST_THREAD_LIB) \
+ $(USRP_DBOARD_LA)
noinst_HEADERS =