diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-04-06 21:49:41 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-04-06 21:51:26 +0200 |
| commit | 9960d59fffa176ab022c9641c7358030d7f8065c (patch) | |
| tree | 18573b4edf3eb496307d4b33d99ca031c98c3981 /libosmocore/src/Makefile.am | |
| parent | 161bd6d253abeef6b181dbe9fdd245bd7c9884af (diff) | |
| parent | 3c71232b112a40bf09bd9687f1bc6aed12e863a3 (diff) | |
Merge remote branch 'origin/master' into on-waves/bsc-master
* Move to the new log code and update binaries
* Catch up with lchan changes from master
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/include/openbsc/gsm_data.h
openbsc/src/Makefile.am
openbsc/src/bsc_rll.c
openbsc/src/chan_alloc.c
openbsc/src/debug.c
openbsc/src/gsm_04_08.c
openbsc/src/gsm_04_11.c
openbsc/src/gsm_subscriber_base.c
openbsc/src/handover_logic.c
openbsc/src/silent_call.c
openbsc/src/transaction.c
openbsc/src/vty_interface.c
openbsc/src/vty_interface_cmds.c
Diffstat (limited to 'libosmocore/src/Makefile.am')
| -rw-r--r-- | libosmocore/src/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libosmocore/src/Makefile.am b/libosmocore/src/Makefile.am index f0effa2ea..16978074a 100644 --- a/libosmocore/src/Makefile.am +++ b/libosmocore/src/Makefile.am @@ -9,7 +9,8 @@ lib_LTLIBRARIES = libosmocore.la libosmocore_la_SOURCES = timer.c select.c signal.c msgb.c rxlev_stat.c \ tlv_parser.c bitvec.c comp128.c gsm_utils.c statistics.c \ - write_queue.c utils.c rsl.c gsm48.c gsm48_ie.c + write_queue.c utils.c rsl.c gsm48.c gsm48_ie.c \ + logging.c if ENABLE_TALLOC libosmocore_la_SOURCES += talloc.c |