<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24981">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Itnroduce libbsc to avoid linking long lists of .o files<br><br>Every time a new file is added in osmo-bsc, it ends up being a pain<br>because its .o file has to be included to other tests/util binaries, or<br>stubs need to be added.<br>Let's instead bundle all .o files together in an .la file and pass that<br>around.<br><br>Change-Id: If91dc589ea1e476da105b58846d1c3e720a439e1<br>---<br>M src/ipaccess/Makefile.am<br>M src/osmo-bsc/Makefile.am<br>M src/utils/Makefile.am<br>M tests/abis/Makefile.am<br>M tests/acc/Makefile.am<br>M tests/bsc/Makefile.am<br>M tests/codec_pref/Makefile.am<br>M tests/gsm0408/Makefile.am<br>M tests/handover/Makefile.am<br>M tests/nanobts_omlattr/Makefile.am<br>M tests/subscr/Makefile.am<br>11 files changed, 36 insertions(+), 246 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/24981/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am</span><br><span>index 351f618..9a9fff6 100644</span><br><span>--- a/src/ipaccess/Makefile.am</span><br><span>+++ b/src/ipaccess/Makefile.am</span><br><span>@@ -46,25 +46,7 @@</span><br><span> </span><br><span> # FIXME: resolve the bogus dependencies patched around here:</span><br><span> ipaccess_config_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(OSMO_LIBS) \</span><br><span>       $(NULL)</span><br><span> </span><br><span>@@ -74,22 +56,6 @@</span><br><span>     $(NULL)</span><br><span> </span><br><span> ipaccess_proxy_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(OSMO_LIBS) \</span><br><span>       $(NULL)</span><br><span>diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am</span><br><span>index 34b4f34..a4c732d 100644</span><br><span>--- a/src/osmo-bsc/Makefile.am</span><br><span>+++ b/src/osmo-bsc/Makefile.am</span><br><span>@@ -21,11 +21,9 @@</span><br><span>    $(COVERAGE_LDFLAGS) \</span><br><span>        $(NULL)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = \</span><br><span style="color: hsl(0, 100%, 40%);">-     osmo-bsc \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_LTLIBRARIES = libbsc.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-osmo_bsc_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+libbsc_la_SOURCES = \</span><br><span>       a_reset.c \</span><br><span>  abis_nm.c \</span><br><span>  abis_nm_vty.c \</span><br><span>@@ -95,7 +93,6 @@</span><br><span>  osmo_bsc_filter.c \</span><br><span>  osmo_bsc_grace.c \</span><br><span>   osmo_bsc_lcls.c \</span><br><span style="color: hsl(0, 100%, 40%);">-       osmo_bsc_main.c \</span><br><span>    osmo_bsc_mgcp.c \</span><br><span>    osmo_bsc_msc.c \</span><br><span>     osmo_bsc_sigtran.c \</span><br><span>@@ -110,7 +107,29 @@</span><br><span>  cbsp_link.c \</span><br><span>        $(NULL)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+libbsc_la_LIBADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+  $(LIBOSMOVTY_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+  $(LIBOSMOCTRL_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMONETIF_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+        $(COVERAGE_LDFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOABIS_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOSIGTRAN_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(LIBOSMOMGCPCLIENT_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+   $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = \</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo-bsc \</span><br><span style="color: hsl(120, 100%, 40%);">+    $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_bsc_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_bsc_main.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#$(top_builddir)/src/osmo-bsc/libbsc.la</span><br><span> osmo_bsc_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+      libbsc.la \</span><br><span>  $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOVTY_LIBS) \</span><br><span>diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am</span><br><span>index 39d2417..1d6c48e 100644</span><br><span>--- a/src/utils/Makefile.am</span><br><span>+++ b/src/utils/Makefile.am</span><br><span>@@ -47,26 +47,7 @@</span><br><span>   $(NULL)</span><br><span> </span><br><span> bs11_config_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/e1_config.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOABIS_LIBS) \</span><br><span>@@ -132,23 +113,7 @@</span><br><span>         $(NULL)</span><br><span> </span><br><span> meas_json_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOABIS_LIBS) \</span><br><span>diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am</span><br><span>index 0612827..5abbf77 100644</span><br><span>--- a/tests/abis/Makefile.am</span><br><span>+++ b/tests/abis/Makefile.am</span><br><span>@@ -25,24 +25,7 @@</span><br><span>      $(NULL)</span><br><span> </span><br><span> abis_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOABIS_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>diff --git a/tests/acc/Makefile.am b/tests/acc/Makefile.am</span><br><span>index e0044d0..0c7fe0c 100644</span><br><span>--- a/tests/acc/Makefile.am</span><br><span>+++ b/tests/acc/Makefile.am</span><br><span>@@ -25,24 +25,7 @@</span><br><span>   $(NULL)</span><br><span> </span><br><span> acc_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOABIS_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am</span><br><span>index 2f66778..94b606c 100644</span><br><span>--- a/tests/bsc/Makefile.am</span><br><span>+++ b/tests/bsc/Makefile.am</span><br><span>@@ -34,30 +34,7 @@</span><br><span>   $(NULL)</span><br><span> </span><br><span> bsc_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/handover_cfg.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/handover_logic.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/meas_rep.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/neighbor_ident.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOVTY_LIBS) \</span><br><span>diff --git a/tests/codec_pref/Makefile.am b/tests/codec_pref/Makefile.am</span><br><span>index e000252..3bdd1fa 100644</span><br><span>--- a/tests/codec_pref/Makefile.am</span><br><span>+++ b/tests/codec_pref/Makefile.am</span><br><span>@@ -27,7 +27,7 @@</span><br><span>        $(NULL)</span><br><span> </span><br><span> codec_pref_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/codec_pref.o \</span><br><span style="color: hsl(120, 100%, 40%);">+   $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         -lrt \</span><br><span>diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am</span><br><span>index 186dc39..320f7de 100644</span><br><span>--- a/tests/gsm0408/Makefile.am</span><br><span>+++ b/tests/gsm0408/Makefile.am</span><br><span>@@ -24,27 +24,7 @@</span><br><span>         $(NULL)</span><br><span> </span><br><span> gsm0408_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/system_information.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/neighbor_ident.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOCTRL_LIBS) \</span><br><span>diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am</span><br><span>index 55b25c6..bfd64b0 100644</span><br><span>--- a/tests/handover/Makefile.am</span><br><span>+++ b/tests/handover/Makefile.am</span><br><span>@@ -40,74 +40,7 @@</span><br><span>      $(NULL)</span><br><span> </span><br><span> handover_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/a_reset.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_nm_vty.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/abis_om2000.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/abis_om2000_vty.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/abis_rsl.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/assignment_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/handover_ctrl.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/bsc_init.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/bsc_rf_ctrl.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bsc_rll.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/bsc_subscr_conn_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bsc_vty.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts_unknown.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_vty.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/bts_trx_vty.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/chan_alloc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/codec_pref.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/handover_cfg.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/handover_decision.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/handover_decision_2.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/handover_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/handover_logic.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/handover_vty.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/lchan_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/lchan_rtp_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/lchan_select.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/meas_feed.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/meas_rep.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/neighbor_ident.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/neighbor_ident_vty.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/osmo_bsc_ctrl.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/osmo_bsc_mgcp.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/osmo_bsc_msc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/paging.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/pcu_sock.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/penalty_timers.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/system_information.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/timeslot_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/smscb.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/cbch_scheduler.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/cbsp_link.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/lcs_loc_req.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/lcs_ta_req.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/lb.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/bsc_sccp.o \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOCTRL_LIBS) \</span><br><span>diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am</span><br><span>index e31b8e9..b5d1d7a 100644</span><br><span>--- a/tests/nanobts_omlattr/Makefile.am</span><br><span>+++ b/tests/nanobts_omlattr/Makefile.am</span><br><span>@@ -23,23 +23,7 @@</span><br><span>  $(NULL)</span><br><span> </span><br><span> nanobts_omlattr_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/abis_osmo.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/bts_trx.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/gsm_data.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span>         $(LIBOSMOABIS_LIBS) \</span><br><span>diff --git a/tests/subscr/Makefile.am b/tests/subscr/Makefile.am</span><br><span>index e56d142..fef486a 100644</span><br><span>--- a/tests/subscr/Makefile.am</span><br><span>+++ b/tests/subscr/Makefile.am</span><br><span>@@ -31,7 +31,7 @@</span><br><span>       $(NULL)</span><br><span> </span><br><span> bsc_subscr_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \</span><br><span style="color: hsl(120, 100%, 40%);">+       $(top_builddir)/src/osmo-bsc/libbsc.la \</span><br><span>     $(LIBOSMOCORE_LIBS) \</span><br><span>        $(LIBOSMOABIS_LIBS) \</span><br><span>        $(LIBOSMOGSM_LIBS) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24981">change 24981</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/24981"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If91dc589ea1e476da105b58846d1c3e720a439e1 </div>
<div style="display:none"> Gerrit-Change-Number: 24981 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>