diff options
Diffstat (limited to 'openbsc/src/libabis')
-rw-r--r-- | openbsc/src/libabis/Makefile.am | 4 | ||||
-rw-r--r-- | openbsc/src/libabis/e1_input.c | 8 | ||||
-rw-r--r-- | openbsc/src/libabis/e1_input_vty.c | 8 | ||||
-rw-r--r-- | openbsc/src/libabis/input/dahdi.c | 6 | ||||
-rw-r--r-- | openbsc/src/libabis/input/hsl.c | 8 | ||||
-rw-r--r-- | openbsc/src/libabis/input/ipaccess.c | 8 | ||||
-rw-r--r-- | openbsc/src/libabis/input/lapd.c | 8 | ||||
-rw-r--r-- | openbsc/src/libabis/input/lapd.h | 2 | ||||
-rw-r--r-- | openbsc/src/libabis/input/misdn.c | 6 |
9 files changed, 29 insertions, 29 deletions
diff --git a/openbsc/src/libabis/Makefile.am b/openbsc/src/libabis/Makefile.am index 0df7b5a4a..ffaa201ec 100644 --- a/openbsc/src/libabis/Makefile.am +++ b/openbsc/src/libabis/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_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) noinst_LIBRARIES = libabis.a diff --git a/openbsc/src/libabis/e1_input.c b/openbsc/src/libabis/e1_input.c index 3b6644eff..eea1abe59 100644 --- a/openbsc/src/libabis/e1_input.c +++ b/openbsc/src/libabis/e1_input.c @@ -39,18 +39,18 @@ #define PF_ISDN AF_ISDN #endif -#include <osmocore/select.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> #include <openbsc/abis_nm.h> #include <openbsc/abis_rsl.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/subchan_demux.h> #include <openbsc/trau_frame.h> #include <openbsc/trau_mux.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/misdn.h> diff --git a/openbsc/src/libabis/e1_input_vty.c b/openbsc/src/libabis/e1_input_vty.c index 66bf6555e..890550196 100644 --- a/openbsc/src/libabis/e1_input_vty.c +++ b/openbsc/src/libabis/e1_input_vty.c @@ -27,12 +27,12 @@ #include <osmocom/vty/logging.h> #include <osmocom/vty/telnet_interface.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> -#include <osmocore/utils.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libabis/input/dahdi.c b/openbsc/src/libabis/input/dahdi.c index 572bb5ae9..2754944f7 100644 --- a/openbsc/src/libabis/input/dahdi.c +++ b/openbsc/src/libabis/input/dahdi.c @@ -39,8 +39,8 @@ #include <arpa/inet.h> #include <dahdi/user.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> @@ -48,7 +48,7 @@ #include <openbsc/subchan_demux.h> #include <openbsc/e1_input.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include "lapd.h" diff --git a/openbsc/src/libabis/input/hsl.c b/openbsc/src/libabis/input/hsl.c index 1afe82b49..d8f284e3f 100644 --- a/openbsc/src/libabis/input/hsl.c +++ b/openbsc/src/libabis/input/hsl.c @@ -43,9 +43,9 @@ #include <sys/ioctl.h> #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/tlv.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> @@ -55,7 +55,7 @@ #include <openbsc/ipaccess.h> #include <openbsc/socket.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #define HSL_TCP_PORT 2500 #define HSL_PROTO_DEBUG 0xdd diff --git a/openbsc/src/libabis/input/ipaccess.c b/openbsc/src/libabis/input/ipaccess.c index dcf8d1a53..f0746161a 100644 --- a/openbsc/src/libabis/input/ipaccess.c +++ b/openbsc/src/libabis/input/ipaccess.c @@ -33,10 +33,10 @@ #include <sys/ioctl.h> #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/tlv.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> diff --git a/openbsc/src/libabis/input/lapd.c b/openbsc/src/libabis/input/lapd.c index 7bce6cc51..2a4f60e22 100644 --- a/openbsc/src/libabis/input/lapd.c +++ b/openbsc/src/libabis/input/lapd.c @@ -36,10 +36,10 @@ #include "lapd.h" -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/msgb.h> -#include <osmocore/timer.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/timer.h> #include <openbsc/debug.h> #define SABM_INTERVAL 0, 300000 diff --git a/openbsc/src/libabis/input/lapd.h b/openbsc/src/libabis/input/lapd.h index fd11edaa3..fb980d104 100644 --- a/openbsc/src/libabis/input/lapd.h +++ b/openbsc/src/libabis/input/lapd.h @@ -3,7 +3,7 @@ #include <stdint.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> typedef enum { LAPD_MPH_NONE = 0, diff --git a/openbsc/src/libabis/input/misdn.c b/openbsc/src/libabis/input/misdn.c index 459887917..e111c131e 100644 --- a/openbsc/src/libabis/input/misdn.c +++ b/openbsc/src/libabis/input/misdn.c @@ -40,9 +40,9 @@ #define PF_ISDN AF_ISDN #endif -#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/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> |