diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-15 17:37:39 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-15 17:37:39 +0000 |
| commit | f6a32f018d030f13b433cb5fe473bac02fd018ce (patch) | |
| tree | bf63a8076bf2751ec894b900fd2d46955d87ab28 /codecs/Makefile | |
| parent | a5d96b3844a3c90e955b5a95f93ba5c241d6085f (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@194720 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/Makefile')
| -rw-r--r-- | codecs/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index a8050ece7..cb90c6fe1 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 |