diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-29 18:54:21 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-29 18:54:21 +0000 |
commit | 89050169c8547cc6564741f0541583377d9a93d7 (patch) | |
tree | 90d8fe328a1e6371e95020100dad8cd49eb55be0 /codecs/Makefile | |
parent | ee4141c375981e803098f0831d6b7a6213e5835a (diff) |
Merged revisions 43996-43997,44008,44011-44012 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43996 | kpfleming | 2006-09-29 11:47:05 -0500 (Fri, 29 Sep 2006) | 2 lines
another cross-compile fix
........
r43997 | kpfleming | 2006-09-29 11:52:27 -0500 (Fri, 29 Sep 2006) | 2 lines
support --without-curl in configure script
........
r44008 | kpfleming | 2006-09-29 13:25:49 -0500 (Fri, 29 Sep 2006) | 2 lines
don't abuse CFLAGS and LDFLAGS for build of Asterisk components, because they are also then used for non-Asterisk components (like menuselect); use our own variables instead
........
r44011 | kpfleming | 2006-09-29 13:40:17 -0500 (Fri, 29 Sep 2006) | 2 lines
missed one conversion to ASTCFLAGS
........
r44012 | kpfleming | 2006-09-29 13:49:07 -0500 (Fri, 29 Sep 2006) | 2 lines
yet another place where we were not using the correct CFLAGS by default
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 cdc581d3d..8996ad452 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -42,14 +42,14 @@ clean:: gsm/lib/libgsm.a: @mkdir -p gsm/lib - @CFLAGS="$(OTHER_SUBDIR_CFLAGS) -I." $(MAKE) -C gsm lib/libgsm.a + @$(MAKE) -C gsm lib/libgsm.a $(LIBLPC10): - @CFLAGS="$(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C lpc10 all + @$(MAKE) -C lpc10 all $(codec_lpc10): $(LIBLPC10) $(LIBILBC): - @CFLAGS="$(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C ilbc all + @$(MAKE) -C ilbc all $(codec_ilbc): $(LIBILBC) |