kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 43996-43997,44008,44011-44012 via svnmerge from

Browse Source 
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
This commit is contained in:
Kevin P. Fleming
2006-09-29 18:54:21 +00:00
parent ee4141c375
commit 89050169c8
13 changed files with 155 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
codecs/Makefile
View File

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

7
codecs/gsm/Makefile
View File

@@ -72,7 +72,6 @@ PG =
# CCFLAGS = -c -O
CCFLAGS += -c -DNeedFunctionPrototypes=1 -funroll-loops $(OPTIMIZE)
CCFLAGS += -fPIC
# LD = gcc
# LDFLAGS =
@@ -155,7 +154,7 @@ INC = $(ROOT)/inc
DEBUG = -DNDEBUG
######### Remove -DNDEBUG to enable assertions.
CFLAGS += $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
ASTCFLAGS += $(PG) $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) \
$(LTP_CUT) $(WAV49) $(K6OPT) $(CCINC) -I$(INC)
######### It's $(CC) $(CFLAGS)
@@ -319,10 +318,6 @@ TOAST_INSTALL_TARGETS = \
# Default rules
.c.o:
$(CC) $(CFLAGS:-Werror=) $?
@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
include $(ASTTOPDIR)/Makefile.rules
# Target rules