Merge remote branch 'origin/master' into on-waves/bsc-master

* Move to libosmocore
* Move to new debugging architecture
* Register the BTS types
* Has only been compile tested

Conflicts:
	openbsc/include/openbsc/Makefile.am
	openbsc/include/openbsc/gsm_data.h
	openbsc/include/openbsc/ipaccess.h
	openbsc/include/openbsc/mgcp.h
	openbsc/include/openbsc/msgb.h
	openbsc/include/openbsc/tlv.h
	openbsc/src/Makefile.am
	openbsc/src/abis_rsl.c
	openbsc/src/bsc_init.c
	openbsc/src/bsc_mgcp.c
	openbsc/src/chan_alloc.c
	openbsc/src/debug.c
	openbsc/src/gsm_subscriber_base.c
	openbsc/src/msgb.c
	openbsc/src/rest_octets.c
	openbsc/src/sccp/sccp.c
	openbsc/src/vty/command.c
	openbsc/src/vty_interface.c
	openbsc/tests/Makefile.am

1 files changed, 23 insertions, 14 deletions

diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index 615884a38..2c695993d 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -1,23 +1,29 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-Wall
+AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
+AM_LDFLAGS = $(LIBOSMOCORE_LIBS)
 
 sbin_PROGRAMS = bsc_hack bs11_config ipaccess-find ipaccess-config \
-                isdnsync bsc_mgcp bsc_msc_ip bsc_nat
-noinst_LIBRARIES = libbsc.a libmsc.a libvty.a libsccp.a
+                isdnsync bsc_mgcp ipaccess-proxy \
+                bsc_msc_ip bsc_nat
+noinst_LIBRARIES = libbsc.a libmsc.a libvty.a
 noinst_HEADERS = vty/cardshell.h
 
+bscdir = $(libdir)
+bsc_LIBRARIES = libsccp.a
+
 libbsc_a_SOURCES = abis_rsl.c abis_nm.c gsm_data.c gsm_04_08_utils.c \
-		msgb.c select.c chan_alloc.c timer.c debug.c \
+		chan_alloc.c debug.c \
 		gsm_subscriber_base.c subchan_demux.c bsc_rll.c transaction.c \
-		trau_frame.c trau_mux.c paging.c e1_config.c e1_input.c tlv_parser.c \
-		input/misdn.c input/ipaccess.c signal.c gsm_utils.c talloc.c \
-		talloc_ctx.c system_information.c bitvec.c rest_octets.c \
-		rtp_proxy.c telnet_interface.c
+		trau_frame.c trau_mux.c paging.c e1_config.c e1_input.c \
+		input/misdn.c input/ipaccess.c \
+		talloc_ctx.c system_information.c rest_octets.c \
+		rtp_proxy.c bts_siemens_bs11.c bts_ipaccess_nanobts.c \
+		bts_unknown.c telnet_interface.c meas_rep.c
 
 libmsc_a_SOURCES = gsm_subscriber.c db.c \
 		mncc.c gsm_04_08.c gsm_04_11.c transaction.c \
 		token_auth.c rrlp.c gsm_04_80.c ussd.c silent_call.c \
-                handover_logic.c handover_decision.c meas_rep.c
+		handover_logic.c handover_decision.c
 
 libvty_a_SOURCES = vty/buffer.c vty/command.c vty/vector.c vty/vty.c
 
@@ -26,22 +32,25 @@ libsccp_a_SOURCES = sccp/sccp.c
 bsc_hack_SOURCES = bsc_hack.c bsc_init.c vty_interface.c vty_interface_layer3.c
 bsc_hack_LDADD = libmsc.a libbsc.a libmsc.a libvty.a -ldl -ldbi $(LIBCRYPT)
 
+bs11_config_SOURCES = bs11_config.c abis_nm.c gsm_data.c debug.c \
+		      rs232.c bts_siemens_bs11.c
 bsc_msc_ip_SOURCES = bssap.c bsc_msc_ip.c bsc_init.c vty_interface.c vty_interface_bsc.c \
 		bsc_msc.c
 bsc_msc_ip_LDADD = libbsc.a libvty.a libsccp.a
 
-bs11_config_SOURCES = bs11_config.c abis_nm.c gsm_data.c msgb.c debug.c \
-		      select.c timer.c rs232.c tlv_parser.c signal.c talloc.c
 
-ipaccess_find_SOURCES = ipaccess-find.c select.c timer.c
+ipaccess_find_SOURCES = ipaccess/ipaccess-find.c
 
-ipaccess_config_SOURCES = ipaccess-config.c
+ipaccess_config_SOURCES = ipaccess/ipaccess-config.c ipaccess/ipaccess-firmware.c
 ipaccess_config_LDADD = libbsc.a libmsc.a libbsc.a libvty.a -ldl -ldbi $(LIBCRYPT)
 
 isdnsync_SOURCES = isdnsync.c
 
-bsc_mgcp_SOURCES = bsc_mgcp.c msgb.c talloc.c debug.c select.c timer.c telnet_interface.c
+bsc_mgcp_SOURCES = mgcp/mgcp_main.c mgcp/mgcp_protocol.c mgcp/mgcp_network.c mgcp/mgcp_vty.c \
+		   debug.c telnet_interface.c
 bsc_mgcp_LDADD = libvty.a
 
+ipaccess_proxy_SOURCES = ipaccess/ipaccess-proxy.c debug.c
+
 bsc_nat_SOURCES = nat/bsc_nat.c nat/bsc_filter.c nat/bsc_nat_vty.c bsc_msc.c bssap.c
 bsc_nat_LDADD = libvty.a libbsc.a libsccp.a