diff options
Diffstat (limited to 'openbsc/src/ipaccess')
-rw-r--r-- | openbsc/src/ipaccess/Makefile.am | 4 | ||||
-rw-r--r-- | openbsc/src/ipaccess/ipaccess-config.c | 6 | ||||
-rw-r--r-- | openbsc/src/ipaccess/ipaccess-find.c | 4 | ||||
-rw-r--r-- | openbsc/src/ipaccess/ipaccess-firmware.c | 2 | ||||
-rw-r--r-- | openbsc/src/ipaccess/ipaccess-proxy.c | 8 | ||||
-rw-r--r-- | openbsc/src/ipaccess/network_listen.c | 8 |
6 files changed, 16 insertions, 16 deletions
diff --git a/openbsc/src/ipaccess/Makefile.am b/openbsc/src/ipaccess/Makefile.am index 144cca1ee..c997c2923 100644 --- a/openbsc/src/ipaccess/Makefile.am +++ b/openbsc/src/ipaccess/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS) bin_PROGRAMS = ipaccess-find ipaccess-config ipaccess-proxy diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c index d02faea3a..5215538b2 100644 --- a/openbsc/src/ipaccess/ipaccess-config.c +++ b/openbsc/src/ipaccess/ipaccess-config.c @@ -35,8 +35,8 @@ #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/timer.h> +#include <osmocom/core/select.h> +#include <osmocom/core/timer.h> #include <openbsc/ipaccess.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> @@ -44,7 +44,7 @@ #include <openbsc/signal.h> #include <openbsc/debug.h> #include <openbsc/network_listen.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> static struct gsm_network *gsmnet; diff --git a/openbsc/src/ipaccess/ipaccess-find.c b/openbsc/src/ipaccess/ipaccess-find.c index bea4b77ad..6dc2f0641 100644 --- a/openbsc/src/ipaccess/ipaccess-find.c +++ b/openbsc/src/ipaccess/ipaccess-find.c @@ -27,8 +27,8 @@ #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/timer.h> +#include <osmocom/core/select.h> +#include <osmocom/core/timer.h> #include <openbsc/ipaccess.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/ipaccess/ipaccess-firmware.c b/openbsc/src/ipaccess/ipaccess-firmware.c index 7fdd0f825..971db9d70 100644 --- a/openbsc/src/ipaccess/ipaccess-firmware.c +++ b/openbsc/src/ipaccess/ipaccess-firmware.c @@ -20,7 +20,7 @@ #include <openbsc/debug.h> #include <openbsc/ipaccess.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <stdio.h> #include <stdlib.h> diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c index 2dc1b2f62..56fe160cb 100644 --- a/openbsc/src/ipaccess/ipaccess-proxy.c +++ b/openbsc/src/ipaccess/ipaccess-proxy.c @@ -39,12 +39,12 @@ #include <getopt.h> #include <openbsc/gsm_data.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/ipaccess.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> static struct log_target *stderr_target; diff --git a/openbsc/src/ipaccess/network_listen.c b/openbsc/src/ipaccess/network_listen.c index aaf7c974a..cf0a6dc94 100644 --- a/openbsc/src/ipaccess/network_listen.c +++ b/openbsc/src/ipaccess/network_listen.c @@ -28,10 +28,10 @@ #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> -#include <osmocore/rxlev_stat.h> -#include <osmocore/gsm48_ie.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> +#include <osmocom/gsm/rxlev_stat.h> +#include <osmocom/gsm/gsm48_ie.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> |