summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-12-08 22:29:27 +0100
committerHarald Welte <laforge@gnumonks.org>2016-12-13 14:54:01 +0000
commit3d6b9f4fe99c4351ba8937f6d7df6030986b8a92 (patch)
tree47a5655673a6a0fadc3b49411fb0737fd6b38659
parent11ecc9320c168d22ee89f84b75007420020b8356 (diff)
move gprs/oap.c to libcommon/oap_client.c
This is in preparation for libvlr. Related: OS#1592 Change-Id: Ib526df6d9de55a1e59a379d5e2c8541ed0ef67e3
-rw-r--r--openbsc/src/gprs/Makefile.am3
-rw-r--r--openbsc/src/libcommon/Makefile.am1
-rw-r--r--openbsc/src/libcommon/oap_client.c (renamed from openbsc/src/gprs/oap.c)0
-rw-r--r--openbsc/tests/oap/Makefile.am1
-rw-r--r--openbsc/tests/sgsn/Makefile.am1
5 files changed, 2 insertions, 4 deletions
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index ab2517eea..d059aeed0 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -92,7 +92,6 @@ osmo_sgsn_SOURCES = \
sgsn_cdr.c \
sgsn_ares.c \
slhc.c \
- oap.c \
gprs_llc_xid.c \
v42bis.c \
$(NULL)
@@ -137,9 +136,9 @@ osmo_gtphub_LDADD = \
gsup_test_client_SOURCES = \
gprs_gsup_client.c \
gsup_test_client.c \
- oap.c \
$(NULL)
gsup_test_client_LDADD = \
+ $(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOVTY_LIBS) \
diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am
index 6cfebc2da..6582d1ea3 100644
--- a/openbsc/src/libcommon/Makefile.am
+++ b/openbsc/src/libcommon/Makefile.am
@@ -23,6 +23,7 @@ libcommon_a_SOURCES = \
debug.c \
gsm_data.c \
gsm_data_shared.c \
+ oap_client.c \
socket.c \
talloc_ctx.c \
gsm_subscriber_base.c \
diff --git a/openbsc/src/gprs/oap.c b/openbsc/src/libcommon/oap_client.c
index 92140c17d..92140c17d 100644
--- a/openbsc/src/gprs/oap.c
+++ b/openbsc/src/libcommon/oap_client.c
diff --git a/openbsc/tests/oap/Makefile.am b/openbsc/tests/oap/Makefile.am
index bb9ebb247..c17abb55f 100644
--- a/openbsc/tests/oap/Makefile.am
+++ b/openbsc/tests/oap/Makefile.am
@@ -27,7 +27,6 @@ oap_test_SOURCES = \
$(NULL)
oap_test_LDADD = \
- $(top_builddir)/src/gprs/oap.o \
$(top_builddir)/src/gprs/gprs_utils.o \
$(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
diff --git a/openbsc/tests/sgsn/Makefile.am b/openbsc/tests/sgsn/Makefile.am
index 9e1a5a8e3..00b80f637 100644
--- a/openbsc/tests/sgsn/Makefile.am
+++ b/openbsc/tests/sgsn/Makefile.am
@@ -54,7 +54,6 @@ sgsn_test_LDADD = \
$(top_builddir)/src/gprs/gprs_utils.o \
$(top_builddir)/src/gprs/gprs_subscriber.o \
$(top_builddir)/src/gprs/gprs_gb_parse.o \
- $(top_builddir)/src/gprs/oap.o \
$(top_builddir)/src/gprs/gprs_llc_xid.o \
$(top_builddir)/src/gprs/gprs_sndcp_xid.o \
$(top_builddir)/src/gprs/slhc.o \