fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/43391?usp=email )
Change subject: build: drop unused libosmo-abis dependency
......................................................................
build: drop unused libosmo-abis dependency
No code in this tree includes any <osmocom/abis/*> header anymore.
The last use, <osmocom/abis/ipa.h> in sgsn_vty.c, was already
unneeded and dropped in 08c1ba313. LIBOSMOABIS_CFLAGS was still
added to several AM_CFLAGS, and LIBOSMOABIS_LIBS was never
referenced by any LDADD at all, so the library wasn't even linked
despite configure.ac and debian/control requiring it.
Change-Id: I5548e8e952cd57ea4268067e3f3e4d2f731911c1
Related: 08c1ba313 ("sgsn_vty: Drop unneeded use of abis/ipa.h header")
Related: OS#6535
---
M configure.ac
M debian/control
M src/gprs/Makefile.am
M src/sgsn/Makefile.am
M tests/gprs/Makefile.am
M tests/gprs_routing_area/Makefile.am
M tests/gtphub/Makefile.am
M tests/sgsn/Makefile.am
8 files changed, 1 insertion(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/91/43391/1
diff --git a/configure.ac b/configure.ac
index 17a0236..74e0640 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@
PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.10.0)
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0)
PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.10.0)
-PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.6.0)
PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.8.0)
PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.12.0)
diff --git a/debian/control b/debian/control
index 2a3d427..1c066ff 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@
libc-ares-dev,
libgtp-dev (>= 1.12.0),
libosmocore-dev (>= 1.10.0),
- libosmo-abis-dev (>= 1.6.0),
libosmo-gsup-client-dev (>= 1.8.0),
libasn1c-dev (>= 0.9.30),
libosmo-ranap-dev (>= 1.6.0),
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index 1533dc0..c2387b1 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -11,7 +11,6 @@
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOVTY_CFLAGS) \
$(LIBOSMOCTRL_CFLAGS) \
- $(LIBOSMOABIS_CFLAGS) \
$(LIBOSMOGB_CFLAGS) \
$(LIBOSMOGSUPCLIENT_CFLAGS) \
$(COVERAGE_CFLAGS) \
diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am
index e64fe94..75df1e5 100644
--- a/src/sgsn/Makefile.am
+++ b/src/sgsn/Makefile.am
@@ -11,7 +11,6 @@
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOVTY_CFLAGS) \
$(LIBOSMOCTRL_CFLAGS) \
- $(LIBOSMOABIS_CFLAGS) \
$(LIBOSMOGB_CFLAGS) \
$(LIBOSMOGSUPCLIENT_CFLAGS) \
$(COVERAGE_CFLAGS) \
diff --git a/tests/gprs/Makefile.am b/tests/gprs/Makefile.am
index ddfd2ae..7e0f464 100644
--- a/tests/gprs/Makefile.am
+++ b/tests/gprs/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
$(LIBOSMOABIS_CFLAGS)
+AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
AM_LDFLAGS = -no-install
EXTRA_DIST = gprs_test.ok
diff --git a/tests/gprs_routing_area/Makefile.am
b/tests/gprs_routing_area/Makefile.am
index 380d946..4f6524d 100644
--- a/tests/gprs_routing_area/Makefile.am
+++ b/tests/gprs_routing_area/Makefile.am
@@ -8,7 +8,6 @@
-ggdb3 \
$(LIBOSMOCORE_CFLAGS) \
$(LIBOSMOCTRL_CFLAGS) \
- $(LIBOSMOABIS_CFLAGS) \
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOGSUPCLIENT_CFLAGS) \
$(LIBCARES_CFLAGS) \
diff --git a/tests/gtphub/Makefile.am b/tests/gtphub/Makefile.am
index 22b2a52..e41b4a4 100644
--- a/tests/gtphub/Makefile.am
+++ b/tests/gtphub/Makefile.am
@@ -7,7 +7,6 @@
-Wall \
-ggdb3 \
$(LIBOSMOCORE_CFLAGS) \
- $(LIBOSMOABIS_CFLAGS) \
$(LIBOSMOGSM_CFLAGS) \
$(LIBGTP_CFLAGS) \
$(NULL)
diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am
index 77c1dd7..ab3bb0a 100644
--- a/tests/sgsn/Makefile.am
+++ b/tests/sgsn/Makefile.am
@@ -8,7 +8,6 @@
-ggdb3 \
$(LIBOSMOCORE_CFLAGS) \
$(LIBOSMOCTRL_CFLAGS) \
- $(LIBOSMOABIS_CFLAGS) \
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOGSUPCLIENT_CFLAGS) \
$(LIBCARES_CFLAGS) \
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43391?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I5548e8e952cd57ea4268067e3f3e4d2f731911c1
Gerrit-Change-Number: 43391
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>