fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-cbc/+/31781 )
Change subject: {src,tests/sbcap}/Makefile.am: reorder libraries in LDADD
......................................................................
{src,tests/sbcap}/Makefile.am: reorder libraries in LDADD
... so that locally built libraries are listed first.
Otherwise the linker may pick system-installed libs instead.
Change-Id: I3396a95d221e81f3785a5883630d261f033aa10e
---
M src/Makefile.am
M tests/sbcap/Makefile.am
2 files changed, 24 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/Makefile.am b/src/Makefile.am
index ade53d0..dc99732 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,10 +30,17 @@
smscb_peer_fsm.c \
$(NULL)
-osmo_cbc_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \
- $(LIBOSMONETIF_LIBS) \
- $(ULFIUS_LIBS) $(JANSSON_LIBS) $(ORCANIA_LIBS) $(LIBSCTP_LIBS)
\
- sbcap/libosmo-sbcap.la
+osmo_cbc_LDADD = \
+ sbcap/libosmo-sbcap.la \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMONETIF_LIBS) \
+ $(ULFIUS_LIBS) \
+ $(JANSSON_LIBS) \
+ $(ORCANIA_LIBS) \
+ $(LIBSCTP_LIBS) \
+ $(NULL)
regen:
$(MAKE) -C sbcap regen
diff --git a/tests/sbcap/Makefile.am b/tests/sbcap/Makefile.am
index 844b4b0..bfb9f25 100644
--- a/tests/sbcap/Makefile.am
+++ b/tests/sbcap/Makefile.am
@@ -34,6 +34,7 @@
$(NULL)
sbcap_test_LDADD = \
+ $(top_builddir)/src/sbcap/libosmo-sbcap.la \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOVTY_LIBS) \
@@ -42,5 +43,4 @@
$(JANSSON_LIBS) \
$(ORCANIA_LIBS) \
$(LIBSCTP_LIBS) \
- $(top_builddir)/src/sbcap/libosmo-sbcap.la \
$(NULL)
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/31781
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: I3396a95d221e81f3785a5883630d261f033aa10e
Gerrit-Change-Number: 31781
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
