Merged revisions 44055 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44055 | kpfleming | 2006-09-29 17:47:40 -0500 (Fri, 29 Sep 2006) | 2 lines

fix a few build system bugs, and convert Makefiles to be compatible with GNU make 3.80

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-09-29 22:48:43 +00:00
parent 3ca6a02f89
commit e92c34cc38
15 changed files with 103 additions and 174 deletions

View File

@@ -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)