diff options
| author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-03-22 16:47:59 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-03-23 18:17:56 +0100 |
| commit | 136f453dd2492b95004461a33c90b11732f33bd8 (patch) | |
| tree | 8f8094b17e3c904851a3f2b1cac31b1ae09f66dd /openbsc/src/libmgcp | |
| parent | 3848770669563aba82f12c1537b4331c880de150 (diff) | |
src: use new library libosmogsm and new path to headers in libosmocore
libosmogsm is a new library that is distributed in the libosmocore.
Now, openbsc depends on it. This patch gets openbsc with this
change.
This patch also rewrites all include path to the new
osmocom/[gsm|core]
Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org>
Diffstat (limited to 'openbsc/src/libmgcp')
| -rw-r--r-- | openbsc/src/libmgcp/Makefile.am | 2 | ||||
| -rw-r--r-- | openbsc/src/libmgcp/mgcp_network.c | 4 | ||||
| -rw-r--r-- | openbsc/src/libmgcp/mgcp_protocol.c | 6 | ||||
| -rw-r--r-- | openbsc/src/libmgcp/mgcp_vty.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/openbsc/src/libmgcp/Makefile.am b/openbsc/src/libmgcp/Makefile.am index b1d1d158a..6347eac69 100644 --- a/openbsc/src/libmgcp/Makefile.am +++ b/openbsc/src/libmgcp/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libmgcp.a diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index b814d9857..7167d5809 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -29,8 +29,8 @@ #include <sys/socket.h> #include <arpa/inet.h> -#include <osmocore/msgb.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c index c9a9b7fc0..bca4b31fd 100644 --- a/openbsc/src/libmgcp/mgcp_protocol.c +++ b/openbsc/src/libmgcp/mgcp_protocol.c @@ -29,9 +29,9 @@ #include <limits.h> #include <unistd.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c index 2e695c89b..be77b83ef 100644 --- a/openbsc/src/libmgcp/mgcp_vty.c +++ b/openbsc/src/libmgcp/mgcp_vty.c @@ -23,7 +23,7 @@ #include <sys/types.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> |