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/utils | |
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/utils')
-rw-r--r-- | openbsc/src/utils/Makefile.am | 4 | ||||
-rw-r--r-- | openbsc/src/utils/bs11_config.c | 6 | ||||
-rw-r--r-- | openbsc/src/utils/rs232.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index 2351f8a46..c2d2085b0 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/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) bin_PROGRAMS = bs11_config isdnsync diff --git a/openbsc/src/utils/bs11_config.c b/openbsc/src/utils/bs11_config.c index eaed8b75d..110d337e7 100644 --- a/openbsc/src/utils/bs11_config.c +++ b/openbsc/src/utils/bs11_config.c @@ -35,10 +35,10 @@ #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> #include <openbsc/debug.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <openbsc/rs232.h> /* state of our bs11_config application */ diff --git a/openbsc/src/utils/rs232.c b/openbsc/src/utils/rs232.c index 75505710f..5c20531f9 100644 --- a/openbsc/src/utils/rs232.c +++ b/openbsc/src/utils/rs232.c @@ -27,8 +27,8 @@ #include <termios.h> #include <fcntl.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/rs232.h> |