diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 16:49:27 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 16:49:27 +0000 |
| commit | 91ba8ce8c94796fed8bc3f92733721eb66582a3b (patch) | |
| tree | 08fd22336f059b6ad0ce0c54f8d251c011c217da /main/Makefile | |
| parent | 3b0484f45b3b63714e8800d4ae48ac0f3b7baf4e (diff) | |
Merged revisions 144949-144951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r144949 | kpfleming | 2008-09-27 10:52:56 -0500 (Sat, 27 Sep 2008) | 17 lines
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
........
................
r144950 | kpfleming | 2008-09-27 11:10:33 -0500 (Sat, 27 Sep 2008) | 2 lines
fix bugs caused by r144949 when MALLOC_DEBUG is defined
................
r144951 | kpfleming | 2008-09-27 11:17:43 -0500 (Sat, 27 Sep 2008) | 1 line
remove incorrect comment
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@144993 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 9 |
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 |