<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13873">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">smpl_buf: Move it to device/common and create libdevice_common.la<br><br>Since in next commit osmo-trx-lms starts using smpl_buf.cpp, it seems<br>some automake step doesn't like including a cpp file twice from a<br>different directory, since race conditions can occur building it.<br>Instead we define the dependency by first building a static lib and then<br>using it on each libdevice.la (one per device type).<br><br>We already do the similar under arch/ subdir, where we have a common/<br>subdir and then one subdir and lib per architecture.<br><br>Change-Id: I465ad0f6d5569bb3006d711c8fd0df14391fcf35<br>---<br>M Transceiver52M/Makefile.am<br>M Transceiver52M/device/Makefile.am<br>A Transceiver52M/device/common/Makefile.am<br>R Transceiver52M/device/common/radioDevice.h<br>R Transceiver52M/device/common/smpl_buf.cpp<br>R Transceiver52M/device/common/smpl_buf.h<br>M Transceiver52M/device/lms/Makefile.am<br>M Transceiver52M/device/uhd/Makefile.am<br>M Transceiver52M/device/usrp1/Makefile.am<br>M configure.ac<br>10 files changed, 20 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am</span><br><span>index 28c47ab..89ab796 100644</span><br><span>--- a/Transceiver52M/Makefile.am</span><br><span>+++ b/Transceiver52M/Makefile.am</span><br><span>@@ -23,7 +23,7 @@</span><br><span> </span><br><span> SUBDIRS = arch device</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device/common</span><br><span> AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)</span><br><span> </span><br><span> rev2dir = $(datadir)/usrp/rev2</span><br><span>diff --git a/Transceiver52M/device/Makefile.am b/Transceiver52M/device/Makefile.am</span><br><span>index e653a9e..369e877 100644</span><br><span>--- a/Transceiver52M/device/Makefile.am</span><br><span>+++ b/Transceiver52M/device/Makefile.am</span><br><span>@@ -1,8 +1,6 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = radioDevice.h smpl_buf.h</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS =</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = common</span><br><span> </span><br><span> if DEVICE_USRP1</span><br><span> SUBDIRS += usrp1</span><br><span>diff --git a/Transceiver52M/device/common/Makefile.am b/Transceiver52M/device/common/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..e14cc38</span><br><span>--- /dev/null</span><br><span>+++ b/Transceiver52M/device/common/Makefile.am</span><br><span>@@ -0,0 +1,12 @@</span><br><span style="color: hsl(120, 100%, 40%);">+include $(top_srcdir)/Makefile.common</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LMS_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = radioDevice.h smpl_buf.h</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_LTLIBRARIES = libdevice_common.la</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+libdevice_common_la_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+        smpl_buf.cpp</span><br><span>diff --git a/Transceiver52M/device/radioDevice.h b/Transceiver52M/device/common/radioDevice.h</span><br><span>similarity index 100%</span><br><span>rename from Transceiver52M/device/radioDevice.h</span><br><span>rename to Transceiver52M/device/common/radioDevice.h</span><br><span>diff --git a/Transceiver52M/device/smpl_buf.cpp b/Transceiver52M/device/common/smpl_buf.cpp</span><br><span>similarity index 100%</span><br><span>rename from Transceiver52M/device/smpl_buf.cpp</span><br><span>rename to Transceiver52M/device/common/smpl_buf.cpp</span><br><span>diff --git a/Transceiver52M/device/smpl_buf.h b/Transceiver52M/device/common/smpl_buf.h</span><br><span>similarity index 100%</span><br><span>rename from Transceiver52M/device/smpl_buf.h</span><br><span>rename to Transceiver52M/device/common/smpl_buf.h</span><br><span>diff --git a/Transceiver52M/device/lms/Makefile.am b/Transceiver52M/device/lms/Makefile.am</span><br><span>index 8471074..682cf26 100644</span><br><span>--- a/Transceiver52M/device/lms/Makefile.am</span><br><span>+++ b/Transceiver52M/device/lms/Makefile.am</span><br><span>@@ -1,6 +1,6 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common</span><br><span> AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LMS_CFLAGS)</span><br><span> </span><br><span> noinst_HEADERS = LMSDevice.h</span><br><span>diff --git a/Transceiver52M/device/uhd/Makefile.am b/Transceiver52M/device/uhd/Makefile.am</span><br><span>index 11b380e..ab63a4a 100644</span><br><span>--- a/Transceiver52M/device/uhd/Makefile.am</span><br><span>+++ b/Transceiver52M/device/uhd/Makefile.am</span><br><span>@@ -1,10 +1,11 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common</span><br><span> AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS)</span><br><span> </span><br><span> noinst_HEADERS = UHDDevice.h</span><br><span> </span><br><span> noinst_LTLIBRARIES = libdevice.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-libdevice_la_SOURCES = UHDDevice.cpp ../smpl_buf.cpp</span><br><span style="color: hsl(120, 100%, 40%);">+libdevice_la_SOURCES = UHDDevice.cpp</span><br><span style="color: hsl(120, 100%, 40%);">+libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la</span><br><span>diff --git a/Transceiver52M/device/usrp1/Makefile.am b/Transceiver52M/device/usrp1/Makefile.am</span><br><span>index d99874a..5078934 100644</span><br><span>--- a/Transceiver52M/device/usrp1/Makefile.am</span><br><span>+++ b/Transceiver52M/device/usrp1/Makefile.am</span><br><span>@@ -1,6 +1,6 @@</span><br><span> include $(top_srcdir)/Makefile.common</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/..</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common</span><br><span> AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)</span><br><span> </span><br><span> noinst_HEADERS = USRPDevice.h</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index bd421aa..e2a07f8 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -296,6 +296,7 @@</span><br><span>     Transceiver52M/arch/arm/Makefile \</span><br><span>     Transceiver52M/arch/x86/Makefile \</span><br><span>     Transceiver52M/device/Makefile \</span><br><span style="color: hsl(120, 100%, 40%);">+    Transceiver52M/device/common/Makefile \</span><br><span>     Transceiver52M/device/uhd/Makefile \</span><br><span>     Transceiver52M/device/usrp1/Makefile \</span><br><span>     Transceiver52M/device/lms/Makefile \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13873">change 13873</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13873"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I465ad0f6d5569bb3006d711c8fd0df14391fcf35 </div>
<div style="display:none"> Gerrit-Change-Number: 13873 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>