[asterisk-commits] tilghman: branch 1.6.0 r242720 - in /branches/1.6.0: ./ main/Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sun Jan 24 23:32:52 2010
New Revision: 242720

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242720
Log:
Merged revisions 242719 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r242719 | tilghman | 2010-01-24 23:30:33 -0600 (Sun, 24 Jan 2010) | 9 lines
  
  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.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/Makefile?view=diff&rev=242720&r1=242719&r2=242720
==============================================================================
--- branches/1.6.0/main/Makefile (original)
+++ branches/1.6.0/main/Makefile Sun Jan 24 23:32:52 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
 
@@ -104,16 +104,26 @@
 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