diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-25 21:51:41 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-25 21:51:41 +0000 |
| commit | 1ffdf5c2ee645e9f79e9dd2d0b34f418048fba81 (patch) | |
| tree | 62f2ebe82a7af6754b230ad61b0a0fd8413b86ea /main/Makefile | |
| parent | bbc47dbac2d8c80496e0a4ddccacc1c42c550899 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@242971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index 98b142889..fcfe8a037 100644 --- a/main/Makefile +++ b/main/Makefile @@ -101,7 +101,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: @@ -109,7 +109,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: |