diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-06-01 10:40:51 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-06-01 10:40:51 -0500 |
| commit | 8d70c081a4defcdfc35af341803dfe015f293ad2 (patch) | |
| tree | c9ddfad6f5c4c2522eb5f8b4959f866079b238d1 | |
| parent | 48d047ad5a6cbd24368a003027c5a9c5cc43ef26 (diff) | |
| parent | 045d7b8cb774318ea09fb95feb989f7636ca7786 (diff) | |
Merge "format_mp3: Re-work menuselect/build issues"
| -rw-r--r-- | addons/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/addons/Makefile b/addons/Makefile index 82bbc49a1..47da13247 100644 --- a/addons/Makefile +++ b/addons/Makefile @@ -32,12 +32,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: @@ -65,6 +62,10 @@ include $(ASTTOPDIR)/Makefile.moddir_rules 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 |