diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:32:52 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:32:52 +0000 |
| commit | fdd073384fe30211d58424c9d1c759de3e19ad66 (patch) | |
| tree | 68e6e8ec6e2547ead58b85c65965e3618c8bffdb | |
| parent | a953d24693d24db8f15f2cfc680ad184b1b0b065 (diff) | |
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.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242720 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/Makefile | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/main/Makefile b/main/Makefile index f9c54b73c..3ef5b3b07 100644 --- a/main/Makefile +++ b/main/Makefile @@ -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 @@ editline/libedit.a: CHECK_SUBDIR 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 |