diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-06-01 10:16:20 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-06-01 10:16:20 -0500 |
| commit | 1e086cf018ea86b3d4ac0494a077cede3311dd93 (patch) | |
| tree | b1c32bd6d44fffa153e18ca122bd0e1c4eaa2d2a | |
| parent | 3e8eea0325d18ef4b29c45349cddbf13552b4d86 (diff) | |
| parent | 97b003f5e2d4a350508fc20173e180a23f8ef525 (diff) | |
Merge "format_mp3: Re-work menuselect/build issues" into 13
| -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 |