diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-05-03 21:08:40 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-05-06 11:23:18 +0200 |
commit | b5def414b8c485c8fb434a427ed8f4df427ae224 (patch) | |
tree | 2239221545e4d625681cd08476de8fbb8d907bb0 /Transceiver52M/device/uhd/Makefile.am | |
parent | fc73c073a127c702e2513c2983871a8970879845 (diff) |
smpl_buf: Move it to device/common and create libdevice_common.la
Since in next commit osmo-trx-lms starts using smpl_buf.cpp, it seems
some automake step doesn't like including a cpp file twice from a
different directory, since race conditions can occur building it.
Instead we define the dependency by first building a static lib and then
using it on each libdevice.la (one per device type).
We already do the similar under arch/ subdir, where we have a common/
subdir and then one subdir and lib per architecture.
Change-Id: I465ad0f6d5569bb3006d711c8fd0df14391fcf35
Diffstat (limited to 'Transceiver52M/device/uhd/Makefile.am')
-rw-r--r-- | Transceiver52M/device/uhd/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Transceiver52M/device/uhd/Makefile.am b/Transceiver52M/device/uhd/Makefile.am index 11b380e..ab63a4a 100644 --- a/Transceiver52M/device/uhd/Makefile.am +++ b/Transceiver52M/device/uhd/Makefile.am @@ -1,10 +1,11 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/.. +AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(UHD_CFLAGS) noinst_HEADERS = UHDDevice.h noinst_LTLIBRARIES = libdevice.la -libdevice_la_SOURCES = UHDDevice.cpp ../smpl_buf.cpp +libdevice_la_SOURCES = UHDDevice.cpp +libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la |