aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-01-05 15:05:03 +0100
committerHarald Welte <laforge@gnumonks.org>2016-01-06 19:53:44 +0100
commit5c6bd5104ebe828def8d12779fb372dcc6d57e96 (patch)
tree7635d7a1c2a297a62e79319b958cfb6dfed3bc1f
parent8fa5d558fbe5f9a3c073a2a526acf391a5bb347d (diff)
make ranap_common.cn.[ch] part of libosmo-ranap
-rw-r--r--include/osmocom/ranap/Makefile.am1
-rw-r--r--include/osmocom/ranap/ranap_common_cn.h (renamed from src/tests/ranap_common_cn.h)0
-rw-r--r--src/Makefile.am3
-rw-r--r--src/ranap_common_cn.c (renamed from src/tests/ranap_common_cn.c)2
-rw-r--r--src/tests/Makefile.am2
5 files changed, 5 insertions, 3 deletions
diff --git a/include/osmocom/ranap/Makefile.am b/include/osmocom/ranap/Makefile.am
index b4e1e29..13f1e1c 100644
--- a/include/osmocom/ranap/Makefile.am
+++ b/include/osmocom/ranap/Makefile.am
@@ -9,6 +9,7 @@ ranap_ies_defs.h: $(top_builddir)/src/ranap_encoder.c
ranap_HEADERS = \
ranap_ies_defs.h \
ranap_common.h \
+ ranap_common_cn.h \
ranap_msg_factory.h \
iu_helpers.h \
RANAP_AccuracyFulfilmentIndicator.h \
diff --git a/src/tests/ranap_common_cn.h b/include/osmocom/ranap/ranap_common_cn.h
index f0fd09e..f0fd09e 100644
--- a/src/tests/ranap_common_cn.h
+++ b/include/osmocom/ranap/ranap_common_cn.h
diff --git a/src/Makefile.am b/src/Makefile.am
index aeb75b2..0f5112d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,8 @@ RANAP_LIBVERSION=0:0:0
lib_LTLIBRARIES = libosmo-ranap.la
libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION)
libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(ASN1C_LIBS) $(COMMON_LDADD) ranap/libosmo-asn1-ranap.la
-libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_msg_factory.c iu_helpers.c
+libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_msg_factory.c iu_helpers.c \
+ ranap_common_cn.c
# build the actual HomeNodeB gateway
#
diff --git a/src/tests/ranap_common_cn.c b/src/ranap_common_cn.c
index 59186ff..751145c 100644
--- a/src/tests/ranap_common_cn.c
+++ b/src/ranap_common_cn.c
@@ -26,8 +26,8 @@
#include <osmocom/core/logging.h>
#include <osmocom/ranap/ranap_common.h>
+#include <osmocom/ranap/ranap_common_cn.h>
#include <osmocom/ranap/ranap_ies_defs.h>
-#include "ranap_common_cn.h"
#include "hnbgw.h"
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 7262d27..bcf4a46 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -19,7 +19,7 @@ hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/hnbap/libosmo-asn1-hnbap.a $
test_ranap_SOURCES = $(RANAP_FILES) test-ranap.c test_common.c
test_ranap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la
-dummy_cn_SOURCES = $(RANAP_FILES) test_common.c dummy_cn_sua.c ranap_common_cn.c
+dummy_cn_SOURCES = $(RANAP_FILES) test_common.c dummy_cn_sua.c
dummy_cn_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la
# The `:;' works around a Bash 3.2 bug when the output is not writeable.