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/gprs | |
| parent | 0e167fc9740793cf4a3c82747919146073255486 (diff) | |
move libctrl from openbsc to libosmoctrl (libosmocore.git)
Diffstat (limited to 'openbsc/src/gprs')
| -rw-r--r-- | openbsc/src/gprs/Makefile.am | 5 | ||||
| -rw-r--r-- | openbsc/src/gprs/sgsn_ctrl.c | 5 | ||||
| -rw-r--r-- | openbsc/src/gprs/sgsn_main.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index 2e26b8ae7..bad38c8fc 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -1,9 +1,9 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) $(LIBOSMOGB_CFLAGS) $(COVERAGE_CFLAGS) OSMO_LIBS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOGB_LIBS) + $(LIBOSMOCTRL_LIBS) $(LIBOSMOGB_LIBS) noinst_HEADERS = gprs_sndcp.h @@ -23,6 +23,5 @@ osmo_sgsn_SOURCES = gprs_gmm.c gprs_sgsn.c gprs_sndcp.c gprs_sndcp_vty.c \ gprs_llc.c gprs_llc_parse.c gprs_llc_vty.c crc24.c \ sgsn_ctrl.c osmo_sgsn_LDADD = \ - $(top_builddir)/src/libctrl/libctrl.a \ $(top_builddir)/src/libcommon/libcommon.a \ -lgtp $(OSMO_LIBS) $(LIBOSMOABIS_LIBS) diff --git a/openbsc/src/gprs/sgsn_ctrl.c b/openbsc/src/gprs/sgsn_ctrl.c index 789c91e05..aa5816325 100644 --- a/openbsc/src/gprs/sgsn_ctrl.c +++ b/openbsc/src/gprs/sgsn_ctrl.c @@ -19,8 +19,9 @@ * */ -#include <openbsc/control_if.h> -#include <openbsc/control_cmd.h> +#include <osmocom/ctrl/control_if.h> +#include <osmocom/ctrl/control_cmd.h> +#include <openbsc/gsm_data.h> #include <openbsc/gprs_sgsn.h> #include <openbsc/sgsn.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index f5a66e663..c8078ba93 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -50,7 +50,7 @@ #include <openbsc/sgsn.h> #include <openbsc/gprs_llc.h> #include <openbsc/gprs_gmm.h> -#include <openbsc/control_if.h> +#include <osmocom/ctrl/control_if.h> #include <gtp.h> |