diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-24 06:42:42 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-24 06:42:42 +0000 |
| commit | c55dccb2d50c7787779a4653cd1001cd82d764ef (patch) | |
| tree | a50c30808acd4def994949be08d35a11f3f5c9f5 /res | |
| parent | f6b9b9c331d3b1858724188500a7cadf146bfee7 (diff) | |
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.0@242524 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/Makefile | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/res/Makefile b/res/Makefile index 74c9d47c7..a8f764f8a 100644 --- a/res/Makefile +++ b/res/Makefile @@ -39,14 +39,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 |