summaryrefslogtreecommitdiffstats
path: root/modules/ssl/Makefile.in
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2010-09-29 21:42:03 +0200
committerStefan Fritsch <sf@apache.org>2010-09-29 21:42:03 +0200
commitf9ba292bfabc8bee00d15d518211ccde06a25e2f (patch)
treee0a02fb1e276863d076db4eff5a04ec3e6af1626 /modules/ssl/Makefile.in
parenthtcacheclean: If the cache file format is unrecognised, remove the entry (diff)
downloadapache2-f9ba292bfabc8bee00d15d518211ccde06a25e2f.tar.xz
apache2-f9ba292bfabc8bee00d15d518211ccde06a25e2f.zip
Make the ssl expression parser thread-safe. It now requires bison instead of
yacc. Also change the make file magic so that the real source file name is embedded in the debug info. The generated files have been created with flex 2.5.35/bison 2.4.1. The two 'no previous prototype' warnings are supposed to be fixed with the next flex version. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1002824 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl/Makefile.in')
-rw-r--r--modules/ssl/Makefile.in18
1 files changed, 8 insertions, 10 deletions
diff --git a/modules/ssl/Makefile.in b/modules/ssl/Makefile.in
index 978b1c47d6..efb721582b 100644
--- a/modules/ssl/Makefile.in
+++ b/modules/ssl/Makefile.in
@@ -25,15 +25,13 @@ include $(top_srcdir)/build/special.mk
#
ssl_expr_scan.c: $(top_srcdir)/modules/ssl/ssl_expr_scan.l ssl_expr_parse.h
- flex -Pssl_expr_yy -s -B $(top_srcdir)/modules/ssl/ssl_expr_scan.l
- sed -e '/$$Header:/d' -e "s|\"`pwd`/|\"|g" <lex.ssl_expr_yy.c >ssl_expr_scan.c && rm -f lex.ssl_expr_yy.c
+ flex -Pssl_expr_yy -o ssl_expr_scan.c ssl_expr_scan.l
+ mv ssl_expr_scan.c ssl_expr_scan.c.tmp
+ sed -e "s|\"`pwd`/|\"|g" <ssl_expr_scan.c.tmp >ssl_expr_scan.c
+ rm -f ssl_expr_scan.c.tmp
ssl_expr_parse.c ssl_expr_parse.h: $(top_srcdir)/modules/ssl/ssl_expr_parse.y
- yacc -d $(top_srcdir)/modules/ssl/ssl_expr_parse.y
- sed -e 's;yy;ssl_expr_yy;g' \
- -e "s|\"`pwd`/|\"|g" \
- -e '/#if defined(c_plusplus) || defined(__cplusplus)/,/#endif/d' \
- <y.tab.c >ssl_expr_parse.c && rm -f y.tab.c
- sed -e 's;yy;ssl_expr_yy;g' \
- <y.tab.h >ssl_expr_parse.h && rm -f y.tab.h
-
+ bison -pssl_expr_yy --defines=ssl_expr_parse.h -o ssl_expr_parse.c ssl_expr_parse.y
+ mv ssl_expr_parse.c ssl_expr_parse.c.tmp
+ sed -e "s|\"`pwd`/|\"|g" < ssl_expr_parse.c.tmp > ssl_expr_parse.c
+ rm -f ssl_expr_parse.c.tmp