From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 15 May 2009 17:37:39 +0000 (+0000)
Subject: Merged revisions 194718 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~238
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04ba6723d88c4b9bb2d813db5426f1beb7219fec;p=thirdparty%2Fasterisk.git

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.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@194720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/codecs/Makefile b/codecs/Makefile
index a8050ece76..cb90c6fe18 100644
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -19,7 +19,6 @@ MENUSELECT_DESCRIPTION=Codec Translators
 
 LIBILBC:=ilbc/libilbc.a
 LIBLPC10:=lpc10/liblpc10.a
-LIBG722:=g722/libg722.a
 
 all: _all
 
@@ -34,7 +33,7 @@ clean::
 	$(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 @@ $(LIBILBC):
 
 $(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
diff --git a/codecs/g722/Makefile b/codecs/g722/Makefile
deleted file mode 100644
index dee23c6e8a..0000000000
--- a/codecs/g722/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-LIB=libg722.a
-CFLAGS+=-fPIC
-
-include $(ASTTOPDIR)/Makefile.rules
-
-OBJS=g722_encode.o g722_decode.o
-
-all: $(LIB)
-
-$(LIB): $(OBJS)
-	$(ECHO_PREFIX) echo "   [AR] $^ -> $@"
-	$(CMD_PREFIX) $(AR) cr $@ $^
-	$(CMD_PREFIX) $(RANLIB) $@
-
-clean:
-	rm -f $(LIB) *.o
-	rm -f .*.o.d
-	rm -f *.s *.i