aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo-msc
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-07-19 16:48:42 +0200
committerHarald Welte <laforge@gnumonks.org>2017-08-29 12:51:19 +0000
commit979cd26f35cc979a15073f263cdc5d1b5691bc65 (patch)
tree66d6d79a840b5ec74b1abe195d19b684cf485af9 /src/osmo-msc
parentc2df7e84a711e1da14d16c7110b45f9a8d9b38fb (diff)
move to osmo-mgw.git: osmo-bsc_mgcp and libmgcp as libosmo-legacy-mgcp
Rewire build and includes to libosmo-legacy-mgcp. Drop osmo-bsc_mgcp and related python tests, now found in osmo-mgw.git. libosmo-legacy-mgcp is installed from osmo-mgw, hence add the dependency to jenkins.sh (so far using the pre_release branch). Change-Id: Ic99d681759edce11564da62500c2aac5cf5fffe2
Diffstat (limited to 'src/osmo-msc')
-rw-r--r--src/osmo-msc/Makefile.am4
-rw-r--r--src/osmo-msc/msc_main.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am
index 87b6133f9..0d4876fa9 100644
--- a/src/osmo-msc/Makefile.am
+++ b/src/osmo-msc/Makefile.am
@@ -17,6 +17,7 @@ AM_CFLAGS = \
$(LIBOSMORANAP_CFLAGS) \
$(LIBASN1C_CFLAGS) \
$(LIBOSMOSIGTRAN_CFLAGS) \
+ $(LIBOSMOLEGACYMGCP_CFLAGS) \
$(NULL)
AM_LDFLAGS = \
@@ -37,7 +38,6 @@ osmo_msc_LDADD = \
$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(top_builddir)/src/libmgcp/libmgcp.a \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOVTY_LIBS) \
$(LIBOSMOCORE_LIBS) \
@@ -46,6 +46,8 @@ osmo_msc_LDADD = \
$(LIBSMPP34_LIBS) \
$(LIBCRYPTO_LIBS) \
$(LIBOSMOSIGTRAN_LIBS) \
+ $(LIBOSMOLEGACYMGCP_LIBS) \
+ $(LIBRARY_GSM) \
-ldbi \
$(NULL)
if BUILD_IU
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index de6af5dd6..30b11d983 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -64,7 +64,7 @@
#include <openbsc/osmo_bsc_rf.h>
#include <openbsc/smpp.h>
#include <osmocom/sigtran/osmo_ss7.h>
-#include <openbsc/mgcpgw_client.h>
+#include <osmocom/legacy_mgcp/mgcpgw_client.h>
#ifdef BUILD_IU
#include <osmocom/ranap/iu_client.h>