mod_session_cookie: Add a session implementation capable of storing

[apache] / server / Makefile.in

diff --git a/server/Makefile.in b/server/Makefile.in
index 6d842c51d0bf52793d97609fa6eff4c3ec52a46d..3c96c4061bee3433f3b784102d45218b272d92be 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,8 +1,7 @@
 
-CLEAN_TARGETS = gen_test_char test_char.h gen_uri_delims uri_delims.h \
-       ApacheCoreOS2.def
-DISTCLEAN_TARGETS = httpd.exp
-EXTRACLEAN_TARGETS = export_files exports.c export_vars.h
+CLEAN_TARGETS = gen_test_char test_char.h \
+       ApacheCoreOS2.def httpd.exp export_files \
+       exports.c export_vars.h
 
 SUBDIRS = mpm
 
@@ -11,17 +10,18 @@ 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 \
-       rfc1413.c connection.c listen.c \
-       mpm_common.c util_charset.c util_debug.c util_xml.c \
-       util_filter.c $(top_builddir)/server/exports.c buildmark.c \
-       scoreboard.c error_bucket.c protocol.c core.c request.c provider.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 \
+       scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
+       eoc_bucket.c eor_bucket.c core_filters.c
 
 TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
 
 include $(top_builddir)/build/rules.mk
 include $(top_srcdir)/build/library.mk
 
-gen_test_char_OBJECTS = gen_test_char.lo util_debug.lo
+gen_test_char_OBJECTS = gen_test_char.lo
 gen_test_char: $(gen_test_char_OBJECTS)
        $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
 
@@ -30,15 +30,24 @@ test_char.h: gen_test_char
 
 util.lo: test_char.h
 
-EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http
+EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(top_srcdir)/modules/http
+EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
 
-delete-exports: export_files
+# If export_files is a dependency here, but we remove it during this stage,
+# when exports.c is generated, make will not detect that export_files is no
+# longer here and deadlock.  So, export_files can't be a dependency of
+# delete-exports.
+delete-exports:
        @if test -f exports.c; then \
-           files=`cat $?`; \
-           headers="`find $$files -newer exports.c`"; \
-           if test -n "$$headers"; then \
-               echo Found newer headers. Will rebuild exports.c.; \
-               echo rm -f exports.c; \
+           if test -f export_files; then \
+               files=`cat export_files`; \
+               headers="`find $$files -newer exports.c`"; \
+               if test -n "$$headers"; then \
+                  echo Found newer headers. Will rebuild exports.c.; \
+                  echo rm -f exports.c export_files; \
+                  rm -f exports.c export_files; \
+               fi; \
+           else \
                rm -f exports.c; \
            fi; \
        fi
@@ -47,21 +56,20 @@ export_files:
        tmp=export_files_unsorted.txt; \
        rm -f $$tmp && touch $$tmp; \
        for dir in $(EXPORT_DIRS); do \
-           find $$dir -maxdepth 1 -type f -name '*.h' >> $$tmp; \
+           ls $$dir/*.h >> $$tmp; \
+       done; \
+       for dir in $(EXPORT_DIRS_APR); do \
+           (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
        done; \
        sort -u $$tmp > $@; \
        rm -f $$tmp
 
-# full path required to keep BSD make happy
-$(top_builddir)/server/exports.c: export_files
+exports.c: export_files
        $(AWK) -f $(top_srcdir)/build/make_exports.awk `cat $?` > $@
 
 export_vars.h: export_files
        $(AWK) -f $(top_srcdir)/build/make_var_export.awk `cat $?` > $@
 
-# wtf does this have to be explicit????
-exports.lo: exports.c
-
 # Rule to make def file for OS/2 core dll
 ApacheCoreOS2.def: exports.c export_vars.h $(top_srcdir)/os/$(OS_DIR)/core_header.def
        cat $(top_srcdir)/os/$(OS_DIR)/core_header.def > $@