aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/tests
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-06-14 13:31:59 +0200
committerHarald Welte <laforge@gnumonks.org>2016-06-18 11:34:21 +0000
commit29048b2a80b5865ffc41fa4401113c5826227e23 (patch)
tree2228a4eec4c8d8281062e6910e826bfeaf9fccf8 /openbsc/tests
parentf8e02aa4e3d87bbdc66819d3a56380881e24ce5a (diff)
rm dup: use channel type names from libosmocore
In gsm_lchant_name(enum gsm_chan_t), use the gsm_chan_t_names value strings from libosmocore instead of redefining the same strings. The list from libosmocore is also more complete, including CCCH and PDTCH. Add a todo comment to move to libosmocore. In consequence, libosmogsm linkage needs to be added to osmo-bsc_mgcp, mgcp_test, mgcp_transcoding_test and smpp_mirror, smpp_test. Change-Id: If65ee7c0619cbc0acb0a15045bd5a969442c93cc
Diffstat (limited to 'openbsc/tests')
-rw-r--r--openbsc/tests/mgcp/Makefile.am8
-rw-r--r--openbsc/tests/smpp/Makefile.am2
2 files changed, 6 insertions, 4 deletions
diff --git a/openbsc/tests/mgcp/Makefile.am b/openbsc/tests/mgcp/Makefile.am
index ec7cc99d8..82d6ac605 100644
--- a/openbsc/tests/mgcp/Makefile.am
+++ b/openbsc/tests/mgcp/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)
-AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) $(LIBBCG729_CFLAGS)
+AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_FLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) $(LIBBCG729_CFLAGS)
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
EXTRA_DIST = mgcp_test.ok mgcp_transcoding_test.ok
@@ -15,7 +15,8 @@ mgcp_test_SOURCES = mgcp_test.c
mgcp_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libmgcp/libmgcp.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
+ -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
$(LIBRARY_DL) $(LIBOSMONETIF_LIBS)
mgcp_transcoding_test_SOURCES = mgcp_transcoding_test.c
@@ -24,5 +25,6 @@ mgcp_transcoding_test_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
$(top_builddir)/src/libmgcp/libmgcp.a \
$(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS) $(LIBBCG729_LIBS) -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
+ $(LIBBCG729_LIBS) -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \
$(LIBRARY_DL) $(LIBOSMONETIF_LIBS) $(LIBRARY_GSM)
diff --git a/openbsc/tests/smpp/Makefile.am b/openbsc/tests/smpp/Makefile.am
index 9ab15c589..aab4de9e3 100644
--- a/openbsc/tests/smpp/Makefile.am
+++ b/openbsc/tests/smpp/Makefile.am
@@ -10,4 +10,4 @@ smpp_test_SOURCES = smpp_test.c \
$(top_builddir)/src/libmsc/smpp_utils.c
smpp_test_LDADD = \
$(top_builddir)/src/libcommon/libcommon.a \
- $(LIBOSMOCORE_LIBS)
+ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)