pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/42254?usp=email )
Change subject: ipc: Makefile.am: Pick already compiled UHDDevice.o object
......................................................................
ipc: Makefile.am: Pick already compiled UHDDevice.o object
Take the chance to reorder LDADD, since it expects dependencies to be in
inversed-tree order.
Change-Id: I344309cb7264caf1622b70e87bb44ad3f32edb88
---
M Transceiver52M/device/Makefile.am
M Transceiver52M/device/ipc/Makefile.am
2 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/Transceiver52M/device/Makefile.am
b/Transceiver52M/device/Makefile.am
index 9af18f7..b5a5cec 100644
--- a/Transceiver52M/device/Makefile.am
+++ b/Transceiver52M/device/Makefile.am
@@ -2,10 +2,6 @@
SUBDIRS = common
-if DEVICE_IPC
-SUBDIRS += ipc
-endif
-
if DEVICE_USRP1
SUBDIRS += usrp1
endif
@@ -14,6 +10,10 @@
SUBDIRS += uhd
endif
+if DEVICE_IPC
+SUBDIRS += ipc
+endif
+
if DEVICE_LMS
SUBDIRS += lms
endif
diff --git a/Transceiver52M/device/ipc/Makefile.am
b/Transceiver52M/device/ipc/Makefile.am
index c08621f..3e28169 100644
--- a/Transceiver52M/device/ipc/Makefile.am
+++ b/Transceiver52M/device/ipc/Makefile.am
@@ -24,11 +24,13 @@
bin_PROGRAMS = ipc-driver-test
#ipc_driver_test_SHORTNAME = drvt
-ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ../uhd/UHDDevice.cpp
+ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp
ipc_driver_test_LDADD = \
- libdevice.la \
- $(COMMON_LA) \
- $(LIBOSMOCORE_LIBS) \
$(UHD_LIBS) \
+ $(LIBOSMOCORE_LIBS) \
+ $(COMMON_LA) \
+ libdevice.la \
+ $(top_builddir)/Transceiver52M/device/uhd/UHDDevice.o \
$(NULL)
+
endif
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/42254?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I344309cb7264caf1622b70e87bb44ad3f32edb88
Gerrit-Change-Number: 42254
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
