Merged revisions 242683 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r242683 | tilghman | 2010-01-24 23:13:28 -0600 (Sun, 24 Jan 2010) | 2 lines

  Make the build of the Asterisk expression parser match that of the AEL parser.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@242719 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/Makefile b/main/Makefile
index 24481c0..9630b63 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
 
@@ -101,16 +101,26 @@ 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 ($(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] $< -> $@"
+       $(CMD_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
-       sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix
-       echo "#include \"asterisk.h\"" > $@
-       echo >> $@
-       cat $@.fix >> $@
-       rm $@.fix
+endif
+       $(ECHO_PREFIX) echo "   [FLEX] $< -> $@"
+       $(CMD_PREFIX) flex -o $@ ast_expr2.fl
+       $(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix
+       $(CMD_PREFIX) echo "#include \"asterisk.h\"" > $@
+       $(CMD_PREFIX) echo >> $@
+       $(CMD_PREFIX) cat $@.fix >> $@
+       $(CMD_PREFIX) rm $@.fix
 
 ast_expr2f.o: _ASTCFLAGS+=-Wno-unused