pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39045?usp=email ) Change subject: Drop dependency on libosmo-abis ...................................................................... Drop dependency on libosmo-abis Change-Id: I7658b0c92c589b24a9f2bfe101ada5fc0077059f --- M configure.ac M contrib/jenkins.sh M debian/control M src/Makefile.am M src/bankd/Makefile.am M src/client/Makefile.am M src/server/Makefile.am 7 files changed, 2 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/45/39045/1 diff --git a/configure.ac b/configure.ac index 0296197..ad2dcdb 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,6 @@ PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.6.0) PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 1.5.0) -PKG_CHECK_MODULES(OSMOABIS, libosmoabis >= 1.6.0) AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])], [osmo_ac_build_server="$enableval"],[osmo_ac_build_server="yes"]) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 2aa56a4..bfc4f57 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,5 @@ #!/bin/sh -# jenkins build helper script for libosmo-abis. This is how we build on jenkins.osmocom.org +# jenkins build helper script for osmo-remsim. This is how we build on jenkins.osmocom.org # # environment variables: # * WITH_MANUALS: build manual PDFs if set to "1" @@ -30,7 +30,6 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-netif "" --disable-doxygen -osmo-build-dep.sh libosmo-abis osmo-build-dep.sh simtrace2 # Additional configure options and depends diff --git a/debian/control b/debian/control index 1d6d7b3..3e98465 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ osmo-gsm-manuals-dev, libcsv-dev, libosmocore-dev (>= 1.6.0), - libosmo-abis-dev (>= 1.6.0), libosmo-netif-dev (>= 1.5.0), libosmo-simtrace2-dev (>= 0.8.0), libpcsclite-dev, diff --git a/src/Makefile.am b/src/Makefile.am index 6bb3d79..c2551a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,6 @@ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOABIS_CFLAGS) \ $(OSMONETIF_CFLAGS) \ $(OSMOGSM_CFLAGS) \ $(OSMOCORE_CFLAGS) \ @@ -20,7 +19,7 @@ RSPRO_LIBVERSION=2:0:0 lib_LTLIBRARIES = libosmo-rspro.la libosmo_rspro_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RSPRO_LIBVERSION) -# OSMOABIS_LIBS, OSMONETIF_LIBS, OSMOGSM_LIBS not needed, we don't use any of its symbols, only the header above +# OSMONETIF_LIBS, OSMOGSM_LIBS not needed, we don't use any of its symbols, only the header above libosmo_rspro_la_LIBADD = $(OSMOCORE_LIBS) \ rspro/libosmo-asn1-rspro.la libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c diff --git a/src/bankd/Makefile.am b/src/bankd/Makefile.am index d5eee87..1e2db28 100644 --- a/src/bankd/Makefile.am +++ b/src/bankd/Makefile.am @@ -3,7 +3,6 @@ -I$(top_builddir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOABIS_CFLAGS) \ $(OSMONETIF_CFLAGS) \ $(OSMOGSM_CFLAGS) \ $(OSMOCORE_CFLAGS) \ @@ -24,7 +23,6 @@ osmo_remsim_bankd_SOURCES = ../slotmap.c ../rspro_client_fsm.c ../debug.c \ bankd_main.c bankd_pcsc.c gsmtap.c osmo_remsim_bankd_LDADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ diff --git a/src/client/Makefile.am b/src/client/Makefile.am index dc61196..6c7abc6 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -3,7 +3,6 @@ -I/$(top_builddir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOABIS_CFLAGS) \ $(OSMONETIF_CFLAGS) \ $(OSMOGSM_CFLAGS) \ $(OSMOCORE_CFLAGS) \ @@ -17,7 +16,6 @@ remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c osmo_remsim_client_shell_CFLAGS = $(AM_CFLAGS) osmo_remsim_client_shell_LDADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ @@ -36,7 +34,6 @@ libifd_remsim_client_la_CPPFLAGS = $(PCSC_CFLAGS) libifd_remsim_client_la_LDFLAGS = -no-undefined libifd_remsim_client_la_LIBADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ @@ -50,7 +47,6 @@ osmo_remsim_client_st2_CPPFLAGS = -DUSB_SUPPORT -DSIMTRACE_SUPPORT osmo_remsim_client_st2_CFLAGS = $(AM_CFLAGS) osmo_remsim_client_st2_LDADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOSIMTRACE2_LIBS) \ $(OSMOGSM_LIBS) \ diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 5a1908a..308c8f7 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -4,7 +4,6 @@ -I$(top_builddir)/include \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include/osmocom/rspro \ - $(OSMOABIS_CFLAGS) \ $(OSMONETIF_CFLAGS) \ $(OSMOGSM_CFLAGS) \ $(OSMOCORE_CFLAGS) \ @@ -20,7 +19,6 @@ osmo_remsim_server_SOURCES = remsim_server.c rspro_server.c rest_api.c \ ../rspro_util.c ../slotmap.c ../debug.c osmo_remsim_server_LDADD = $(top_builddir)/src/libosmo-rspro.la \ - $(OSMOABIS_LIBS) \ $(OSMONETIF_LIBS) \ $(OSMOGSM_LIBS) \ $(OSMOCORE_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39045?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I7658b0c92c589b24a9f2bfe101ada5fc0077059f Gerrit-Change-Number: 39045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>