Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/12393 )
Change subject: Move shared libs into common LDADD
......................................................................
Move shared libs into common LDADD
Change-Id: I8b2f2cd60426cf3b52dd463959a48fd7619cfcce
---
M src/Makefile.am
1 file changed, 3 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/src/Makefile.am b/src/Makefile.am
index 9ad5947..412337b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+
AM_CPPFLAGS = \
$(all_includes) \
-I$(top_srcdir) \
@@ -20,9 +22,7 @@
osmo-ctrl-client \
$(NULL)
-osmo_sysmon_LDADD = \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
+osmo_sysmon_LDADD = $(LDADD) \
$(LIBOSMOVTY_LIBS) \
$(LIBMNL_LIBS) \
$(NULL)
@@ -37,11 +37,6 @@
osysmon_main.c \
$(NULL)
-osmo_ctrl_client_LDADD = \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- $(NULL)
-
osmo_ctrl_client_SOURCES = \
simple_ctrl.c \
osmo-ctrl-client.c \
--
To view, visit https://gerrit.osmocom.org/12393
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sysmon
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b2f2cd60426cf3b52dd463959a48fd7619cfcce
Gerrit-Change-Number: 12393
Gerrit-PatchSet: 1
Gerrit-Owner: Max <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <[email protected]>
