summaryrefslogtreecommitdiff
path: root/Makefile.moddir_rules
diff options
context:
space:
mode:
authorMatt Jordan <mjordan@digium.com>2015-04-29 16:44:09 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-04-29 16:44:09 -0500
commit7fe923d20b7e1b2b27b10a1fb4fa627da7d95149 (patch)
tree6868c3956f85032c6d662cdcf5d11a193c5b84de /Makefile.moddir_rules
parent08355350a26d8856cc84349398e73bbca89d741c (diff)
parentf226bd6f602cff85bd1e4540aa834d1e4fa9c901 (diff)
Merge "ARI: Fix missing dependencies."
Diffstat (limited to 'Makefile.moddir_rules')
-rw-r--r--Makefile.moddir_rules5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 673580db1..3d3e6ad67 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -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))))