diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-11-20 18:01:37 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-11-20 18:01:37 +0100 |
commit | 851ace9f331a1488b51af6ce269794025fd1ff46 (patch) | |
tree | d85206af35e9981c5099590aeb338d26d11d059e | |
parent | d1dd069b48fc6452b090e40c022d8e0cac665662 (diff) | |
parent | 7466351026f09364aa9b92ae921e564519bb115e (diff) |
Merge branch 'master' into on-waves/bsc-masteron-waves/0.1
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/src/Makefile.am
-rw-r--r-- | openbsc/include/openbsc/Makefile.am | 3 | ||||
-rw-r--r-- | openbsc/src/Makefile.am | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index 3c42bc033..9f9928c90 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -3,4 +3,5 @@ noinst_HEADERS = abis_nm.h abis_rsl.h debug.h db.h gsm_04_08.h gsm_data.h \ timer.h misdn.h chan_alloc.h telnet_interface.h paging.h \ subchan_demux.h trau_frame.h e1_input.h trau_mux.h signal.h \ gsm_utils.h ipaccess.h rs232.h openbscdefines.h rtp_proxy.h \ - bsc_rll.h mncc.h talloc.h transaction.h ussd.h gsm_04_80.h bssap.h + bsc_rll.h mncc.h talloc.h transaction.h ussd.h gsm_04_80.h \ + silent_call.h mgcp.h bssap.h diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am index 8bcb031ab..fef7ee001 100644 --- a/openbsc/src/Makefile.am +++ b/openbsc/src/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS=-Wall -sbin_PROGRAMS = bsc_hack bs11_config ipaccess-find ipaccess-config isdnsync \ +sbin_PROGRAMS = bsc_hack bs11_config ipaccess-find ipaccess-config \ isdnsync bsc_mgcp bsc_msc_ip noinst_LIBRARIES = libbsc.a libmsc.a libvty.a libsccp.a noinst_HEADERS = vty/cardshell.h |