diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-22 21:46:27 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-22 21:46:27 +0000 |
| commit | a4c14ea2dbf8bcb7455a28de27ab4eb8deebd1d7 (patch) | |
| tree | bd927cc9d62b6caa283cf7ead1460299ef6bbdf9 /res | |
| parent | 77cecf88ae33ad891ee5579a61c8768574dcf217 (diff) | |
Merged revisions 242424 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r242424 | tilghman | 2010-01-22 15:45:18 -0600 (Fri, 22 Jan 2010) | 14 lines
Merged revisions 242423 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r242423 | tilghman | 2010-01-22 15:44:18 -0600 (Fri, 22 Jan 2010) | 7 lines
Rebuild from flex, bison sources when necessary.
(issue #14629)
Reported by: Marquis
Patches:
20100121__issue14629.diff.txt uploaded by tilghman (license 14)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242425 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/Makefile b/res/Makefile index 5c3f1cdfc..74c9d47c7 100644 --- a/res/Makefile +++ b/res/Makefile @@ -39,11 +39,13 @@ $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o -ael/ael_lex.c: +ael/ael_lex.c: ael/ael.flex + $(ECHO_PREFIX) echo " [FLEX] $< -> $@" (cd ael; flex ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c) -ael/ael.tab.c ael/ael.tab.h: +ael/ael.tab.c ael/ael.tab.h: ael/ael.y + $(ECHO_PREFIX) echo " [BISON] $< -> $@" (cd ael; bison -v -d ael.y) ael/pval.o: ael/pval.c |