[asterisk-commits] tilghman: branch 1.4 r242683 - /branches/1.4/main/Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sun Jan 24 23:13:28 2010
New Revision: 242683

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242683
Log:
Make the build of the Asterisk expression parser match that of the AEL parser.

Modified:
    branches/1.4/main/Makefile

Modified: branches/1.4/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/Makefile?view=diff&rev=242683&r1=242682&r2=242683
==============================================================================
--- branches/1.4/main/Makefile (original)
+++ branches/1.4/main/Makefile Sun Jan 24 23:13:28 2010
@@ -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 @@
 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