diff options
-rw-r--r-- | openbsc/configure.in | 1 | ||||
-rw-r--r-- | openbsc/src/Makefile.am | 2 | ||||
-rw-r--r-- | openbsc/src/gb/Makefile.am | 9 | ||||
-rw-r--r-- | openbsc/src/gb/gprs_bssgp.c (renamed from openbsc/src/gprs/gprs_bssgp.c) | 0 | ||||
-rw-r--r-- | openbsc/src/gb/gprs_bssgp_util.c (renamed from openbsc/src/gprs/gprs_bssgp_util.c) | 0 | ||||
-rw-r--r-- | openbsc/src/gb/gprs_bssgp_vty.c (renamed from openbsc/src/gprs/gprs_bssgp_vty.c) | 0 | ||||
-rw-r--r-- | openbsc/src/gb/gprs_ns.c (renamed from openbsc/src/gprs/gprs_ns.c) | 0 | ||||
-rw-r--r-- | openbsc/src/gb/gprs_ns_frgre.c (renamed from openbsc/src/gprs/gprs_ns_frgre.c) | 0 | ||||
-rw-r--r-- | openbsc/src/gb/gprs_ns_vty.c (renamed from openbsc/src/gprs/gprs_ns_vty.c) | 0 | ||||
-rw-r--r-- | openbsc/src/gprs/Makefile.am | 13 |
10 files changed, 15 insertions, 10 deletions
diff --git a/openbsc/configure.in b/openbsc/configure.in index 65b39e606..aec490d51 100644 --- a/openbsc/configure.in +++ b/openbsc/configure.in @@ -99,6 +99,7 @@ AC_OUTPUT( src/osmo-bsc_mgcp/Makefile src/ipaccess/Makefile src/utils/Makefile + src/gb/Makefile src/gprs/Makefile tests/Makefile tests/debug/Makefile diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am index 1a8ec6483..489dc58b9 100644 --- a/openbsc/src/Makefile.am +++ b/openbsc/src/Makefile.am @@ -2,7 +2,7 @@ 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) -SUBDIRS = common abis mgcp bsc trau osmo-nitb osmo-bsc_mgcp utils ipaccess gprs +SUBDIRS = common abis mgcp bsc trau osmo-nitb osmo-bsc_mgcp utils ipaccess gb gprs # Conditional modules if BUILD_NAT diff --git a/openbsc/src/gb/Makefile.am b/openbsc/src/gb/Makefile.am new file mode 100644 index 000000000..b48b17791 --- /dev/null +++ b/openbsc/src/gb/Makefile.am @@ -0,0 +1,9 @@ +INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) +AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) + +noinst_LIBRARIES = libgb.a + +libgb_a_SOURCES = gprs_ns.c gprs_ns_frgre.c gprs_ns_vty.c \ + gprs_bssgp.c gprs_bssgp_util.c gprs_bssgp_vty.c +#gprs_llc.c gprs_llc_vty.c crc24.c diff --git a/openbsc/src/gprs/gprs_bssgp.c b/openbsc/src/gb/gprs_bssgp.c index eca34b989..eca34b989 100644 --- a/openbsc/src/gprs/gprs_bssgp.c +++ b/openbsc/src/gb/gprs_bssgp.c diff --git a/openbsc/src/gprs/gprs_bssgp_util.c b/openbsc/src/gb/gprs_bssgp_util.c index f8e3b5699..f8e3b5699 100644 --- a/openbsc/src/gprs/gprs_bssgp_util.c +++ b/openbsc/src/gb/gprs_bssgp_util.c diff --git a/openbsc/src/gprs/gprs_bssgp_vty.c b/openbsc/src/gb/gprs_bssgp_vty.c index 9ebd09004..9ebd09004 100644 --- a/openbsc/src/gprs/gprs_bssgp_vty.c +++ b/openbsc/src/gb/gprs_bssgp_vty.c diff --git a/openbsc/src/gprs/gprs_ns.c b/openbsc/src/gb/gprs_ns.c index 5a8e35860..5a8e35860 100644 --- a/openbsc/src/gprs/gprs_ns.c +++ b/openbsc/src/gb/gprs_ns.c diff --git a/openbsc/src/gprs/gprs_ns_frgre.c b/openbsc/src/gb/gprs_ns_frgre.c index 106f410e6..106f410e6 100644 --- a/openbsc/src/gprs/gprs_ns_frgre.c +++ b/openbsc/src/gb/gprs_ns_frgre.c diff --git a/openbsc/src/gprs/gprs_ns_vty.c b/openbsc/src/gb/gprs_ns_vty.c index 39277fc71..39277fc71 100644 --- a/openbsc/src/gprs/gprs_ns_vty.c +++ b/openbsc/src/gb/gprs_ns_vty.c diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index cdad70f7c..e98111561 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -2,7 +2,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) -noinst_LIBRARIES = libgb.a noinst_HEADERS = gprs_sndcp.h if HAVE_LIBGTP @@ -11,14 +10,10 @@ else bin_PROGRAMS = osmo-gbproxy endif - -libgb_a_SOURCES = gprs_ns.c gprs_ns_frgre.c gprs_ns_vty.c \ - gprs_bssgp.c gprs_bssgp_util.c gprs_bssgp_vty.c \ - gprs_llc.c gprs_llc_vty.c crc24.c - osmo_gbproxy_SOURCES = gb_proxy.c gb_proxy_main.c gb_proxy_vty.c -osmo_gbproxy_LDADD = libgb.a $(top_builddir)/src/common/libcommon.a +osmo_gbproxy_LDADD = $(top_builddir)/src/gb/libgb.a $(top_builddir)/src/common/libcommon.a osmo_sgsn_SOURCES = gprs_gmm.c gprs_sgsn.c gprs_sndcp.c gprs_sndcp_vty.c \ - sgsn_main.c sgsn_vty.c sgsn_libgtp.c -osmo_sgsn_LDADD = libgb.a $(top_builddir)/src/common/libcommon.a -lgtp + sgsn_main.c sgsn_vty.c sgsn_libgtp.c \ + gprs_llc.c gprs_llc_vty.c crc24.c +osmo_sgsn_LDADD = $(top_builddir)/src/gb/libgb.a $(top_builddir)/src/common/libcommon.a -lgtp |