summaryrefslogtreecommitdiff
path: root/main/Makefile
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2008-09-27 15:52:56 +0000
committerKevin P. Fleming <kpfleming@digium.com>2008-09-27 15:52:56 +0000
commit629861a70566cc36ce9d81adb077878545271279 (patch)
tree74b2e6933215849b3a07e112fb2b9f893431888f /main/Makefile
parentf1b673eef0471fa17b4149aec92a3a10e76ff5b2 (diff)
Merged revisions 144924-144925 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r144924 | kpfleming | 2008-09-27 10:00:48 -0500 (Sat, 27 Sep 2008) | 6 lines improve header inclusion process in a few small ways: - it is no longer necessary to forcibly include asterisk/autoconfig.h; every module already includes asterisk.h as its first header (even before system headers), which serves the same purpose - astmm.h is now included by asterisk.h when needed, instead of being forced by the Makefile; this means external modules will build properly against installed headers with MALLOC_DEBUG enabled - simplify the usage of some of these headers in the AEL-related stuff in the utils directory ........ r144925 | kpfleming | 2008-09-27 10:13:30 -0500 (Sat, 27 Sep 2008) | 2 lines fix some minor issues with rev 144924 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@144949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
-rw-r--r--main/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/main/Makefile b/main/Makefile
index db4aad7e4..b1ef7ef77 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -123,9 +123,12 @@ ast_expr2.c ast_expr2.h:
bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
ast_expr2f.c:
- flex -o $@ --full ast_expr2.fl # moved the correction of yyfree into the flex input file itself.
- sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz
- mv zz ast_expr2f.c
+ flex -o $@ --full 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
ast_expr2f.o: ASTCFLAGS+=-Wno-unused