diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 18:54:21 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 18:54:21 +0000 |
| commit | 170dae49be63222c93841e0cc4b12598a8b47388 (patch) | |
| tree | 90d8fe328a1e6371e95020100dad8cd49eb55be0 /utils | |
| parent | 18f0e3efb46368cfa21125c19a9a76cf678d17ca (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: http://svn.digium.com/svn/asterisk/trunk@44013 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/Makefile b/utils/Makefile index 084a01ab1..5e5bdca88 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -71,18 +71,18 @@ $(eval $(call ast_make_o_c,strcompat.o,../main/strcompat.c)) $(eval $(call ast_make_o_c,ast_expr2.o,../main/ast_expr2.c)) $(eval $(call ast_make_o_c,ast_expr2f.o,../main/ast_expr2f.c)) -ast_expr2f.o: CFLAGS+=-DSTANDALONE_AEL +ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE_AEL $(eval $(call ast_make_final,check_expr,check_expr.c ast_expr2.o ast_expr2f.o)) $(eval $(call ast_make_o_c,aelflex.o,../pbx/ael/ael_lex.c ../include/asterisk/ael_structs.h ../pbx/ael/ael.tab.h)) -aelflex.o: CFLAGS+=-I../pbx -DSTANDALONE_AEL +aelflex.o: ASTCFLAGS+=-I../pbx -DSTANDALONE_AEL $(eval $(call ast_make_o_c,aelbison.o,../pbx/ael/ael.tab.c ../pbx/ael/ael.tab.h ../include/asterisk/ael_structs.h)) -aelbison.o: CFLAGS+=-I../pbx +aelbison.o: ASTCFLAGS+=-I../pbx $(eval $(call ast_make_o_c,pbx_ael.o,../pbx/pbx_ael.c)) -pbx_ael.o: CFLAGS+=-DSTANDALONE_AEL +pbx_ael.o: ASTCFLAGS+=-DSTANDALONE_AEL $(eval $(call ast_make_final,aelparse,aelflex.o aelbison.o pbx_ael.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o)) @@ -110,4 +110,4 @@ endif depend: .depend .depend: - ../build_tools/mkdep $(CFLAGS) `ls *.c` + ../build_tools/mkdep $(ASTCFLAGS) `ls *.c` |