[Asterisk-cvs] asterisk/codecs Makefile,1.11,1.12 codec_mp3_d.c,1.2,NONE mp3_slin_ex.h,1.1.1.1,NONE mp3anal.h,1.1.1.1,NONE

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/codecs
In directory mongoose.digium.com:/tmp/cvs-serv12608/codecs

Modified Files:
	Makefile 
Removed Files:
	codec_mp3_d.c mp3_slin_ex.h mp3anal.h 
Log Message:
Remove really broken MP3 stuff in favor of G.726 in the near future


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	27 Oct 2003 20:00:41 -0000	1.11
+++ Makefile	4 Nov 2003 02:40:09 -0000	1.12
@@ -28,13 +28,12 @@
 LIBG723B=g723.1b/libg723b.a
 LIBGSM=gsm/lib/libgsm.a
 LIBGSMT=gsm/lib/libgsm.a
-LIBMP3=mp3/libmp3.a
 LIBLPC10=lpc10/liblpc10.a
 LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
 LIBSPEEX+=-lspeex -lm
 LIBILBC=ilbc/libilbc.a
 
-CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so  \
+CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so
 
 all: depend $(CODECS)
@@ -44,7 +43,6 @@
 	! [ -d g723.1 ] || $(MAKE) -C g723.1 clean
 	! [ -d g723.1b ] || $(MAKE) -C g723.1b clean
 	$(MAKE) -C gsm clean
-	$(MAKE) -C mp3 clean
 	$(MAKE) -C lpc10 clean
 	$(MAKE) -C ilbc clean
 
@@ -57,9 +55,6 @@
 $(LIBG723B):
 	$(MAKE) -C g723.1b all
 
-$(LIBMP3):
-	$(MAKE) -C mp3 all
-
 $(LIBLPC10):
 	$(MAKE) -C lpc10 all
 
@@ -86,9 +81,6 @@
 
 codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
 	$(CC) $(SOLINK) -o $@ $< $(LIBLPC10) -lm
-
-codec_mp3_d.so: codec_mp3_d.o $(LIBMP3)
-	$(CC) -lm $(SOLINK) -o $@ $< $(LIBMP3)
 
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ $<

--- codec_mp3_d.c DELETED ---

--- mp3_slin_ex.h DELETED ---

--- mp3anal.h DELETED ---