diff options
Diffstat (limited to 'openbsc/src/osmo-bsc_nat')
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/Makefile.am | 4 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_filter.c | 4 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c | 6 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat.c | 8 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | 8 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 6 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_sccp.c | 2 | ||||
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_ussd.c | 8 |
8 files changed, 23 insertions, 23 deletions
diff --git a/openbsc/src/osmo-bsc_nat/Makefile.am b/openbsc/src/osmo-bsc_nat/Makefile.am index 98a343108..03fe62b4b 100644 --- a/openbsc/src/osmo-bsc_nat/Makefile.am +++ b/openbsc/src/osmo-bsc_nat/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) bin_PROGRAMS = osmo-bsc_nat diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c index 73e987893..5765a6640 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_filter.c +++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c @@ -25,8 +25,8 @@ #include <openbsc/ipaccess.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 9eac00bf4..0c10d84ac 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -28,9 +28,9 @@ #include <osmocom/sccp/sccp.h> -#include <osmocore/talloc.h> -#include <osmocore/gsm0808.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index f513933fa..fe78ee911 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -44,11 +44,11 @@ #include <openbsc/socket.h> #include <openbsc/vty.h> -#include <osmocore/gsm0808.h> -#include <osmocore/talloc.h> -#include <osmocore/process.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/process.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/vty.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c index cd294ccfb..6068333bb 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c @@ -29,11 +29,11 @@ #include <openbsc/ipaccess.h> #include <openbsc/vty.h> -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/gsm0808.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/gsm0808.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 814d9aaa5..90f69aefe 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -26,9 +26,9 @@ #include <openbsc/mgcp.h> #include <openbsc/vty.h> -#include <osmocore/talloc.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/utils.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/utils.h> #include <osmocom/vty/logging.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_sccp.c b/openbsc/src/osmo-bsc_nat/bsc_sccp.c index 72de11201..f7d868a20 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_sccp.c +++ b/openbsc/src/osmo-bsc_nat/bsc_sccp.c @@ -25,7 +25,7 @@ #include <osmocom/sccp/sccp.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <string.h> #include <time.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c index c121abe5d..817433650 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_ussd.c +++ b/openbsc/src/osmo-bsc_nat/bsc_ussd.c @@ -25,10 +25,10 @@ #include <openbsc/ipaccess.h> #include <openbsc/socket.h> -#include <osmocore/protocol/gsm_08_08.h> -#include <osmocore/gsm0480.h> -#include <osmocore/talloc.h> -#include <osmocore/tlv.h> +#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/core/gsm0480.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/tlv.h> #include <osmocom/sccp/sccp.h> |