[asterisk-commits] tilghman: trunk r242971 - in /trunk: ./ main/Makefile res/Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jan 25 15:51:41 2010
New Revision: 242971

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242971
Log:
Merged revisions 242969 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r242969 | tilghman | 2010-01-25 15:50:22 -0600 (Mon, 25 Jan 2010) | 2 lines
  
  Err, and use the new menuselect define, too.
........

Modified:
    trunk/   (props changed)
    trunk/main/Makefile
    trunk/res/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=242971&r1=242970&r2=242971
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Mon Jan 25 15:51:41 2010
@@ -101,7 +101,7 @@
 db1-ast/libdb1.a: CHECK_SUBDIR
 	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
 
-ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
+ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ast_expr2.c ast_expr2.h: ast_expr2.y
 else
 ast_expr2.c ast_expr2.h:
@@ -109,7 +109,7 @@
 	$(ECHO_PREFIX) echo "   [BISON] $< -> $@"
 	$(CMD_PREFIX) $(BISON) -o $@ -d --name-prefix=ast_yy ast_expr2.y
 
-ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
+ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ast_expr2f.c: ast_expr2.fl
 else
 ast_expr2f.c:

Modified: trunk/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/res/Makefile?view=diff&rev=242971&r1=242970&r2=242971
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Mon Jan 25 15:51:41 2010
@@ -45,7 +45,7 @@
 
 $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o
 
-ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
+ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ael/ael_lex.c: ael/ael.flex
 else
 ael/ael_lex.c:
@@ -54,7 +54,7 @@
 	$(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c)
 	$(CMD_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c)
 
-ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
+ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ael/ael.tab.c ael/ael.tab.h: ael/ael.y
 else
 ael/ael.tab.c ael/ael.tab.h: