diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:48:43 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:48:43 +0000 |
| commit | a8442c9b22767096823aa7a169bc1496a8dd2c42 (patch) | |
| tree | 88f2aec2951b6ce52b91c03ed0bd4a697b1642c9 /codecs/Makefile | |
| parent | fcfda97ed2478ac34b65ba502ad183583c446476 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@44056 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/Makefile')
| -rw-r--r-- | codecs/Makefile | 6 |
1 files changed, 3 insertions, 3 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) |