summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-18 15:17:25 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-18 15:17:29 +0100
commitc3533aaebfe3fcbcc2b506fa2f0d93104bab146a (patch)
treebed1398a3c8ea423c8cf65290ee4873ae64eeb14
parent01ddd10c5a59aedd8fbc9930e860331981862c90 (diff)
cosmetic: move gsm_subscriber_base.c to libcommon-csneels/libcommon-cs
-rw-r--r--openbsc/src/ipaccess/ipaccess-proxy.c3
-rw-r--r--openbsc/src/libcommon-cs/Makefile.am1
-rw-r--r--openbsc/src/libcommon-cs/gsm_subscriber_base.c (renamed from openbsc/src/libcommon/gsm_subscriber_base.c)0
-rw-r--r--openbsc/src/libcommon/Makefile.am1
-rw-r--r--openbsc/src/osmo-bsc_mgcp/Makefile.am1
-rw-r--r--openbsc/src/utils/Makefile.am1
-rw-r--r--openbsc/tests/bsc-nat-trie/Makefile.am1
-rw-r--r--openbsc/tests/mgcp/mgcp_test.c3
-rw-r--r--openbsc/tests/mm_auth/Makefile.am1
-rw-r--r--openbsc/tests/smpp/Makefile.am1
-rw-r--r--openbsc/tests/subscr/Makefile.am2
11 files changed, 13 insertions, 2 deletions
diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c
index 9e8ec88..0039b57 100644
--- a/openbsc/src/ipaccess/ipaccess-proxy.c
+++ b/openbsc/src/ipaccess/ipaccess-proxy.c
@@ -1225,3 +1225,6 @@ int main(int argc, char **argv)
osmo_select_main(0);
}
}
+
+struct gsm_subscriber *subscr_get(struct gsm_subscriber *subscr) { return subscr; }
+struct gsm_subscriber *subscr_put(struct gsm_subscriber *subscr) { return NULL; }
diff --git a/openbsc/src/libcommon-cs/Makefile.am b/openbsc/src/libcommon-cs/Makefile.am
index d4c9740..616df28 100644
--- a/openbsc/src/libcommon-cs/Makefile.am
+++ b/openbsc/src/libcommon-cs/Makefile.am
@@ -20,4 +20,5 @@ libcommon_cs_a_SOURCES = \
common_cs_vty.c \
gsm_data.c \
gsm_data_shared.c \
+ gsm_subscriber_base.c \
$(NULL)
diff --git a/openbsc/src/libcommon/gsm_subscriber_base.c b/openbsc/src/libcommon-cs/gsm_subscriber_base.c
index 1ecdee5..1ecdee5 100644
--- a/openbsc/src/libcommon/gsm_subscriber_base.c
+++ b/openbsc/src/libcommon-cs/gsm_subscriber_base.c
diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am
index 714612f..5ac674b 100644
--- a/openbsc/src/libcommon/Makefile.am
+++ b/openbsc/src/libcommon/Makefile.am
@@ -26,7 +26,6 @@ libcommon_a_SOURCES = \
socket.c \
talloc_ctx.c \
tall_bsc_ctx.c \
- gsm_subscriber_base.c \
$(NULL)
noinst_PROGRAMS = \
diff --git a/openbsc/src/osmo-bsc_mgcp/Makefile.am b/openbsc/src/osmo-bsc_mgcp/Makefile.am
index a19a4eb..ecd5e91 100644
--- a/openbsc/src/osmo-bsc_mgcp/Makefile.am
+++ b/openbsc/src/osmo-bsc_mgcp/Makefile.am
@@ -24,6 +24,7 @@ osmo_bsc_mgcp_SOURCES = \
osmo_bsc_mgcp_LDADD = \
$(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(top_builddir)/src/libmgcp/libmgcp.a \
$(LIBOSMOVTY_LIBS) \
$(LIBOSMOCORE_LIBS) \
diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am
index ceef708..5314da5 100644
--- a/openbsc/src/utils/Makefile.am
+++ b/openbsc/src/utils/Makefile.am
@@ -69,6 +69,7 @@ smpp_mirror_SOURCES = \
smpp_mirror_LDADD = \
$(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBSMPP34_LIBS) \
diff --git a/openbsc/tests/bsc-nat-trie/Makefile.am b/openbsc/tests/bsc-nat-trie/Makefile.am
index cf8ebaf..bf962d1 100644
--- a/openbsc/tests/bsc-nat-trie/Makefile.am
+++ b/openbsc/tests/bsc-nat-trie/Makefile.am
@@ -12,6 +12,7 @@ bsc_nat_trie_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libmgcp/libmgcp.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) -lrt \
$(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
$(LIBOSMOABIS_LIBS)
diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c
index b2d237e..4589935 100644
--- a/openbsc/tests/mgcp/mgcp_test.c
+++ b/openbsc/tests/mgcp/mgcp_test.c
@@ -1225,3 +1225,6 @@ int main(int argc, char **argv)
printf("Done\n");
return EXIT_SUCCESS;
}
+
+struct gsm_subscriber *subscr_get(struct gsm_subscriber *subscr) { return subscr; }
+struct gsm_subscriber *subscr_put(struct gsm_subscriber *subscr) { return NULL; }
diff --git a/openbsc/tests/mm_auth/Makefile.am b/openbsc/tests/mm_auth/Makefile.am
index cb35198..fe45f82 100644
--- a/openbsc/tests/mm_auth/Makefile.am
+++ b/openbsc/tests/mm_auth/Makefile.am
@@ -32,6 +32,7 @@ mm_auth_test_LDFLAGS = \
mm_auth_test_LDADD = \
$(top_builddir)/src/libmsc/libmsc.a \
$(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(NULL)
diff --git a/openbsc/tests/smpp/Makefile.am b/openbsc/tests/smpp/Makefile.am
index 5082707..a48af00 100644
--- a/openbsc/tests/smpp/Makefile.am
+++ b/openbsc/tests/smpp/Makefile.am
@@ -35,6 +35,7 @@ smpp_test_SOURCES = \
smpp_test_LDADD = \
$(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(NULL)
diff --git a/openbsc/tests/subscr/Makefile.am b/openbsc/tests/subscr/Makefile.am
index 6342444..bcc56a0 100644
--- a/openbsc/tests/subscr/Makefile.am
+++ b/openbsc/tests/subscr/Makefile.am
@@ -50,9 +50,9 @@ bsc_subscr_test_SOURCES = \
bsc_subscr_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(top_builddir)/src/libtrau/libtrau.a \
$(top_builddir)/src/libcommon/libcommon.a \
+ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOABIS_LIBS) \
$(LIBOSMOGSM_LIBS) \