diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-15 17:37:12 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-15 17:37:12 +0000 |
| commit | f445764a454e60d6f8ae7ea87ce7b2009bddc62e (patch) | |
| tree | f302f449df831eab6ab0be27d5089a9df66472ac /codecs | |
| parent | 38dc66c16382d422b6d15da856e2c00a92c2140c (diff) | |
Further simplify codec_g722 build.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@194718 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile | 10 | ||||
| -rw-r--r-- | codecs/g722/Makefile | 18 |
2 files changed, 2 insertions, 26 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 diff --git a/codecs/g722/Makefile b/codecs/g722/Makefile deleted file mode 100644 index dee23c6e8..000000000 --- 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 |