event: child_main() never returns, so remove some dead code after

[apache] / server / Makefile.in

diff --git a/server/Makefile.in b/server/Makefile.in
index 3c96c4061bee3433f3b784102d45218b272d92be..9f9fa13601ffb85e44ac7891f6504641c759d411 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -7,14 +7,15 @@ SUBDIRS = mpm
 
 LTLIBRARY_NAME    = libmain.la
 LTLIBRARY_SOURCES = \
-    test_char.h \
        config.c log.c main.c vhost.c util.c \
        util_script.c util_md5.c util_cfgtree.c util_ebcdic.c util_time.c \
-       connection.c listen.c util_mutex.c \
-       mpm_common.c util_charset.c util_cookies.c util_debug.c util_xml.c \
-       util_expr.c util_filter.c util_pcre.c exports.c \
+       connection.c listen.c util_mutex.c mpm_common.c mpm_unix.c \
+       util_charset.c util_cookies.c util_debug.c util_xml.c \
+       util_filter.c util_pcre.c util_regex.c exports.c \
        scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
-       eoc_bucket.c eor_bucket.c core_filters.c
+       eoc_bucket.c eor_bucket.c core_filters.c \
+       util_expr_parse.c util_expr_scan.c util_expr_eval.c
+LTLIBRARY_DEPENDENCIES = test_char.h
 
 TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
 
@@ -30,7 +31,7 @@ test_char.h: gen_test_char
 
 util.lo: test_char.h
 
-EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(top_srcdir)/modules/http
+EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR)
 EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
 
 # If export_files is a dependency here, but we remove it during this stage,
@@ -83,3 +84,22 @@ httpd.exp: exports.c export_vars.h
        @echo "* Please do not edit by hand." >> $@
        $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | grep -v apr_ | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
        $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep -v apr_ | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
+
+
+#   developer stuff
+#   (we really don't expect end users to use these targets!)
+#
+util_expr_scan.c util_expr_parse.c util_expr_parse.h: util_expr_scan.l util_expr_parse.y
+       bison -pap_expr_yy --defines=$(builddir)/util_expr_parse.h \
+           -o $(builddir)/util_expr_parse.c $(srcdir)/util_expr_parse.y
+       flex -Pap_expr_yy -o $(builddir)/util_expr_scan.c $(srcdir)/util_expr_scan.l
+       set -e ; \
+       for f in util_expr_scan.c util_expr_parse.c util_expr_parse.h ; do \
+               sed -e "s|\"$(builddir)/|\"|g" < $(builddir)/$$f > \
+                       $(builddir)/$$f.$$$$ && \
+               mv $(builddir)/$$f.$$$$ $(builddir)/$$f ; \
+       done
+       # work around flex bug
+       # http://sourceforge.net/tracker/?func=detail&aid=3029024&group_id=97492&atid=618177
+       perl -0777 -p -i -e 's,\n(void|int) ap_expr_yy[gs]et_column[^\n]+\)\n.*?\n\},,gs' \
+               $(builddir)/util_expr_scan.c