From: Corey Farrell <git@cfware.com>
Date: Thu, 30 Apr 2015 19:40:48 +0000 (-0400)
Subject: Build System: Fix issue with addons moduleinfo.
X-Git-Tag: 14.0.0-beta1~1007^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47fa2ad10b20fbc2b9edc6202644a794e7dd74f6;p=thirdparty%2Fasterisk.git

Build System: Fix issue with addons moduleinfo.

The build system now scans additional sources when generating
moduleinfo for menuselect.  Unfortunately the extra sources
for format_mp3 only exist if downloaded.

Use the Makefile macro 'wildcard' to allow moduleinfo generator
to ignore sources that do not exist.

Change-Id: I596604713b7345ce994f32197f8f6bfd9bcf4170
---

diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 3d3e6ad670..d2964e374b 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -66,7 +66,9 @@ 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)
+# The use of wildcard ensures that 'make menuselect' will not fail for modules that
+# require additional source downloads.
+.$(1).moduleinfo: $(wildcard $(2))
 
 clean:: clean-$(1)$(3)