summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2014-11-07 14:07:48 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-11-11 22:52:21 +0100
commit3911880b68ddd92c9dd89d6ac20c26807e33f905 (patch)
treee6f15cd028a1c96879d78218b8ae29edf6d6a6c0
parentcdd4302c6dde84693a16b33362a75061480333cd (diff)
bsc: Move gsm_subscriber_base.c to libcommon
Since it is planned to use struct gsm_subscriber to manage subscriber data in the SGSN, this file which contains the generic subscriber related methods is moved to libcommon. Sponsored-by: On-Waves ehf
-rw-r--r--openbsc/src/libbsc/Makefile.am1
-rw-r--r--openbsc/src/libcommon/Makefile.am4
-rw-r--r--openbsc/src/libcommon/gsm_subscriber_base.c (renamed from openbsc/src/libbsc/gsm_subscriber_base.c)0
-rw-r--r--openbsc/src/osmo-bsc_nat/Makefile.am3
-rw-r--r--openbsc/src/utils/Makefile.am4
5 files changed, 7 insertions, 5 deletions
diff --git a/openbsc/src/libbsc/Makefile.am b/openbsc/src/libbsc/Makefile.am
index 3588b6692..8fa5c7c1a 100644
--- a/openbsc/src/libbsc/Makefile.am
+++ b/openbsc/src/libbsc/Makefile.am
@@ -15,7 +15,6 @@ libbsc_a_SOURCES = abis_nm.c abis_nm_vty.c \
bts_unknown.c \
bts_sysmobts.c \
chan_alloc.c \
- gsm_subscriber_base.c \
handover_decision.c handover_logic.c meas_rep.c \
rest_octets.c system_information.c \
e1_config.c \
diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am
index e41326f12..75f40eea7 100644
--- a/openbsc/src/libcommon/Makefile.am
+++ b/openbsc/src/libcommon/Makefile.am
@@ -4,4 +4,6 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) \
noinst_LIBRARIES = libcommon.a
-libcommon_a_SOURCES = bsc_version.c common_vty.c debug.c gsm_data.c gsm_data_shared.c socket.c talloc_ctx.c
+libcommon_a_SOURCES = bsc_version.c common_vty.c debug.c gsm_data.c \
+ gsm_data_shared.c socket.c talloc_ctx.c \
+ gsm_subscriber_base.c
diff --git a/openbsc/src/libbsc/gsm_subscriber_base.c b/openbsc/src/libcommon/gsm_subscriber_base.c
index 5e00443c2..5e00443c2 100644
--- a/openbsc/src/libbsc/gsm_subscriber_base.c
+++ b/openbsc/src/libcommon/gsm_subscriber_base.c
diff --git a/openbsc/src/osmo-bsc_nat/Makefile.am b/openbsc/src/osmo-bsc_nat/Makefile.am
index a9e81fce7..ca103a4ff 100644
--- a/openbsc/src/osmo-bsc_nat/Makefile.am
+++ b/openbsc/src/osmo-bsc_nat/Makefile.am
@@ -8,10 +8,11 @@ bin_PROGRAMS = osmo-bsc_nat
osmo_bsc_nat_SOURCES = bsc_filter.c bsc_mgcp_utils.c bsc_nat.c bsc_nat_utils.c \
bsc_nat_vty.c bsc_sccp.c bsc_ussd.c bsc_nat_ctrl.c \
bsc_nat_rewrite.c bsc_nat_filter.c bsc_nat_rewrite_trie.c
-osmo_bsc_nat_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
+osmo_bsc_nat_LDADD = \
$(top_builddir)/src/libmgcp/libmgcp.a \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
-lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOCTRL_LIBS) \
$(LIBOSMOABIS_LIBS) $(LIBOSMONETIF_LIBS)
diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am
index fd1f7aebf..acaa93700 100644
--- a/openbsc/src/utils/Makefile.am
+++ b/openbsc/src/utils/Makefile.am
@@ -9,9 +9,9 @@ noinst_PROGRAMS = smpp_mirror
endif
bs11_config_SOURCES = bs11_config.c
-bs11_config_LDADD = $(top_builddir)/src/libcommon/libcommon.a \
- $(top_builddir)/src/libbsc/libbsc.a \
+bs11_config_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
+ $(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOABIS_LIBS)
isdnsync_SOURCES = isdnsync.c