[svn-commits] tilghman: branch 1.6.0 r242425 - in /branches/1.6.0: ./ res/Makefile

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jan 22 15:46:27 2010
New Revision: 242425

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

................
  r242424 | tilghman | 2010-01-22 15:45:18 -0600 (Fri, 22 Jan 2010) | 14 lines
  
  Merged revisions 242423 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r242423 | tilghman | 2010-01-22 15:44:18 -0600 (Fri, 22 Jan 2010) | 7 lines
    
    Rebuild from flex, bison sources when necessary.
    
    (issue #14629)
     Reported by: Marquis
     Patches: 
           20100121__issue14629.diff.txt uploaded by tilghman (license 14)
  ........
................

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

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

Modified: branches/1.6.0/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/res/Makefile?view=diff&rev=242425&r1=242424&r2=242425
==============================================================================
--- branches/1.6.0/res/Makefile (original)
+++ branches/1.6.0/res/Makefile Fri Jan 22 15:46:27 2010
@@ -39,11 +39,13 @@
 
 $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o
 
-ael/ael_lex.c:
+ael/ael_lex.c: ael/ael.flex
+	$(ECHO_PREFIX) echo "   [FLEX] $< -> $@"
 	(cd ael; flex ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c)
 	(cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c)
 
-ael/ael.tab.c ael/ael.tab.h:
+ael/ael.tab.c ael/ael.tab.h: ael/ael.y
+	$(ECHO_PREFIX) echo "   [BISON] $< -> $@"
 	(cd ael; bison -v -d ael.y)
 
 ael/pval.o: ael/pval.c