diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:53:48 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:53:48 +0000 |
| commit | b347291f1f0b0a21e9a8862a3c56a8c24b6b53af (patch) | |
| tree | 65c3f358fa60c49803684558308ff2af0e8e5aa2 /main | |
| parent | 6f6f206d803c82649dd2eb87a40b55d70d03f00b (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.2@242974 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index d14a78abd..7e0613a3f 100644 --- a/main/Makefile +++ b/main/Makefile @@ -113,7 +113,7 @@ editline/libedit.a: CHECK_SUBDIR db1-ast/libdb1.a: CHECK_SUBDIR _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: @@ -121,7 +121,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: |