From 8e3320ac4835aa4b7cbe71ac3b3ccd4a7c07f20e Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 21 Jul 2021 20:43:35 +0200 Subject: Introduce 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 --- tests/abis/Makefile.am | 19 +---------- tests/acc/Makefile.am | 19 +---------- tests/bsc/Makefile.am | 25 +------------- tests/codec_pref/Makefile.am | 2 +- tests/gsm0408/Makefile.am | 22 +------------ tests/handover/Makefile.am | 69 +-------------------------------------- tests/nanobts_omlattr/Makefile.am | 18 +--------- tests/subscr/Makefile.am | 2 +- 8 files changed, 8 insertions(+), 168 deletions(-) (limited to 'tests') diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am index 0612827e1..5abbf775e 100644 --- a/tests/abis/Makefile.am +++ b/tests/abis/Makefile.am @@ -25,24 +25,7 @@ abis_test_SOURCES = \ $(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 e0044d07c..0c7fe0c59 100644 --- a/tests/acc/Makefile.am +++ b/tests/acc/Makefile.am @@ -25,24 +25,7 @@ acc_test_SOURCES = \ $(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 2f6677878..94b606cfd 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -34,30 +34,7 @@ bsc_test_SOURCES = \ $(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 e000252da..3bdd1fabe 100644 --- a/tests/codec_pref/Makefile.am +++ b/tests/codec_pref/Makefile.am @@ -27,7 +27,7 @@ codec_pref_test_SOURCES = \ $(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 186dc39b6..320f7dea5 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -24,27 +24,7 @@ gsm0408_test_SOURCES = \ $(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 55b25c67a..bfd64b09c 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -40,74 +40,7 @@ handover_test_LDFLAGS = \ $(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 e31b8e921..b5d1d7a7e 100644 --- a/tests/nanobts_omlattr/Makefile.am +++ b/tests/nanobts_omlattr/Makefile.am @@ -23,23 +23,7 @@ nanobts_omlattr_test_SOURCES = \ $(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 e56d142bc..fef486a0b 100644 --- a/tests/subscr/Makefile.am +++ b/tests/subscr/Makefile.am @@ -31,7 +31,7 @@ bsc_subscr_test_SOURCES = \ $(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) \ -- cgit v1.2.3