From 909fac6689df570ef0c5983fe51da14eb3bf2783 Mon Sep 17 00:00:00 2001 From: Jacob Erlbeck Date: Thu, 8 May 2014 14:08:37 +0200 Subject: [PATCH] mgcp: Move transcoding to libmgcp This patch moves the files relevant to transcoding from src/osmo-bsc_mgcp to src/libmgcp and src/include/openbsc. Makefiles and include directives are being updated accordingly. Sponsored-by: On-Waves ehf --- openbsc/contrib/testconv/Makefile | 3 +-- openbsc/contrib/testconv/testconv_main.c | 2 +- openbsc/include/openbsc/Makefile.am | 2 +- .../openbsc}/mgcp_transcode.h | 0 openbsc/src/libmgcp/Makefile.am | 12 +++++++++--- openbsc/src/{osmo-bsc_mgcp => libmgcp}/g711common.h | 0 .../src/{osmo-bsc_mgcp => libmgcp}/mgcp_transcode.c | 0 openbsc/src/osmo-bsc_mgcp/Makefile.am | 9 ++------- openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 2 +- openbsc/tests/mgcp/Makefile.am | 2 +- openbsc/tests/mgcp/mgcp_transcoding_test.c | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) rename openbsc/{src/osmo-bsc_mgcp => include/openbsc}/mgcp_transcode.h (100%) rename openbsc/src/{osmo-bsc_mgcp => libmgcp}/g711common.h (100%) rename openbsc/src/{osmo-bsc_mgcp => libmgcp}/mgcp_transcode.c (100%) diff --git a/openbsc/contrib/testconv/Makefile b/openbsc/contrib/testconv/Makefile index 90adeccca..bb856f750 100644 --- a/openbsc/contrib/testconv/Makefile +++ b/openbsc/contrib/testconv/Makefile @@ -1,5 +1,5 @@ -OBJS = testconv_main.o mgcp_transcode.o +OBJS = testconv_main.o CC = gcc CFLAGS = -O0 -ggdb -Wall @@ -11,7 +11,6 @@ testconv: $(OBJS) $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) testconv_main.o: testconv_main.c -mgcp_transcode.o: ../../src/osmo-bsc_mgcp/mgcp_transcode.c $(OBJS): $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< diff --git a/openbsc/contrib/testconv/testconv_main.c b/openbsc/contrib/testconv/testconv_main.c index e74c686e4..89dce1ac2 100644 --- a/openbsc/contrib/testconv/testconv_main.c +++ b/openbsc/contrib/testconv/testconv_main.c @@ -17,7 +17,7 @@ #error "Requires MGCP transcoding enabled (see --enable-mgcp-transcoding)" #endif -#include "src/osmo-bsc_mgcp/mgcp_transcode.h" +#include "openbsc/mgcp_transcode.h" static int audio_name_to_type(const char *name) { diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index d902315b5..b739d0f46 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \ osmo_msc_data.h osmo_bsc_grace.h sms_queue.h abis_om2000.h \ bss.h gsm_data_shared.h control_cmd.h ipaccess.h mncc_int.h \ arfcn_range_encode.h nat_rewrite_trie.h bsc_nat_callstats.h \ - osmux.h + osmux.h mgcp_transcode.h openbsc_HEADERS = gsm_04_08.h meas_rep.h bsc_api.h openbscdir = $(includedir)/openbsc diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_transcode.h b/openbsc/include/openbsc/mgcp_transcode.h similarity index 100% rename from openbsc/src/osmo-bsc_mgcp/mgcp_transcode.h rename to openbsc/include/openbsc/mgcp_transcode.h diff --git a/openbsc/src/libmgcp/Makefile.am b/openbsc/src/libmgcp/Makefile.am index 262ad34a2..e5dab1ad7 100644 --- a/openbsc/src/libmgcp/Makefile.am +++ b/openbsc/src/libmgcp/Makefile.am @@ -1,9 +1,15 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMONETIF_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) $(COVERAGE_CFLAGS) $(LIBBCG729_CFLAGS) AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ - $(LIBOSMONETIF_LIBS) $(COVERAGE_LDFLAGS) + $(LIBOSMONETIF_LIBS) $(COVERAGE_LDFLAGS) $(LIBBCG729_LIBS) noinst_LIBRARIES = libmgcp.a +noinst_HEADERS = g711common.h + libmgcp_a_SOURCES = mgcp_protocol.c mgcp_network.c mgcp_vty.c osmux.c + +if BUILD_MGCP_TRANSCODING + libmgcp_a_SOURCES += mgcp_transcode.c +endif diff --git a/openbsc/src/osmo-bsc_mgcp/g711common.h b/openbsc/src/libmgcp/g711common.h similarity index 100% rename from openbsc/src/osmo-bsc_mgcp/g711common.h rename to openbsc/src/libmgcp/g711common.h diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_transcode.c b/openbsc/src/libmgcp/mgcp_transcode.c similarity index 100% rename from openbsc/src/osmo-bsc_mgcp/mgcp_transcode.c rename to openbsc/src/libmgcp/mgcp_transcode.c diff --git a/openbsc/src/osmo-bsc_mgcp/Makefile.am b/openbsc/src/osmo-bsc_mgcp/Makefile.am index be399779f..fba76b41e 100644 --- a/openbsc/src/osmo-bsc_mgcp/Makefile.am +++ b/openbsc/src/osmo-bsc_mgcp/Makefile.am @@ -1,17 +1,12 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) \ - $(LIBBCG729_CFLAGS) + $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) bin_PROGRAMS = osmo-bsc_mgcp osmo_bsc_mgcp_SOURCES = mgcp_main.c -if BUILD_MGCP_TRANSCODING - osmo_bsc_mgcp_SOURCES += mgcp_transcode.c -endif + osmo_bsc_mgcp_LDADD = $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libmgcp/libmgcp.a -lrt \ $(LIBOSMOVTY_LIBS) $(LIBOSMOCORE_LIBS) \ $(LIBOSMONETIF_LIBS) $(LIBBCG729_LIBS) - -noinst_HEADERS = g711common.h mgcp_transcode.h diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index 6b7296591..8c3808a28 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -50,7 +50,7 @@ #include "../../bscconfig.h" #ifdef BUILD_MGCP_TRANSCODING -#include "mgcp_transcode.h" +#include "openbsc/mgcp_transcode.h" #endif /* this is here for the vty... it will never be called */ diff --git a/openbsc/tests/mgcp/Makefile.am b/openbsc/tests/mgcp/Makefile.am index 3982b0782..ce9e59647 100644 --- a/openbsc/tests/mgcp/Makefile.am +++ b/openbsc/tests/mgcp/Makefile.am @@ -18,7 +18,7 @@ mgcp_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(LIBOSMOCORE_LIBS) -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \ $(LIBRARY_DL) $(LIBOSMONETIF_LIBS) -mgcp_transcoding_test_SOURCES = mgcp_transcoding_test.c $(top_builddir)/src/osmo-bsc_mgcp/mgcp_transcode.c +mgcp_transcoding_test_SOURCES = mgcp_transcoding_test.c mgcp_transcoding_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ diff --git a/openbsc/tests/mgcp/mgcp_transcoding_test.c b/openbsc/tests/mgcp/mgcp_transcoding_test.c index e5da13856..9ba2c4b46 100644 --- a/openbsc/tests/mgcp/mgcp_transcoding_test.c +++ b/openbsc/tests/mgcp/mgcp_transcoding_test.c @@ -17,7 +17,7 @@ #error "Requires MGCP transcoding enabled (see --enable-mgcp-transcoding)" #endif -#include "src/osmo-bsc_mgcp/mgcp_transcode.h" +#include "openbsc/mgcp_transcode.h" uint8_t *audio_frame_l16[] = { };