diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:47:40 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:47:40 +0000 |
| commit | baa8d6158635e36d4daaa52ddec661cd1bb0912f (patch) | |
| tree | e4c026f46c9bc49b0e295938912686965a0897dc /codecs | |
| parent | 8db549642d02e7a37783caec3d1b9929cfa5db55 (diff) | |
fix a few build system bugs, and convert Makefiles to be compatible with GNU make 3.80
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@44055 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile | 6 | ||||
| -rw-r--r-- | codecs/gsm/Makefile | 6 | ||||
| -rw-r--r-- | codecs/ilbc/Makefile | 5 | ||||
| -rw-r--r-- | codecs/lpc10/Makefile | 5 |
4 files changed, 16 insertions, 6 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 8996ad452..c3ab707f6 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -32,7 +32,7 @@ include $(ASTTOPDIR)/Makefile.moddir_rules ifneq ($(GSM_INTERNAL),) GSM_INCLUDE:=-Igsm/inc -$(codec_gsm): gsm/lib/libgsm.a +$(if $(filter codec_gsm,$(EMBEDDED_MODS)),modules.link,codec_gsm.so): gsm/lib/libgsm.a endif clean:: @@ -47,9 +47,9 @@ gsm/lib/libgsm.a: $(LIBLPC10): @$(MAKE) -C lpc10 all -$(codec_lpc10): $(LIBLPC10) +$(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10) $(LIBILBC): @$(MAKE) -C ilbc all -$(codec_ilbc): $(LIBILBC) +$(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC) diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index ba3a20062..ec2694a65 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -347,7 +347,11 @@ $(LIBGSMSO): $(LIB) $(GSM_OBJECTS) ln -fs libgsm.so.1.0.10 lib/libgsm.so.1 ln -fs libgsm.so.1.0.10 lib/libgsm.so -$(eval $(call ast_make_a_o,$(LIBGSM),$(GSM_OBJECTS))) +$(LIBGSM): $(GSM_OBJECTS) + $(ECHO_PREFIX) echo " [AR] $^ -> $@" + $(CMD_PREFIX) $(AR) cr $@ $^ + $(CMD_PREFIX) $(RANLIB) $@ + # Toast, Untoast and Tcat -- the compress-like frontends to gsm. diff --git a/codecs/ilbc/Makefile b/codecs/ilbc/Makefile index 1060579ab..3c4668ba8 100644 --- a/codecs/ilbc/Makefile +++ b/codecs/ilbc/Makefile @@ -11,7 +11,10 @@ include $(ASTTOPDIR)/Makefile.rules all: $(LIB) -$(eval $(call ast_make_a_o,$(LIB),$(OBJS))) +$(LIB): $(OBJS) + $(ECHO_PREFIX) echo " [AR] $^ -> $@" + $(CMD_PREFIX) $(AR) cr $@ $^ + $(CMD_PREFIX) $(RANLIB) $@ clean: rm -f $(LIB) *.o diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index 75b3f858f..18b7c0bcc 100644 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -64,7 +64,10 @@ OBJ=f2clib.o analys.o bsynz.o chanwr.o dcbias.o decode.o \ placea.o placev.o preemp.o prepro.o random.o rcchk.o \ synths.o tbdm.o voicin.o vparms.o -$(eval $(call ast_make_a_o,$(LIB),$(OBJ))) +$(LIB): $(OBJ) + $(ECHO_PREFIX) echo " [AR] $^ -> $@" + $(CMD_PREFIX) $(AR) cr $@ $^ + $(CMD_PREFIX) $(RANLIB) $@ clean: rm -f *.o $(LIB) |