summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-12-08 22:27:22 +0100
committerHarald Welte <laforge@gnumonks.org>2016-12-13 14:54:02 +0000
commit2c1f8c8cebe41b30deca29c55290fef7a61e5343 (patch)
treeef0a18c59380a6015ace279eac76a517f0638bd8
parent3d6b9f4fe99c4351ba8937f6d7df6030986b8a92 (diff)
move grps_gsup_client.c to libcommon/gsup_client.c
This is in preparation for libvlr. Related: OS#1592 Change-Id: I9ad7dc7f17f3b033c779de9ae8bc120655502fce
-rw-r--r--openbsc/src/gprs/Makefile.am15
-rw-r--r--openbsc/src/libcommon/Makefile.am17
-rw-r--r--openbsc/src/libcommon/gsup_client.c (renamed from openbsc/src/gprs/gprs_gsup_client.c)0
-rw-r--r--openbsc/src/libcommon/gsup_test_client.c (renamed from openbsc/src/gprs/gsup_test_client.c)0
-rw-r--r--openbsc/tests/sgsn/Makefile.am1
5 files changed, 17 insertions, 16 deletions
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index d059aee..cff17dd 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -37,7 +37,6 @@ OSMO_LIBS = \
$(NULL)
bin_PROGRAMS = \
- gsup_test_client \
osmo-gbproxy \
$(NULL)
if HAVE_LIBGTP
@@ -88,7 +87,6 @@ osmo_sgsn_SOURCES = \
sgsn_auth.c \
gprs_subscriber.c \
gprs_utils.c \
- gprs_gsup_client.c \
sgsn_cdr.c \
sgsn_ares.c \
slhc.c \
@@ -132,16 +130,3 @@ osmo_gtphub_LDADD = \
$(LIBGTP_LIBS) \
-lrt \
$(NULL)
-
-gsup_test_client_SOURCES = \
- gprs_gsup_client.c \
- gsup_test_client.c \
- $(NULL)
-gsup_test_client_LDADD = \
- $(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- $(LIBOSMOVTY_LIBS) \
- $(LIBOSMOABIS_LIBS) \
- -lrt \
- $(NULL)
diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am
index 6582d1e..0b258c0 100644
--- a/openbsc/src/libcommon/Makefile.am
+++ b/openbsc/src/libcommon/Makefile.am
@@ -23,8 +23,25 @@ libcommon_a_SOURCES = \
debug.c \
gsm_data.c \
gsm_data_shared.c \
+ gsup_client.c \
oap_client.c \
socket.c \
talloc_ctx.c \
gsm_subscriber_base.c \
$(NULL)
+
+noinst_PROGRAMS = \
+ gsup_test_client \
+ $(NULL)
+
+gsup_test_client_SOURCES = \
+ gsup_test_client.c \
+ $(NULL)
+gsup_test_client_LDADD = \
+ libcommon.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ -lrt \
+ $(NULL)
diff --git a/openbsc/src/gprs/gprs_gsup_client.c b/openbsc/src/libcommon/gsup_client.c
index 0360e0a..0360e0a 100644
--- a/openbsc/src/gprs/gprs_gsup_client.c
+++ b/openbsc/src/libcommon/gsup_client.c
diff --git a/openbsc/src/gprs/gsup_test_client.c b/openbsc/src/libcommon/gsup_test_client.c
index 1889c6f..1889c6f 100644
--- a/openbsc/src/gprs/gsup_test_client.c
+++ b/openbsc/src/libcommon/gsup_test_client.c
diff --git a/openbsc/tests/sgsn/Makefile.am b/openbsc/tests/sgsn/Makefile.am
index 00b80f6..f1606cb 100644
--- a/openbsc/tests/sgsn/Makefile.am
+++ b/openbsc/tests/sgsn/Makefile.am
@@ -50,7 +50,6 @@ sgsn_test_LDADD = \
$(top_builddir)/src/gprs/sgsn_libgtp.o \
$(top_builddir)/src/gprs/sgsn_auth.o \
$(top_builddir)/src/gprs/sgsn_ares.o \
- $(top_builddir)/src/gprs/gprs_gsup_client.o \
$(top_builddir)/src/gprs/gprs_utils.o \
$(top_builddir)/src/gprs/gprs_subscriber.o \
$(top_builddir)/src/gprs/gprs_gb_parse.o \