From c3a90e6c79d94a70cc0c5437860a9b6ba4e5c337 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Wed, 7 Jun 2006 22:37:31 +0000 Subject: moh files will now be distributed in native format, not mp3, so... update sounds/Makefile to download/unpack the proper files remove all evidence of mpg123 from the main Makefile change the sample musiconhold.conf file to use native mode instead of mp3 git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32917 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 373176149..fc74bb1de 100644 --- a/Makefile +++ b/Makefile @@ -196,7 +196,6 @@ ifeq ($(OSARCH),Linux) endif endif endif - MPG123TARG=linux endif GREP=grep @@ -239,12 +238,10 @@ ifeq ($(OSARCH),FreeBSD) ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp endif - MPG123TARG=freebsd endif # FreeBSD ifeq ($(OSARCH),NetBSD) AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include - MPG123TARG=netbsd endif ifeq ($(OSARCH),OpenBSD) @@ -512,7 +509,6 @@ clean: clean-depend rm -f include/asterisk/version.h rm -f .tags-sources tags TAGS @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi - @if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi $(MAKE) -C db1-ast clean $(MAKE) -C stdtime clean @@ -615,7 +611,6 @@ bininstall: all else \ echo "You need to do cvs update -d not just cvs update" ; \ fi - if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi install-subdirs: @for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done @@ -773,12 +768,6 @@ progdocs: (cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \ echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - -mpg123: - @wget -V >/dev/null || (echo "You need wget" ; false ) - [ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz - [ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz - $(MAKE) -C mpg123-0.59r $(MPG123TARG) - config: @if [ "${OSARCH}" = "Linux" ]; then \ if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \ -- cgit v1.2.3