diff options
author | Joshua Colp <jcolp@digium.com> | 2009-03-05 18:18:27 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2009-03-05 18:18:27 +0000 |
commit | 4c9ab0df8c51c7d9dd2d8cf2f76968ef185214ba (patch) | |
tree | cc242551fdaa17b1537490b8ec0621d2c3fa2c66 /Makefile | |
parent | dd1a5f1969ea62e83af6f3e2f0162c18384f0891 (diff) |
Merge phase 1 support for the new bridging architecture.
This commit brings in the bridging core, bridging technologies,
and the ConfBridge application.
For usage information on the ConfBridge application please see
the output of "core show application ConfBridge" from the CLI.
For API documentation please see the doxygen page describing the
architecture and the documentation for each API call.
Review: http://reviewboard.digium.com/r/93/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@180369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -293,7 +293,7 @@ endif # value directly to ASTCFLAGS ASTCFLAGS+=$(MALLOC_DEBUG)$(OPTIONS) -MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS) +MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs tests main res $(LOCAL_MOD_SUBDIRS) OTHER_SUBDIRS:=utils agi SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS) SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install) |