diff options
Diffstat (limited to 'openbsc/src/libcommon')
| -rw-r--r-- | openbsc/src/libcommon/Makefile.am | 4 | ||||
| -rw-r--r-- | openbsc/src/libcommon/common_vty.c | 2 | ||||
| -rw-r--r-- | openbsc/src/libcommon/debug.c | 6 | ||||
| -rw-r--r-- | openbsc/src/libcommon/gsm_data.c | 8 | ||||
| -rw-r--r-- | openbsc/src/libcommon/socket.c | 8 | ||||
| -rw-r--r-- | openbsc/src/libcommon/talloc_ctx.c | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/openbsc/src/libcommon/Makefile.am b/openbsc/src/libcommon/Makefile.am index 2895452ea..ed74b440b 100644 --- a/openbsc/src/libcommon/Makefile.am +++ b/openbsc/src/libcommon/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 = libcommon.a diff --git a/openbsc/src/libcommon/common_vty.c b/openbsc/src/libcommon/common_vty.c index 84375a22d..e974f2d88 100644 --- a/openbsc/src/libcommon/common_vty.c +++ b/openbsc/src/libcommon/common_vty.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libcommon/debug.c b/openbsc/src/libcommon/debug.c index ea5db49e5..1372150c8 100644 --- a/openbsc/src/libcommon/debug.c +++ b/openbsc/src/libcommon/debug.c @@ -27,9 +27,9 @@ #include <time.h> #include <errno.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> -#include <osmocore/logging.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c index b2c52e4b1..cab1e4a58 100644 --- a/openbsc/src/libcommon/gsm_data.c +++ b/openbsc/src/libcommon/gsm_data.c @@ -26,10 +26,10 @@ #include <netinet/in.h> -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/statistics.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/core/statistics.h> #include <openbsc/gsm_data.h> #include <openbsc/osmo_msc_data.h> diff --git a/openbsc/src/libcommon/socket.c b/openbsc/src/libcommon/socket.c index 47778e746..42d7b48d9 100644 --- a/openbsc/src/libcommon/socket.c +++ b/openbsc/src/libcommon/socket.c @@ -33,12 +33,12 @@ #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 <osmocore/talloc.h> +#include <osmocom/core/talloc.h> int make_sock(struct bsc_fd *bfd, int proto, u_int32_t ip, u_int16_t port, int (*cb)(struct bsc_fd *fd, unsigned int what)) diff --git a/openbsc/src/libcommon/talloc_ctx.c b/openbsc/src/libcommon/talloc_ctx.c index 8e7ec230f..ae6a15636 100644 --- a/openbsc/src/libcommon/talloc_ctx.c +++ b/openbsc/src/libcommon/talloc_ctx.c @@ -1,4 +1,4 @@ -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> extern void *tall_msgb_ctx; |