diff options
| author | Sean Bright <sean.bright@gmail.com> | 2017-05-30 10:34:34 -0400 |
|---|---|---|
| committer | Sean Bright <sean.bright@gmail.com> | 2017-05-30 10:51:00 -0400 |
| commit | 97b003f5e2d4a350508fc20173e180a23f8ef525 (patch) | |
| tree | 89f53692dbff646aeb06feb3317a602fd6fe3eff /addons | |
| parent | 1e65857e6f5da8cf0dd84f9a669e11dc79d36513 (diff) | |
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
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/addons/Makefile b/addons/Makefile index be5cd5e2f..3d4045d8f 100644 --- a/addons/Makefile +++ b/addons/Makefile @@ -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 |