diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-12-22 07:58:24 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-12-22 08:02:13 +0100 |
| commit | 5c18ad08293ae6f95edd75e6bcc370fd6cff069b (patch) | |
| tree | 120273d6da84a0bdb52b32f981714e9bcaea0f59 /openbsc/src/Makefile.am | |
| parent | 0d9ed87d5c7d5b6e21dc3bbb282e215068742566 (diff) | |
| parent | 4f5456c040c2dd0c53fe28cb51219d668d464a21 (diff) | |
Merge commit 'origin/master' into on-waves/bsc-master
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/include/openbsc/gsm_data.h
openbsc/src/Makefile.am
openbsc/src/abis_rsl.c
openbsc/src/chan_alloc.c
openbsc/src/gsm_04_08.c
openbsc/src/gsm_data.c
openbsc/src/vty_interface.c
The biggest problem is the moving of the RTP code into
the RSL layer. This may break quite some things...
Diffstat (limited to 'openbsc/src/Makefile.am')
| -rw-r--r-- | openbsc/src/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am index fef7ee001..789c52aa0 100644 --- a/openbsc/src/Makefile.am +++ b/openbsc/src/Makefile.am @@ -7,14 +7,15 @@ noinst_LIBRARIES = libbsc.a libmsc.a libvty.a libsccp.a noinst_HEADERS = vty/cardshell.h 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 \ + msgb.c select.c chan_alloc.c timer.c debug.c handover_logic.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 telnet_interface.c + talloc_ctx.c system_information.c bitvec.c rest_octets.c \ + handover_decision.c meas_rep.c rtp_proxy.c telnet_interface.c libmsc_a_SOURCES = gsm_subscriber.c db.c \ - mncc.c rtp_proxy.c gsm_04_08.c gsm_04_11.c transaction.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 libvty_a_SOURCES = vty/buffer.c vty/command.c vty/vector.c vty/vty.c |