diff options
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/ipaccess/Makefile.am | 3 | ||||
-rw-r--r-- | src/libbsc/Makefile.am | 2 | ||||
-rw-r--r-- | src/libbsc/gsm_data.c (renamed from src/libcommon/gsm_data.c) | 0 | ||||
-rw-r--r-- | src/libbsc/handover_cfg.c (renamed from src/libcommon/handover_cfg.c) | 0 | ||||
-rw-r--r-- | src/libcommon/Makefile.am | 25 | ||||
-rw-r--r-- | src/osmo-bsc/Makefile.am | 1 | ||||
-rw-r--r-- | src/osmo-bsc_nat/Makefile.am | 1 | ||||
-rw-r--r-- | src/utils/Makefile.am | 3 | ||||
-rw-r--r-- | tests/abis/Makefile.am | 1 | ||||
-rw-r--r-- | tests/bsc-nat-trie/Makefile.am | 1 | ||||
-rw-r--r-- | tests/bsc-nat/Makefile.am | 1 | ||||
-rw-r--r-- | tests/bsc/Makefile.am | 1 | ||||
-rw-r--r-- | tests/bssap/Makefile.am | 1 | ||||
-rw-r--r-- | tests/channel/Makefile.am | 1 | ||||
-rw-r--r-- | tests/gsm0408/Makefile.am | 1 | ||||
-rw-r--r-- | tests/nanobts_omlattr/Makefile.am | 1 | ||||
-rw-r--r-- | tests/subscr/Makefile.am | 1 |
19 files changed, 3 insertions, 43 deletions
diff --git a/configure.ac b/configure.ac index d756970dc..b2644fe67 100644 --- a/configure.ac +++ b/configure.ac @@ -149,7 +149,6 @@ AC_OUTPUT( include/osmocom/bsc/Makefile src/Makefile src/libbsc/Makefile - src/libcommon/Makefile src/libfilter/Makefile src/libcommon-cs/Makefile src/osmo-bsc/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 637272de1..28b070ea4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,6 @@ AM_LDFLAGS = \ # Libraries SUBDIRS = \ - libcommon \ libcommon-cs \ libbsc \ libfilter \ diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index b3b2b8cd8..0301d3ab1 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -30,7 +30,6 @@ bin_PROGRAMS = \ abisip_find_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(OSMO_LIBS) \ $(NULL) @@ -48,7 +47,6 @@ ipaccess_config_SOURCES = \ ipaccess_config_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(OSMO_LIBS) \ $(NULL) @@ -58,6 +56,5 @@ ipaccess_proxy_SOURCES = \ ipaccess_proxy_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(OSMO_LIBS) \ $(NULL) diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index d118f443b..f03b4987a 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -37,6 +37,7 @@ libbsc_a_SOURCES = \ bts_unknown.c \ bts_sysmobts.c \ chan_alloc.c \ + gsm_data.c \ handover_decision.c \ handover_logic.c \ meas_rep.c \ @@ -58,5 +59,6 @@ libbsc_a_SOURCES = \ bsc_dyn_ts.c \ bts_ipaccess_nanobts_omlattr.c \ handover_vty.c \ + handover_cfg.c \ $(NULL) diff --git a/src/libcommon/gsm_data.c b/src/libbsc/gsm_data.c index a50425238..a50425238 100644 --- a/src/libcommon/gsm_data.c +++ b/src/libbsc/gsm_data.c diff --git a/src/libcommon/handover_cfg.c b/src/libbsc/handover_cfg.c index 8c208f669..8c208f669 100644 --- a/src/libcommon/handover_cfg.c +++ b/src/libbsc/handover_cfg.c diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am deleted file mode 100644 index 02ec0b673..000000000 --- a/src/libcommon/Makefile.am +++ /dev/null @@ -1,25 +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) \ - $(LIBOSMOLEGACYMGCP_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -noinst_LIBRARIES = \ - libcommon.a \ - $(NULL) - -libcommon_a_SOURCES = \ - gsm_data.c \ - handover_cfg.c \ - $(NULL) diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 79788526f..50f9c7847 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -43,7 +43,6 @@ osmo_bsc_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ diff --git a/src/osmo-bsc_nat/Makefile.am b/src/osmo-bsc_nat/Makefile.am index a941b5869..83ef85064 100644 --- a/src/osmo-bsc_nat/Makefile.am +++ b/src/osmo-bsc_nat/Makefile.am @@ -41,7 +41,6 @@ osmo_bsc_nat_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOSCCP_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 78d4965e6..354f2b28c 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -49,7 +49,6 @@ bs11_config_SOURCES = \ bs11_config_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ @@ -115,7 +114,7 @@ meas_json_SOURCES = \ $(NULL) meas_json_LDADD = \ - $(top_builddir)/src/libcommon/libcommon.a \ + $(top_builddir)/src/libbsc/libbsc.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(NULL) diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 137321cb4..1e982afc6 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/libcommon.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/bsc-nat-trie/Makefile.am b/tests/bsc-nat-trie/Makefile.am index d20bd0a5a..4afa1a4d7 100644 --- a/tests/bsc-nat-trie/Makefile.am +++ b/tests/bsc-nat-trie/Makefile.am @@ -11,7 +11,6 @@ noinst_PROGRAMS = bsc_nat_trie_test bsc_nat_trie_test_SOURCES = bsc_nat_trie_test.c \ $(top_srcdir)/src/osmo-bsc_nat/bsc_nat_rewrite_trie.c bsc_nat_trie_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lrt \ $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/bsc-nat/Makefile.am b/tests/bsc-nat/Makefile.am index 7f6730e26..4231cb431 100644 --- a/tests/bsc-nat/Makefile.am +++ b/tests/bsc-nat/Makefile.am @@ -46,7 +46,6 @@ bsc_nat_test_LDADD = \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOSCCP_LIBS) \ diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index 9d95ead23..70a788e63 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -34,7 +34,6 @@ bsc_test_SOURCES = \ bsc_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ diff --git a/tests/bssap/Makefile.am b/tests/bssap/Makefile.am index 77309c983..697a21511 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/libcommon.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/channel/Makefile.am b/tests/channel/Makefile.am index aae7a4532..a3c31595c 100644 --- a/tests/channel/Makefile.am +++ b/tests/channel/Makefile.am @@ -26,7 +26,6 @@ channel_test_SOURCES = \ channel_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index c5ae061f5..eeb0d3c42 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -25,7 +25,6 @@ gsm0408_test_SOURCES = \ gsm0408_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am index 336ccaf03..2d7754243 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/libcommon.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ diff --git a/tests/subscr/Makefile.am b/tests/subscr/Makefile.am index b743063fc..3c0004392 100644 --- a/tests/subscr/Makefile.am +++ b/tests/subscr/Makefile.am @@ -33,7 +33,6 @@ bsc_subscr_test_SOURCES = \ bsc_subscr_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOGSM_LIBS) \ |