ben 99/09/10 07:34:49
Modified: src Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/mpm/prefork Makefile.tmpl src/modules/standard Makefile.tmpl src/os/unix Makefile.tmpl Log: Update dependencies. Revision Changes Path 1.5 +11 -12 apache-2.0/src/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-2.0/src/Makefile.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.tmpl 1999/09/01 14:38:34 1.4 +++ Makefile.tmpl 1999/09/10 14:34:39 1.5 @@ -123,17 +123,16 @@ # DO NOT REMOVE buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \ include/ap_config_auto.h os/unix/os.h os/unix/os-inline.c \ - include/ap_ctype.h include/hsregex.h include/httpd.h \ - lib/apr/include/apr_general.h lib/apr/include/apr_config.h \ - lib/apr/include/apr_errno.h lib/apr/include/apr_lib.h \ - lib/apr/include/apr_file_io.h lib/apr/include/hsregex.h \ - include/buff.h include/ap_iol.h include/ap.h include/apr.h \ - include/util_uri.h + include/ap_ctype.h include/httpd.h lib/apr/include/apr_general.h \ + lib/apr/include/apr_config.h lib/apr/include/apr_errno.h \ + lib/apr/include/apr_lib.h lib/apr/include/apr_file_io.h \ + lib/apr/include/hsregex.h include/buff.h include/ap_iol.h \ + include/ap.h include/apr.h include/util_uri.h modules.o: modules.c include/httpd.h include/ap_config.h \ include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \ - os/unix/os-inline.c include/ap_ctype.h include/hsregex.h \ - lib/apr/include/apr_general.h lib/apr/include/apr_config.h \ - lib/apr/include/apr_errno.h lib/apr/include/apr_lib.h \ - lib/apr/include/apr_file_io.h lib/apr/include/hsregex.h \ - include/buff.h include/ap_iol.h include/ap.h include/apr.h \ - include/util_uri.h include/http_config.h include/ap_hooks.h + os/unix/os-inline.c include/ap_ctype.h lib/apr/include/apr_general.h \ + lib/apr/include/apr_config.h lib/apr/include/apr_errno.h \ + lib/apr/include/apr_lib.h lib/apr/include/apr_file_io.h \ + lib/apr/include/hsregex.h include/buff.h include/ap_iol.h \ + include/ap.h include/apr.h include/util_uri.h include/http_config.h \ + include/ap_hooks.h 1.5 +15 -18 apache-2.0/src/ap/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-2.0/src/ap/Makefile.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.tmpl 1999/09/01 14:38:36 1.4 +++ Makefile.tmpl 1999/09/10 14:34:41 1.5 @@ -40,17 +40,15 @@ # DO NOT REMOVE ap_base64.o: ap_base64.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h + $(INCDIR)/ap_ctype.h $(INCDIR)/ap.h $(INCDIR)/apr.h ap_buf.o: ap_buf.c ap_checkpass.o: ap_checkpass.c $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/ap_md5.h $(INCDIR)/ap_sha1.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/ap_md5.h \ + $(INCDIR)/ap_sha1.h $(INCDIR)/ap.h $(INCDIR)/apr.h ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ @@ -58,7 +56,7 @@ $(INCDIR)/apr.h $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ @@ -66,14 +64,13 @@ $(INCDIR)/apr.h $(INCDIR)/util_uri.h ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h + $(INCDIR)/ap_ctype.h $(INCDIR)/fnmatch.h ap_getpass.o: ap_getpass.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h + $(INCDIR)/ap_ctype.h $(INCDIR)/ap.h $(INCDIR)/apr.h ap_hooks.o: ap_hooks.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ @@ -81,15 +78,15 @@ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/ap_hooks.h ap_md5c.o: ap_md5c.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \ - $(INCDIR)/ap.h $(INCDIR)/apr.h + $(INCDIR)/ap_ctype.h $(INCDIR)/ap_md5.h $(INCDIR)/ap.h \ + $(INCDIR)/apr.h ap_sha1.o: ap_sha1.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_sha1.h \ - $(INCDIR)/ap.h $(INCDIR)/apr.h + $(INCDIR)/ap_ctype.h $(INCDIR)/ap_sha1.h $(INCDIR)/ap.h \ + $(INCDIR)/apr.h ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ @@ -97,7 +94,7 @@ $(INCDIR)/apr.h $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ @@ -105,7 +102,7 @@ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ 1.5 +111 -81 apache-2.0/src/main/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-2.0/src/main/Makefile.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.tmpl 1999/09/01 14:38:38 1.4 +++ Makefile.tmpl 1999/09/10 14:34:42 1.5 @@ -60,7 +60,7 @@ # DO NOT REMOVE buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ @@ -70,35 +70,40 @@ gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h + $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_general.h \ + ../lib/apr/include/apr_config.h ../lib/apr/include/apr_errno.h \ + ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \ + ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h gen_uri_delims.o: gen_uri_delims.c -http_config.o: http_config.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ +http_config.o: http_config.c ../lib/apr/include/apr_portable.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ - $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_vhost.h $(INCDIR)/explain.h + ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_thread_proc.h \ + ../lib/apr/include/apr_file_io.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h $(INCDIR)/httpd.h \ + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ + $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_lib.h \ + ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_vhost.h $(INCDIR)/explain.h http_connection.o: http_connection.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_connection.h \ - $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/ap_mpm.h \ + $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_general.h \ + ../lib/apr/include/apr_config.h ../lib/apr/include/apr_errno.h \ + ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \ + ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_connection.h $(INCDIR)/ap_hooks.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \ + ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h $(INCDIR)/ap_mpm.h \ $(INCDIR)/http_config.h $(INCDIR)/http_vhost.h http_core.o: http_core.c ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ @@ -106,119 +111,141 @@ ../lib/apr/include/hsregex.h $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/buff.h \ - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_vhost.h \ - $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \ - $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h $(INCDIR)/fnmatch.h \ - $(INCDIR)/http_connection.h + $(INCDIR)/ap_ctype.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_vhost.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ + $(INCDIR)/rfc1413.h $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \ + $(INCDIR)/fnmatch.h $(INCDIR)/http_connection.h http_log.o: http_log.c ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_file_io.h \ - ../lib/apr/include/hsregex.h $(INCDIR)/httpd.h \ + ../lib/apr/include/hsregex.h ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/buff.h \ - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h + $(INCDIR)/ap_ctype.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_main.h http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/ap_mpm.h + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/ap_mpm.h \ + ../lib/expat-lite/xmlparse.h http_protocol.o: http_protocol.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ - $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \ + $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_general.h \ + ../lib/apr/include/apr_config.h ../lib/apr/include/apr_errno.h \ + ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \ + ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h $(INCDIR)/http_main.h \ $(INCDIR)/http_request.h $(INCDIR)/http_vhost.h \ $(INCDIR)/http_log.h $(INCDIR)/util_date.h http_request.o: http_request.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ - $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_main.h $(INCDIR)/fnmatch.h + $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_general.h \ + ../lib/apr/include/apr_config.h ../lib/apr/include/apr_errno.h \ + ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \ + ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \ + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_main.h $(INCDIR)/fnmatch.h http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_core.h + $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h $(INCDIR)/http_core.h iol_file.o: iol_file.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ $(INCDIR)/apr.h $(INCDIR)/util_uri.h -listen.o: listen.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ +listen.o: listen.c ../lib/apr/include/apr_network_io.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ + ../lib/apr/include/apr_errno.h $(INCDIR)/httpd.h \ + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ + $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/ap_listen.h $(INCDIR)/http_log.h rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \ - $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h + $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h \ + ../lib/apr/include/apr_network_io.h util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/ap_hooks.h test_char.h + $(INCDIR)/ap_hooks.h ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h test_char.h util_date.o: util_date.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/util_date.h -util_md5.o: util_md5.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/util_date.h +util_md5.o: util_md5.c ../lib/apr/include/apr_portable.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ - ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ - ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/util_md5.h \ - $(INCDIR)/ap_md5.h + ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_thread_proc.h \ + ../lib/apr/include/apr_file_io.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h $(INCDIR)/httpd.h \ + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ + $(INCDIR)/ap_ctype.h ../lib/apr/include/apr_lib.h \ + ../lib/apr/include/hsregex.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ @@ -226,11 +253,14 @@ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ - $(INCDIR)/http_request.h $(INCDIR)/util_script.h \ - $(INCDIR)/util_date.h + ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \ + ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \ + ../lib/apr/include/apr_time.h $(INCDIR)/http_request.h \ + $(INCDIR)/util_script.h $(INCDIR)/util_date.h util_uri.o: util_uri.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \ 1.10 +15 -11 apache-2.0/src/modules/mpm/prefork/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/mpm/prefork/Makefile.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.tmpl 1999/09/08 14:15:48 1.9 +++ Makefile.tmpl 1999/09/10 14:34:43 1.10 @@ -55,21 +55,25 @@ $(OBJS) $(OBJS_PIC): Makefile # DO NOT REMOVE -prefork.o: prefork.c $(INCDIR)/httpd.h \ - $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../../lib/apr/include/apr_general.h \ +prefork.o: prefork.c ../../../lib/apr/include/apr_portable.h \ + ../../../lib/apr/include/apr_general.h \ ../../../lib/apr/include/apr_config.h \ ../../../lib/apr/include/apr_errno.h \ - ../../../lib/apr/include/apr_lib.h \ + ../../../lib/apr/include/apr_thread_proc.h \ ../../../lib/apr/include/apr_file_io.h \ - ../../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h mpm_default.h \ + ../../../lib/apr/include/apr_win.h \ + ../../../lib/apr/include/apr_network_io.h \ + ../../../lib/apr/include/apr_lock.h \ + ../../../lib/apr/include/apr_time.h $(INCDIR)/httpd.h \ + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ + ../../../lib/apr/include/apr_lib.h ../../../lib/apr/include/hsregex.h \ + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h \ + $(INCDIR)/util_uri.h mpm_default.h \ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \ $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \ scoreboard.h $(INCDIR)/ap_mpm.h $(OSDIR)/unixd.h \ - $(OSDIR)/iol_socket.h $(INCDIR)/ap_listen.h \ - ../../../lib/apr/include/apr_network_io.h + $(OSDIR)/iol_socket.h $(INCDIR)/ap_listen.h 1.5 +151 -53 apache-2.0/src/modules/standard/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-2.0/src/modules/standard/Makefile.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.tmpl 1999/09/01 22:48:17 1.4 +++ Makefile.tmpl 1999/09/10 14:34:47 1.5 @@ -8,7 +8,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -20,7 +20,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -28,13 +28,18 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ $(INCDIR)/util_script.h mod_alias.o: mod_alias.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -44,19 +49,24 @@ mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/http_log.h $(INCDIR)/util_script.h \ $(INCDIR)/http_main.h $(INCDIR)/http_request.h mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -64,12 +74,17 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/http_request.h mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -77,45 +92,71 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/http_request.h mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h mod_auth_digest.o: mod_auth_digest.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ + ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ + ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ + ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \ - $(INCDIR)/ap_md5.h + $(INCDIR)/ap_hooks.h $(INCDIR)/http_conf_globals.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ + $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \ + $(INCDIR)/ap_sha1.h mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -123,13 +164,18 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ $(INCDIR)/util_script.h $(INCDIR)/fnmatch.h mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -140,7 +186,7 @@ mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -148,13 +194,18 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ $(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h mod_digest.o: mod_digest.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -162,11 +213,16 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -174,12 +230,17 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ $(INCDIR)/util_script.h mod_echo.o: mod_echo.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -189,7 +250,7 @@ mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -200,7 +261,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -211,7 +272,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -221,7 +282,7 @@ mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -229,13 +290,18 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ $(INCDIR)/util_script.h mod_include.o: mod_include.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -243,12 +309,17 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ $(INCDIR)/util_script.h mod_info.o: mod_info.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -256,13 +327,17 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/util_script.h \ - $(INCDIR)/http_conf_globals.h + $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ + $(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h mod_log_agent.o: mod_log_agent.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -273,19 +348,24 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h mod_log_referer.o: mod_log_referer.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -295,7 +375,7 @@ mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -307,7 +387,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -315,25 +395,34 @@ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \ $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_protocol.h + $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h mod_negotiation.o: mod_negotiation.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/util_script.h + $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/util_script.h mod_rewrite.o: mod_rewrite.c mod_rewrite.h $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -346,18 +435,23 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \ + ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h mod_so.o: mod_so.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -368,7 +462,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -380,22 +474,26 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_protocol.h $(INCDIR)/http_conf_globals.h \ - $(INCDIR)/http_main.h $(INCDIR)/util_script.h \ - ../../modules/mpm/mpmt_pthread/scoreboard.h \ - ../../modules/mpm/mpmt_pthread/mpm_default.h $(INCDIR)/http_log.h + $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \ + ../../lib/apr/include/apr_thread_proc.h \ + ../../lib/apr/include/apr_win.h \ + ../../lib/apr/include/apr_network_io.h \ + ../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \ + $(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \ + $(INCDIR)/util_script.h ../../modules/mpm/prefork/scoreboard.h \ + $(INCDIR)/http_log.h mod_unique_id.o: mod_unique_id.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -406,7 +504,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -417,7 +515,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -428,7 +526,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ 1.4 +4 -5 apache-2.0/src/os/unix/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-2.0/src/os/unix/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1999/09/01 14:38:41 1.3 +++ Makefile.tmpl 1999/09/10 14:34:49 1.4 @@ -42,7 +42,7 @@ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \ @@ -51,15 +51,14 @@ os-aix-dso.o: os-aix-dso.c os-inline.o: os-inline.c $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ - $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h + $(OSDIR)/os.h $(INCDIR)/ap_ctype.h os.o: os.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h os.h + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h os.h unixd.o: unixd.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \ + ../../lib/apr/include/apr_general.h \ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \