Max has uploaded this change for review. ( https://gerrit.osmocom.org/12557
Change subject: Fix optional libmsc linking with libsmpp
......................................................................
Fix optional libmsc linking with libsmpp
Link internal libmsc against libsmpp as determined at ./configure
time. This removes the need for unrelated binaries to be linked against
libsmpp.
Change-Id: Ia660964e91f65255465b8620dc9e43dbd47a4e70
---
M src/libmsc/Makefile.am
M tests/msc_vlr/Makefile.am
M tests/sms_queue/Makefile.am
3 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/12557/1
diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am
index 72da747..3c06f10 100644
--- a/src/libmsc/Makefile.am
+++ b/src/libmsc/Makefile.am
@@ -75,4 +75,6 @@
smpp_vty.c \
smpp_utils.c \
$(NULL)
+
+libmsc_a_LIBADD = $(LIBSMPP34_LIBS)
endif
diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am
index 8a5e719..83145e3 100644
--- a/tests/msc_vlr/Makefile.am
+++ b/tests/msc_vlr/Makefile.am
@@ -8,7 +8,6 @@
-ggdb3 \
$(LIBOSMOCORE_CFLAGS) \
$(LIBOSMOGSM_CFLAGS) \
- $(LIBSMPP34_CFLAGS) \
$(LIBOSMOVTY_CFLAGS) \
$(LIBOSMOABIS_CFLAGS) \
$(LIBOSMOSIGTRAN_CFLAGS) \
@@ -41,7 +40,6 @@
LDADD = \
$(top_builddir)/src/libmsc/libmsc.a \
$(top_builddir)/src/libvlr/libvlr.a \
- $(LIBSMPP34_LIBS) \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOVTY_LIBS) \
diff --git a/tests/sms_queue/Makefile.am b/tests/sms_queue/Makefile.am
index 1ffbe1c..5ea0dc6 100644
--- a/tests/sms_queue/Makefile.am
+++ b/tests/sms_queue/Makefile.am
@@ -33,7 +33,6 @@
sms_queue_test_LDADD = \
$(top_builddir)/src/libmsc/libmsc.a \
$(top_builddir)/src/libvlr/libvlr.a \
- $(LIBSMPP34_LIBS) \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOVTY_LIBS) \
--
To view, visit https://gerrit.osmocom.org/12557
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia660964e91f65255465b8620dc9e43dbd47a4e70
Gerrit-Change-Number: 12557
Gerrit-PatchSet: 1
Gerrit-Owner: Max <[email protected]>
