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 /pbx | |
| 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 'pbx')
| -rw-r--r-- | pbx/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pbx/Makefile b/pbx/Makefile index 056e2040b..43812f1dc 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -29,10 +29,10 @@ clean:: rm -f ael/*.o $(eval $(call ast_make_o_c,ael/aelflex.o,ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h)) -ael/aelflex.o: CFLAGS+=-I. +ael/aelflex.o: ASTCFLAGS+=-I. $(eval $(call ast_make_o_c,ael/aelbison.o,ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h)) -ael/aelbison.o: CFLAGS+=-I. +ael/aelbison.o: ASTCFLAGS+=-I. $(pbx_ael): ael/aelbison.o ael/aelflex.o @@ -43,6 +43,6 @@ ael/ael.tab.c ael/ael.tab.h: (cd ael; bison -v -d ael.y) dundi-parser.o: dundi-parser.h -dundi-parser.o: CFLAGS+=-I. +dundi-parser.o: ASTCFLAGS+=-I. $(pbx_dundi): dundi-parser.o |