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 | ff663237b508109b7ccbc236ddfaa00b26a5f2ab (patch) | |
| tree | 412f5c02cac772640c8327c4346fd6c5da8394b7 /openbsc/src/libgb | |
| parent | 85e109711d5b07ebc80ded03dd0b682407339800 (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/libgb')
| -rw-r--r-- | openbsc/src/libgb/Makefile.am | 2 | ||||
| -rw-r--r-- | openbsc/src/libgb/gprs_bssgp.c | 8 | ||||
| -rw-r--r-- | openbsc/src/libgb/gprs_bssgp_util.c | 6 | ||||
| -rw-r--r-- | openbsc/src/libgb/gprs_bssgp_vty.c | 10 | ||||
| -rw-r--r-- | openbsc/src/libgb/gprs_ns.c | 10 | ||||
| -rw-r--r-- | openbsc/src/libgb/gprs_ns_frgre.c | 6 | ||||
| -rw-r--r-- | openbsc/src/libgb/gprs_ns_vty.c | 10 |
7 files changed, 26 insertions, 26 deletions
diff --git a/openbsc/src/libgb/Makefile.am b/openbsc/src/libgb/Makefile.am index b48b1779..8ec10069 100644 --- a/openbsc/src/libgb/Makefile.am +++ b/openbsc/src/libgb/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOCORE_GSM) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libgb.a diff --git a/openbsc/src/libgb/gprs_bssgp.c b/openbsc/src/libgb/gprs_bssgp.c index eca34b98..b74791c4 100644 --- a/openbsc/src/libgb/gprs_bssgp.c +++ b/openbsc/src/libgb/gprs_bssgp.c @@ -27,10 +27,10 @@ #include <netinet/in.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libgb/gprs_bssgp_util.c b/openbsc/src/libgb/gprs_bssgp_util.c index f8e3b569..b5393239 100644 --- a/openbsc/src/libgb/gprs_bssgp_util.c +++ b/openbsc/src/libgb/gprs_bssgp_util.c @@ -24,9 +24,9 @@ #include <netinet/in.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libgb/gprs_bssgp_vty.c b/openbsc/src/libgb/gprs_bssgp_vty.c index 9ebd0900..720c221b 100644 --- a/openbsc/src/libgb/gprs_bssgp_vty.c +++ b/openbsc/src/libgb/gprs_bssgp_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> diff --git a/openbsc/src/libgb/gprs_ns.c b/openbsc/src/libgb/gprs_ns.c index 5a8e3586..877a0654 100644 --- a/openbsc/src/libgb/gprs_ns.c +++ b/openbsc/src/libgb/gprs_ns.c @@ -59,11 +59,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> diff --git a/openbsc/src/libgb/gprs_ns_frgre.c b/openbsc/src/libgb/gprs_ns_frgre.c index 106f410e..98b1ad60 100644 --- a/openbsc/src/libgb/gprs_ns_frgre.c +++ b/openbsc/src/libgb/gprs_ns_frgre.c @@ -31,9 +31,9 @@ #include <netinet/ip.h> #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> #include <openbsc/socket.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libgb/gprs_ns_vty.c b/openbsc/src/libgb/gprs_ns_vty.c index 39277fc7..505dc3b2 100644 --- a/openbsc/src/libgb/gprs_ns_vty.c +++ b/openbsc/src/libgb/gprs_ns_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> |