summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-18 13:18:47 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-18 13:27:42 +0100
commit6f05e0d95f6f1c7f97ed596adcb2522bbb3dad9f (patch)
tree334af254230a9a30e7ce1f712c0b195efbcfb792
parentac27a99021d404f9a15b952fbbc03789926b7ecc (diff)
cosmetic: move gsm_data.c to libcommon-cs
-rw-r--r--openbsc/src/libcommon-cs/Makefile.am4
-rw-r--r--openbsc/src/libcommon-cs/gsm_data.c (renamed from openbsc/src/libcommon/gsm_data.c)2
-rw-r--r--openbsc/src/libcommon/Makefile.am2
-rw-r--r--openbsc/src/libcommon/tall_bsc_ctx.c1
-rw-r--r--openbsc/tests/abis/Makefile.am1
-rw-r--r--openbsc/tests/nanobts_omlattr/Makefile.am1
6 files changed, 7 insertions, 4 deletions
diff --git a/openbsc/src/libcommon-cs/Makefile.am b/openbsc/src/libcommon-cs/Makefile.am
index f3921ba5f..ad1376a04 100644
--- a/openbsc/src/libcommon-cs/Makefile.am
+++ b/openbsc/src/libcommon-cs/Makefile.am
@@ -17,4 +17,6 @@ noinst_LIBRARIES = libcommon-cs.a
libcommon_cs_a_SOURCES = \
common_cs.c \
- common_cs_vty.c
+ common_cs_vty.c \
+ gsm_data.c \
+ $(NULL)
diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon-cs/gsm_data.c
index 3e12430e4..23ce9d0b5 100644
--- a/openbsc/src/libcommon/gsm_data.c
+++ b/openbsc/src/libcommon-cs/gsm_data.c
@@ -37,8 +37,6 @@
#include <openbsc/bsc_msc_data.h>
#include <openbsc/abis_nm.h>
-void *tall_bsc_ctx;
-
static LLIST_HEAD(bts_models);
void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr,
diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am
index 0b258c08a..d7e956c3e 100644
--- a/openbsc/src/libcommon/Makefile.am
+++ b/openbsc/src/libcommon/Makefile.am
@@ -21,12 +21,12 @@ libcommon_a_SOURCES = \
bsc_version.c \
common_vty.c \
debug.c \
- gsm_data.c \
gsm_data_shared.c \
gsup_client.c \
oap_client.c \
socket.c \
talloc_ctx.c \
+ tall_bsc_ctx.c \
gsm_subscriber_base.c \
$(NULL)
diff --git a/openbsc/src/libcommon/tall_bsc_ctx.c b/openbsc/src/libcommon/tall_bsc_ctx.c
new file mode 100644
index 000000000..69ce74732
--- /dev/null
+++ b/openbsc/src/libcommon/tall_bsc_ctx.c
@@ -0,0 +1 @@
+void *tall_bsc_ctx = 0;
diff --git a/openbsc/tests/abis/Makefile.am b/openbsc/tests/abis/Makefile.am
index cbc3e07b0..99b2addfc 100644
--- a/openbsc/tests/abis/Makefile.am
+++ b/openbsc/tests/abis/Makefile.am
@@ -27,6 +27,7 @@ abis_test_SOURCES = \
abis_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(LIBOSMOCORE_LIBS) \
diff --git a/openbsc/tests/nanobts_omlattr/Makefile.am b/openbsc/tests/nanobts_omlattr/Makefile.am
index b03d50cc1..55d15befd 100644
--- a/openbsc/tests/nanobts_omlattr/Makefile.am
+++ b/openbsc/tests/nanobts_omlattr/Makefile.am
@@ -27,6 +27,7 @@ nanobts_omlattr_test_LDADD = \
$(top_builddir)/src/libmsc/libmsc.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \