Change in osmo-trx[master]: Move smpl_buf out of uhd dir to re-use it in other devices

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/13831 )

Change subject: Move smpl_buf out of uhd dir to re-use it in other devices
......................................................................

Move smpl_buf out of uhd dir to re-use it in other devices

Change-Id: I39ac8435072cff8d4dac786b31ff4af9b61a77fe
---
M Transceiver52M/device/Makefile.am
R Transceiver52M/device/smpl_buf.cpp
R Transceiver52M/device/smpl_buf.h
M Transceiver52M/device/uhd/Makefile.am
4 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/Transceiver52M/device/Makefile.am b/Transceiver52M/device/Makefile.am
index 1a2d077..e653a9e 100644
--- a/Transceiver52M/device/Makefile.am
+++ b/Transceiver52M/device/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.common
 
-noinst_HEADERS = radioDevice.h
+noinst_HEADERS = radioDevice.h smpl_buf.h
 
 SUBDIRS =
 
diff --git a/Transceiver52M/device/uhd/smpl_buf.cpp b/Transceiver52M/device/smpl_buf.cpp
similarity index 100%
rename from Transceiver52M/device/uhd/smpl_buf.cpp
rename to Transceiver52M/device/smpl_buf.cpp
diff --git a/Transceiver52M/device/uhd/smpl_buf.h b/Transceiver52M/device/smpl_buf.h
similarity index 100%
rename from Transceiver52M/device/uhd/smpl_buf.h
rename to Transceiver52M/device/smpl_buf.h
diff --git a/Transceiver52M/device/uhd/Makefile.am b/Transceiver52M/device/uhd/Makefile.am
index 4fcc0d7..11b380e 100644
--- a/Transceiver52M/device/uhd/Makefile.am
+++ b/Transceiver52M/device/uhd/Makefile.am
@@ -3,8 +3,8 @@
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)
 
-noinst_HEADERS = UHDDevice.h smpl_buf.h
+noinst_HEADERS = UHDDevice.h
 
 noinst_LTLIBRARIES = libdevice.la
 
-libdevice_la_SOURCES = UHDDevice.cpp smpl_buf.cpp
+libdevice_la_SOURCES = UHDDevice.cpp ../smpl_buf.cpp

-- 
To view, visit https://gerrit.osmocom.org/13831
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I39ac8435072cff8d4dac786b31ff4af9b61a77fe
Gerrit-Change-Number: 13831
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: tnt <tnt at 246tNt.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190503/7b103de0/attachment.htm>