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 /openbsc/src/Makefile.am | |
| 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
Diffstat (limited to 'openbsc/src/Makefile.am')
| -rw-r--r-- | openbsc/src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
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 |