kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

format_mp3: Re-work menuselect/build issues

Browse Source 
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
This commit is contained in:
Sean Bright
2017-05-30 10:34:34 -04:00
parent 1e65857e6f
commit 97b003f5e2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
addons/Makefile
View File

@@ -30,12 +30,9 @@ ALL_C_MODS:=app_mysql \
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
check_mp3:
@@ -64,7 +61,9 @@ clean::
if [ -f mp3/Makefile ] ; then $(MAKE) -C mp3 clean ; fi
rm -f $(addprefix ooh323c/src/,$(H323OBJS))
ifneq ($(wildcard mp3/Makefile),)
format_mp3.so: mp3/common.o mp3/dct64_i386.o mp3/decode_ntom.o mp3/layer3.o mp3/tabinit.o mp3/interface.o
endif
chan_ooh323.o: _ASTCFLAGS+=$(H323CFLAGS)
chan_ooh323.so: _ASTCFLAGS+=$(H323CFLAGS)
@@ -72,3 +71,7 @@ chan_ooh323.so: $(addprefix ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDrive
$(addprefix ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDriver.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_ooh323)
.PHONY: check_mp3
ifeq ($(wildcard mp3/Makefile),)
.PHONY: format_mp3.o format_mp3.so
endif