20 files changed, 18 insertions, 18 deletions
diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt
index a30a45977..80f4bf45e 100644
--- a/host/lib/usrp/CMakeLists.txt
+++ b/host/lib/usrp/CMakeLists.txt
@@ -37,5 +37,5 @@ INCLUDE_SUBDIRECTORY(dboard)
 INCLUDE_SUBDIRECTORY(fx2)
 INCLUDE_SUBDIRECTORY(usrp1)
 INCLUDE_SUBDIRECTORY(usrp2)
-INCLUDE_SUBDIRECTORY(usrp_b100)
+INCLUDE_SUBDIRECTORY(b100)
 INCLUDE_SUBDIRECTORY(usrp_e100)
diff --git a/host/lib/usrp/usrp_b100/CMakeLists.txt b/host/lib/usrp/b100/CMakeLists.txt
index f83a10935..e1618a49c 100644
--- a/host/lib/usrp/usrp_b100/CMakeLists.txt
+++ b/host/lib/usrp/b100/CMakeLists.txt
@@ -26,22 +26,22 @@ LIBUHD_REGISTER_COMPONENT("B100" ENABLE_B100 ON "ENABLE_LIBUHD;ENABLE_USB" OFF)
 
 IF(ENABLE_B100)
     LIBUHD_APPEND_SOURCES(
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/clock_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/clock_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/codec_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/codec_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/codec_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/ctrl_packet.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/dboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/dboard_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/dsp_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/io_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/mboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/b100_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/b100_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/b100_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/b100_iface.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/b100_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_b100/b100_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/clock_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/codec_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/ctrl_packet.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dboard_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dsp_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/io_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/mboard_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/b100_ctrl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/b100_ctrl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/b100_iface.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/b100_iface.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/b100_impl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/b100_impl.hpp
     )
 ENDIF(ENABLE_B100)
diff --git a/host/lib/usrp/usrp_b100/b100_ctrl.cpp b/host/lib/usrp/b100/b100_ctrl.cpp
index 4d4520e1e..4d4520e1e 100644
--- a/host/lib/usrp/usrp_b100/b100_ctrl.cpp
+++ b/host/lib/usrp/b100/b100_ctrl.cpp
diff --git a/host/lib/usrp/usrp_b100/b100_ctrl.hpp b/host/lib/usrp/b100/b100_ctrl.hpp
index ae706dbb4..ae706dbb4 100644
--- a/host/lib/usrp/usrp_b100/b100_ctrl.hpp
+++ b/host/lib/usrp/b100/b100_ctrl.hpp
diff --git a/host/lib/usrp/usrp_b100/b100_iface.cpp b/host/lib/usrp/b100/b100_iface.cpp
index 17ea2e6ad..17ea2e6ad 100644
--- a/host/lib/usrp/usrp_b100/b100_iface.cpp
+++ b/host/lib/usrp/b100/b100_iface.cpp
diff --git a/host/lib/usrp/usrp_b100/b100_iface.hpp b/host/lib/usrp/b100/b100_iface.hpp
index 57ed6a45c..57ed6a45c 100644
--- a/host/lib/usrp/usrp_b100/b100_iface.hpp
+++ b/host/lib/usrp/b100/b100_iface.hpp
diff --git a/host/lib/usrp/usrp_b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp
index 772da8f42..772da8f42 100644
--- a/host/lib/usrp/usrp_b100/b100_impl.cpp
+++ b/host/lib/usrp/b100/b100_impl.cpp
diff --git a/host/lib/usrp/usrp_b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp
index daec70bca..daec70bca 100644
--- a/host/lib/usrp/usrp_b100/b100_impl.hpp
+++ b/host/lib/usrp/b100/b100_impl.hpp
diff --git a/host/lib/usrp/usrp_b100/b100_regs.hpp b/host/lib/usrp/b100/b100_regs.hpp
index 010df283e..010df283e 100644
--- a/host/lib/usrp/usrp_b100/b100_regs.hpp
+++ b/host/lib/usrp/b100/b100_regs.hpp
diff --git a/host/lib/usrp/usrp_b100/clock_ctrl.cpp b/host/lib/usrp/b100/clock_ctrl.cpp
index e138242d1..e138242d1 100644
--- a/host/lib/usrp/usrp_b100/clock_ctrl.cpp
+++ b/host/lib/usrp/b100/clock_ctrl.cpp
diff --git a/host/lib/usrp/usrp_b100/clock_ctrl.hpp b/host/lib/usrp/b100/clock_ctrl.hpp
index 2a2e74024..2a2e74024 100644
--- a/host/lib/usrp/usrp_b100/clock_ctrl.hpp
+++ b/host/lib/usrp/b100/clock_ctrl.hpp
diff --git a/host/lib/usrp/usrp_b100/codec_ctrl.cpp b/host/lib/usrp/b100/codec_ctrl.cpp
index 4d118b68b..4d118b68b 100644
--- a/host/lib/usrp/usrp_b100/codec_ctrl.cpp
+++ b/host/lib/usrp/b100/codec_ctrl.cpp
diff --git a/host/lib/usrp/usrp_b100/codec_ctrl.hpp b/host/lib/usrp/b100/codec_ctrl.hpp
index 1bd579190..1bd579190 100644
--- a/host/lib/usrp/usrp_b100/codec_ctrl.hpp
+++ b/host/lib/usrp/b100/codec_ctrl.hpp
diff --git a/host/lib/usrp/usrp_b100/codec_impl.cpp b/host/lib/usrp/b100/codec_impl.cpp
index de3ca3a66..de3ca3a66 100644
--- a/host/lib/usrp/usrp_b100/codec_impl.cpp
+++ b/host/lib/usrp/b100/codec_impl.cpp
diff --git a/host/lib/usrp/usrp_b100/ctrl_packet.hpp b/host/lib/usrp/b100/ctrl_packet.hpp
index f504fc5aa..f504fc5aa 100644
--- a/host/lib/usrp/usrp_b100/ctrl_packet.hpp
+++ b/host/lib/usrp/b100/ctrl_packet.hpp
diff --git a/host/lib/usrp/usrp_b100/dboard_iface.cpp b/host/lib/usrp/b100/dboard_iface.cpp
index ec3da6220..ec3da6220 100644
--- a/host/lib/usrp/usrp_b100/dboard_iface.cpp
+++ b/host/lib/usrp/b100/dboard_iface.cpp
diff --git a/host/lib/usrp/usrp_b100/dboard_impl.cpp b/host/lib/usrp/b100/dboard_impl.cpp
index ba3776728..ba3776728 100644
--- a/host/lib/usrp/usrp_b100/dboard_impl.cpp
+++ b/host/lib/usrp/b100/dboard_impl.cpp
diff --git a/host/lib/usrp/usrp_b100/dsp_impl.cpp b/host/lib/usrp/b100/dsp_impl.cpp
index c1bf6bedd..c1bf6bedd 100644
--- a/host/lib/usrp/usrp_b100/dsp_impl.cpp
+++ b/host/lib/usrp/b100/dsp_impl.cpp
diff --git a/host/lib/usrp/usrp_b100/io_impl.cpp b/host/lib/usrp/b100/io_impl.cpp
index 3978bea75..3978bea75 100644
--- a/host/lib/usrp/usrp_b100/io_impl.cpp
+++ b/host/lib/usrp/b100/io_impl.cpp
diff --git a/host/lib/usrp/usrp_b100/mboard_impl.cpp b/host/lib/usrp/b100/mboard_impl.cpp
index c651ff2a2..c651ff2a2 100644
--- a/host/lib/usrp/usrp_b100/mboard_impl.cpp
+++ b/host/lib/usrp/b100/mboard_impl.cpp