diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
| commit | 3d63833bd6c869b7efa383e8dea14be1a6eff998 (patch) | |
| tree | 34957dd051b8f67c7cc58a510e24ee3873a61ad4 /res/Makefile | |
| parent | e1e1cc2deefb92f8b43825f1f34e619354737842 (diff) | |
Merge in the bridge_construction branch to make the system use the Bridging API.
Breaks many things until they can be reworked. A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/Makefile')
| -rw-r--r-- | res/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/Makefile b/res/Makefile index 2ed719093..667e097e8 100644 --- a/res/Makefile +++ b/res/Makefile @@ -75,6 +75,10 @@ ael/pval.o: ael/pval.c clean:: rm -f snmp/*.[oi] ael/*.[oi] ais/*.[oi] stasis_http/*.[oi] rm -f res_sip/*.[oi] stasis/*.[oi] + rm -f parking/*.o parking/*.i + +$(if $(filter res_parking,$(EMBEDDED_MODS)),modules.link,res_parking.so): $(subst .c,.o,$(wildcard parking/*.c)) +$(subst .c,.o,$(wildcard parking/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_parking) # Dependencies for res_stasis_http_*.so are generated, so they're in this file include stasis_http.make |