Change in osmo-bsc[master]: Itnroduce libbsc to avoid linking long lists of .o files

pespin gerrit-no-reply at lists.osmocom.org
Wed Jul 21 18:48:04 UTC 2021


pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24981 )


Change subject: Itnroduce libbsc to avoid linking long lists of .o files
......................................................................

Itnroduce libbsc to avoid linking long lists of .o files

Every time a new file is added in osmo-bsc, it ends up being a pain
because its .o file has to be included to other tests/util binaries, or
stubs need to be added.
Let's instead bundle all .o files together in an .la file and pass that
around.

Change-Id: If91dc589ea1e476da105b58846d1c3e720a439e1
---
M src/ipaccess/Makefile.am
M src/osmo-bsc/Makefile.am
M src/utils/Makefile.am
M tests/abis/Makefile.am
M tests/acc/Makefile.am
M tests/bsc/Makefile.am
M tests/codec_pref/Makefile.am
M tests/gsm0408/Makefile.am
M tests/handover/Makefile.am
M tests/nanobts_omlattr/Makefile.am
M tests/subscr/Makefile.am
11 files changed, 36 insertions(+), 246 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/24981/1

diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index 351f618..9a9fff6 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -46,25 +46,7 @@
 
 # FIXME: resolve the bogus dependencies patched around here:
 ipaccess_config_LDADD = \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/net_init.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(OSMO_LIBS) \
 	$(NULL)
 
@@ -74,22 +56,6 @@
 	$(NULL)
 
 ipaccess_proxy_LDADD = \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(OSMO_LIBS) \
 	$(NULL)
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index 34b4f34..a4c732d 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -21,11 +21,9 @@
 	$(COVERAGE_LDFLAGS) \
 	$(NULL)
 
-bin_PROGRAMS = \
-	osmo-bsc \
-	$(NULL)
+noinst_LTLIBRARIES = libbsc.la
 
-osmo_bsc_SOURCES = \
+libbsc_la_SOURCES = \
 	a_reset.c \
 	abis_nm.c \
 	abis_nm_vty.c \
@@ -95,7 +93,6 @@
 	osmo_bsc_filter.c \
 	osmo_bsc_grace.c \
 	osmo_bsc_lcls.c \
-	osmo_bsc_main.c \
 	osmo_bsc_mgcp.c \
 	osmo_bsc_msc.c \
 	osmo_bsc_sigtran.c \
@@ -110,7 +107,29 @@
 	cbsp_link.c \
 	$(NULL)
 
+libbsc_la_LIBADD = \
+	$(LIBOSMOCORE_LIBS) \
+	$(LIBOSMOGSM_LIBS) \
+	$(LIBOSMOVTY_LIBS) \
+	$(LIBOSMOCTRL_LIBS) \
+	$(LIBOSMONETIF_LIBS) \
+	$(COVERAGE_LDFLAGS) \
+	$(LIBOSMOABIS_LIBS) \
+	$(LIBOSMOSIGTRAN_LIBS) \
+	$(LIBOSMOMGCPCLIENT_LIBS) \
+	$(NULL)
+
+bin_PROGRAMS = \
+	osmo-bsc \
+	$(NULL)
+
+osmo_bsc_SOURCES = \
+	osmo_bsc_main.c \
+	$(NULL)
+
+#$(top_builddir)/src/osmo-bsc/libbsc.la
 osmo_bsc_LDADD = \
+	libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 39d2417..1d6c48e 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -47,26 +47,7 @@
 	$(NULL)
 
 bs11_config_LDADD = \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/bts_siemens_bs11.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/e1_config.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/net_init.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOABIS_LIBS) \
@@ -132,23 +113,7 @@
 	$(NULL)
 
 meas_json_LDADD = \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOABIS_LIBS) \
diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am
index 0612827..5abbf77 100644
--- a/tests/abis/Makefile.am
+++ b/tests/abis/Makefile.am
@@ -25,24 +25,7 @@
 	$(NULL)
 
 abis_test_LDADD = \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/net_init.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOABIS_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
diff --git a/tests/acc/Makefile.am b/tests/acc/Makefile.am
index e0044d0..0c7fe0c 100644
--- a/tests/acc/Makefile.am
+++ b/tests/acc/Makefile.am
@@ -25,24 +25,7 @@
 	$(NULL)
 
 acc_test_LDADD = \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/net_init.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOABIS_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am
index 2f66778..94b606c 100644
--- a/tests/bsc/Makefile.am
+++ b/tests/bsc/Makefile.am
@@ -34,30 +34,7 @@
 	$(NULL)
 
 bsc_test_LDADD = \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \
-	$(top_builddir)/src/osmo-bsc/bsc_subscriber.o \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/handover_cfg.o \
-	$(top_builddir)/src/osmo-bsc/handover_logic.o \
-	$(top_builddir)/src/osmo-bsc/meas_rep.o \
-	$(top_builddir)/src/osmo-bsc/neighbor_ident.o \
-	$(top_builddir)/src/osmo-bsc/net_init.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
diff --git a/tests/codec_pref/Makefile.am b/tests/codec_pref/Makefile.am
index e000252..3bdd1fa 100644
--- a/tests/codec_pref/Makefile.am
+++ b/tests/codec_pref/Makefile.am
@@ -27,7 +27,7 @@
 	$(NULL)
 
 codec_pref_test_LDADD = \
-	$(top_builddir)/src/osmo-bsc/codec_pref.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	-lrt \
diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am
index 186dc39..320f7de 100644
--- a/tests/gsm0408/Makefile.am
+++ b/tests/gsm0408/Makefile.am
@@ -24,27 +24,7 @@
 	$(NULL)
 
 gsm0408_test_LDADD = \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/net_init.o \
-	$(top_builddir)/src/osmo-bsc/system_information.o \
-	$(top_builddir)/src/osmo-bsc/neighbor_ident.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOCTRL_LIBS) \
diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am
index 55b25c6..bfd64b0 100644
--- a/tests/handover/Makefile.am
+++ b/tests/handover/Makefile.am
@@ -40,74 +40,7 @@
 	$(NULL)
 
 handover_test_LDADD = \
-	$(top_builddir)/src/osmo-bsc/a_reset.o \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_nm_vty.o \
-	$(top_builddir)/src/osmo-bsc/abis_om2000.o \
-	$(top_builddir)/src/osmo-bsc/abis_om2000_vty.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/abis_rsl.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/assignment_fsm.o \
-	$(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \
-	$(top_builddir)/src/osmo-bsc/handover_ctrl.o \
-	$(top_builddir)/src/osmo-bsc/bsc_init.o \
-	$(top_builddir)/src/osmo-bsc/bsc_rf_ctrl.o \
-	$(top_builddir)/src/osmo-bsc/bsc_rll.o \
-	$(top_builddir)/src/osmo-bsc/bsc_subscr_conn_fsm.o \
-	$(top_builddir)/src/osmo-bsc/bsc_subscriber.o \
-	$(top_builddir)/src/osmo-bsc/bsc_vty.o \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/bts_unknown.o \
-	$(top_builddir)/src/osmo-bsc/bts_vty.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx_vty.o \
-	$(top_builddir)/src/osmo-bsc/chan_alloc.o \
-	$(top_builddir)/src/osmo-bsc/codec_pref.o \
-	$(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/handover_cfg.o \
-	$(top_builddir)/src/osmo-bsc/handover_decision.o \
-	$(top_builddir)/src/osmo-bsc/handover_decision_2.o \
-	$(top_builddir)/src/osmo-bsc/handover_fsm.o \
-	$(top_builddir)/src/osmo-bsc/handover_logic.o \
-	$(top_builddir)/src/osmo-bsc/handover_vty.o \
-	$(top_builddir)/src/osmo-bsc/lchan_fsm.o \
-	$(top_builddir)/src/osmo-bsc/lchan_rtp_fsm.o \
-	$(top_builddir)/src/osmo-bsc/lchan_select.o \
-	$(top_builddir)/src/osmo-bsc/meas_feed.o \
-	$(top_builddir)/src/osmo-bsc/meas_rep.o \
-	$(top_builddir)/src/osmo-bsc/neighbor_ident.o \
-	$(top_builddir)/src/osmo-bsc/neighbor_ident_vty.o \
-	$(top_builddir)/src/osmo-bsc/net_init.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
-	$(top_builddir)/src/osmo-bsc/osmo_bsc_ctrl.o \
-	$(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \
-	$(top_builddir)/src/osmo-bsc/osmo_bsc_mgcp.o \
-	$(top_builddir)/src/osmo-bsc/osmo_bsc_msc.o \
-	$(top_builddir)/src/osmo-bsc/paging.o \
-	$(top_builddir)/src/osmo-bsc/pcu_sock.o \
-	$(top_builddir)/src/osmo-bsc/penalty_timers.o \
-	$(top_builddir)/src/osmo-bsc/system_information.o \
-	$(top_builddir)/src/osmo-bsc/timeslot_fsm.o \
-	$(top_builddir)/src/osmo-bsc/smscb.o \
-	$(top_builddir)/src/osmo-bsc/cbch_scheduler.o \
-	$(top_builddir)/src/osmo-bsc/cbsp_link.o \
-	$(top_builddir)/src/osmo-bsc/lcs_loc_req.o \
-	$(top_builddir)/src/osmo-bsc/lcs_ta_req.o \
-	$(top_builddir)/src/osmo-bsc/lb.o \
-	$(top_builddir)/src/osmo-bsc/bsc_sccp.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOCTRL_LIBS) \
diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am
index e31b8e9..b5d1d7a 100644
--- a/tests/nanobts_omlattr/Makefile.am
+++ b/tests/nanobts_omlattr/Makefile.am
@@ -23,23 +23,7 @@
 	$(NULL)
 
 nanobts_omlattr_test_LDADD = \
-	$(top_builddir)/src/osmo-bsc/abis_nm.o \
-	$(top_builddir)/src/osmo-bsc/abis_osmo.o \
-	$(top_builddir)/src/osmo-bsc/acc.o \
-	$(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \
-	$(top_builddir)/src/osmo-bsc/bts.o \
-	$(top_builddir)/src/osmo-bsc/bts_sm.o \
-	$(top_builddir)/src/osmo-bsc/bts_trx.o \
-	$(top_builddir)/src/osmo-bsc/gsm_data.o \
-	$(top_builddir)/src/osmo-bsc/nm_common_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \
-	$(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOABIS_LIBS) \
diff --git a/tests/subscr/Makefile.am b/tests/subscr/Makefile.am
index e56d142..fef486a 100644
--- a/tests/subscr/Makefile.am
+++ b/tests/subscr/Makefile.am
@@ -31,7 +31,7 @@
 	$(NULL)
 
 bsc_subscr_test_LDADD = \
-	$(top_builddir)/src/osmo-bsc/bsc_subscriber.o \
+	$(top_builddir)/src/osmo-bsc/libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOABIS_LIBS) \
 	$(LIBOSMOGSM_LIBS) \

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24981
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: If91dc589ea1e476da105b58846d1c3e720a439e1
Gerrit-Change-Number: 24981
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210721/52a8ee31/attachment.htm>


More information about the gerrit-log mailing list