manoj 99/10/29 22:59:32
Modified: src Makefile.tmpl src/ap Makefile.tmpl src/lib/apr/lib Makefile.in src/lib/apr/locks/unix Makefile.in src/lib/apr/mmap/unix Makefile.in src/lib/apr/network_io/unix Makefile.in src/lib/apr/threadproc/unix Makefile.in src/main Makefile.tmpl src/modules/mpm/dexter Makefile.tmpl src/modules/mpm/mpmt_pthread Makefile.tmpl src/modules/mpm/prefork Makefile.tmpl src/modules/standard Makefile.tmpl src/os/unix Makefile.tmpl Log: Remake the unix dependencies. Revision Changes Path 1.10 +8 -8 apache-2.0/src/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-2.0/src/Makefile.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -u -r1.9 -r1.10 --- Makefile.tmpl 1999/09/27 07:25:06 1.9 +++ Makefile.tmpl 1999/10/30 05:59:19 1.10 @@ -123,16 +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/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 \ - include/buff.h include/ap_iol.h \ + 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 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 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 \ - include/buff.h include/ap_iol.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 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.8 +42 -35 apache-2.0/src/ap/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-2.0/src/ap/Makefile.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -u -r1.7 -r1.8 --- Makefile.tmpl 1999/09/27 07:19:47 1.7 +++ Makefile.tmpl 1999/10/30 05:59:20 1.8 @@ -40,71 +40,78 @@ # 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)/ap.h $(INCDIR)/apr.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.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)/ap_md5.h \ - $(INCDIR)/ap_sha1.h $(INCDIR)/ap.h $(INCDIR)/apr.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 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 \ + $(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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h + ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(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 \ + $(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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h + ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(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)/fnmatch.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.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)/ap.h $(INCDIR)/apr.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.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 \ + $(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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/ap_hooks.h + ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(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)/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)/ap_sha1.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h +ap_sha1.o: ap_sha1.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 $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ + $(INCDIR)/util_uri.h $(INCDIR)/ap_sha1.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 \ + $(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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h + ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(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 \ + $(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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h + ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(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 \ + $(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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h + ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ + $(INCDIR)/util_uri.h 1.5 +8 -3 apache-2.0/src/lib/apr/lib/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -u -r1.4 -r1.5 --- Makefile.in 1999/09/23 18:19:03 1.4 +++ Makefile.in 1999/10/30 05:59:21 1.5 @@ -61,7 +61,9 @@ && rm Makefile.new # DO NOT REMOVE -apr_cpystrn.o: apr_cpystrn.c ../include/apr_config.h +apr_cpystrn.o: apr_cpystrn.c ../include/apr_config.h \ + ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \ + ../include/apr_file_io.h apr_execve.o: apr_execve.c ../include/apr_config.h apr_fnmatch.o: apr_fnmatch.c ../include/apr_config.h \ $(INCDIR)/apr_fnmatch.h ../include/apr_lib.h ../include/apr_general.h \ @@ -74,11 +76,14 @@ ../include/apr_file_io.h apr_pools.o: apr_pools.c ../include/apr_config.h \ ../include/apr_general.h ../include/apr_errno.h $(INCDIR)/apr_pools.h \ - ../include/apr_lib.h ../include/apr_file_io.h ../misc/unix/misc.h + ../include/apr_lib.h ../include/apr_file_io.h ../include/apr_lock.h \ + ../misc/unix/misc.h apr_signal.o: apr_signal.c ../include/apr_config.h \ ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \ ../include/apr_file_io.h -apr_slack.o: apr_slack.c ../include/apr_config.h +apr_slack.o: apr_slack.c ../include/apr_config.h ../include/apr_lib.h \ + ../include/apr_general.h ../include/apr_errno.h \ + ../include/apr_file_io.h apr_snprintf.o: apr_snprintf.c ../include/apr_config.h \ ../include/apr_lib.h ../include/apr_general.h ../include/apr_errno.h \ ../include/apr_file_io.h 1.4 +4 -3 apache-2.0/src/lib/apr/locks/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -u -r1.3 -r1.4 --- Makefile.in 1999/09/23 18:19:04 1.3 +++ Makefile.in 1999/10/30 05:59:23 1.4 @@ -57,9 +57,10 @@ ../../include/apr_general.h ../../include/apr_config.h \ ../../include/apr_errno.h ../../include/apr_lib.h \ ../../include/apr_file_io.h locks.h -intraproc.o: intraproc.c ../../include/apr_lock.h \ - ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h locks.h ../../include/apr_file_io.h +intraproc.o: intraproc.c ../../include/apr_config.h \ + ../../include/apr_lock.h ../../include/apr_general.h \ + ../../include/apr_errno.h ../../include/apr_lib.h \ + ../../include/apr_file_io.h locks.h locks.o: locks.c ../../include/apr_general.h \ ../../include/apr_config.h ../../include/apr_errno.h \ ../../include/apr_portable.h ../../include/apr_thread_proc.h \ 1.3 +1 -0 apache-2.0/src/lib/apr/mmap/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -u -r1.2 -r1.3 --- Makefile.in 1999/10/21 21:13:32 1.2 +++ Makefile.in 1999/10/30 05:59:24 1.3 @@ -50,3 +50,4 @@ && rm Makefile.new # DO NOT REMOVE +mmap.o: mmap.c 1.7 +13 -9 apache-2.0/src/lib/apr/network_io/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -u -r1.6 -r1.7 --- Makefile.in 1999/10/24 05:59:14 1.6 +++ Makefile.in 1999/10/30 05:59:24 1.7 @@ -56,19 +56,23 @@ # DO NOT REMOVE poll.o: poll.c networkio.h ../../include/apr_network_io.h \ ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_lib.h \ - ../../include/apr_file_io.h + ../../include/apr_errno.h ../../include/apr_lock.h \ + ../../include/apr_lib.h ../../include/apr_file_io.h sendrecv.o: sendrecv.c networkio.h ../../include/apr_network_io.h \ ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_lib.h \ - ../../include/apr_file_io.h + ../../include/apr_errno.h ../../include/apr_lock.h \ + ../../include/apr_lib.h ../../include/apr_file_io.h +sockaddr.o: sockaddr.c networkio.h ../../include/apr_network_io.h \ + ../../include/apr_general.h ../../include/apr_config.h \ + ../../include/apr_errno.h ../../include/apr_lock.h \ + ../../include/apr_lib.h ../../include/apr_file_io.h sockets.o: sockets.c networkio.h ../../include/apr_network_io.h \ ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_portable.h \ - ../../include/apr_thread_proc.h ../../include/apr_file_io.h \ - ../../include/apr_win.h ../../include/apr_lock.h \ + ../../include/apr_errno.h ../../include/apr_lock.h \ + ../../include/apr_portable.h ../../include/apr_thread_proc.h \ + ../../include/apr_file_io.h ../../include/apr_win.h \ ../../include/apr_time.h ../../include/apr_lib.h sockopt.o: sockopt.c networkio.h ../../include/apr_network_io.h \ ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_lib.h \ - ../../include/apr_file_io.h + ../../include/apr_errno.h ../../include/apr_lock.h \ + ../../include/apr_lib.h ../../include/apr_file_io.h 1.6 +18 -22 apache-2.0/src/lib/apr/threadproc/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -u -r1.5 -r1.6 --- Makefile.in 1999/09/23 18:19:07 1.5 +++ Makefile.in 1999/10/30 05:59:25 1.6 @@ -56,36 +56,32 @@ && rm Makefile.new # DO NOT REMOVE -proc.o: proc.c threadproc.h ../../include/apr_thread_proc.h \ - ../../include/apr_file_io.h ../../include/apr_general.h \ - ../../include/apr_config.h ../../include/apr_errno.h \ +proc.o: proc.c threadproc.h ../../include/apr_config.h \ + ../../include/apr_thread_proc.h ../../include/apr_file_io.h \ + ../../include/apr_general.h ../../include/apr_errno.h \ ../../include/apr_win.h ../../file_io/unix/fileio.h \ ../../include/apr_lib.h ../../include/apr_portable.h \ ../../include/apr_network_io.h ../../include/apr_lock.h \ ../../include/apr_time.h -procsup.o: procsup.c threadproc.h ../../include/apr_thread_proc.h \ - ../../include/apr_file_io.h ../../include/apr_general.h \ - ../../include/apr_config.h ../../include/apr_errno.h \ +procsup.o: procsup.c threadproc.h ../../include/apr_config.h \ + ../../include/apr_thread_proc.h ../../include/apr_file_io.h \ + ../../include/apr_general.h ../../include/apr_errno.h \ ../../include/apr_win.h ../../file_io/unix/fileio.h \ ../../include/apr_lib.h -signals.o: signals.c threadproc.h ../../include/apr_thread_proc.h \ - ../../include/apr_file_io.h ../../include/apr_general.h \ - ../../include/apr_config.h ../../include/apr_errno.h \ +signals.o: signals.c threadproc.h ../../include/apr_config.h \ + ../../include/apr_thread_proc.h ../../include/apr_file_io.h \ + ../../include/apr_general.h ../../include/apr_errno.h \ ../../include/apr_win.h ../../file_io/unix/fileio.h -thread.o: thread.c threadproc.h ../../include/apr_thread_proc.h \ - ../../include/apr_file_io.h ../../include/apr_general.h \ - ../../include/apr_config.h ../../include/apr_errno.h \ +thread.o: thread.c ../../include/apr_config.h threadproc.h \ + ../../include/apr_thread_proc.h ../../include/apr_file_io.h \ + ../../include/apr_general.h ../../include/apr_errno.h \ ../../include/apr_win.h ../../include/apr_portable.h \ ../../include/apr_network_io.h ../../include/apr_lock.h \ ../../include/apr_time.h ../../include/apr_lib.h -threadcancel.o: threadcancel.c threadproc.h \ - ../../include/apr_thread_proc.h ../../include/apr_file_io.h \ - ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_win.h -threadpriv.o: threadpriv.c threadproc.h \ +threadcancel.o: threadcancel.c +threadpriv.o: threadpriv.c ../../include/apr_config.h threadproc.h \ ../../include/apr_thread_proc.h ../../include/apr_file_io.h \ - ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_win.h \ - ../../include/apr_portable.h ../../include/apr_network_io.h \ - ../../include/apr_lock.h ../../include/apr_time.h \ - ../../include/apr_lib.h + ../../include/apr_general.h ../../include/apr_errno.h \ + ../../include/apr_win.h ../../include/apr_portable.h \ + ../../include/apr_network_io.h ../../include/apr_lock.h \ + ../../include/apr_time.h ../../include/apr_lib.h 1.7 +89 -90 apache-2.0/src/main/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-2.0/src/main/Makefile.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -u -r1.6 -r1.7 --- Makefile.tmpl 1999/09/23 19:07:59 1.6 +++ Makefile.tmpl 1999/10/30 05:59:26 1.7 @@ -60,32 +60,32 @@ # 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 \ + $(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 \ - $(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 + ../lib/apr/include/apr_file_io.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 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 ../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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h + $(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 $(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 ../lib/apr/include/apr_portable.h \ - ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \ + ../lib/apr/include/apr_config.h ../lib/apr/include/apr_general.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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + ../lib/apr/include/apr_lib.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 \ @@ -93,28 +93,29 @@ 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 ../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 \ - $(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)/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 $(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 ../lib/apr/include/apr_network_io.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 + ../lib/apr/include/apr_lock.h ../lib/apr/include/apr_time.h \ + $(INCDIR)/ap_mpm.h $(INCDIR)/mpm_status.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 \ ../lib/apr/include/apr_errno.h ../lib/apr/include/apr_file_io.h \ - $(INCDIR)/httpd.h \ - $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.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)/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 \ + $(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 \ + ../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 \ @@ -130,44 +131,45 @@ ../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)/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)/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 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 \ + $(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 \ - $(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 \ + ../lib/apr/include/apr_file_io.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 \ ../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 ../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 \ - $(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 \ + $(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 $(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 + $(INCDIR)/http_log.h $(INCDIR)/util_date.h $(INCDIR)/mpm_status.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 ../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 \ - $(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_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 $(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 \ @@ -176,94 +178,91 @@ $(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 \ + $(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 \ - $(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 \ + ../lib/apr/include/apr_file_io.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 ../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 \ + $(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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h + ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ + $(INCDIR)/util_uri.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 $(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 \ + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + ../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.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 \ + $(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 \ - $(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 \ - ../lib/apr/include/apr_network_io.h + ../lib/apr/include/apr_file_io.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 ../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 \ + $(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 \ - $(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 ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_file_io.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 \ + ../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)/util_date.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.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_config.h ../lib/apr/include/apr_general.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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ + ../lib/apr/include/apr_lib.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 \ + $(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 \ - $(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_main.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \ - ../lib/apr/include/apr_portable.h \ + ../lib/apr/include/apr_file_io.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_main.h $(INCDIR)/http_log.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)/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 \ + $(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 \ - $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ - $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \ - uri_delims.h + ../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_log.h uri_delims.h 1.6 +38 -12 apache-2.0/src/modules/mpm/dexter/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/Makefile.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -u -r1.5 -r1.6 --- Makefile.tmpl 1999/10/13 05:24:14 1.5 +++ Makefile.tmpl 1999/10/30 05:59:27 1.6 @@ -63,17 +63,45 @@ ../../../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 \ - $(INCDIR)/buff.h \ + ../../../lib/apr/include/apr_file_io.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_config.h $(INCDIR)/ap_hooks.h \ - $(INCDIR)/http_protocol.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_request.h \ $(INCDIR)/http_conf_globals.h $(INCDIR)/http_core.h \ $(INCDIR)/http_vhost.h $(INCDIR)/util_script.h \ acceptlock.h dexter.h $(OSDIR)/unixd.h -dexter.o: dexter.c $(INCDIR)/httpd.h \ +dexter.o: dexter.c ../../../lib/apr/include/apr_portable.h \ + ../../../lib/apr/include/apr_config.h \ + ../../../lib/apr/include/apr_general.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 \ + $(INCDIR)/hsregex.h ../../../lib/apr/include/apr_lib.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_config.h \ + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_connection.h $(INCDIR)/ap_mpm.h \ + $(OSDIR)/unixd.h $(OSDIR)/iol_socket.h \ + $(INCDIR)/ap_listen.h acceptlock.h mpm_default.h dexter.h \ + scoreboard.h $(INCDIR)/mpm_status.h +scoreboard.o: scoreboard.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 \ @@ -81,13 +109,11 @@ ../../../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 \ - $(INCDIR)/buff.h \ + ../../../lib/apr/include/apr_file_io.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_config.h $(INCDIR)/ap_hooks.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \ - $(INCDIR)/ap_mpm.h $(OSDIR)/unixd.h \ - $(OSDIR)/iol_socket.h $(INCDIR)/ap_listen.h \ - acceptlock.h mpm_default.h dexter.h + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_config.h \ + $(INCDIR)/ap_hooks.h $(OSDIR)/unixd.h \ + $(INCDIR)/http_conf_globals.h $(INCDIR)/mpm_status.h \ + scoreboard.h mpm_default.h dexter.h 1.10 +28 -20 apache-2.0/src/modules/mpm/mpmt_pthread/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/Makefile.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -u -r1.9 -r1.10 --- Makefile.tmpl 1999/09/23 19:08:04 1.9 +++ Makefile.tmpl 1999/10/30 05:59:28 1.10 @@ -63,34 +63,43 @@ ../../../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 \ - $(INCDIR)/buff.h \ + ../../../lib/apr/include/apr_file_io.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_config.h $(INCDIR)/ap_hooks.h \ - $(INCDIR)/http_protocol.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_request.h \ $(INCDIR)/http_conf_globals.h $(INCDIR)/http_core.h \ $(INCDIR)/http_vhost.h $(INCDIR)/util_script.h \ acceptlock.h mpmt_pthread.h $(OSDIR)/unixd.h -mpmt_pthread.o: mpmt_pthread.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 \ +mpmt_pthread.o: mpmt_pthread.c ../../../lib/apr/include/apr_portable.h \ ../../../lib/apr/include/apr_config.h \ + ../../../lib/apr/include/apr_general.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 \ - $(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_config.h $(INCDIR)/ap_hooks.h \ - $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \ - $(INCDIR)/ap_mpm.h $(OSDIR)/unixd.h \ - $(OSDIR)/iol_socket.h $(INCDIR)/ap_listen.h \ - scoreboard.h mpm_default.h acceptlock.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 ../../../lib/apr/include/apr_lib.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_config.h \ + $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_connection.h $(INCDIR)/ap_mpm.h \ + $(OSDIR)/unixd.h $(OSDIR)/iol_socket.h \ + $(INCDIR)/ap_listen.h scoreboard.h mpm_default.h acceptlock.h scoreboard.o: scoreboard.c $(INCDIR)/httpd.h \ $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ @@ -99,8 +108,7 @@ ../../../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 \ - $(INCDIR)/buff.h \ + ../../../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \ 1.12 +2 -2 apache-2.0/src/modules/mpm/prefork/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/Makefile.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -u -r1.11 -r1.12 --- Makefile.tmpl 1999/09/23 19:08:07 1.11 +++ Makefile.tmpl 1999/10/30 05:59:29 1.12 @@ -56,8 +56,8 @@ # DO NOT REMOVE 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_general.h \ ../../../lib/apr/include/apr_errno.h \ ../../../lib/apr/include/apr_thread_proc.h \ ../../../lib/apr/include/apr_file_io.h \ @@ -68,7 +68,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 \ - ../../../lib/apr/include/apr_lib.h \ + $(INCDIR)/hsregex.h ../../../lib/apr/include/apr_lib.h \ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h mpm_default.h \ 1.7 +206 -225 apache-2.0/src/modules/standard/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -u -r1.6 -r1.7 --- Makefile.tmpl 1999/09/23 19:08:10 1.6 +++ Makefile.tmpl 1999/10/30 05:59:29 1.7 @@ -8,27 +8,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 \ - ../../lib/apr/include/apr_general.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 \ - $(INCDIR)/buff.h \ - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_request.h + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ + $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_config.h \ + $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_request.h mod_actions.o: mod_actions.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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 \ + $(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 \ @@ -39,24 +38,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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/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 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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 \ + $(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 \ @@ -66,15 +64,14 @@ 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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 \ - ../../lib/apr/include/apr_portable.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 ../../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 \ @@ -84,15 +81,14 @@ $(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_general.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 \ - $(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 \ - ../../lib/apr/include/apr_portable.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 ../../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 \ @@ -102,15 +98,14 @@ $(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_general.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 \ - $(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 \ - ../../lib/apr/include/apr_portable.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 ../../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 \ @@ -119,15 +114,14 @@ $(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_general.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 \ - $(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 \ - ../../lib/apr/include/apr_portable.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 ../../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 \ @@ -136,16 +130,15 @@ $(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_general.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 \ - $(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_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 \ + $(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_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 \ @@ -156,15 +149,14 @@ $(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_general.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 \ - $(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_request.h $(INCDIR)/http_protocol.h \ - ../../lib/apr/include/apr_portable.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_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 \ @@ -175,26 +167,25 @@ $(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_general.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 \ - $(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)/util_script.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_request.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)/util_script.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_request.h 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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 \ + $(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 \ @@ -205,15 +196,14 @@ $(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_general.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 \ - $(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 \ - ../../lib/apr/include/apr_portable.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 ../../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 \ @@ -222,15 +212,14 @@ 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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_request.h $(INCDIR)/http_protocol.h \ - ../../lib/apr/include/apr_portable.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_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 \ @@ -240,57 +229,56 @@ 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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_connection.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_connection.h \ + ../../lib/apr/include/apr_network_io.h 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/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 mod_expires.o: mod_expires.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/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 mod_headers.o: mod_headers.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ + $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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 \ + $(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 \ @@ -301,15 +289,14 @@ $(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_general.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 \ - $(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 \ + $(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 \ @@ -319,15 +306,15 @@ 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/http_protocol.h ../../lib/apr/include/apr_portable.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)/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 \ @@ -337,26 +324,25 @@ $(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_general.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 \ - $(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)/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 mod_log_config.o: mod_log_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 \ - ../../lib/apr/include/apr_general.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 \ - $(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 \ - ../../lib/apr/include/apr_portable.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 ../../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 \ @@ -365,37 +351,36 @@ $(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_general.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 \ - $(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)/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 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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_request.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_request.h mod_mime_magic.o: mod_mime_magic.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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_log.h \ - $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.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_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 \ @@ -404,14 +389,14 @@ $(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_general.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 \ - $(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 ../../lib/apr/include/apr_portable.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 \ + ../../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 \ @@ -422,28 +407,27 @@ $(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_general.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 \ - $(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_conf_globals.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h $(INCDIR)/http_vhost.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_conf_globals.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_vhost.h mod_setenvif.o: mod_setenvif.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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 \ - ../../lib/apr/include/apr_portable.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 ../../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 \ @@ -451,85 +435,82 @@ 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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/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 mod_speling.o: mod_speling.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 \ - ../../lib/apr/include/apr_general.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 \ - $(INCDIR)/buff.h \ - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \ - $(INCDIR)/http_log.h + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ + $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_core.h $(INCDIR)/http_config.h \ + $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h mod_status.o: mod_status.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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 \ + $(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_conf_globals.h $(INCDIR)/http_main.h \ - $(INCDIR)/util_script.h ../../modules/mpm/prefork/scoreboard.h \ - $(INCDIR)/http_log.h + $(INCDIR)/mpm_status.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/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 mod_userdir.o: mod_userdir.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/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 mod_usertrack.o: mod_usertrack.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/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 mod_vhost_alias.o: mod_vhost_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 \ - ../../lib/apr/include/apr_general.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 \ - $(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)/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 1.6 +11 -12 apache-2.0/src/os/unix/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-2.0/src/os/unix/Makefile.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -u -r1.5 -r1.6 --- Makefile.tmpl 1999/09/23 19:08:19 1.5 +++ Makefile.tmpl 1999/10/30 05:59:32 1.6 @@ -42,27 +42,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 \ - ../../lib/apr/include/apr_general.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 \ - $(INCDIR)/buff.h \ - $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h iol_socket.h + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ + $(INCDIR)/apr.h $(INCDIR)/util_uri.h iol_socket.h 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 + $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.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 os.h + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ + $(INCDIR)/hsregex.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 \ - ../../lib/apr/include/apr_general.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 \ - $(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_main.h \ - $(INCDIR)/http_log.h unixd.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_main.h $(INCDIR)/http_log.h unixd.h