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

diff --git a/main/Makefile b/main/Makefile
index 47e27e81d6ecb1fce30b6285cd7ad61344c5c67c..1a182ed9066e76a505939f9ff6654f77d97e7383 100644 (file)
--- 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