aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 05:32:59 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 05:32:59 +0000
commitec4cba4cd71c8a936dc4faa3df578752f742317b (patch)
tree663cbd50c40d469e0d98ad2f311c450d07468c4a
parent7437e981bca7368009613def02736121d3327309 (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.1@242721 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/Makefile26
1 files changed, 18 insertions, 8 deletions
diff --git a/main/Makefile b/main/Makefile
index 0a4d84939..4990fcff2 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
@@ -110,16 +110,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