From 7437e981bca7368009613def02736121d3327309 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Sun, 24 Jan 2010 06:42:32 +0000
Subject: Merged revisions 242521 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r242521 | tilghman | 2010-01-24 00:40:31 -0600 (Sun, 24 Jan 2010) | 15 lines

  Merged revisions 242520 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r242520 | tilghman | 2010-01-24 00:33:01 -0600 (Sun, 24 Jan 2010) | 8 lines

    Only rebuild bison and flex source files on demand, if bison and flex are detected by the configure script.

    Changed after discussion on the -dev list about possible unnecessary build
    failures, due to checkouts/untars causing these special source files to
    possibly be newer than their resulting C files.  This should additionally
    ensure that nobody need learn about extra Makefile arguments to ensure the
    proper files get rebuilt when changes are made to these special source files.
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@242523 f38db490-d61c-443f-a65b-d21fe96a405b
---
 res/Makefile | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/Makefile b/res/Makefile
index ff5dddb85..e78fd8fcf 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -43,14 +43,22 @@ $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o
 
 $(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 ($(FLEX),)
 ael/ael_lex.c: ael/ael.flex
+else
+ael/ael_lex.c:
+endif
 	$(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)
+	$(ECHO_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)
+	$(ECHO_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 ($(BISON),)
 ael/ael.tab.c ael/ael.tab.h: ael/ael.y
+else
+ael/ael.tab.c ael/ael.tab.h:
+endif
 	$(ECHO_PREFIX) echo "   [BISON] $< -> $@"
-	(cd ael; bison -v -d ael.y)
+	$(ECHO_PREFIX) (cd ael; bison -v -d ael.y)
 
 ael/pval.o: ael/pval.c
 
-- 
cgit v1.2.3