This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgPau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/13873 Change subject: smpl_buf: Move it to device/common and create libdevice_common.la ...................................................................... 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 --- M Transceiver52M/Makefile.am M Transceiver52M/device/Makefile.am A Transceiver52M/device/common/Makefile.am R Transceiver52M/device/common/radioDevice.h R Transceiver52M/device/common/smpl_buf.cpp R Transceiver52M/device/common/smpl_buf.h M Transceiver52M/device/lms/Makefile.am M Transceiver52M/device/uhd/Makefile.am M Transceiver52M/device/usrp1/Makefile.am M configure.ac 10 files changed, 20 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/73/13873/1 diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index 28c47ab..89ab796 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -23,7 +23,7 @@ SUBDIRS = arch device -AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device +AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcdir}/device/common AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) rev2dir = $(datadir)/usrp/rev2 diff --git a/Transceiver52M/device/Makefile.am b/Transceiver52M/device/Makefile.am index e653a9e..369e877 100644 --- a/Transceiver52M/device/Makefile.am +++ b/Transceiver52M/device/Makefile.am @@ -1,8 +1,6 @@ include $(top_srcdir)/Makefile.common -noinst_HEADERS = radioDevice.h smpl_buf.h - -SUBDIRS = +SUBDIRS = common if DEVICE_USRP1 SUBDIRS += usrp1 diff --git a/Transceiver52M/device/common/Makefile.am b/Transceiver52M/device/common/Makefile.am new file mode 100644 index 0000000..a5815bb --- /dev/null +++ b/Transceiver52M/device/common/Makefile.am @@ -0,0 +1,12 @@ +include $(top_srcdir)/Makefile.common + +AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) +AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LMS_CFLAGS) + + +noinst_HEADERS = radioDevice.h smpl_buf.h + +noinst_LTLIBRARIES = libdevice_common.la + +libdevice_common_la_SOURCES = \ + smpl_buf.cpp diff --git a/Transceiver52M/device/radioDevice.h b/Transceiver52M/device/common/radioDevice.h similarity index 100% rename from Transceiver52M/device/radioDevice.h rename to Transceiver52M/device/common/radioDevice.h diff --git a/Transceiver52M/device/smpl_buf.cpp b/Transceiver52M/device/common/smpl_buf.cpp similarity index 100% rename from Transceiver52M/device/smpl_buf.cpp rename to Transceiver52M/device/common/smpl_buf.cpp diff --git a/Transceiver52M/device/smpl_buf.h b/Transceiver52M/device/common/smpl_buf.h similarity index 100% rename from Transceiver52M/device/smpl_buf.h rename to Transceiver52M/device/common/smpl_buf.h diff --git a/Transceiver52M/device/lms/Makefile.am b/Transceiver52M/device/lms/Makefile.am index 8471074..682cf26 100644 --- a/Transceiver52M/device/lms/Makefile.am +++ b/Transceiver52M/device/lms/Makefile.am @@ -1,6 +1,6 @@ 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) $(LMS_CFLAGS) noinst_HEADERS = LMSDevice.h 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 diff --git a/Transceiver52M/device/usrp1/Makefile.am b/Transceiver52M/device/usrp1/Makefile.am index d99874a..5078934 100644 --- a/Transceiver52M/device/usrp1/Makefile.am +++ b/Transceiver52M/device/usrp1/Makefile.am @@ -1,6 +1,6 @@ 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) $(USRP_CFLAGS) noinst_HEADERS = USRPDevice.h diff --git a/configure.ac b/configure.ac index bd421aa..e2a07f8 100644 --- a/configure.ac +++ b/configure.ac @@ -296,6 +296,7 @@ Transceiver52M/arch/arm/Makefile \ Transceiver52M/arch/x86/Makefile \ Transceiver52M/device/Makefile \ + Transceiver52M/device/common/Makefile \ Transceiver52M/device/uhd/Makefile \ Transceiver52M/device/usrp1/Makefile \ Transceiver52M/device/lms/Makefile \ -- To view, visit https://gerrit.osmocom.org/13873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I465ad0f6d5569bb3006d711c8fd0df14391fcf35 Gerrit-Change-Number: 13873 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190503/b2b2a675/attachment.htm>