[asterisk-commits] format mp3: Re-work menuselect/build issues (asterisk[14])

[SVN commits to the Asterisk project]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/5737 )

Change subject: format_mp3: Re-work menuselect/build issues
......................................................................


format_mp3: Re-work menuselect/build issues

Rather than removing format_mp3 from ALL_C_MODS (which caused format_mp3
to not show up in menuselect), use .PHONY targets when the necessary
source files are not present.

ASTERISK-23951
Reported by: Tzafrir Cohen

Change-Id: I0a7512c51acc9e86043671795020b0de725bd9e8
---
M addons/Makefile
1 file changed, 5 insertions(+), 4 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/addons/Makefile b/addons/Makefile
index 82bbc49..47da132 100644
--- a/addons/Makefile
+++ b/addons/Makefile
@@ -32,11 +32,8 @@
             cdr_mysql \
             chan_mobile \
             chan_ooh323 \
+            format_mp3 \
             res_config_mysql
-
-ifneq ($(wildcard mp3/Makefile),)
-	ALL_C_MODS += format_mp3
-endif
 
 all: check_mp3 _all
 
@@ -65,6 +62,10 @@
 chan_ooh323.so: _ASTCFLAGS+=$(H323CFLAGS)
 $(call MOD_ADD_C,chan_ooh323,$(H323SOURCE))
 
+ifneq ($(wildcard mp3/Makefile),)
 $(call MOD_ADD_C,format_mp3,mp3/common.c mp3/dct64_i386.c mp3/decode_ntom.c mp3/layer3.c mp3/tabinit.c mp3/interface.c)
 
 .PHONY: check_mp3
+else
+.PHONY: check_mp3 format_mp3.o format_mp3.so
+endif

-- 
To view, visit https://gerrit.asterisk.org/5737
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a7512c51acc9e86043671795020b0de725bd9e8
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-Owner: Sean Bright <sean.bright at gmail.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>