From d23ce86c25d3b9e5ee9cd28a9f0aec5aca00e056 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 14 Feb 2018 00:07:40 +0100 Subject: drop libcommon-cs completely Change-Id: I07d4a48af3154ee4d904686f230a51b8b8a94ff9 --- configure.ac | 1 - include/osmocom/bsc/Makefile.am | 1 - include/osmocom/bsc/common_bsc.h | 1 - include/osmocom/bsc/common_cs.h | 9 --------- include/osmocom/bsc/gsm_data.h | 1 - src/Makefile.am | 1 - src/ipaccess/Makefile.am | 1 - src/libbsc/Makefile.am | 2 -- src/libbsc/bsc_vty.c | 1 - src/libbsc/net_init.c | 1 - src/libcommon-cs/Makefile.am | 21 --------------------- src/libcommon-cs/common_cs.c | 32 -------------------------------- src/libcommon-cs/common_cs_vty.c | 31 ------------------------------- src/osmo-bsc/Makefile.am | 1 - src/osmo-bsc/osmo_bsc_filter.c | 1 + src/osmo-bsc_nat/Makefile.am | 1 - src/osmo-bsc_nat/bsc_nat.c | 1 + src/utils/Makefile.am | 1 - tests/abis/Makefile.am | 1 - tests/bsc-nat/Makefile.am | 1 - tests/bsc/Makefile.am | 1 - tests/bssap/Makefile.am | 1 - tests/channel/Makefile.am | 1 - tests/gsm0408/Makefile.am | 1 - tests/nanobts_omlattr/Makefile.am | 1 - tests/subscr/Makefile.am | 1 - 26 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 include/osmocom/bsc/common_cs.h delete mode 100644 src/libcommon-cs/Makefile.am delete mode 100644 src/libcommon-cs/common_cs.c delete mode 100644 src/libcommon-cs/common_cs_vty.c diff --git a/configure.ac b/configure.ac index b2644fe67..dac222ff3 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,6 @@ AC_OUTPUT( src/Makefile src/libbsc/Makefile src/libfilter/Makefile - src/libcommon-cs/Makefile src/osmo-bsc/Makefile src/ipaccess/Makefile src/utils/Makefile diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index c503a50f5..f97594788 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -16,7 +16,6 @@ noinst_HEADERS = \ chan_alloc.h \ common.h \ common_bsc.h \ - common_cs.h \ ctrl.h \ debug.h \ e1_config.h \ diff --git a/include/osmocom/bsc/common_bsc.h b/include/osmocom/bsc/common_bsc.h index 32e509716..d3c7ff5bf 100644 --- a/include/osmocom/bsc/common_bsc.h +++ b/include/osmocom/bsc/common_bsc.h @@ -1,7 +1,6 @@ #pragma once #include -#include struct gsm_network *bsc_network_init(void *ctx, uint16_t country_code, diff --git a/include/osmocom/bsc/common_cs.h b/include/osmocom/bsc/common_cs.h deleted file mode 100644 index b6a8ed831..000000000 --- a/include/osmocom/bsc/common_cs.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include -#include - -struct msgb; -struct gsm_network; - -struct vty; diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 8af594fc8..d1a901e8f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/src/Makefile.am b/src/Makefile.am index 28b070ea4..fc9bf8e1a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,6 @@ AM_LDFLAGS = \ # Libraries SUBDIRS = \ - libcommon-cs \ libbsc \ libfilter \ $(NULL) diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 0301d3ab1..a6195b9c7 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -46,7 +46,6 @@ ipaccess_config_SOURCES = \ # FIXME: resolve the bogus dependencies patched around here: ipaccess_config_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(OSMO_LIBS) \ $(NULL) diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index e68ada8c4..e8e69c7a4 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -19,8 +19,6 @@ noinst_LIBRARIES = \ libbsc.a \ $(NULL) -libbsc_a_LIBADD = $(top_builddir)/src/libcommon-cs/libcommon-cs.a - libbsc_a_SOURCES = \ abis_nm.c \ abis_nm_vty.c \ diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index 1407061ac..f1cbb5402 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c index c5c7c5e97..90f668f2c 100644 --- a/src/libbsc/net_init.c +++ b/src/libbsc/net_init.c @@ -17,7 +17,6 @@ * */ -#include #include #include #include diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am deleted file mode 100644 index e54950937..000000000 --- a/src/libcommon-cs/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - -I$(top_builddir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(LIBOSMOSIGTRAN_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -noinst_LIBRARIES = libcommon-cs.a - -libcommon_cs_a_SOURCES = \ - common_cs.c \ - common_cs_vty.c diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c deleted file mode 100644 index 9307f6359..000000000 --- a/src/libcommon-cs/common_cs.c +++ /dev/null @@ -1,32 +0,0 @@ -/* Code used by both libbsc and libmsc (common_cs means "BSC or MSC"). - * - * (C) 2016 by sysmocom s.m.f.c. - * (C) 2008-2010 by Harald Welte - * (C) 2014 by Holger Hans Peter Freyther - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include - -#include -#include - -#include -#include -#include -#include - diff --git a/src/libcommon-cs/common_cs_vty.c b/src/libcommon-cs/common_cs_vty.c deleted file mode 100644 index 684c55f88..000000000 --- a/src/libcommon-cs/common_cs_vty.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Code used by both libbsc and libmsc (common_cs means "BSC or MSC"). - * - * (C) 2016 by sysmocom s.m.f.c. - * (C) 2008-2010 by Harald Welte - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include - -#include -#include -#include - -#include - -#include - diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 50f9c7847..3019470d3 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -42,7 +42,6 @@ osmo_bsc_SOURCES = \ osmo_bsc_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c index 78b2c0516..5399b7aee 100644 --- a/src/osmo-bsc/osmo_bsc_filter.c +++ b/src/osmo-bsc/osmo_bsc_filter.c @@ -26,6 +26,7 @@ #include #include #include +#include #include diff --git a/src/osmo-bsc_nat/Makefile.am b/src/osmo-bsc_nat/Makefile.am index 83ef85064..267565147 100644 --- a/src/osmo-bsc_nat/Makefile.am +++ b/src/osmo-bsc_nat/Makefile.am @@ -40,7 +40,6 @@ osmo_bsc_nat_SOURCES = \ osmo_bsc_nat_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOSCCP_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/src/osmo-bsc_nat/bsc_nat.c b/src/osmo-bsc_nat/bsc_nat.c index cf67d9bc9..a5dbf9716 100644 --- a/src/osmo-bsc_nat/bsc_nat.c +++ b/src/osmo-bsc_nat/bsc_nat.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 354f2b28c..983a3bb04 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -48,7 +48,6 @@ bs11_config_SOURCES = \ bs11_config_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 1e982afc6..8dc829fc3 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -26,7 +26,6 @@ abis_test_SOURCES = \ abis_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/bsc-nat/Makefile.am b/tests/bsc-nat/Makefile.am index 4231cb431..c2ed6e44c 100644 --- a/tests/bsc-nat/Makefile.am +++ b/tests/bsc-nat/Makefile.am @@ -45,7 +45,6 @@ bsc_nat_test_SOURCES = \ bsc_nat_test_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOSCCP_LIBS) \ diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 70a788e63..a436c27f0 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -33,7 +33,6 @@ bsc_test_SOURCES = \ bsc_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ diff --git a/tests/bssap/Makefile.am b/tests/bssap/Makefile.am index 697a21511..e4fe38b77 100644 --- a/tests/bssap/Makefile.am +++ b/tests/bssap/Makefile.am @@ -34,7 +34,6 @@ bssap_test_SOURCES = \ bssap_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/channel/Makefile.am b/tests/channel/Makefile.am index a3c31595c..f641f6026 100644 --- a/tests/channel/Makefile.am +++ b/tests/channel/Makefile.am @@ -25,7 +25,6 @@ channel_test_SOURCES = \ channel_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index eeb0d3c42..9a74d449a 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -24,7 +24,6 @@ gsm0408_test_SOURCES = \ gsm0408_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 2d7754243..c2b2c3b7a 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -24,7 +24,6 @@ nanobts_omlattr_test_SOURCES = \ nanobts_omlattr_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/subscr/Makefile.am b/tests/subscr/Makefile.am index 3c0004392..8d14ebf9d 100644 --- a/tests/subscr/Makefile.am +++ b/tests/subscr/Makefile.am @@ -32,7 +32,6 @@ bsc_subscr_test_SOURCES = \ bsc_subscr_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOGSM_LIBS) \ -- cgit v1.2.3