diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:53:28 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:53:28 +0000 |
| commit | 6e1d51e8dbf27be0a158b9eb67c645231b79c205 (patch) | |
| tree | 1ba34729aa9921c66778eb9b04c2209999d3f060 /res/Makefile | |
| parent | f0020259697ccc2e20f8c37819c67f4b9019e630 (diff) | |
Merged revisions 242967,242971 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r242967 | tilghman | 2010-01-25 15:38:33 -0600 (Mon, 25 Jan 2010) | 9 lines
Merged revisions 242966 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r242966 | tilghman | 2010-01-25 15:36:33 -0600 (Mon, 25 Jan 2010) | 2 lines
Only rebuild parsers by an option in menuselect
........
................
r242971 | tilghman | 2010-01-25 15:51:41 -0600 (Mon, 25 Jan 2010) | 9 lines
Merged revisions 242969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r242969 | tilghman | 2010-01-25 15:50:22 -0600 (Mon, 25 Jan 2010) | 2 lines
Err, and use the new menuselect define, too.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242972 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/Makefile')
| -rw-r--r-- | res/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/Makefile b/res/Makefile index 16216829b..4ada1ffcf 100644 --- a/res/Makefile +++ b/res/Makefile @@ -39,7 +39,7 @@ $(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 -ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) +ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) ael/ael_lex.c: ael/ael.flex else ael/ael_lex.c: @@ -48,7 +48,7 @@ endif $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c) $(CMD_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c) -ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) +ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) ael/ael.tab.c ael/ael.tab.h: ael/ael.y else ael/ael.tab.c ael/ael.tab.h: |