diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-07-23 15:59:32 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-07-23 15:59:32 +0000 |
| commit | 83a871ea35e48264f35d4170f08c96d9485097f0 (patch) | |
| tree | 2b83bc8355f5e6df795ddd8f013c66298cc4fe17 /channels/Makefile | |
| parent | bf22391b8d3ab34d8bfea29cf8a8ac66a80c2733 (diff) | |
Restore chan_dahdi native bridging and PRI tromboned call elimination.
Created a native_dahdi bridging technology for use with the new bridging
API.
The new bridging technology is part of the chan_dahdi channel driver
because it is very specific to that driver. Rather than include the new
code directly into chan_dahdi.c the new bridge technology is in its own
file and linked into chan_dahdi.so. A large part of this change is the
mechanical process of moving declarations around so chan_dahdi.c can be
split up into more files later.
* Changed the bridging core to pass NULL frames into the channel
technologies instead of discarding them. The channel technologies may
need the proding to determine if their configuration is still valid.
(closes issue ASTERISK-21886)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2681/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/Makefile')
| -rw-r--r-- | channels/Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/channels/Makefile b/channels/Makefile index 10d487cfb..154d52e53 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -1,6 +1,6 @@ # # Asterisk -- An open source telephony toolkit. -# +# # Makefile for channel drivers # # Copyright (C) 1999-2006, Digium, Inc. @@ -72,10 +72,19 @@ dist-clean:: $(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): $(subst .c,.o,$(wildcard iax2/*.c)) $(subst .c,.o,$(wildcard iax2/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_iax2) + $(if $(filter chan_sip,$(EMBEDDED_MODS)),modules.link,chan_sip.so): $(subst .c,.o,$(wildcard sip/*.c)) $(subst .c,.o,$(wildcard sip/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_sip) -$(if $(filter chan_dahdi,$(EMBEDDED_MODS)),modules.link,chan_dahdi.so): sig_analog.o sig_pri.o sig_ss7.o -sig_analog.o sig_pri.o sig_ss7.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_dahdi) + +# Additional objects to combine with chan_dahdi.so +CHAN_DAHDI_OBJS= \ + $(subst .c,.o,$(wildcard dahdi/*.c)) \ + sig_analog.o \ + sig_pri.o \ + sig_ss7.o \ + +$(if $(filter chan_dahdi,$(EMBEDDED_MODS)),modules.link,chan_dahdi.so): $(CHAN_DAHDI_OBJS) +$(CHAN_DAHDI_OBJS): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_dahdi) ifneq ($(filter chan_h323,$(EMBEDDED_MODS)),) modules.link: h323/libchanh323.a |