[asterisk-commits] russell: branch 1.6.0 r194719 - in /branches/1.6.0: ./ codecs/ codecs/g722/

[SVN commits to the Asterisk project]

Author: russell
Date: Fri May 15 12:37:29 2009
New Revision: 194719

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=194719
Log:
Merged revisions 194718 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r194718 | russell | 2009-05-15 12:37:12 -0500 (Fri, 15 May 2009) | 2 lines

Further simplify codec_g722 build.

........

Removed:
    branches/1.6.0/codecs/g722/Makefile
Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/codecs/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/codecs/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/codecs/Makefile?view=diff&rev=194719&r1=194718&r2=194719
==============================================================================
--- branches/1.6.0/codecs/Makefile (original)
+++ branches/1.6.0/codecs/Makefile Fri May 15 12:37:29 2009
@@ -19,7 +19,6 @@
 
 LIBILBC:=ilbc/libilbc.a
 LIBLPC10:=lpc10/liblpc10.a
-LIBG722:=g722/libg722.a
 
 all: _all
 
@@ -34,7 +33,7 @@
 	$(MAKE) -C gsm clean
 	$(MAKE) -C lpc10 clean
 	$(MAKE) -C ilbc clean
-	$(MAKE) -C g722 clean
+	rm -f g722/*.[oa]
 
 gsm/lib/libgsm.a:
 	@mkdir -p gsm/lib
@@ -50,9 +49,4 @@
 
 $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC)
 
-$(LIBG722):
-	@$(MAKE) -C g722 all
-
-$(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
-
-.PHONY: $(LIBG722)
+$(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): g722/g722_encode.o g722/g722_decode.o