diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-05 18:18:27 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-05 18:18:27 +0000 |
commit | 78d18e52a495a2b1f964a2dceeb7fcc705a79d73 (patch) | |
tree | cc242551fdaa17b1537490b8ec0621d2c3fa2c66 /main/Makefile | |
parent | 62297fe334460eaa96bc7a2a2c39d9714c77c868 (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: http://svn.digium.com/svn/asterisk/trunk@180369 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
-rw-r--r-- | main/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index 51ab58f5f..aec3d7ed6 100644 --- a/main/Makefile +++ b/main/Makefile @@ -29,7 +29,7 @@ OBJS= tcptls.o io.o sched.o logger.o frame.o loader.o config.o channel.o \ strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \ astobj2.o hashtab.o global_datastores.o version.o \ features.o taskprocessor.o timing.o datastore.o xml.o xmldoc.o \ - strings.o + strings.o bridging.o # we need to link in the objects statically, not as a library, because # otherwise modules will not have them available if none of the static |