From f4e9f1a72450b62f3656c0965274accd872c518c Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 25 Jan 2010 05:13:28 +0000 Subject: [PATCH] Make the build of the Asterisk expression parser match that of the AEL parser. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@242683 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/Makefile | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/main/Makefile b/main/Makefile index 47e27e81d6..1a182ed906 100644 --- a/main/Makefile +++ b/main/Makefile @@ -11,7 +11,7 @@ # the GNU General Public License # --include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps $(ASTTOPDIR)/makeopts.embed_rules +-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps $(ASTTOPDIR)/makeopts.embed_rules $(ASTTOPDIR)/makeopts all: asterisk @@ -95,13 +95,23 @@ editline/libedit.a: db1-ast/libdb1.a: _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a +ifneq ($(BISON),) +ast_expr2.c ast_expr2.h: ast_expr2.y +else ast_expr2.c ast_expr2.h: - bison -o $@ -d --name-prefix=ast_yy ast_expr2.y +endif + $(ECHO_PREFIX) echo " [BISON] $< -> $@" + $(ECHO_PREFIX) bison -o $@ -d --name-prefix=ast_yy ast_expr2.y +ifneq ($(FLEX),) +ast_expr2f.c: ast_expr2.fl +else ast_expr2f.c: - flex -o $@ ast_expr2.fl # moved the correction of yyfree into the flex input file itself. - sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz - mv zz ast_expr2f.c +endif + $(ECHO_PREFIX) echo " [FLEX] $< -> $@" + $(ECHO_PREFIX) flex -o $@ ast_expr2.fl # moved the correction of yyfree into the flex input file itself. + $(ECHO_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz + $(ECHO_PREFIX) mv zz ast_expr2f.c ast_expr2f.o: _ASTCFLAGS+=-Wno-unused -- 2.47.2