kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 280742 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r280742 | russell | 2010-08-03 13:48:45 -0500 (Tue, 03 Aug 2010) | 4 lines
  
  Remove the MP3 decoder source code and replace it with a small shell script.
  
  Review: https://reviewboard.asterisk.org/r/836/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280743 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2010-08-03 18:50:14 +00:00
parent ee6592684b
commit 5f45148399
16 changed files with 38 additions and 4037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
addons/Makefile
View File

@@ -34,12 +34,32 @@ ALL_C_MODS:=app_mysql \
format_mp3 \
res_config_mysql
all: _all
all: check_mp3 _all
check_mp3:
ifeq ($(filter format_mp3,$(MENUSELECT_ADDONS)),)
@if [ ! -f mp3/Makefile ] ; then \
echo ; \
echo "**************************************************************" ; \
echo "*** ***" ; \
echo "*** ---> READ THIS OR YOUR BUILD WILL FAIL <--- ***" ; \
echo "*** ***" ; \
echo "*** format_mp3 has been selected to be installed, but the ***" ; \
echo "*** mp3 decoder library has not yet been downloaded into ***" ; \
echo "*** the source tree. To do so, please run the following ***" ; \
echo "*** command: ***" ; \
echo "*** ***" ; \
echo "*** $$ contrib/scripts/get_mp3_source.sh ***" ; \
echo "*** ***" ; \
echo "**************************************************************" ; \
echo ; \
fi
endif
include $(ASTTOPDIR)/Makefile.moddir_rules
clean::
$(MAKE) -C mp3 clean
if [ -f mp3/Makefile ] ; then $(MAKE) -C mp3 clean ; fi
rm -f $(addprefix ooh323c/src/,$(H323OBJS))
$(if $(filter format_mp3,$(EMBEDDED_MODS)),modules.link,format_mp3.so): mp3/common.o mp3/dct64_i386.o mp3/decode_ntom.o mp3/layer3.o mp3/tabinit.o mp3/interface.o
@@ -49,3 +69,5 @@ chan_ooh323.o: _ASTCFLAGS+=$(H323CFLAGS)
$(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): _ASTCFLAGS+=$(H323CFLAGS)
$(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): $(addprefix ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDriver.o
$(addprefix ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDriver.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,chan_ooh323)
.PHONY: check_mp3