diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:50:22 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:50:22 +0000 |
| commit | 10d86e0a02531840992e475e2d0a1b611958c3e1 (patch) | |
| tree | f4f7526adfbbf4f4cdaf6dc724b36bda7fa9de4b | |
| parent | f7f7d104a8ef9d4067bb03d61b67cc0644fa31d9 (diff) | |
Err, and use the new menuselect define, too.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@242969 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/Makefile | 4 | ||||
| -rw-r--r-- | pbx/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/Makefile b/main/Makefile index 71f898a63..e588325c8 100644 --- a/main/Makefile +++ b/main/Makefile @@ -95,7 +95,7 @@ editline/libedit.a: db1-ast/libdb1.a: _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a -ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) +ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) ast_expr2.c ast_expr2.h: ast_expr2.y else ast_expr2.c ast_expr2.h: @@ -103,7 +103,7 @@ endif $(ECHO_PREFIX) echo " [BISON] $< -> $@" $(CMD_PREFIX) $(BISON) -o $@ -d --name-prefix=ast_yy ast_expr2.y -ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),) +ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) ast_expr2f.c: ast_expr2.fl else ast_expr2f.c: diff --git a/pbx/Makefile b/pbx/Makefile index 27c44b189..be79b26bd 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -44,7 +44,7 @@ ael/ael.tab.o ael/ael_lex.o: _ASTCFLAGS+=$(MENUSELECT_OPTS_pbx_ael:%=-D%) $(fore $(if $(filter pbx_ael,$(EMBEDDED_MODS)),modules.link,pbx_ael.so): ael/ael.tab.o ael/ael_lex.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: @@ -53,7 +53,7 @@ endif $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" 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: |