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

3 files changed, 27 insertions, 78 deletions

diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index 351f6183c..9a9fff69b 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -46,25 +46,7 @@ ipaccess_config_SOURCES = \
 
 # 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 @@ ipaccess_proxy_SOURCES = \
 	$(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 34b4f3479..c149f47ef 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -21,11 +21,9 @@ AM_LDFLAGS = \
 	$(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_SOURCES = \
 	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,28 @@ osmo_bsc_SOURCES = \
 	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)
+
 osmo_bsc_LDADD = \
+	libbsc.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 39d24173f..1d6c48e55 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -47,26 +47,7 @@ bs11_config_SOURCES = \
 	$(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 @@ meas_json_SOURCES = \
 	$(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) \