diff options
| author | Harald Welte <laforge@gnumonks.org> | 2014-08-20 23:47:15 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2014-08-21 15:34:28 +0200 |
| commit | ba874b82be0ad1752b46009ba403f9b7bf24492d (patch) | |
| tree | 0677b2490d0a916f14321ef81dd4b91b131884c4 /openbsc/src/osmo-nitb | |
| parent | 0e167fc9740793cf4a3c82747919146073255486 (diff) | |
move libctrl from openbsc to libosmoctrl (libosmocore.git)
Diffstat (limited to 'openbsc/src/osmo-nitb')
| -rw-r--r-- | openbsc/src/osmo-nitb/Makefile.am | 5 | ||||
| -rw-r--r-- | openbsc/src/osmo-nitb/bsc_hack.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openbsc/src/osmo-nitb/Makefile.am b/openbsc/src/osmo-nitb/Makefile.am index fe285cb20..57a928406 100644 --- a/openbsc/src/osmo-nitb/Makefile.am +++ b/openbsc/src/osmo-nitb/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall $(COVERAGE_CFLAGS) \ $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) $(LIBSMPP34_CFLAGS) + $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBSMPP34_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) @@ -13,8 +13,7 @@ osmo_nitb_LDADD = \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/src/libctrl/libctrl.a \ $(top_builddir)/src/libcommon/libcommon.a \ -ldbi $(LIBCRYPT) \ $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOABIS_LIBS) $(LIBSMPP34_LIBS) + $(LIBOSMOCTRL_LIBS) $(LIBOSMOABIS_LIBS) $(LIBSMPP34_LIBS) diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c index 3307bc63c..372e52789 100644 --- a/openbsc/src/osmo-nitb/bsc_hack.c +++ b/openbsc/src/osmo-nitb/bsc_hack.c @@ -46,7 +46,8 @@ #include <openbsc/token_auth.h> #include <openbsc/handover_decision.h> #include <openbsc/rrlp.h> -#include <openbsc/control_if.h> +#include <osmocom/ctrl/control_if.h> +#include <openbsc/ctrl.h> #include <openbsc/osmo_bsc_rf.h> #include "../../bscconfig.h" |