diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-22 21:46:44 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-22 21:46:44 +0000 |
| commit | 580fd5477607dced86b0fead653b324293b2a9af (patch) | |
| tree | 77ca53e0ce8b9f65218aab82eace8d42b9ad67ac /res | |
| parent | 7907430598849b2439ae019371b895c6c14a8cca (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.2@242427 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 93d0246f6..6fc64c61e 100644 --- a/res/Makefile +++ b/res/Makefile @@ -45,11 +45,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 |