ARI: Fix missing dependencies.
ARI modules that are generated by 'make ari-stubs' are all dependent on res_ari_model. Additionally some of the same modules depend on one or more res_stasis_* modules. ASTERISK-25027 #close Reported by: Corey Farrell Change-Id: I8e07fe7e81fedacb87232f2b6f8b5f47927b4153
This commit is contained in:
parent
881844297a
commit
f226bd6f60
|
@ -66,6 +66,7 @@ define MOD_ADD_SOURCE
|
|||
$$(if $$(filter $(1),$$(EMBEDDED_MODS)),modules.link,$(1).so): $$(subst $(3),$(5),$(2))
|
||||
$$(subst $(3),$(5),$(2)): _ASTCFLAGS+=$$(call MOD_ASTCFLAGS,$(1))
|
||||
.$(1).moduleinfo: MODULEINFO_EXTRA_OUTPUT=" $$(addprefix $$(SUBDIR)/,$$(subst $(3),$(5),$(2)) $$(subst $(3),$(4),$(2)))"
|
||||
.$(1).moduleinfo: $(2)
|
||||
|
||||
clean:: clean-$(1)$(3)
|
||||
|
||||
|
@ -148,12 +149,12 @@ dist-clean::
|
|||
|
||||
.%.moduleinfo: %.c
|
||||
@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.i $(SUBDIR)/$*.so$(MODULEINFO_EXTRA_OUTPUT)\">" > $@
|
||||
$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
|
||||
$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $^ >> $@
|
||||
echo "</member>" >> $@
|
||||
|
||||
.%.moduleinfo: %.cc
|
||||
@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.oo $(SUBDIR)/$*.ii $(SUBDIR)/$*.so$(MODULEINFO_EXTRA_OUTPUT)\">" > $@
|
||||
$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
|
||||
$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $^ >> $@
|
||||
echo "</member>" >> $@
|
||||
|
||||
.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(sort $(ALL_C_MODS) $(ALL_CC_MODS))))
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
/\/\*\*\* MODULEINFO/ {printit=1; next}
|
||||
/\*\*\*\// {if (printit) exit}
|
||||
/<support_level>/ {if (gotsupportlevel) { next }; gotsupportlevel=1}
|
||||
/\*\*\*\// {printit=0}
|
||||
/.*/ {if (printit) print}
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
* !!!!! DO NOT EDIT !!!!!
|
||||
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
* This file is generated by a mustache template. Please see the original
|
||||
* template in rest-api-templates/ari_model_validators.h.mustache
|
||||
* template in rest-api-templates/ari_model_validators.c.mustache
|
||||
*/
|
||||
|
||||
#include "asterisk.h"
|
||||
|
|
|
@ -24,7 +24,10 @@
|
|||
*/
|
||||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_stasis_app_playback</depend>
|
||||
<depend type="module">res_stasis_answer</depend>
|
||||
<depend type="module">res_stasis_playback</depend>
|
||||
<depend type="module">res_stasis_recording</depend>
|
||||
<depend type="module">res_stasis_snoop</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
||||
|
|
|
@ -23,6 +23,11 @@
|
|||
* \author Kevin Harwell <kharwell@digium.com>
|
||||
*/
|
||||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_stasis_device_states</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
||||
#include "asterisk.h"
|
||||
|
||||
ASTERISK_REGISTER_FILE()
|
||||
|
|
|
@ -23,6 +23,11 @@
|
|||
* \author Jonathan Rose <jrose@digium.com>
|
||||
*/
|
||||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_stasis_mailbox</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
||||
#include "asterisk.h"
|
||||
#include "asterisk/stasis_app_mailbox.h"
|
||||
|
||||
|
|
|
@ -23,6 +23,11 @@
|
|||
* \author David M. Lee, II <dlee@digium.com>
|
||||
*/
|
||||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_stasis_playback</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
||||
#include "asterisk.h"
|
||||
|
||||
ASTERISK_REGISTER_FILE()
|
||||
|
|
|
@ -23,6 +23,11 @@
|
|||
* \author David M. Lee, II <dlee@digium.com>
|
||||
*/
|
||||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_stasis_recording</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
||||
#include "asterisk.h"
|
||||
|
||||
ASTERISK_REGISTER_FILE()
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
/*
|
||||
{{> do-not-edit}}
|
||||
* This file is generated by a mustache template. Please see the original
|
||||
* template in rest-api-templates/ari_model_validators.h.mustache
|
||||
* template in rest-api-templates/ari_model_validators.c.mustache
|
||||
*/
|
||||
|
||||
#include "asterisk.h"
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend type="module">res_ari</depend>
|
||||
<depend type="module">res_ari_model</depend>
|
||||
<depend type="module">res_stasis</depend>
|
||||
<support_level>core</support_level>
|
||||
***/
|
||||
|
|
Loading…
Reference in New Issue