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/gprs | |
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/gprs')
-rw-r--r-- | openbsc/src/gprs/Makefile.am | 4 | ||||
-rw-r--r-- | openbsc/src/gprs/gb_proxy.c | 4 | ||||
-rw-r--r-- | openbsc/src/gprs/gb_proxy_main.c | 8 | ||||
-rw-r--r-- | openbsc/src/gprs/gb_proxy_vty.c | 2 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_gmm.c | 12 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_llc.c | 8 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_llc_vty.c | 10 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_sgsn.c | 8 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_sndcp.c | 8 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_sndcp_vty.c | 10 | ||||
-rw-r--r-- | openbsc/src/gprs/sgsn_libgtp.c | 6 | ||||
-rw-r--r-- | openbsc/src/gprs/sgsn_main.c | 10 | ||||
-rw-r--r-- | openbsc/src/gprs/sgsn_vty.c | 6 |
13 files changed, 48 insertions, 48 deletions
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index 16c2200e5..b6eccee9a 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/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_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) noinst_HEADERS = gprs_sndcp.h diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index 8df93a9ce..53282e22b 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -30,8 +30,8 @@ #include <sys/types.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> #include <openbsc/signal.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gb_proxy_main.c b/openbsc/src/gprs/gb_proxy_main.c index 58b6a76dd..bd18b2fc3 100644 --- a/openbsc/src/gprs/gb_proxy_main.c +++ b/openbsc/src/gprs/gb_proxy_main.c @@ -33,10 +33,10 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/process.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/process.h> #include <openbsc/signal.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gb_proxy_vty.c b/openbsc/src/gprs/gb_proxy_vty.c index 05f5b1e46..67ed09317 100644 --- a/openbsc/src/gprs/gb_proxy_vty.c +++ b/openbsc/src/gprs/gb_proxy_vty.c @@ -23,7 +23,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gb_proxy.h> diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c index 949cd96ea..43aa2123c 100644 --- a/openbsc/src/gprs/gprs_gmm.c +++ b/openbsc/src/gprs/gprs_gmm.c @@ -31,12 +31,12 @@ #include <arpa/inet.h> #include <openbsc/db.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/signal.h> -#include <osmocore/talloc.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/tlv.h> +#include <osmocom/core/gsm_utils.h> +#include <osmocom/core/signal.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/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c index 7991f4c1e..f7408ef97 100644 --- a/openbsc/src/gprs/gprs_llc.c +++ b/openbsc/src/gprs/gprs_llc.c @@ -22,10 +22,10 @@ #include <errno.h> #include <stdint.h> -#include <osmocore/msgb.h> -#include <osmocore/linuxlist.h> -#include <osmocore/timer.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gprs_llc_vty.c b/openbsc/src/gprs/gprs_llc_vty.c index d4f743b01..050d0249c 100644 --- a/openbsc/src/gprs/gprs_llc_vty.c +++ b/openbsc/src/gprs/gprs_llc_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/core/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_llc.h> diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c index 443655418..85f710500 100644 --- a/openbsc/src/gprs/gprs_sgsn.c +++ b/openbsc/src/gprs/gprs_sgsn.c @@ -21,10 +21,10 @@ #include <stdint.h> -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/debug.h> #include <openbsc/gprs_sgsn.h> diff --git a/openbsc/src/gprs/gprs_sndcp.c b/openbsc/src/gprs/gprs_sndcp.c index 4f421e451..1307fe548 100644 --- a/openbsc/src/gprs/gprs_sndcp.c +++ b/openbsc/src/gprs/gprs_sndcp.c @@ -23,10 +23,10 @@ #include <errno.h> #include <stdint.h> -#include <osmocore/msgb.h> -#include <osmocore/linuxlist.h> -#include <osmocore/timer.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gprs_sndcp_vty.c b/openbsc/src/gprs/gprs_sndcp_vty.c index 5a755d5f7..a6c0bd3c1 100644 --- a/openbsc/src/gprs/gprs_sndcp_vty.c +++ b/openbsc/src/gprs/gprs_sndcp_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/core/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_llc.h> diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/openbsc/src/gprs/sgsn_libgtp.c index 7b10a45a3..c2afc7944 100644 --- a/openbsc/src/gprs/sgsn_libgtp.c +++ b/openbsc/src/gprs/sgsn_libgtp.c @@ -34,9 +34,9 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/gsm_04_08_gprs.h> #include <openbsc/signal.h> diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index 53494c175..8ec74cffe 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -33,11 +33,11 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/logging.h> -#include <osmocore/process.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/process.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c index 74669ffb7..7100b1f8d 100644 --- a/openbsc/src/gprs/sgsn_vty.c +++ b/openbsc/src/gprs/sgsn_vty.c @@ -23,9 +23,9 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/sgsn.h> |