drop libcommon completely, move remaining files to libbsc

Move gsm_data.c and handover_cfg.c to libbsc, where they belong.

This leaves libcommon utterly empty, drop it.

Change-Id: I6178061fa30c7e1a4c22c29d3c8f508b1033569f

9 files changed, 3 insertions, 33 deletions

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)